Updated Forge to 1.12.2 RB (#3141)
* 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:
+6
-6
@@ -7,9 +7,9 @@ aebasename=appliedenergistics2
|
|||||||
#########################################################
|
#########################################################
|
||||||
# Versions #
|
# Versions #
|
||||||
#########################################################
|
#########################################################
|
||||||
minecraft_version=1.12.1
|
minecraft_version=1.12.2
|
||||||
mcp_mappings=snapshot_20170811
|
mcp_mappings=snapshot_20171003
|
||||||
forge_version=14.22.1.2478
|
forge_version=14.23.0.2491
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Installable #
|
# Installable #
|
||||||
@@ -19,7 +19,7 @@ hwyla_version=1.8.20-B35_1.12
|
|||||||
#########################################################
|
#########################################################
|
||||||
# Provided APIs #
|
# Provided APIs #
|
||||||
#########################################################
|
#########################################################
|
||||||
jei_version=4.7.8.95
|
jei_version=4.8.0.105
|
||||||
tesla_version=1.0.61
|
tesla_version=1.0.61
|
||||||
ic2_version=2.8.19-ex112
|
ic2_version=2.8.19-ex112
|
||||||
top_version=1.12-1.4.18-10
|
top_version=1.12-1.4.18-10
|
||||||
@@ -27,5 +27,5 @@ top_version=1.12-1.4.18-10
|
|||||||
#########################################################
|
#########################################################
|
||||||
# Deployment #
|
# Deployment #
|
||||||
#########################################################
|
#########################################################
|
||||||
website_version=1.12.x
|
website_version=1.12.2
|
||||||
curse_versions=1.12,1.12.1
|
curse_versions=1.12.2
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ public class FacadeWithBlockBakedModel implements IBakedModel
|
|||||||
{
|
{
|
||||||
if( sprite.getTint() != -1 )
|
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.setTexture( sprite.getSprite() );
|
||||||
builder.setDrawFaces( EnumSet.of( EnumFacing.NORTH ) );
|
builder.setDrawFaces( EnumSet.of( EnumFacing.NORTH ) );
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class StaticItemColor implements IItemColor
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getColorFromItemstack( ItemStack stack, int tintIndex )
|
public int colorMultiplier( ItemStack stack, int tintIndex )
|
||||||
{
|
{
|
||||||
return this.color.getVariantByTintIndex( tintIndex );
|
return this.color.getVariantByTintIndex( tintIndex );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class FacadeRenderState
|
|||||||
|
|
||||||
public int resolveTintColor( int tintIndex )
|
public int resolveTintColor( int tintIndex )
|
||||||
{
|
{
|
||||||
return Minecraft.getMinecraft().getItemColors().getColorFromItemstack( this.textureItem, tintIndex );
|
return Minecraft.getMinecraft().getItemColors().colorMultiplier( this.textureItem, tintIndex );
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ import appeng.services.version.VersionCheckerConfig;
|
|||||||
import appeng.util.Platform;
|
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
|
public final class AppEng
|
||||||
{
|
{
|
||||||
@SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper", modId = AppEng.MOD_ID )
|
@SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper", modId = AppEng.MOD_ID )
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ public class PartCableAnchor implements IPart
|
|||||||
@Override
|
@Override
|
||||||
public boolean isLadder( final EntityLivingBase entity )
|
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
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user