mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-02 18:37:55 +00:00
Code Issues Releases Wiki Activity

update commits

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

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

1
src/main/java/dan200/computercraft/ComputerCraft.java
View File

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

2
src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java
View File

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

2
src/main/java/dan200/computercraft/shared/util/DropConsumer.java
View File

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

9
src/main/resources/assets/computercraft/lua/rom/programs/motd.lua
View File

@@ -1,3 +1,11 @@
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 = {} local tMotd = {}
for sPath in string.gmatch(settings.get("motd.path"), "[^:]+") do for sPath in string.gmatch(settings.get("motd.path"), "[^:]+") do
@@ -13,3 +21,4 @@ if #tMotd == 0 then
else else
print(tMotd[math.random(1, #tMotd)]) print(tMotd[math.random(1, #tMotd)])
end end
end