fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Forge to 1.12.2 RB (#3141)

Browse Source 
* Updated Forge to 1.12.2 RB

Updated mappings to the MDK defaults for 1.12.2
Updated related depdencies

* With Forge 14.23 not available for < 1.12.2, we have to drop support.

With one potential fix for TE corruption, this step should be
reasonable.
This commit is contained in:
yueh
2017-10-08 17:34:05 +02:00
committed by GitHub
parent 95b27f490c
commit 644194d0d6
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+6 -6
View File
@@ -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
src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java
+1 -1
View File
@@ -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 ) );
src/main/java/appeng/client/render/StaticItemColor.java
+1 -1
View File
@@ -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 );
}
src/main/java/appeng/client/render/cablebus/FacadeRenderState.java
+1 -1
View File
@@ -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 );
}
}
src/main/java/appeng/core/AppEng.java
+1 -1
View File
@@ -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 )
src/main/java/appeng/parts/misc/PartCableAnchor.java
+1 -1
View File
@@ -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