mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-05-06 17:34:15 +00:00
Code Issues Releases Wiki Activity

Bump Forge to 1.14.3

Browse Source 
Guess it's time for another release?
This commit is contained in:
SquidDev 2019-06-26 08:25:32 +01:00
parent f1e551b960
commit 6ea8ca991b
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -2,6 +2,6 @@
mod_version=1.83.1 mod_version=1.83.1
# Minecraft properties # Minecraft properties
mc_version=1.14.2 mc_version=1.14.3
forge_version=26.0.55 forge_version=27.0.3
mappings_version=20190621-1.14.2 mappings_version=20190626-1.14.3

5
src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
View File

@ -22,6 +22,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.GameRules;
import net.minecraft.world.ServerWorld; import net.minecraft.world.ServerWorld;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -63,7 +64,7 @@ public class TileCommandComputer extends TileComputer
@Override @Override
public boolean shouldReceiveFeedback() public boolean shouldReceiveFeedback()
{ {
return getWorld().getGameRules().getBoolean( "sendCommandFeedback" ); return getWorld().getGameRules().getBoolean( GameRules.SEND_COMMAND_FEEDBACK );
} }
@Override @Override
@ -75,7 +76,7 @@ public class TileCommandComputer extends TileComputer
@Override @Override
public boolean allowLogging() public boolean allowLogging()
{ {
return getWorld().getGameRules().getBoolean( "commandBlockOutput" ); return getWorld().getGameRules().getBoolean( GameRules.COMMAND_BLOCK_OUTPUT );
} }
} }

2
src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
View File

@ -416,7 +416,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
{ {
return hasCustomName() return hasCustomName()
? new StringTextComponent( label ) ? new StringTextComponent( label )
: new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() );
} }
@Override @Override

2
src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java
View File

@ -581,7 +581,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
@Override @Override
public ITextComponent getName() public ITextComponent getName()
{ {
return customName != null ? customName : new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); return customName != null ? customName : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() );
} }
@Nonnull @Nonnull

2
src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
View File

@ -574,7 +574,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
@Override @Override
public ITextComponent getName() public ITextComponent getName()
{ {
return customName != null ? customName : new TranslationTextComponent(getBlockState().getBlock().getTranslationKey()); return customName != null ? customName : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() );
} }
@Override @Override

4
src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader="javafml" modLoader="javafml"
loaderVersion="[26,)" loaderVersion="[27,28)"
issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues" issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
displayURL="https://github.com/SquidDev-CC/CC-Tweaked" 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]] [[dependencies.computercraft]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[26,)" versionRange="[27,28)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"