Skip to content

Commit

Permalink
Update to Forge 14.23.5.2768 and MCP snapshot_20180814
Browse files Browse the repository at this point in the history
  • Loading branch information
rubensworks committed Mar 18, 2019
1 parent 1a5c731 commit 318d72e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions build.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/main/java/org/cyclops/colossalchests/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public boolean isFullCube(IBlockState blockState) {

@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) {

@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 318d72e

Please sign in to comment.