diff --git a/build.gradle b/build.gradle index ba9bea2cf..6e0b981cb 100644 --- a/build.gradle +++ b/build.gradle @@ -162,6 +162,7 @@ curseforge { changelogType = 'html' releaseType = 'beta' addGameVersion '1.12' + addGameVersion '1.12.1' } } diff --git a/gradle.properties b/gradle.properties index 94fc46208..6b34a34e5 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -mcversion=1.12.1 -forgeversion=14.22.0.2474 -mcp_mappings=snapshot_20170904 +mcversion=1.12.2 +forgeversion=14.23.0.2486 +mcp_mappings=snapshot_20170918 curse_project_id=59751 tesla_version=1.0.60 @@ -11,4 +11,4 @@ ic2_version=2.8.24-ex112 version_major=5 version_minor=5 -version_patch=5 +version_patch=6 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index d89fb522f..e56673e06 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -59,7 +59,7 @@ import forestry.plugins.compat.PluginNatura; name = Constants.MOD_NAME, version = Constants.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - acceptedMinecraftVersions = "[1.12, 1.12.1]", + acceptedMinecraftVersions = "[1.12, 1.12.2]", dependencies = "required-after:forge@[14.21.1.2395,);" + "after:jei@[4.7.8.91,);" + "after:" + PluginIC2.modId + ";" diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 0fa5e3e78..9d8d74702 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -99,7 +99,7 @@ public class ItemCrated extends ItemForestry implements IColoredItem { if (contained.isEmpty() || renderPass == 100) { return -1; } - int color = colors.getColorFromItemstack(contained, renderPass); + int color = colors.colorMultiplier(contained, renderPass); if (color != -1) { return color; } diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 036190601..0ed15a758 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -60,7 +60,7 @@ public class ItemForestryTool extends ItemForestry { } @Override - public float getStrVsBlock(ItemStack itemstack, IBlockState state) { + public float getDestroySpeed(ItemStack itemstack, IBlockState state) { for (String type : getToolClasses(itemstack)) { if (state.getBlock().isToolEffective(type, state)) { return efficiencyOnProperMaterial; @@ -68,9 +68,9 @@ public class ItemForestryTool extends ItemForestry { } if (this == PluginCore.getItems().bronzePickaxe) { Material material = state.getMaterial(); - return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getStrVsBlock(itemstack, state) : this.efficiencyOnProperMaterial; + return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getDestroySpeed(itemstack, state) : this.efficiencyOnProperMaterial; } - return super.getStrVsBlock(itemstack, state); + return super.getDestroySpeed(itemstack, state); } @Override diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index d20e11ac6..660753984 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -220,7 +220,7 @@ public class ModelManager implements IModelManager { } @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) { + public int colorMultiplier(ItemStack stack, int tintIndex) { Item item = stack.getItem(); if (item instanceof IColoredItem) { return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex); diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index 3bdfa8c55..2aae7fce0 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -77,7 +77,7 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer { } RenderManager rendermanager = Minecraft.getMinecraft().getRenderManager(); - rendermanager.doRenderEntity(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F, false); + rendermanager.renderEntity(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F, false); GlStateManager.popMatrix(); } diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 9b544c857..ecb8968a2 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -103,7 +103,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer } RenderManager rendermanager = minecraft.getRenderManager(); - rendermanager.doRenderEntity(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F, false); + rendermanager.renderEntity(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F, false); } GlStateManager.popMatrix();