mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-30 21:23:00 +00:00
Code Issues Releases Wiki Activity

Update to 1.14pr2

Browse Source
This commit is contained in:
SquidDev
2019-04-12 19:35:34 +01:00
parent b1fff97bff
commit b9ec6f236d
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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"

4
gradle.properties
View File

@@ -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

4
src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
View File

@@ -86,13 +86,13 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
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();

4
src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java
View File

@@ -44,7 +44,7 @@ import static dan200.computercraft.shared.command.builder.CommandBuilder.args;
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 @@ public final class CommandComputerCraft
}
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;

4
src/main/java/dan200/computercraft/shared/command/CommandCopy.java
View File

@@ -16,8 +16,8 @@ import net.minecraft.text.TranslatableTextComponent;
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
{

4
src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java
View File

@@ -20,7 +20,7 @@ import net.minecraft.block.BlockState;
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 @@ public class CommandAPI implements ILuaAPI
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
{

4
src/main/java/dan200/computercraft/shared/mixin/MixinItemFrameEntityRenderer.java
View File

@@ -19,8 +19,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@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 )

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

@@ -207,7 +207,7 @@ public class BlockCable extends BlockGeneric implements WaterloggableBlock
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

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

@@ -83,7 +83,7 @@ public class BlockWirelessModem extends BlockGeneric implements WaterloggableBlo
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

2
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
View File

@@ -299,7 +299,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
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 )

2
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
View File

@@ -146,7 +146,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
// 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();