From 6ea8ca991b4725437300af206fbeaedb259b0c01 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Wed, 26 Jun 2019 08:25:32 +0100 Subject: [PATCH] Bump Forge to 1.14.3 Guess it's time for another release? --- gradle.properties | 6 +++--- .../shared/computer/blocks/TileCommandComputer.java | 5 +++-- .../shared/computer/blocks/TileComputerBase.java | 2 +- .../shared/peripheral/diskdrive/TileDiskDrive.java | 2 +- .../shared/peripheral/printer/TilePrinter.java | 2 +- src/main/resources/META-INF/mods.toml | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5acb12d7c1..b6ea6fe239 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ mod_version=1.83.1 # Minecraft properties -mc_version=1.14.2 -forge_version=26.0.55 -mappings_version=20190621-1.14.2 +mc_version=1.14.3 +forge_version=27.0.3 +mappings_version=20190626-1.14.3 diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java index dcd4765922..1a689ded3f 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java @@ -22,6 +22,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.GameRules; import net.minecraft.world.ServerWorld; import javax.annotation.Nonnull; @@ -63,7 +64,7 @@ public void sendMessage( @Nonnull ITextComponent textComponent ) @Override public boolean shouldReceiveFeedback() { - return getWorld().getGameRules().getBoolean( "sendCommandFeedback" ); + return getWorld().getGameRules().getBoolean( GameRules.SEND_COMMAND_FEEDBACK ); } @Override @@ -75,7 +76,7 @@ public boolean shouldReceiveErrors() @Override public boolean allowLogging() { - return getWorld().getGameRules().getBoolean( "commandBlockOutput" ); + return getWorld().getGameRules().getBoolean( GameRules.COMMAND_BLOCK_OUTPUT ); } } diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java index e0a6da47db..cdadb3c3c2 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java @@ -416,7 +416,7 @@ public ITextComponent getName() { return hasCustomName() ? new StringTextComponent( label ) - : new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); + : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java index a2715d4326..72d3c634f7 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java @@ -581,7 +581,7 @@ public ITextComponent getCustomName() @Override public ITextComponent getName() { - return customName != null ? customName : new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); + return customName != null ? customName : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() ); } @Nonnull diff --git a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java index 206040c81b..98a22fb355 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java @@ -574,7 +574,7 @@ public ITextComponent getCustomName() @Override public ITextComponent getName() { - return customName != null ? customName : new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); + return customName != null ? customName : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() ); } @Override diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index ff246ba743..0e40894ea7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[26,)" +loaderVersion="[27,28)" issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues" displayURL="https://github.com/SquidDev-CC/CC-Tweaked" @@ -19,6 +19,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a [[dependencies.computercraft]] modId="forge" mandatory=true - versionRange="[26,)" + versionRange="[27,28)" ordering="NONE" side="BOTH"