From 3e255fb1cf667277c1f153e189bc942bb113fa2e Mon Sep 17 00:00:00 2001 From: alexbegt Date: Mon, 27 Jan 2020 18:48:01 -0500 Subject: [PATCH] Update to the latest mappings and forge version. --- gradle.properties | 4 ++-- .../slimeknights/mantle/block/InventoryBlock.java | 5 +++-- .../slimeknights/mantle/client/ModelHelper.java | 2 +- .../mantle/client/book/StructureBlockAccess.java | 8 ++++---- .../mantle/client/model/BlockItemModelWrapper.java | 2 +- .../mantle/client/model/TRSRBakedModel.java | 14 +++++++------- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index d417ae7..be24c99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,11 +10,11 @@ minecraft_version=1.15.2 minecraft_version_toml=15 # Forge Version Information -forge_version=31.0.0 +forge_version=31.0.1 forge_version_toml=31 # Mappings Information -mappings_version=20200122-1.15.1 +mappings_version=20200127-1.15.1 mapping_version=20200115-mixed-1.15.1 jei_version=6.0.0.2 diff --git a/src/main/java/slimeknights/mantle/block/InventoryBlock.java b/src/main/java/slimeknights/mantle/block/InventoryBlock.java index 247540e..678b4e6 100644 --- a/src/main/java/slimeknights/mantle/block/InventoryBlock.java +++ b/src/main/java/slimeknights/mantle/block/InventoryBlock.java @@ -42,8 +42,9 @@ public abstract class InventoryBlock extends ContainerBlock { protected abstract boolean openGui(PlayerEntity player, World world, BlockPos pos); @Deprecated - public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { - if (player.func_226272_bl_()) { + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + if (player.isSuppressingBounce()) { return ActionResultType.PASS; } diff --git a/src/main/java/slimeknights/mantle/client/ModelHelper.java b/src/main/java/slimeknights/mantle/client/ModelHelper.java index 46f4031..9c3e387 100644 --- a/src/main/java/slimeknights/mantle/client/ModelHelper.java +++ b/src/main/java/slimeknights/mantle/client/ModelHelper.java @@ -94,7 +94,7 @@ public class ModelHelper { @Override public void put(int element, float... data) { - VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage(); + VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElements().get(element).getUsage(); // transform normals and position if (usage == VertexFormatElement.Usage.COLOR && data.length >= 4) { diff --git a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java index 4399ed4..65063d1 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java @@ -78,7 +78,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public Biome func_225604_a_(int p_225604_1_, int p_225604_2_, int p_225604_3_) { + public Biome getNoiseBiomeRaw(int p_225604_1_, int p_225604_2_, int p_225604_3_) { return null; } @@ -88,7 +88,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public int func_226659_b_(BlockPos pos, int amount) { + public int getLightSubtracted(BlockPos pos, int amount) { return 0; } @@ -109,7 +109,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public boolean func_226660_f_(BlockPos pos) { + public boolean canSeeSky(BlockPos pos) { return true; } @@ -124,7 +124,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public BiomeManager func_225523_d_() { + public BiomeManager getBiomeManager() { return null; } diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index e7da66c..71b4f5e 100644 --- a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java @@ -39,7 +39,7 @@ public class BlockItemModelWrapper implements IBakedModel { } if (transform != null) { - mat.getLast().getPositionMatrix().multiply(transform.func_227988_c_()); + mat.getLast().getPositionMatrix().multiply(transform.getMatrix()); } return this; } diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index 71f1acc..c594fb3 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -158,21 +158,21 @@ public class TRSRBakedModel implements IBakedModel { public Transformer(TransformationMatrix transformation, TextureAtlasSprite textureAtlasSprite) { super(new BakedQuadBuilder(textureAtlasSprite)); // position transform - this.transformation = transformation.func_227988_c_(); + this.transformation = transformation.getMatrix(); // normal transform this.normalTransformation = new Matrix3f(this.transformation); - this.normalTransformation.func_226123_f_(); - this.normalTransformation.func_226110_a_(); + this.normalTransformation.invert(); + this.normalTransformation.transpose(); } @Override public void put(int element, float... data) { - VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage(); + VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElements().get(element).getUsage(); // transform normals and position if (usage == VertexFormatElement.Usage.POSITION && data.length >= 3) { Vector4f vec = new Vector4f(data[0], data[1], data[2], 1f); - vec.func_229372_a_(this.transformation); + vec.transform(this.transformation); data = new float[4]; data[0] = vec.getX(); data[1] = vec.getY(); @@ -181,8 +181,8 @@ public class TRSRBakedModel implements IBakedModel { } else if (usage == VertexFormatElement.Usage.NORMAL && data.length >= 3) { Vector3f vec = new Vector3f(data); - vec.func_229188_a_(this.normalTransformation); - vec.func_229194_d_(); + vec.transform(this.normalTransformation); + vec.normalize(); data = new float[4]; data[0] = vec.getX(); data[1] = vec.getY();