1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-01 18:17:55 +00:00

update commits

Signed-off-by: Devan-Kerman <devan@cleverpath.com>
This commit is contained in:
Devan-Kerman
2020-09-15 11:38:16 -05:00
parent 5e31dcde83
commit 01d3d12992
5 changed files with 23 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
org.gradle.jvmargs=-Xmx1G
# Mod properties
mod_version=1.91.1
mod_version=1.91.2
# Minecraft properties
mc_version=1.16.2

View File

@@ -72,6 +72,7 @@ public final class ComputerCraft implements ModInitializer {
"172.16.0.0/12",
"192.168.0.0/16",
"fd00::/8",
"0.0.0.0/8"
};
public static final int terminalWidth_computer = 51;
public static final int terminalHeight_computer = 19;

View File

@@ -106,7 +106,7 @@ public class FileSystemWrapperMount implements IFileSystem {
@Override
public boolean isDirectory(@Nonnull String path) throws IOException {
try {
return this.m_filesystem.exists(path);
return this.m_filesystem.isDir(path);
} catch (FileSystemException e) {
throw new IOException(e.getMessage());
}

View File

@@ -36,7 +36,7 @@ public final class DropConsumer {
dropPos = null;
dropBounds = new Box(entity.getBlockPos()).expand(2, 2, 2);
// entity.captureDrops( new ArrayList<>() );
// entity.getScale().captureDrops( new ArrayList<>() );
}
public static void set(World world, BlockPos pos, Function<ItemStack, ItemStack> consumer) {

View File

@@ -1,15 +1,24 @@
local tMotd = {}
local date = os.date("*t")
if date.month == 1 and date.day == 1 then
print("Happy new year!")
elseif date.month == 12 and date.day == 24 then
print("Merry X-mas!")
elseif date.month == 10 and date.day == 31 then
print("OOoooOOOoooo! Spooky!")
else
local tMotd = {}
for sPath in string.gmatch(settings.get( "motd.path" ), "[^:]+") do
if fs.exists(sPath) then
for sLine in io.lines(sPath) do
table.insert(tMotd,sLine)
for sPath in string.gmatch(settings.get("motd.path"), "[^:]+") do
if fs.exists(sPath) then
for sLine in io.lines(sPath) do
table.insert(tMotd, sLine)
end
end
end
end
if #tMotd == 0 then
print("missingno")
else
print(tMotd[math.random(1,#tMotd)])
if #tMotd == 0 then
print("missingno")
else
print(tMotd[math.random(1, #tMotd)])
end
end