From e5cf0d1c61c1816eb8d4a56ca21d8d76cbb5a3ce Mon Sep 17 00:00:00 2001 From: SquidDev Date: Mon, 27 Jul 2020 18:26:42 +0100 Subject: [PATCH] Update mappings --- gradle.properties | 2 +- .../computercraft/ComputerCraftAPIImpl.java | 4 ++-- .../computercraft/client/gui/GuiComputer.java | 16 ++++++++-------- .../computercraft/client/gui/GuiDiskDrive.java | 2 +- .../computercraft/client/gui/GuiPrinter.java | 2 +- .../computercraft/client/gui/GuiPrintout.java | 7 ++----- .../computercraft/client/gui/GuiTurtle.java | 16 ++++++++-------- .../java/dan200/computercraft/data/Tags.java | 10 +++++----- .../shared/command/CommandComputerCraft.java | 14 +++++++------- .../shared/command/CommandCopy.java | 2 +- .../command/builder/HelpingArgumentBuilder.java | 16 ++++++++-------- .../shared/command/text/ChatHelpers.java | 8 ++++---- .../shared/command/text/TableFormatter.java | 16 ++++++++-------- .../shared/computer/items/ItemComputerBase.java | 2 +- .../shared/media/items/ItemDisk.java | 2 +- .../shared/peripheral/generic/data/ItemData.java | 2 +- .../modem/wired/TileWiredModemFull.java | 4 ++-- .../shared/peripheral/printer/TilePrinter.java | 2 +- .../shared/pocket/core/PocketServerComputer.java | 2 +- .../shared/pocket/items/ItemPocketComputer.java | 2 +- .../shared/proxy/ComputerCraftProxyCommon.java | 2 +- .../shared/turtle/upgrades/TurtleTool.java | 2 +- .../computercraft/shared/util/DropConsumer.java | 2 +- .../computercraft/shared/util/RecordUtil.java | 2 +- 24 files changed, 68 insertions(+), 71 deletions(-) diff --git a/gradle.properties b/gradle.properties index ccb81d88c..2b9a3c95a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ mod_version=1.90.2 # Minecraft properties (update mods.toml when changing) mc_version=1.16.1 forge_version=32.0.75 -mappings_version=20200707-1.16.1 +mappings_version=20200723-1.16.1 diff --git a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java index 2c8d0a683..e294a7ac1 100644 --- a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java +++ b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java @@ -54,7 +54,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI public static InputStream getResourceFile( String domain, String subPath ) { - IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().func_240970_h_(); + IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager(); try { return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream(); @@ -97,7 +97,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI @Override public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath ) { - IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().func_240970_h_(); + IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager(); ResourceMount mount = ResourceMount.get( domain, subPath, manager ); return mount.exists( "" ) ? mount : null; } diff --git a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java index 65ef21bdd..ed46daf49 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java @@ -91,13 +91,13 @@ public final class GuiComputer extends Containe terminalWrapper = new WidgetWrapper( terminal, MARGIN + BORDER + guiLeft, MARGIN + BORDER + guiTop, termPxWidth, termPxHeight ); children.add( terminalWrapper ); - setFocused( terminalWrapper ); + setListener( terminalWrapper ); } @Override - public void removed() + public void onClose() { - super.removed(); + super.onClose(); children.remove( terminal ); terminal = null; minecraft.keyboardListener.enableRepeatEvents( false ); @@ -114,16 +114,16 @@ public final class GuiComputer extends Containe public boolean keyPressed( int key, int scancode, int modifiers ) { // Forward the tab key to the terminal, rather than moving between controls. - if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper ) + if( key == GLFW.GLFW_KEY_TAB && getListener() != null && getListener() == terminalWrapper ) { - return getFocused().keyPressed( key, scancode, modifiers ); + return getListener().keyPressed( key, scancode, modifiers ); } return super.keyPressed( key, scancode, modifiers ); } @Override - public void func_230450_a_( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY ) + public void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY ) { // Draw terminal terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() ); @@ -147,12 +147,12 @@ public final class GuiComputer extends Containe @Override public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY ) { - return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY )) + return (getListener() != null && getListener().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY ); } @Override - protected void func_230451_b_( @Nonnull MatrixStack transform, int mouseX, int mouseY ) + protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY ) { // Skip rendering labels. } diff --git a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java index e4d2ab06c..0eb36af5a 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java @@ -25,7 +25,7 @@ public class GuiDiskDrive extends ContainerScreen } @Override - protected void func_230450_a_( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) + protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) { RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F ); minecraft.getTextureManager().bindTexture( BACKGROUND ); diff --git a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java index a6c14aea3..a111a6e6a 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java @@ -33,7 +33,7 @@ public class GuiPrinter extends ContainerScreen }*/ @Override - protected void func_230450_a_( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) + protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) { RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F ); minecraft.getTextureManager().bindTexture( BACKGROUND ); diff --git a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java index 6e2bc6ead..e340894ef 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java @@ -15,7 +15,6 @@ import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.TransformationMatrix; import net.minecraft.util.text.ITextComponent; import org.lwjgl.glfw.GLFW; @@ -25,8 +24,6 @@ import static dan200.computercraft.client.render.PrintoutRenderer.*; public class GuiPrintout extends ContainerScreen { - private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix(); - private final boolean m_book; private final int m_pages; private final TextBuffer[] m_text; @@ -94,7 +91,7 @@ public class GuiPrintout extends ContainerScreen } @Override - protected void func_230450_a_( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) + protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) { // Draw the printout RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f ); @@ -120,7 +117,7 @@ public class GuiPrintout extends ContainerScreen } @Override - protected void func_230451_b_( @Nonnull MatrixStack transform, int mouseX, int mouseY ) + protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY ) { // Skip rendering labels. } diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java index 6399b0101..945e7d1f9 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java @@ -64,13 +64,13 @@ public class GuiTurtle extends ContainerScreen terminalWrapper = new WidgetWrapper( terminal, 2 + 8 + guiLeft, 2 + 8 + guiTop, termPxWidth, termPxHeight ); children.add( terminalWrapper ); - setFocused( terminalWrapper ); + setListener( terminalWrapper ); } @Override - public void removed() + public void onClose() { - super.removed(); + super.onClose(); children.remove( terminal ); terminal = null; minecraft.keyboardListener.enableRepeatEvents( false ); @@ -87,9 +87,9 @@ public class GuiTurtle extends ContainerScreen public boolean keyPressed( int key, int scancode, int modifiers ) { // Forward the tab key to the terminal, rather than moving between controls. - if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper ) + if( key == GLFW.GLFW_KEY_TAB && getListener() != null && getListener() == terminalWrapper ) { - return getFocused().keyPressed( key, scancode, modifiers ); + return getListener().keyPressed( key, scancode, modifiers ); } return super.keyPressed( key, scancode, modifiers ); @@ -110,7 +110,7 @@ public class GuiTurtle extends ContainerScreen } @Override - protected void func_230450_a_( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) + protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY ) { // Draw term boolean advanced = m_family == ComputerFamily.ADVANCED; @@ -135,12 +135,12 @@ public class GuiTurtle extends ContainerScreen @Override public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY ) { - return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY )) + return (getListener() != null && getListener().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY ); } @Override - protected void func_230451_b_( @Nonnull MatrixStack transform, int mouseX, int mouseY ) + protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY ) { // Skip rendering labels. } diff --git a/src/main/java/dan200/computercraft/data/Tags.java b/src/main/java/dan200/computercraft/data/Tags.java index 2920548a4..587c1b506 100644 --- a/src/main/java/dan200/computercraft/data/Tags.java +++ b/src/main/java/dan200/computercraft/data/Tags.java @@ -38,16 +38,16 @@ public class Tags extends ItemTagsProvider @Override protected void registerTags() { - func_240522_a_( COMPUTER ).func_240534_a_( + getOrCreateBuilder( COMPUTER ).add( Registry.ModItems.COMPUTER_NORMAL.get(), Registry.ModItems.COMPUTER_ADVANCED.get(), Registry.ModItems.COMPUTER_COMMAND.get() ); - func_240522_a_( TURTLE ).func_240534_a_( Registry.ModItems.TURTLE_NORMAL.get(), Registry.ModItems.TURTLE_ADVANCED.get() ); - func_240522_a_( WIRED_MODEM ).func_240534_a_( Registry.ModItems.WIRED_MODEM.get(), Registry.ModItems.WIRED_MODEM_FULL.get() ); - func_240522_a_( MONITOR ).func_240534_a_( Registry.ModItems.MONITOR_NORMAL.get(), Registry.ModItems.MONITOR_ADVANCED.get() ); + getOrCreateBuilder( TURTLE ).add( Registry.ModItems.TURTLE_NORMAL.get(), Registry.ModItems.TURTLE_ADVANCED.get() ); + getOrCreateBuilder( WIRED_MODEM ).add( Registry.ModItems.WIRED_MODEM.get(), Registry.ModItems.WIRED_MODEM_FULL.get() ); + getOrCreateBuilder( MONITOR ).add( Registry.ModItems.MONITOR_NORMAL.get(), Registry.ModItems.MONITOR_ADVANCED.get() ); - func_240522_a_( PIGLIN_LOVED ).func_240534_a_( + getOrCreateBuilder( PIGLIN_LOVED ).add( Registry.ModItems.COMPUTER_ADVANCED.get(), Registry.ModItems.TURTLE_ADVANCED.get(), Registry.ModItems.WIRELESS_MODEM_ADVANCED.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get(), Registry.ModItems.MONITOR_ADVANCED.get() diff --git a/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java b/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java index c8afb9c44..dcde9c562 100644 --- a/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java +++ b/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java @@ -289,11 +289,11 @@ public final class CommandComputerCraft // Append the computer instance if( serverComputer == null ) { - out.func_230529_a_( text( "?" ) ); + out.append( text( "?" ) ); } else { - out.func_230529_a_( link( + out.append( link( text( Integer.toString( serverComputer.getInstanceID() ) ), "/computercraft dump " + serverComputer.getInstanceID(), translate( "commands.computercraft.dump.action" ) @@ -301,20 +301,20 @@ public final class CommandComputerCraft } // And ID - out.func_240702_b_( " (id " + computerId + ")" ); + out.appendString( " (id " + computerId + ")" ); // And, if we're a player, some useful links if( serverComputer != null && UserLevel.OP.test( source ) && isPlayer( source ) ) { out - .func_240702_b_( " " ) - .func_230529_a_( link( + .appendString( " " ) + .append( link( text( "\u261b" ), "/computercraft tp " + serverComputer.getInstanceID(), translate( "commands.computercraft.tp.action" ) ) ) - .func_240702_b_( " " ) - .func_230529_a_( link( + .appendString( " " ) + .append( link( text( "\u20e2" ), "/computercraft view " + serverComputer.getInstanceID(), translate( "commands.computercraft.view.action" ) diff --git a/src/main/java/dan200/computercraft/shared/command/CommandCopy.java b/src/main/java/dan200/computercraft/shared/command/CommandCopy.java index 52143faee..92b794109 100644 --- a/src/main/java/dan200/computercraft/shared/command/CommandCopy.java +++ b/src/main/java/dan200/computercraft/shared/command/CommandCopy.java @@ -58,7 +58,7 @@ public final class CommandCopy public static ITextComponent createCopyText( String text ) { - return new StringTextComponent( text ).func_230530_a_( Style.EMPTY + return new StringTextComponent( text ).mergeStyle( Style.EMPTY .setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, PREFIX + text ) ) .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TranslationTextComponent( "gui.computercraft.tooltip.copy" ) ) ) ); } diff --git a/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java b/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java index 48ba35e6c..0faf686fc 100644 --- a/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java +++ b/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java @@ -175,11 +175,11 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder child : node.getChildren() ) { @@ -188,16 +188,16 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder T coloured( T component, TextFormatting colour ) { - component.func_240699_a_( colour ); + component.mergeStyle( colour ); return component; } @@ -50,7 +50,7 @@ public final class ChatHelpers IFormattableTextComponent component = new StringTextComponent( "" ); for( ITextComponent child : children ) { - component.func_230529_a_( child ); + component.append( child ); } return component; } @@ -76,7 +76,7 @@ public final class ChatHelpers style = style.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, command ) ); style = style.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, toolTip ) ); - return component.func_230530_a_( style ); + return component.setStyle( style ); } public static IFormattableTextComponent header( String text ) diff --git a/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java b/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java index 7d001f20c..c846cbce4 100644 --- a/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java +++ b/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java @@ -79,12 +79,12 @@ public interface TableFormatter StringTextComponent line = new StringTextComponent( "" ); for( int i = 0; i < columns - 1; i++ ) { - line.func_230529_a_( headers[i] ); + line.append( headers[i] ); ITextComponent padding = getPadding( headers[i], maxWidths[i] ); - if( padding != null ) line.func_230529_a_( padding ); - line.func_230529_a_( SEPARATOR ); + if( padding != null ) line.append( padding ); + line.append( SEPARATOR ); } - line.func_230529_a_( headers[columns - 1] ); + line.append( headers[columns - 1] ); writeLine( rowId++, line ); @@ -100,12 +100,12 @@ public interface TableFormatter StringTextComponent line = new StringTextComponent( "" ); for( int i = 0; i < columns - 1; i++ ) { - line.func_230529_a_( row[i] ); + line.append( row[i] ); ITextComponent padding = getPadding( row[i], maxWidths[i] ); - if( padding != null ) line.func_230529_a_( padding ); - line.func_230529_a_( SEPARATOR ); + if( padding != null ) line.append( padding ); + line.append( SEPARATOR ); } - line.func_230529_a_( row[columns - 1] ); + line.append( row[columns - 1] ); writeLine( rowId++, line ); } diff --git a/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java b/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java index 04d61c252..4bdd39642 100644 --- a/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java +++ b/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java @@ -43,7 +43,7 @@ public abstract class ItemComputerBase extends BlockItem implements IComputerIte if( id >= 0 ) { list.add( new TranslationTextComponent( "gui.computercraft.tooltip.computer_id", id ) - .func_240699_a_( TextFormatting.GRAY ) ); + .mergeStyle( TextFormatting.GRAY ) ); } } } diff --git a/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java b/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java index 017781cba..5a067984f 100644 --- a/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java +++ b/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java @@ -69,7 +69,7 @@ public class ItemDisk extends Item implements IMedia, IColouredItem if( id >= 0 ) { list.add( new TranslationTextComponent( "gui.computercraft.tooltip.disk_id", id ) - .func_240699_a_( TextFormatting.GRAY ) ); + .mergeStyle( TextFormatting.GRAY ) ); } } } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java index c20a91c85..005ff4e02 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java @@ -144,7 +144,7 @@ public class ItemData enchants.ensureCapacity( enchants.size() + rawEnchants.size() ); - for( Map.Entry entry : EnchantmentHelper.func_226652_a_( rawEnchants ).entrySet() ) + for( Map.Entry entry : EnchantmentHelper.deserializeEnchantments( rawEnchants ).entrySet() ) { Enchantment enchantment = entry.getKey(); Integer level = entry.getValue(); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java index 459aa7277..2b9cd6278 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java @@ -217,8 +217,8 @@ public class TileWiredModemFull extends TileGeneric StringTextComponent base = new StringTextComponent( "" ); for( int i = 0; i < names.size(); i++ ) { - if( i > 0 ) base.func_240702_b_( ", " ); - base.func_230529_a_( CommandCopy.createCopyText( names.get( i ) ) ); + if( i > 0 ) base.appendString( ", " ); + base.append( CommandCopy.createCopyText( names.get( i ) ) ); } player.sendStatusMessage( new TranslationTextComponent( kind, base ), false ); 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 fc44c7dac..a647afe60 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java @@ -403,7 +403,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent setInventorySlotContents( i, ItemStack.EMPTY ); // Spawn the item in the world - WorldUtil.dropItemStack( stack, getWorld(), Vector3d.func_237491_b_( getPos() ).add( 0.5, 0.75, 0.5 ) ); + WorldUtil.dropItemStack( stack, getWorld(), Vector3d.copy( getPos() ).add( 0.5, 0.75, 0.5 ) ); } } } diff --git a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java index fdc21e23f..e165daf95 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java @@ -163,7 +163,7 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces if( entity != null ) { setWorld( entity.getEntityWorld() ); - setPosition( entity.func_233580_cy_() ); + setPosition( entity.getPosition() ); } // If a new entity has picked it up then rebroadcast the terminal to them diff --git a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java index 2c4979270..f284296b6 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java @@ -190,7 +190,7 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I if( id >= 0 ) { list.add( new TranslationTextComponent( "gui.computercraft.tooltip.computer_id", id ) - .func_240699_a_( TextFormatting.GRAY ) ); + .mergeStyle( TextFormatting.GRAY ) ); } } } diff --git a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java index d40956cf2..60103bd44 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java +++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java @@ -71,7 +71,7 @@ public final class ComputerCraftProxyCommon private static void registerCondition( String name, LootConditionType serializer ) { - Registry.register( Registry.field_239704_ba_, new ResourceLocation( ComputerCraft.MOD_ID, name ), serializer ); + Registry.register( Registry.LOOT_CONDITION_TYPE, new ResourceLocation( ComputerCraft.MOD_ID, name ), serializer ); } private static void registerProviders() diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java index 721fa4f64..cb322a37d 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java @@ -149,7 +149,7 @@ public class TurtleTool extends AbstractTurtleUpgrade boolean attacked = false; if( !hitEntity.hitByEntity( turtlePlayer ) ) { - float damage = (float) turtlePlayer.func_233637_b_( Attributes.ATTACK_DAMAGE ); + float damage = (float) turtlePlayer.getAttributeValue( Attributes.ATTACK_DAMAGE ); damage *= getDamageMultiplier(); if( damage > 0.0f ) { diff --git a/src/main/java/dan200/computercraft/shared/util/DropConsumer.java b/src/main/java/dan200/computercraft/shared/util/DropConsumer.java index 0378a620d..bf9086dc9 100644 --- a/src/main/java/dan200/computercraft/shared/util/DropConsumer.java +++ b/src/main/java/dan200/computercraft/shared/util/DropConsumer.java @@ -41,7 +41,7 @@ public final class DropConsumer remainingDrops = new ArrayList<>(); dropEntity = entity; dropWorld = entity.world; - dropBounds = new AxisAlignedBB( entity.func_233580_cy_() ).grow( 2, 2, 2 ); + dropBounds = new AxisAlignedBB( entity.getPosition() ).grow( 2, 2, 2 ); entity.captureDrops( new ArrayList<>() ); } diff --git a/src/main/java/dan200/computercraft/shared/util/RecordUtil.java b/src/main/java/dan200/computercraft/shared/util/RecordUtil.java index 66d3fef58..f583cd1ff 100644 --- a/src/main/java/dan200/computercraft/shared/util/RecordUtil.java +++ b/src/main/java/dan200/computercraft/shared/util/RecordUtil.java @@ -20,6 +20,6 @@ public final class RecordUtil public static void playRecord( SoundEvent record, String recordInfo, World world, BlockPos pos ) { NetworkMessage packet = record != null ? new PlayRecordClientMessage( pos, record, recordInfo ) : new PlayRecordClientMessage( pos ); - NetworkHandler.sendToAllAround( packet, world, Vector3d.func_237489_a_( pos ), 64 ); + NetworkHandler.sendToAllAround( packet, world, Vector3d.copyCentered( pos ), 64 ); } }