Update dependencies and mappings.

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"
+    deobfCompile "mezz.jei:jei_1.12.2:4.11.0.204:api"
-    runtime "mezz.jei:jei_1.12.2:4.9.1.191"
+    runtime "mezz.jei:jei_1.12.2:4.11.0.204"
-    deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.1.43:api"
+    deobfCompile "li.cil.oc:OpenComputers:MC1.12.2-1.7.2.67:api"
     compile "inventory-tweaks:InventoryTweaks:1.63:api"
 }
 

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)) {

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

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;

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<Entity> 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) {

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;
 

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")));
             }
         }
 

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;

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();
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java

@@ -32,7 +32,7 @@ public class GridFilterFilter implements Predicate<IGridStack> {
             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())) {

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

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();
         }
 

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));

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();
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java

@@ -42,7 +42,7 @@ public class ItemCuttingTool extends ItemBase {
     }
 
     @Override
-    public String getUnlocalizedName(ItemStack stack) {
+    public String getTranslationKey(ItemStack stack) {
-        return getUnlocalizedName();
+        return getTranslationKey(); // Ignore damage
     }
 }

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

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)));

src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java

@@ -318,7 +318,7 @@ public class ProxyCommon {
         OneSixMigrationHelper.removalHook();
 
         for (RegistryEvent.MissingMappings.Mapping<Item> 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<Block> 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();
             }
         }

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 r = (color >> 16 & 0xFF) / 255F;
-                    float g = (color >> 8 & 0xFF) / 255f;
+                    float g = (color >> 8 & 0xFF) / 255F;
-                    float b = (color & 0xFF) / 255f;
+                    float b = (color & 0xFF) / 255F;
-                    float a = (color >> 24 & 0xFF) / 255f;
+                    float a = (color >> 24 & 0xFF) / 255F;
 
                     builder.put(i, r, g, b, a);
                     break;

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<RayTraceResult> rayTrace(BlockPos pos, Vec3d start, Vec3d end, Collection<CollisionGroup> groups) {

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());

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

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));
         }
     }
 }

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);

src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java

@@ -76,7 +76,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
 
         OneSixMigrationHelper.removalHook();
         if (tag.hasKey(NBT_DIRECTION)) {
-            directionToMigrate = EnumFacing.getFront(tag.getInteger("Direction"));
+            directionToMigrate = EnumFacing.byIndex(tag.getInteger("Direction"));
         }
     }
 

src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java

@@ -68,7 +68,7 @@ public class TileStorageMonitor extends TileNode<NetworkNodeStorageMonitor> {
 
     @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();