From 22e142f94e427f8bfd916465fb50372bd64574ec Mon Sep 17 00:00:00 2001 From: Liang Date: Fri, 24 Jan 2020 18:45:57 +0800 Subject: [PATCH] Update to 1.15.2 mappings (#131) --- gradle.properties | 12 ++++++------ .../slimeknights/mantle/block/InventoryBlock.java | 2 +- .../mantle/client/ExtraHeartRenderHandler.java | 4 ++-- .../java/slimeknights/mantle/client/ModelHelper.java | 2 +- .../mantle/client/book/StructureBlockAccess.java | 6 +++--- .../client/book/data/element/ItemStackData.java | 4 ++-- .../mantle/client/model/BakedSimple.java | 5 +++++ .../mantle/client/model/BakedWrapper.java | 12 ++++++++++++ .../mantle/client/model/BlockItemModelWrapper.java | 8 +++++++- .../mantle/client/model/TRSRBakedModel.java | 7 ++++++- .../mantle/client/screen/book/BookScreen.java | 4 ++-- .../mantle/client/screen/book/TextDataRenderer.java | 10 +++++----- .../client/screen/book/element/BookElement.java | 2 +- .../client/screen/book/element/ElementStructure.java | 4 ++-- .../client/screen/book/element/ElementTooltip.java | 2 -- .../java/slimeknights/mantle/util/TagHelper.java | 2 +- 16 files changed, 56 insertions(+), 30 deletions(-) diff --git a/gradle.properties b/gradle.properties index eeb75c2..d417ae7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,16 +6,16 @@ org.gradle.daemon=false mod_version=1.5 # Minecraft Version Information -minecraft_version=1.15.1 +minecraft_version=1.15.2 minecraft_version_toml=15 # Forge Version Information -forge_version=30.0.36 -forge_version_toml=30 +forge_version=31.0.0 +forge_version_toml=31 # Mappings Information -mappings_version=20191114-1.14.3 -mapping_version=20200109-mixed-1.15.1 +mappings_version=20200122-1.15.1 +mapping_version=20200115-mixed-1.15.1 -jei_version=6.0.0.1 +jei_version=6.0.0.2 configurate_version=3.3 diff --git a/src/main/java/slimeknights/mantle/block/InventoryBlock.java b/src/main/java/slimeknights/mantle/block/InventoryBlock.java index faa3662..247540e 100644 --- a/src/main/java/slimeknights/mantle/block/InventoryBlock.java +++ b/src/main/java/slimeknights/mantle/block/InventoryBlock.java @@ -41,7 +41,7 @@ public abstract class InventoryBlock extends ContainerBlock { */ protected abstract boolean openGui(PlayerEntity player, World world, BlockPos pos); - @Override + @Deprecated public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { if (player.func_226272_bl_()) { return ActionResultType.PASS; diff --git a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java index 41a3ea9..1f0297c 100644 --- a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java +++ b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java @@ -60,8 +60,8 @@ public class ExtraHeartRenderHandler { // extra setup stuff from us left_height = ForgeIngameGui.left_height; - this.width = this.mc.func_228018_at_().getScaledWidth(); - this.height = this.mc.func_228018_at_().getScaledHeight(); + this.width = this.mc.getMainWindow().getScaledWidth(); + this.height = this.mc.getMainWindow().getScaledHeight(); event.setCanceled(true); int updateCounter = this.mc.ingameGUI.getTicks(); diff --git a/src/main/java/slimeknights/mantle/client/ModelHelper.java b/src/main/java/slimeknights/mantle/client/ModelHelper.java index e893e71..46f4031 100644 --- a/src/main/java/slimeknights/mantle/client/ModelHelper.java +++ b/src/main/java/slimeknights/mantle/client/ModelHelper.java @@ -76,7 +76,7 @@ public class ModelHelper { private final float r, g, b, a; public ColorTransformer(int color, BakedQuad quad) { - super(new BakedQuadBuilder(quad.getSprite())); + super(new BakedQuadBuilder(quad.func_187508_a())); int a = (color >> 24); if (a == 0) { diff --git a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java index 26b3aaa..4399ed4 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java @@ -39,12 +39,12 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public WorldLightManager func_225524_e_() { + public WorldLightManager getLightManager() { return null; } @Override - public int func_226658_a_(LightType type, BlockPos pos) { + public int getLightFor(LightType type, BlockPos pos) { return 15 << 20 | 15 << 4; } @@ -73,7 +73,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public Biome func_226691_t_(BlockPos pos) { + public Biome getBiome(BlockPos pos) { return null; } diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java index e1594d8..b7ee70d 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java @@ -78,8 +78,8 @@ public class ItemStackData implements IDataElement { CompoundNBT display = itemStack.getOrCreateChildTag("display"); display.putString("Name", "\u00A7rUnknown Item"); ListNBT lore = new ListNBT(); - lore.add(StringNBT.func_229705_a_("\u00A7r\u00A7eItem Name:")); - lore.add(StringNBT.func_229705_a_("\u00A7r\u00A7e" + this.id)); + lore.add(StringNBT.valueOf("\u00A7r\u00A7eItem Name:")); + lore.add(StringNBT.valueOf("\u00A7r\u00A7e" + this.id)); display.put("Lore", lore); } diff --git a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java index b42c9c3..50441fd 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java @@ -74,6 +74,11 @@ public class BakedSimple implements IBakedModel { return this.isGui3d; } + @Override + public boolean func_230044_c_() { + return false; + } + @Override public boolean isBuiltInRenderer() { return false; diff --git a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java index f2d9d2a..860e90d 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java @@ -27,6 +27,7 @@ public class BakedWrapper implements IBakedModel { @Nonnull @Override + @Deprecated public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { return this.parent.getQuads(state, side, rand); } @@ -41,6 +42,11 @@ public class BakedWrapper implements IBakedModel { return this.parent.isGui3d(); } + @Override + public boolean func_230044_c_() { + return false; + } + @Override public boolean isBuiltInRenderer() { return this.parent.isBuiltInRenderer(); @@ -54,6 +60,7 @@ public class BakedWrapper implements IBakedModel { @Nonnull @Override + @Deprecated public ItemCameraTransforms getItemCameraTransforms() { return this.parent.getItemCameraTransforms(); } @@ -77,5 +84,10 @@ public class BakedWrapper implements IBakedModel { public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { return PerspectiveMapWrapper.handlePerspective(this, this.transforms, cameraTransformType, mat); } + + @Override + public boolean func_230044_c_() { + return false; + } } } diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index c9613ee..e7da66c 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.func_227866_c_().func_227870_a_().func_226595_a_(transform.func_227988_c_()); + mat.getLast().getPositionMatrix().multiply(transform.func_227988_c_()); } return this; } @@ -60,6 +60,11 @@ public class BlockItemModelWrapper implements IBakedModel { return this.parent.isGui3d(); } + @Override + public boolean func_230044_c_() { + return false; + } + @Override public boolean isBuiltInRenderer() { return this.parent.isBuiltInRenderer(); @@ -73,6 +78,7 @@ public class BlockItemModelWrapper implements IBakedModel { @Nonnull @Override + @Deprecated public ItemCameraTransforms getItemCameraTransforms() { return this.parent.getItemCameraTransforms(); } diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index c4848fa..71f1acc 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -80,7 +80,7 @@ public class TRSRBakedModel implements IBakedModel { side = Direction.byHorizontalIndex((side.getHorizontalIndex() + this.faceOffset) % 4); } for (BakedQuad quad : this.original.getQuads(state, side, rand)) { - Transformer transformer = new Transformer(this.transformation, quad.getSprite()); + Transformer transformer = new Transformer(this.transformation, quad.func_187508_a()); quad.pipe(transformer); builder.add(transformer.build()); } @@ -103,6 +103,11 @@ public class TRSRBakedModel implements IBakedModel { return this.original.isGui3d(); } + @Override + public boolean func_230044_c_() { + return false; + } + @Override public boolean isBuiltInRenderer() { return this.original.isBuiltInRenderer(); diff --git a/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java b/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java index 6635576..1abd9c3 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java @@ -532,11 +532,11 @@ public class BookScreen extends Screen { } protected int getMouseX(boolean rightSide) { - return (int) ((Minecraft.getInstance().mouseHelper.getMouseX() * this.width / this.minecraft.func_228018_at_().getFramebufferWidth() - this.leftOffset(rightSide)) / PAGE_SCALE); + return (int) ((Minecraft.getInstance().mouseHelper.getMouseX() * this.width / this.minecraft.getMainWindow().getFramebufferWidth() - this.leftOffset(rightSide)) / PAGE_SCALE); } protected int getMouseY() { - return (int) ((Minecraft.getInstance().mouseHelper.getMouseY() * this.height / this.minecraft.func_228018_at_().getFramebufferHeight() - 1 - this.topOffset()) / PAGE_SCALE); + return (int) ((Minecraft.getInstance().mouseHelper.getMouseY() * this.height / this.minecraft.getMainWindow().getFramebufferHeight() - 1 - this.topOffset()) / PAGE_SCALE); } public int openPage(int page) { diff --git a/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java b/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java index c8961e8..95613cc 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java @@ -10,7 +10,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.client.gui.GuiUtils; import org.apache.commons.lang3.StringUtils; import slimeknights.mantle.Mantle; import slimeknights.mantle.client.book.data.element.TextData; @@ -255,10 +255,10 @@ public class TextDataRenderer { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexBuffer = tessellator.getBuffer(); vertexBuffer.begin(7, DefaultVertexFormats.POSITION_COLOR); - vertexBuffer.func_225582_a_((double) right, (double) top, 0D).func_227885_a_(f1, f2, f3, f).endVertex(); - vertexBuffer.func_225582_a_((double) left, (double) top, 0D).func_227885_a_(f1, f2, f3, f).endVertex(); - vertexBuffer.func_225582_a_((double) left, (double) bottom, 0D).func_227885_a_(f5, f6, f7, f4).endVertex(); - vertexBuffer.func_225582_a_((double) right, (double) bottom, 0D).func_227885_a_(f5, f6, f7, f4).endVertex(); + vertexBuffer.pos((double) right, (double) top, 0D).color(f1, f2, f3, f).endVertex(); + vertexBuffer.pos((double) left, (double) top, 0D).color(f1, f2, f3, f).endVertex(); + vertexBuffer.pos((double) left, (double) bottom, 0D).color(f5, f6, f7, f4).endVertex(); + vertexBuffer.pos((double) right, (double) bottom, 0D).color(f5, f6, f7, f4).endVertex(); tessellator.draw(); RenderSystem.shadeModel(7424); RenderSystem.enableAlphaTest(); diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/BookElement.java b/src/main/java/slimeknights/mantle/client/screen/book/element/BookElement.java index 5a667ed..c4dc8de 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/BookElement.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/BookElement.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.client.gui.GuiUtils; import slimeknights.mantle.client.screen.book.BookScreen; import java.util.List; diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementStructure.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementStructure.java index 013dd69..5323c59 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementStructure.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementStructure.java @@ -230,8 +230,8 @@ public class ElementStructure extends SizedBookElement { buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); Random random = new Random(); - matrixstack.func_227860_a_(); - matrixstack.func_227861_a_((double) (pos.getX() & 15), (double) (pos.getY() & 15), (double) (pos.getZ() & 15)); + matrixstack.push(); + matrixstack.translate((double) (pos.getX() & 15), (double) (pos.getY() & 15), (double) (pos.getZ() & 15)); blockRender.renderModel(state, pos, this.blockAccess, matrixstack, buffer, false, random, net.minecraftforge.client.model.data.EmptyModelData.INSTANCE); tessellator.draw(); diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementTooltip.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementTooltip.java index 80bf7c2..017304f 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementTooltip.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementTooltip.java @@ -1,8 +1,6 @@ package slimeknights.mantle.client.screen.book.element; import net.minecraft.client.gui.FontRenderer; -import net.minecraftforge.fml.client.config.GuiUtils; -import slimeknights.mantle.client.screen.book.BookScreen; import java.util.List; diff --git a/src/main/java/slimeknights/mantle/util/TagHelper.java b/src/main/java/slimeknights/mantle/util/TagHelper.java index a01b3ad..0ffb268 100644 --- a/src/main/java/slimeknights/mantle/util/TagHelper.java +++ b/src/main/java/slimeknights/mantle/util/TagHelper.java @@ -7,7 +7,7 @@ import net.minecraft.nbt.StringNBT; public class TagHelper { - public static int TAG_TYPE_STRING = (StringNBT.func_229705_a_("")).getId(); + public static int TAG_TYPE_STRING = (StringNBT.valueOf("")).getId(); public static int TAG_TYPE_COMPOUND = (new CompoundNBT()).getId(); private TagHelper() {