diff --git a/build.properties b/build.properties index 9f514372..7c585a48 100644 --- a/build.properties +++ b/build.properties @@ -1,10 +1,10 @@ mod_version=1.7.0 minecraft_version=1.12.2 -forge_version=14.23.1.2594 -mcp_mappings_version=snapshot_20170926 -cyclopscore_version=1.0.0-898 +forge_version=14.23.5.2768 +mcp_mappings_version=snapshot_20180814 +cyclopscore_version=1.0.6-927 release_type=release fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 ironchest_version=7.0.9.796 -commoncapabilities_version=1.12.2-2.0.0-246 +commoncapabilities_version=1.12.2-2.1.0-267 diff --git a/src/main/java/org/cyclops/colossalchests/Reference.java b/src/main/java/org/cyclops/colossalchests/Reference.java index cc8fc777..7da3a3a9 100644 --- a/src/main/java/org/cyclops/colossalchests/Reference.java +++ b/src/main/java/org/cyclops/colossalchests/Reference.java @@ -33,10 +33,10 @@ public class Reference { // MOD ID's public static final String MOD_FORGE = "forge"; public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@"; - public static final String MOD_FORGE_VERSION_MIN = "14.23.1.2594"; + public static final String MOD_FORGE_VERSION_MIN = "14.23.5.2768"; public static final String MOD_CYCLOPSCORE = "cyclopscore"; public static final String MOD_CYCLOPSCORE_VERSION = "@CYCLOPSCORE_VERSION@"; - public static final String MOD_CYCLOPSCORE_VERSION_MIN = "1.0.0"; + public static final String MOD_CYCLOPSCORE_VERSION_MIN = "1.0.6"; public static final String MOD_IRONCHEST = "ironchest"; // Dependencies diff --git a/src/main/java/org/cyclops/colossalchests/block/ChestWall.java b/src/main/java/org/cyclops/colossalchests/block/ChestWall.java index 77b2cd14..38847585 100644 --- a/src/main/java/org/cyclops/colossalchests/block/ChestWall.java +++ b/src/main/java/org/cyclops/colossalchests/block/ChestWall.java @@ -76,7 +76,7 @@ public boolean isToolEffective(String type, IBlockState state) { @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/org/cyclops/colossalchests/block/ColossalChest.java b/src/main/java/org/cyclops/colossalchests/block/ColossalChest.java index e76718e2..acf3706f 100644 --- a/src/main/java/org/cyclops/colossalchests/block/ColossalChest.java +++ b/src/main/java/org/cyclops/colossalchests/block/ColossalChest.java @@ -120,7 +120,7 @@ public boolean isFullCube(IBlockState blockState) { @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/org/cyclops/colossalchests/block/Interface.java b/src/main/java/org/cyclops/colossalchests/block/Interface.java index 0047e2ea..8b611e98 100644 --- a/src/main/java/org/cyclops/colossalchests/block/Interface.java +++ b/src/main/java/org/cyclops/colossalchests/block/Interface.java @@ -81,7 +81,7 @@ public boolean isToolEffective(String type, IBlockState state) { @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java b/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java index 0d9a39d4..56a70043 100644 --- a/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java +++ b/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java @@ -92,7 +92,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) { @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/org/cyclops/colossalchests/client/render/tileentity/RenderTileEntityColossalChest.java b/src/main/java/org/cyclops/colossalchests/client/render/tileentity/RenderTileEntityColossalChest.java index 3a9f1a45..4f539696 100644 --- a/src/main/java/org/cyclops/colossalchests/client/render/tileentity/RenderTileEntityColossalChest.java +++ b/src/main/java/org/cyclops/colossalchests/client/render/tileentity/RenderTileEntityColossalChest.java @@ -138,9 +138,9 @@ public boolean isGlobalRenderer(TileColossalChest tile) { * @param direction The direction to orient the OpenGL matrix to. */ protected void setMatrixOrientation(EnumFacing direction) { - float translateX = -1F - direction.getFrontOffsetX(); - float translateY = direction.getFrontOffsetY(); - float translateZ = direction.getFrontOffsetZ(); + float translateX = -1F - direction.getXOffset(); + float translateY = direction.getYOffset(); + float translateZ = direction.getZOffset(); if (direction == EnumFacing.NORTH) { translateZ += 1F; translateX += 2F; diff --git a/src/main/java/org/cyclops/colossalchests/item/ItemUpgradeTool.java b/src/main/java/org/cyclops/colossalchests/item/ItemUpgradeTool.java index 484d6583..9814d1f6 100644 --- a/src/main/java/org/cyclops/colossalchests/item/ItemUpgradeTool.java +++ b/src/main/java/org/cyclops/colossalchests/item/ItemUpgradeTool.java @@ -56,8 +56,8 @@ public ItemUpgradeTool(ExtendedConfig eConfig) { } @Override - public String getUnlocalizedName(ItemStack itemStack) { - return super.getUnlocalizedName(itemStack) + (itemStack.getMetadata() == 0 ? "" : ".reverse"); + public String getTranslationKey(ItemStack itemStack) { + return super.getTranslationKey(itemStack) + (itemStack.getMetadata() == 0 ? "" : ".reverse"); } @Override