Update to 1.14pr2

Author: SquidDev

build.gradle

@@ -53,7 +53,7 @@ configurations {
 dependencies {
     minecraft "com.mojang:minecraft:${mc_version}"
     mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}"
-    modCompile "net.fabricmc:fabric-loader:0.4.0+build.119"
+    modCompile "net.fabricmc:fabric-loader:0.4.0+build.121"
     modCompile "net.fabricmc:fabric:0.2.7+build.122"
 
     // compileOnly "mezz.jei:jei-1.13.2:5.0.0.8:api"

gradle.properties

@@ -2,5 +2,5 @@
 mod_version=1.82.1
 
 # Minecraft properties
-mc_version=1.14 Pre-Release 1
-mappings_version=3
+mc_version=1.14 Pre-Release 2
+mappings_version=1

src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java

@@ -86,13 +86,13 @@ private void renderTurtleAt( TileTurtle turtle, double posX, double posY, double
         String label = turtle.createProxy().getLabel();
         if( label != null && renderManager.hitResult != null && renderManager.hitResult instanceof BlockHitResult && turtle.getPos().equals( ((BlockHitResult) renderManager.hitResult).getBlockPos() ) )
         {
-            method_3570( true );
+            disableLightmap( true );
             GameRenderer.renderFloatingText(
                 getFontRenderer(), label,
                 (float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0,
                 renderManager.cameraEntity.getYaw(), renderManager.cameraEntity.getPitch(), false
             );
-            method_3570( false );
+            disableLightmap( false );
         }
 
         GlStateManager.pushMatrix();

src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -44,7 +44,7 @@
 import static dan200.computercraft.shared.command.builder.CommandBuilder.command;
 import static dan200.computercraft.shared.command.builder.HelpingArgumentBuilder.choice;
 import static dan200.computercraft.shared.command.text.ChatHelpers.*;
-import static net.minecraft.server.command.ServerCommandManager.literal;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public final class CommandComputerCraft
 {
@@ -178,7 +178,7 @@ else if( b.getWorld() == world )
                     }
                     else
                     {
-                        player.method_14251( (ServerWorld) world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0 );
+                        player.teleport( (ServerWorld) world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0 );
                     }
 
                     return 1;

src/main/java/dan200/computercraft/shared/command/CommandCopy.java

@@ -16,8 +16,8 @@
 import net.minecraft.text.event.ClickEvent;
 import net.minecraft.text.event.HoverEvent;
 
-import static net.minecraft.server.command.ServerCommandManager.argument;
-import static net.minecraft.server.command.ServerCommandManager.literal;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public final class CommandCopy
 {

src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -20,7 +20,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.ServerCommandManager;
+import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.state.property.Property;
 import net.minecraft.util.math.BlockPos;
@@ -81,7 +81,7 @@ private Object[] doCommand( String command )
             return new Object[] { false, createOutput( "Command blocks disabled by server" ) };
         }
 
-        ServerCommandManager commandManager = server.getCommandManager();
+        CommandManager commandManager = server.getCommandManager();
         TileCommandComputer.CommandReceiver receiver = m_computer.getReceiver();
         try
         {

src/main/java/dan200/computercraft/shared/mixin/MixinItemFrameEntityRenderer.java

@@ -19,8 +19,8 @@
 @Mixin( ItemFrameEntityRenderer.class )
 public class MixinItemFrameEntityRenderer
 {
-    @Inject( method = "hasLabel", at = @At( "HEAD" ), cancellable = true ) // TODO: This name is entirely wrong
-    private void method_3992_Injected( ItemFrameEntity entity, CallbackInfo info )
+    @Inject( method = "renderItem", at = @At( "HEAD" ), cancellable = true )
+    private void renderItem_Injected( ItemFrameEntity entity, CallbackInfo info )
     {
         ItemStack stack = entity.getHeldItemStack();
         if( stack.getItem() instanceof ItemPrintout )

src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java

@@ -207,7 +207,7 @@ public boolean canPlaceAt( BlockState state, ViewableWorld world, BlockPos pos )
 
         BlockPos offsetPos = pos.offset( facing );
         BlockState offsetState = world.getBlockState( offsetPos );
-        return Block.isFaceFullSquare( offsetState.getCollisionShape( world, offsetPos ), facing.getOpposite() ) && !method_9581( offsetState.getBlock() );
+        return Block.isFaceFullSquare( offsetState.getCollisionShape( world, offsetPos ), facing.getOpposite() );
     }
 
     @Nullable

src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java

@@ -83,7 +83,7 @@ public boolean canPlaceAt( BlockState state, ViewableWorld world, BlockPos pos )
         Direction facing = state.get( FACING );
         BlockPos offsetPos = pos.offset( facing );
         BlockState offsetState = world.getBlockState( offsetPos );
-        return Block.isFaceFullSquare( offsetState.getCollisionShape( world, offsetPos ), facing.getOpposite() ) && !method_9581( offsetState.getBlock() );
+        return Block.isFaceFullSquare( offsetState.getCollisionShape( world, offsetPos ), facing.getOpposite() );
     }
 
     @Nullable

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java

@@ -299,7 +299,7 @@ private static boolean canDeployOnBlock( @Nonnull ItemPlacementContext context,
         BlockState state = world.getBlockState( position );
         Block block = state.getBlock();
 
-        boolean replaceable = state.method_11587( context );
+        boolean replaceable = state.canReplace( context );
         if( !allowReplaceable && replaceable ) return false;
 
         if( ComputerCraft.turtlesObeyBlockProtection )

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java

@@ -146,7 +146,7 @@ private TurtleCommandResult attack( final ITurtleAccess turtle, Direction direct
 
             // Attack the entity
             boolean attacked = false;
-            if( !hitEntity.method_5698( turtlePlayer ) ) // hitByEntity
+            if( !hitEntity.handlePlayerAttack( turtlePlayer ) )
             {
                 float damage = (float) turtlePlayer.getAttributeInstance( EntityAttributes.ATTACK_DAMAGE ).getValue();
                 damage *= getDamageMultiplier();