From 5a46f69da19c310ed989ba5eef5f2346eb118fed Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 14 Jul 2018 16:26:07 +0200 Subject: [PATCH] Update dependencies and mappings. --- build.gradle | 10 +++++----- .../apiimpl/network/node/NetworkNode.java | 2 +- .../apiimpl/network/node/NetworkNodeConstructor.java | 6 +++--- .../apiimpl/network/node/NetworkNodeCrafter.java | 2 +- .../apiimpl/network/node/NetworkNodeDestructor.java | 2 +- .../apiimpl/network/node/cover/CoverManager.java | 2 +- .../network/readerwriter/ReaderWriterHandlerItems.java | 2 +- .../refinedstorage/apiimpl/util/Comparer.java | 4 ++-- .../raoulvdberge/refinedstorage/block/BlockBase.java | 2 +- .../raoulvdberge/refinedstorage/block/BlockCable.java | 2 +- .../refinedstorage/block/BlockController.java | 2 +- .../refinedstorage/block/BlockCrafter.java | 2 +- .../refinedstorage/block/BlockCrafterManager.java | 2 +- .../refinedstorage/block/BlockCraftingMonitor.java | 2 +- .../refinedstorage/block/BlockDetector.java | 2 +- .../refinedstorage/block/BlockDiskManipulator.java | 2 +- .../raoulvdberge/refinedstorage/block/BlockGrid.java | 2 +- .../refinedstorage/block/BlockNetworkReceiver.java | 2 +- .../refinedstorage/block/BlockNetworkTransmitter.java | 2 +- .../raoulvdberge/refinedstorage/block/BlockRelay.java | 2 +- .../refinedstorage/block/BlockSecurityManager.java | 2 +- .../refinedstorage/block/BlockWirelessTransmitter.java | 2 +- .../gui/grid/filtering/GridFilterFilter.java | 2 +- .../refinedstorage/gui/grid/stack/GridStackFluid.java | 2 +- .../funkylocomotion/MoveFactoryNetworkNode.java | 3 ++- .../integration/oc/EnvironmentNetwork.java | 4 ++-- .../com/raoulvdberge/refinedstorage/item/ItemBase.java | 8 ++++---- .../refinedstorage/item/ItemCuttingTool.java | 4 ++-- .../refinedstorage/item/itemblock/ItemBlockBase.java | 6 +++--- .../raoulvdberge/refinedstorage/proxy/ProxyClient.java | 2 +- .../raoulvdberge/refinedstorage/proxy/ProxyCommon.java | 4 ++-- .../refinedstorage/render/CubeBuilder.java | 10 +++++----- .../render/collision/AdvancedRayTracer.java | 2 +- .../render/model/baked/BakedModelTRSR.java | 2 +- .../render/model/loader/CustomModelLoaderCover.java | 4 ++-- .../refinedstorage/tile/DirectionHandlerTile.java | 2 +- .../com/raoulvdberge/refinedstorage/tile/TileBase.java | 2 +- .../com/raoulvdberge/refinedstorage/tile/TileNode.java | 2 +- .../refinedstorage/tile/TileStorageMonitor.java | 2 +- 39 files changed, 60 insertions(+), 59 deletions(-) diff --git a/build.gradle b/build.gradle index b68a66c2f..4a43583d0 100755 --- a/build.gradle +++ b/build.gradle @@ -29,10 +29,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.12.2-14.23.4.2703" + version = "1.12.2-14.23.4.2732" runDir = "run" useDepAts = true - mappings = "snapshot_20180526" + mappings = "snapshot_20180714" replaceIn "RS.java" replace "@version@", project.version @@ -52,9 +52,9 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.12.2:4.9.1.191:api" - runtime "mezz.jei:jei_1.12.2:4.9.1.191" - deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.1.43:api" + deobfCompile "mezz.jei:jei_1.12.2:4.11.0.204:api" + runtime "mezz.jei:jei_1.12.2:4.11.0.204" + deobfCompile "li.cil.oc:OpenComputers:MC1.12.2-1.7.2.67:api" compile "inventory-tweaks:InventoryTweaks:1.63:api" } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index 022615f01..16f6e2b53 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -172,7 +172,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { } if (tag.hasKey(NBT_DIRECTION)) { - direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); + direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); } if (tag.hasKey(NBT_VERSION)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index b1e2b8671..e5d06bef6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -241,17 +241,17 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, // From BlockDispenser#getDispensePosition private double getDispensePositionX() { - return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getFrontOffsetX(); + return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getXOffset(); } // From BlockDispenser#getDispensePosition private double getDispensePositionY() { - return (double) pos.getY() + (getDirection() == EnumFacing.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getFrontOffsetY(); + return (double) pos.getY() + (getDirection() == EnumFacing.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getYOffset(); } // From BlockDispenser#getDispensePosition private double getDispensePositionZ() { - return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getFrontOffsetZ(); + return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getZOffset(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java index ea72c9e58..e7536ec52 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java @@ -222,7 +222,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC } if (facing != null) { - return world.getBlockState(pos.offset(getDirection())).getBlock().getUnlocalizedName() + ".name"; + return world.getBlockState(pos.offset(getDirection())).getBlock().getTranslationKey() + ".name"; } return DEFAULT_NAME; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java index e5dcd0481..884545702 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java @@ -94,7 +94,7 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I if (pickupItem && type == IType.ITEMS) { List droppedItems = new ArrayList<>(); - Chunk chunk = world.getChunkFromBlockCoords(front); + Chunk chunk = world.getChunk(front); chunk.getEntitiesWithinAABBForEntity(null, new AxisAlignedBB(front), droppedItems, null); for (Entity entity : droppedItems) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java index f30cbd9a1..28da6744b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -88,7 +88,7 @@ public class CoverManager { NBTTagCompound tag = list.getCompoundTagAt(i); if (tag.hasKey(NBT_DIRECTION) && tag.hasKey(NBT_ITEM)) { - EnumFacing direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); + EnumFacing direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); ItemStack item = new ItemStack(tag.getCompoundTag(NBT_ITEM)); int type = tag.hasKey(NBT_TYPE) ? tag.getInteger(NBT_TYPE) : 0; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java index 2f6631a10..956da46d8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java @@ -138,7 +138,7 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { ItemStack stack = handler.getStackInSlot(i); if (!stack.isEmpty()) { - components.add(new TextComponentString(stack.getCount() + "x ").appendSibling(new TextComponentTranslation(stack.getUnlocalizedName() + ".name"))); + components.add(new TextComponentString(stack.getCount() + "x ").appendSibling(new TextComponentTranslation(stack.getTranslationKey() + ".name"))); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java index 09df88356..e640c351d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java @@ -80,9 +80,9 @@ public class Comparer implements IComparer { } if (!ItemStack.areItemStackTagsEqual(left, right)) { - if (left.hasTagCompound() && !right.hasTagCompound() && left.getTagCompound().hasNoTags()) { + if (left.hasTagCompound() && !right.hasTagCompound() && left.getTagCompound().isEmpty()) { return true; - } else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().hasNoTags()) { + } else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().isEmpty()) { return true; } else if (!left.hasTagCompound() && !right.hasTagCompound()) { return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index d64b3c735..b56befe97 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -44,7 +44,7 @@ public abstract class BlockBase extends Block { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return "block." + info.getId().toString(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index 41ea944a6..922428490 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -359,7 +359,7 @@ public class BlockCable extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java index 24eb1c666..9cd0ba334 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java @@ -39,7 +39,7 @@ public class BlockController extends BlockNodeProxy { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java index e67de557d..4fa72597f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java @@ -47,7 +47,7 @@ public class BlockCrafter extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java index 493136974..9b5e350ed 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java @@ -36,7 +36,7 @@ public class BlockCrafterManager extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java index 8819c264c..fa7606d3e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java @@ -35,7 +35,7 @@ public class BlockCraftingMonitor extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index a21c0735c..22e5b4b64 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -90,7 +90,7 @@ public class BlockDetector extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index 0686d610a..36969407e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -41,7 +41,7 @@ public class BlockDiskManipulator extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index 043756bc2..7f4cef18c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -53,7 +53,7 @@ public class BlockGrid extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java index ad9805550..fcf8dd748 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java @@ -24,7 +24,7 @@ public class BlockNetworkReceiver extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index 2cb605b38..01fddb26d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -31,7 +31,7 @@ public class BlockNetworkTransmitter extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index 7b7e21800..2622cb594 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -31,7 +31,7 @@ public class BlockRelay extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java index 080fe18c1..14f8bbe80 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java @@ -42,7 +42,7 @@ public class BlockSecurityManager extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index a726bb084..2ce2af0c0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -81,7 +81,7 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java index 53915e246..385674241 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java @@ -32,7 +32,7 @@ public class GridFilterFilter implements Predicate { lastMode = filter.getMode(); if (filter.isModFilter()) { - if (filter.getStack().getItem().getRegistryName().getResourceDomain().equalsIgnoreCase(stackModId)) { + if (filter.getStack().getItem().getRegistryName().getNamespace().equalsIgnoreCase(stackModId)) { return filter.getMode() == IFilter.MODE_WHITELIST; } } else if (API.instance().getComparer().isEqual(stack, filter.getStack(), filter.getCompare())) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java index b119bc05b..9d6b38127 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java @@ -36,7 +36,7 @@ public class GridStackFluid implements IGridStack { @Override public String getModId() { - return stack.getFluid().getStill(stack).getResourceDomain(); + return stack.getFluid().getStill(stack).getNamespace(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java index 9df726fa4..c66176ade 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java @@ -65,7 +65,8 @@ public class MoveFactoryNetworkNode implements IMoveFactory { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileNode) { - ((TileNode) tile).setDirection(EnumFacing.getFront(tag.getInteger(NBT_DIRECTION))); + ((TileNode) tile).setDirection(EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION))); + tile.markDirty(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index 2096fd977..851a0b360 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java @@ -184,7 +184,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { } // Third argument: which direction to extract to - EnumFacing facing = EnumFacing.getFront(args.optInteger(2, 0)); + EnumFacing facing = EnumFacing.byIndex(args.optInteger(2, 0)); // Get the tile-entity on the specified side TileEntity targetEntity = node.getNetwork().world().getTileEntity(node.getPos().offset(facing)); @@ -258,7 +258,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { count = Math.min(count, stack.getMaxStackSize()); // Third argument: which direction to extract to - EnumFacing facing = EnumFacing.getFront(args.optInteger(2, 0)); + EnumFacing facing = EnumFacing.byIndex(args.optInteger(2, 0)); // Get the tile-entity on the specified side TileEntity targetEntity = node.getNetwork().world().getTileEntity(node.getPos().offset(facing)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java index c4edd00c9..c9a858a6d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java @@ -23,16 +23,16 @@ public abstract class ItemBase extends Item { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return "item." + info.getId().toString(); } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getTranslationKey(ItemStack stack) { if (getHasSubtypes()) { - return getUnlocalizedName() + "." + stack.getItemDamage(); + return getTranslationKey() + "." + stack.getItemDamage(); } - return getUnlocalizedName(); + return getTranslationKey(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java index fc90a19ab..0310d9b6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java @@ -42,7 +42,7 @@ public class ItemCuttingTool extends ItemBase { } @Override - public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName(); + public String getTranslationKey(ItemStack stack) { + return getTranslationKey(); // Ignore damage } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java index 926189b64..b061e75ab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java @@ -33,12 +33,12 @@ public class ItemBlockBase extends ItemBlock { } @Override - public String getUnlocalizedName(ItemStack stack) { + public String getTranslationKey(ItemStack stack) { if (getHasSubtypes()) { - return getUnlocalizedName() + "." + stack.getItemDamage(); + return getTranslationKey() + "." + stack.getItemDamage(); } - return getUnlocalizedName(); + return getTranslationKey(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 6717e653b..29a6f414f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -72,7 +72,7 @@ public class ProxyClient extends ProxyCommon implements IModelRegistration { @SubscribeEvent public void onModelBake(ModelBakeEvent e) { for (ModelResourceLocation resource : e.getModelRegistry().getKeys()) { - ResourceLocation key = new ResourceLocation(resource.getResourceDomain(), resource.getResourcePath()); + ResourceLocation key = new ResourceLocation(resource.getNamespace(), resource.getPath()); if (bakedModelOverrides.containsKey(key)) { e.getModelRegistry().putObject(resource, bakedModelOverrides.get(key).apply(e.getModelRegistry().getObject(resource))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 24927ba23..280a5a126 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -318,7 +318,7 @@ public class ProxyCommon { OneSixMigrationHelper.removalHook(); for (RegistryEvent.MissingMappings.Mapping missing : e.getMappings()) { - if (missing.key.getResourceDomain().equals(RS.ID) && (missing.key.getResourcePath().equals("wrench") || missing.key.getResourcePath().equals("solderer"))) { + if (missing.key.getNamespace().equals(RS.ID) && (missing.key.getPath().equals("wrench") || missing.key.getPath().equals("solderer"))) { missing.ignore(); } } @@ -329,7 +329,7 @@ public class ProxyCommon { OneSixMigrationHelper.removalHook(); for (RegistryEvent.MissingMappings.Mapping missing : e.getMappings()) { - if (missing.key.getResourceDomain().equals(RS.ID) && missing.key.getResourcePath().equals("solderer")) { + if (missing.key.getNamespace().equals(RS.ID) && missing.key.getPath().equals("solderer")) { missing.ignore(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/CubeBuilder.java b/src/main/java/com/raoulvdberge/refinedstorage/render/CubeBuilder.java index e1c8fc540..ea86e877c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/CubeBuilder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/CubeBuilder.java @@ -325,13 +325,13 @@ public class CubeBuilder { builder.put(i, x, y, z); break; case NORMAL: - builder.put(i, face.face.getFrontOffsetX(), face.face.getFrontOffsetY(), face.face.getFrontOffsetZ()); + builder.put(i, face.face.getXOffset(), face.face.getYOffset(), face.face.getZOffset()); break; case COLOR: - float r = (color >> 16 & 0xFF) / 255f; - float g = (color >> 8 & 0xFF) / 255f; - float b = (color & 0xFF) / 255f; - float a = (color >> 24 & 0xFF) / 255f; + float r = (color >> 16 & 0xFF) / 255F; + float g = (color >> 8 & 0xFF) / 255F; + float b = (color & 0xFF) / 255F; + float a = (color >> 24 & 0xFF) / 255F; builder.put(i, r, g, b, a); break; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/collision/AdvancedRayTracer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/collision/AdvancedRayTracer.java index 6dd61072b..5533065d5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/collision/AdvancedRayTracer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/collision/AdvancedRayTracer.java @@ -20,7 +20,7 @@ public final class AdvancedRayTracer { Vec3d lookVec = player.getLookVec(); Vec3d start = getStart(player); - return start.addVector(lookVec.x * reachDistance, lookVec.y * reachDistance, lookVec.z * reachDistance); + return start.add(lookVec.x * reachDistance, lookVec.y * reachDistance, lookVec.z * reachDistance); } public static AdvancedRayTraceResult rayTrace(BlockPos pos, Vec3d start, Vec3d end, Collection groups) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelTRSR.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelTRSR.java index 500b2e3ec..d141a2482 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelTRSR.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelTRSR.java @@ -82,7 +82,7 @@ public class BakedModelTRSR implements IBakedModel { try { // adjust side to facing-rotation if (side != null && side.getHorizontalIndex() > -1) { - side = EnumFacing.getHorizontal((side.getHorizontalIndex() + faceOffset) % 4); + side = EnumFacing.byHorizontalIndex((side.getHorizontalIndex() + faceOffset) % 4); } for (BakedQuad quad : original.getQuads(state, side, rand)) { Transformer transformer = new Transformer(transformation, quad.getFormat()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/loader/CustomModelLoaderCover.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/loader/CustomModelLoaderCover.java index 6d128efc3..e35703a1c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/loader/CustomModelLoaderCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/loader/CustomModelLoaderCover.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; public class CustomModelLoaderCover implements ICustomModelLoader { @Override public boolean accepts(ResourceLocation modelLocation) { - return modelLocation.getResourceDomain().equals(RS.ID) && getType(modelLocation) != null; + return modelLocation.getNamespace().equals(RS.ID) && getType(modelLocation) != null; } @Override @@ -23,7 +23,7 @@ public class CustomModelLoaderCover implements ICustomModelLoader { @Nullable private CoverType getType(ResourceLocation modelLocation) { - switch (modelLocation.getResourcePath()) { + switch (modelLocation.getPath()) { case "cover": return CoverType.NORMAL; case "hollow_cover": diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DirectionHandlerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/DirectionHandlerTile.java index 1d23c6818..6059ecc46 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DirectionHandlerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/DirectionHandlerTile.java @@ -26,7 +26,7 @@ public class DirectionHandlerTile implements IDirectionHandler { @Override public void readFromTileNbt(NBTTagCompound tag) { if (tag.hasKey(NBT_DIRECTION)) { - direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); + direction = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java index b74763a59..aab5f7b78 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java @@ -58,7 +58,7 @@ public abstract class TileBase extends TileEntity { public void readUpdate(NBTTagCompound tag) { boolean doRender = canCauseRenderUpdate(tag); - clientDirection = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); + clientDirection = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); if (doRender) { WorldUtils.updateBlock(world, pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java index 5ab33c2e3..75f4e96c2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java @@ -76,7 +76,7 @@ public abstract class TileNode extends TileBase implement OneSixMigrationHelper.removalHook(); if (tag.hasKey(NBT_DIRECTION)) { - directionToMigrate = EnumFacing.getFront(tag.getInteger("Direction")); + directionToMigrate = EnumFacing.byIndex(tag.getInteger("Direction")); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java index 74ddfb1bc..e9e349381 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java @@ -68,7 +68,7 @@ public class TileStorageMonitor extends TileNode { @Override protected boolean canCauseRenderUpdate(NBTTagCompound tag) { - EnumFacing receivedDirection = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); + EnumFacing receivedDirection = EnumFacing.byIndex(tag.getInteger(NBT_DIRECTION)); boolean receivedActive = tag.getBoolean(NBT_ACTIVE); return receivedDirection != getDirection() || receivedActive != getNode().isActive();