diff --git a/gradle.properties b/gradle.properties index ed921239d..89b78ae44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ aebasename=appliedenergistics2 ######################################################### # Versions # ######################################################### -minecraft_version=1.12.1 -mcp_mappings=snapshot_20170811 -forge_version=14.22.1.2478 +minecraft_version=1.12.2 +mcp_mappings=snapshot_20171003 +forge_version=14.23.0.2491 ######################################################### # Installable # @@ -19,7 +19,7 @@ hwyla_version=1.8.20-B35_1.12 ######################################################### # Provided APIs # ######################################################### -jei_version=4.7.8.95 +jei_version=4.8.0.105 tesla_version=1.0.61 ic2_version=2.8.19-ex112 top_version=1.12-1.4.18-10 @@ -27,5 +27,5 @@ top_version=1.12-1.4.18-10 ######################################################### # Deployment # ######################################################### -website_version=1.12.x -curse_versions=1.12,1.12.1 +website_version=1.12.2 +curse_versions=1.12.2 diff --git a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java index ea51e5d84..8d354fcf6 100644 --- a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java @@ -79,7 +79,7 @@ public class FacadeWithBlockBakedModel implements IBakedModel { if( sprite.getTint() != -1 ) { - builder.setColor( Minecraft.getMinecraft().getItemColors().getColorFromItemstack( this.textureItem, sprite.getTint() ) ); + builder.setColor( Minecraft.getMinecraft().getItemColors().colorMultiplier( this.textureItem, sprite.getTint() ) ); } builder.setTexture( sprite.getSprite() ); builder.setDrawFaces( EnumSet.of( EnumFacing.NORTH ) ); diff --git a/src/main/java/appeng/client/render/StaticItemColor.java b/src/main/java/appeng/client/render/StaticItemColor.java index f6d408154..29734f63e 100644 --- a/src/main/java/appeng/client/render/StaticItemColor.java +++ b/src/main/java/appeng/client/render/StaticItemColor.java @@ -39,7 +39,7 @@ public class StaticItemColor implements IItemColor } @Override - public int getColorFromItemstack( ItemStack stack, int tintIndex ) + public int colorMultiplier( ItemStack stack, int tintIndex ) { return this.color.getVariantByTintIndex( tintIndex ); } diff --git a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java index 8f215f995..5e4bbd870 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java @@ -44,7 +44,7 @@ public class FacadeRenderState public int resolveTintColor( int tintIndex ) { - return Minecraft.getMinecraft().getItemColors().getColorFromItemstack( this.textureItem, tintIndex ); + return Minecraft.getMinecraft().getItemColors().colorMultiplier( this.textureItem, tintIndex ); } } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 0757a1e40..cf2a7131d 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -68,7 +68,7 @@ import appeng.services.version.VersionCheckerConfig; import appeng.util.Platform; -@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.12,1.12.1]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" ) +@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.12.2]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" ) public final class AppEng { @SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper", modId = AppEng.MOD_ID ) diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index 1d7601bc1..a77201714 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -128,7 +128,7 @@ public class PartCableAnchor implements IPart @Override public boolean isLadder( final EntityLivingBase entity ) { - return this.mySide.yOffset == 0 && ( entity.isCollidedHorizontally || !entity.onGround ); + return this.mySide.yOffset == 0 && ( entity.collidedHorizontally || !entity.onGround ); } @Override