From 3f8e34648e0bfe040e0f4cc862382ef2954650be Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 11 Jan 2020 17:49:46 -0500 Subject: [PATCH] Update Mantle to 1.15.1! --- build.gradle | 5 + gradle.properties | 11 ++- .../mantle/block/InventoryBlock.java | 11 ++- .../client/ExtraHeartRenderHandler.java | 12 +-- .../mantle/client/ModelHelper.java | 51 +++++------ .../mantle/client/book/BookHelper.java | 2 +- .../client/book/StructureBlockAccess.java | 25 +++-- .../client/book/data/LinkedSectionData.java | 2 +- .../mantle/client/book/data/PageData.java | 10 +- .../mantle/client/book/data/SectionData.java | 2 +- .../book/data/content/ContentSmelting.java | 14 +-- .../client/book/data/element/BlockData.java | 4 +- .../book/data/element/DataLocation.java | 2 +- .../client/book/data/element/ImageData.java | 4 +- .../book/data/element/ItemStackData.java | 48 +++++----- .../mantle/client/model/BakedSimple.java | 62 ++++++------- .../mantle/client/model/BakedWrapper.java | 34 +++---- .../client/model/BlockItemModelWrapper.java | 36 ++++---- .../mantle/client/model/TRSRBakedModel.java | 91 ++++++++++--------- .../client/screen/MultiModuleScreen.java | 13 +-- .../mantle/client/screen/WidgetTabs.java | 5 +- .../client/screen/book/ArrowButton.java | 4 +- .../mantle/client/screen/book/BookScreen.java | 70 +++++++------- .../client/screen/book/BookmarkButton.java | 7 +- .../client/screen/book/TextDataRenderer.java | 32 +++---- .../screen/book/element/BookElement.java | 4 +- .../screen/book/element/ElementImage.java | 17 ++-- .../screen/book/element/ElementItem.java | 11 +-- .../screen/book/element/ElementSection.java | 15 +-- .../screen/book/element/ElementStructure.java | 35 +++---- .../screen/book/element/ElementTooltip.java | 2 +- .../mantle/inventory/WrapperSlot.java | 33 ++----- .../slimeknights/mantle/util/TagHelper.java | 2 +- .../resources/META-INF/accesstransformer.cfg | 4 + 34 files changed, 339 insertions(+), 341 deletions(-) diff --git a/build.gradle b/build.gradle index 3e59f43..00410ab 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,11 @@ repositories { name 'DVS1 Maven FS' url 'https://dvs1.progwml6.com/files/maven' } + maven { + // for Yarn2MCP + name "yarn2mcp" + url "https://maven.tterrag.com/" + } } group = 'slimeknights.mantle' diff --git a/gradle.properties b/gradle.properties index 6b2a734..5f259a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,15 +6,16 @@ org.gradle.daemon=false mod_version=1.4 # Minecraft Version Information -minecraft_version=1.14.4 -minecraft_version_toml=14 +minecraft_version=1.15.1 +minecraft_version_toml=15 # Forge Version Information -forge_version=28.1.90 -forge_version_toml=28 +forge_version=30.0.36 +forge_version_toml=30 # Mappings Information mappings_version=20191114-1.14.3 +mapping_version=20200109-mixed-1.15.1 -jei_version=6.0.0.25 +jei_version=6.0.0.1 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 a549ad9..faa3662 100644 --- a/src/main/java/slimeknights/mantle/block/InventoryBlock.java +++ b/src/main/java/slimeknights/mantle/block/InventoryBlock.java @@ -10,6 +10,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -41,16 +42,16 @@ public abstract class InventoryBlock extends ContainerBlock { protected abstract boolean openGui(PlayerEntity player, World world, BlockPos pos); @Override - public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { - if (player.isSneaking()) { - return false; + 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; } if (!world.isRemote) { - return this.openGui(player, world, pos); + return this.openGui(player, world, pos) ? ActionResultType.SUCCESS : ActionResultType.PASS; } - return true; + return ActionResultType.SUCCESS; } @Override diff --git a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java index 289e0d5..41a3ea9 100644 --- a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java +++ b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.entity.Entity; @@ -14,8 +14,8 @@ import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.ForgeIngameGui; import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.gui.ForgeIngameGui; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import slimeknights.mantle.Mantle; @@ -60,15 +60,15 @@ public class ExtraHeartRenderHandler { // extra setup stuff from us left_height = ForgeIngameGui.left_height; - this.width = this.mc.mainWindow.getScaledWidth(); - this.height = this.mc.mainWindow.getScaledHeight(); + this.width = this.mc.func_228018_at_().getScaledWidth(); + this.height = this.mc.func_228018_at_().getScaledHeight(); event.setCanceled(true); int updateCounter = this.mc.ingameGUI.getTicks(); // start default forge/mc rendering // changes are indicated by comment this.mc.getProfiler().startSection("health"); - GlStateManager.enableBlend(); + RenderSystem.enableBlend(); int health = MathHelper.ceil(player.getHealth()); boolean highlight = this.healthUpdateCounter > (long) updateCounter && (this.healthUpdateCounter - (long) updateCounter) / 3L % 2L == 1L; @@ -183,7 +183,7 @@ public class ExtraHeartRenderHandler { event.setCanceled(true); - GlStateManager.disableBlend(); + RenderSystem.disableBlend(); this.mc.getProfiler().endSection(); } diff --git a/src/main/java/slimeknights/mantle/client/ModelHelper.java b/src/main/java/slimeknights/mantle/client/ModelHelper.java index 74a3b2d..e893e71 100644 --- a/src/main/java/slimeknights/mantle/client/ModelHelper.java +++ b/src/main/java/slimeknights/mantle/client/ModelHelper.java @@ -3,67 +3,66 @@ package slimeknights.mantle.client; import com.google.common.collect.ImmutableMap; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.TransformationMatrix; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.IModelTransform; import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.MissingTextureSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraftforge.client.model.SimpleModelState; -import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.SimpleModelTransform; +import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; import net.minecraftforge.client.model.pipeline.VertexTransformer; -import net.minecraftforge.common.model.IModelPart; -import net.minecraftforge.common.model.IModelState; -import net.minecraftforge.common.model.TRSRTransformation; - -import javax.vecmath.Vector3f; +import net.minecraftforge.common.model.TransformationHelper; public class ModelHelper { - public static final IModelState DEFAULT_ITEM_STATE; - public static final IModelState DEFAULT_TOOL_STATE; - public static final TRSRTransformation BLOCK_THIRD_PERSON_RIGHT; - public static final TRSRTransformation BLOCK_THIRD_PERSON_LEFT; + public static final IModelTransform DEFAULT_ITEM_STATE; + public static final IModelTransform DEFAULT_TOOL_STATE; + public static final TransformationMatrix BLOCK_THIRD_PERSON_RIGHT; + public static final TransformationMatrix BLOCK_THIRD_PERSON_LEFT; public static TextureAtlasSprite getTextureFromBlockstate(BlockState state) { return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state); } public static BakedQuad colorQuad(int color, BakedQuad quad) { - ColorTransformer transformer = new ColorTransformer(color, quad.getFormat()); + ColorTransformer transformer = new ColorTransformer(color, quad); quad.pipe(transformer); return transformer.build(); } - private static TRSRTransformation get(float tx, float ty, float tz, float ax, float ay, float az, float s) { - return TRSRTransformation.blockCenterToCorner(new TRSRTransformation( + private static TransformationMatrix get(float tx, float ty, float tz, float ax, float ay, float az, float s) { + return new TransformationMatrix( new Vector3f(tx / 16, ty / 16, tz / 16), - TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)), + TransformationHelper.quatFromXYZ(new Vector3f(ax, ay, az), true), new Vector3f(s, s, s), - null)); + null).blockCenterToCorner(); } static { { // equals forge:default-item - ImmutableMap.Builder builder = ImmutableMap.builder(); + ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f)); builder.put(ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1)); builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f)); builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f)); builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f)); builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f)); - DEFAULT_ITEM_STATE = new SimpleModelState(builder.build()); + DEFAULT_ITEM_STATE = new SimpleModelTransform(builder.build()); } { // equals forge:default-tool - ImmutableMap.Builder builder = ImmutableMap.builder(); + ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f)); builder.put(ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1)); builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 4, 0.5f, 0, -90, 55, 0.85f)); builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 4, 0.5f, 0, 90, -55, 0.85f)); builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f)); builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f)); - DEFAULT_TOOL_STATE = new SimpleModelState(builder.build()); + DEFAULT_TOOL_STATE = new SimpleModelTransform(builder.build()); } { @@ -76,8 +75,8 @@ public class ModelHelper { private final float r, g, b, a; - public ColorTransformer(int color, VertexFormat format) { - super(new UnpackedBakedQuad.Builder(format)); + public ColorTransformer(int color, BakedQuad quad) { + super(new BakedQuadBuilder(quad.getSprite())); int a = (color >> 24); if (a == 0) { @@ -95,7 +94,7 @@ public class ModelHelper { @Override public void put(int element, float... data) { - VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElement(element).getUsage(); + VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage(); // transform normals and position if (usage == VertexFormatElement.Usage.COLOR && data.length >= 4) { @@ -107,8 +106,8 @@ public class ModelHelper { super.put(element, data); } - public UnpackedBakedQuad build() { - return ((UnpackedBakedQuad.Builder) this.parent).build(); + public BakedQuad build() { + return ((BakedQuadBuilder) this.parent).build(); } } } diff --git a/src/main/java/slimeknights/mantle/client/book/BookHelper.java b/src/main/java/slimeknights/mantle/client/book/BookHelper.java index 74bc462..7427972 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookHelper.java +++ b/src/main/java/slimeknights/mantle/client/book/BookHelper.java @@ -12,7 +12,7 @@ public class BookHelper { if (!item.isEmpty() && item.hasTag()) { CompoundNBT mantleBook = item.getTag().getCompound("mantle").getCompound("book"); - if (mantleBook.contains("page", Arrays.asList(INBT.NBT_TYPES).indexOf("STRING"))) { + if (mantleBook.contains("page", 8)) { return mantleBook.getString("page"); } } diff --git a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java index 3fbe13e..26b3aaa 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java @@ -12,11 +12,13 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IWorldReader; import net.minecraft.world.LightType; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeManager; import net.minecraft.world.border.WorldBorder; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.dimension.Dimension; import net.minecraft.world.gen.Heightmap.Type; +import net.minecraft.world.lighting.WorldLightManager; import javax.annotation.Nullable; @@ -37,13 +39,12 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public int getCombinedLight(BlockPos pos, int lightValue) { - // full brightness always - return 15 << 20 | 15 << 4; + public WorldLightManager func_225524_e_() { + return null; } @Override - public int getLightFor(LightType type, BlockPos pos) { + public int func_226658_a_(LightType type, BlockPos pos) { return 15 << 20 | 15 << 4; } @@ -72,7 +73,12 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public Biome getBiome(BlockPos pos) { + public Biome func_226691_t_(BlockPos pos) { + return null; + } + + @Override + public Biome func_225604_a_(int p_225604_1_, int p_225604_2_, int p_225604_3_) { return null; } @@ -82,7 +88,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public int getLightSubtracted(BlockPos pos, int amount) { + public int func_226659_b_(BlockPos pos, int amount) { return 0; } @@ -103,7 +109,7 @@ public class StructureBlockAccess implements IWorldReader { } @Override - public boolean isSkyLightMax(BlockPos pos) { + public boolean func_226660_f_(BlockPos pos) { return true; } @@ -117,6 +123,11 @@ public class StructureBlockAccess implements IWorldReader { return 0; } + @Override + public BiomeManager func_225523_d_() { + return null; + } + @Override public WorldBorder getWorldBorder() { return null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/LinkedSectionData.java b/src/main/java/slimeknights/mantle/client/book/data/LinkedSectionData.java index ffd1e89..3313800 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/LinkedSectionData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/LinkedSectionData.java @@ -25,7 +25,7 @@ public class LinkedSectionData extends SectionData { this.pages.addAll(section.pages); } - this.icon.load(source); + this.icon.load(this.source); } public void addSection(SectionData data) { diff --git a/src/main/java/slimeknights/mantle/client/book/data/PageData.java b/src/main/java/slimeknights/mantle/client/book/data/PageData.java index b7db5f6..46531b2 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/PageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/PageData.java @@ -86,7 +86,7 @@ public class PageData implements IDataItem { this.content.source = this.source; for (Field f : this.content.getClass().getFields()) { - processField(f); + this.processField(f); } } @@ -99,9 +99,9 @@ public class PageData implements IDataItem { } try { - Object o = f.get(content); + Object o = f.get(this.content); if (o != null) { - processObject(o, 0); + this.processObject(o, 0); } } catch (IllegalAccessException e) { e.printStackTrace(); @@ -117,13 +117,13 @@ public class PageData implements IDataItem { if(!isArray) { if(IDataElement.class.isAssignableFrom(c)) { - ((IDataElement)o).load(source); + ((IDataElement)o).load(this.source); } return; } for(int i = 0; i < Array.getLength(o); i++){ - processObject(Array.get(o, i), depth + 1); + this.processObject(Array.get(o, i), depth + 1); } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java index d472130..d186c98 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java @@ -79,7 +79,7 @@ public class SectionData implements IDataItem { page.load(); } - this.icon.load(source); + this.icon.load(this.source); } /** diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java index d076808..075328a 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java @@ -58,7 +58,7 @@ public class ContentSmelting extends PageContent { tdTitle.underlined = true; list.add(new ElementText(0, 0, BookScreen.PAGE_WIDTH, 9, tdTitle)); list.add(new ElementImage(x, y, IMG_SMELTING.width, IMG_SMELTING.height, IMG_SMELTING, book.appearance.slotColor)); - list.add(new ElementTooltip(ImmutableList.of(I18n.format("mantle:tooltip.cooktime", cookTime / 20)), x + 7, y + 42, 60, 28)); + list.add(new ElementTooltip(ImmutableList.of(I18n.format("mantle:tooltip.cooktime", this.cookTime / 20)), x + 7, y + 42, 60, 28)); if (this.input != null && !this.input.getItems().isEmpty()) { list.add(new ElementItem(x + INPUT_X, y + INPUT_Y, ITEM_SCALE, this.input.getItems(), this.input.action)); @@ -78,8 +78,8 @@ public class ContentSmelting extends PageContent { public NonNullList getFuelsList() { //TODO ask JEI for fuel list if it is present - if(fuel != null) { - return fuel.getItems(); + if(this.fuel != null) { + return this.fuel.getItems(); } return FUELS; @@ -89,13 +89,13 @@ public class ContentSmelting extends PageContent { public void load() { super.load(); - if(!StringUtils.isEmpty(recipe) && ResourceLocation.isResouceNameValid(recipe)) { + if(!StringUtils.isEmpty(this.recipe) && ResourceLocation.isResouceNameValid(this.recipe)) { IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipe(new ResourceLocation(this.recipe)).orElse(null); if(recipe instanceof AbstractCookingRecipe) { - input = ItemStackData.getItemStackData(NonNullList.from(ItemStack.EMPTY, recipe.getIngredients().get(0).getMatchingStacks())); - cookTime = ((AbstractCookingRecipe)recipe).getCookTime(); - result = ItemStackData.getItemStackData(recipe.getRecipeOutput()); + this.input = ItemStackData.getItemStackData(NonNullList.from(ItemStack.EMPTY, recipe.getIngredients().get(0).getMatchingStacks())); + this.cookTime = ((AbstractCookingRecipe)recipe).getCookTime(); + this.result = ItemStackData.getItemStackData(recipe.getRecipeOutput()); } } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/BlockData.java b/src/main/java/slimeknights/mantle/client/book/data/element/BlockData.java index 1200e57..908b50b 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/BlockData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/BlockData.java @@ -15,8 +15,8 @@ public class BlockData implements IDataElement { @Override public void load(BookRepository source) { - if(endPos == null) { - endPos = pos; + if(this.endPos == null) { + this.endPos = this.pos; } } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/DataLocation.java b/src/main/java/slimeknights/mantle/client/book/data/element/DataLocation.java index d0e4701..eec441c 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/DataLocation.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/DataLocation.java @@ -11,6 +11,6 @@ public class DataLocation implements IDataElement { @Override public void load(BookRepository source) { - location = "$BLOCK_ATLAS".equals(file) ? AtlasTexture.LOCATION_BLOCKS_TEXTURE : source.getResourceLocation(file, true); + this.location = "$BLOCK_ATLAS".equals(this.file) ? AtlasTexture.LOCATION_BLOCKS_TEXTURE : source.getResourceLocation(this.file, true); } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java index d6052a4..935d20c 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java @@ -63,8 +63,8 @@ public class ImageData extends DataLocation { public void load(BookRepository source) { super.load(source); - if(item != null) { - item.load(source); + if(this.item != null) { + this.item.load(source); } } } 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 4a36d0b..e1594d8 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 @@ -37,22 +37,22 @@ public class ItemStackData implements IDataElement { private transient int tagGeneration; public NonNullList getItems() { - if(isTag && tagGeneration != ItemTags.getGeneration()) { - loadTag(); + if(this.isTag && this.tagGeneration != ItemTags.getGeneration()) { + this.loadTag(); } - if (items != null) { - return items; + if (this.items != null) { + return this.items; } - return NonNullList.withSize(1, getItem()); + return NonNullList.withSize(1, this.getItem()); } private ItemStack getItem() { Item item; boolean isMissingItem = false; try { - item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(id));//ItemArgument.getItem(null, id).getItem(); + item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(this.id));//ItemArgument.getItem(null, id).getItem(); } catch (Exception e) { item = Item.getItemFromBlock(Blocks.BARRIER); @@ -64,11 +64,11 @@ public class ItemStackData implements IDataElement { isMissingItem = true; } - ItemStack itemStack = new ItemStack(item, amount); + ItemStack itemStack = new ItemStack(item, this.amount); - if (nbt != null) { + if (this.nbt != null) { try { - itemStack.setTag(JsonToNBT.getTagFromJson(filterJsonQuotes(nbt.toString()))); + itemStack.setTag(JsonToNBT.getTagFromJson(filterJsonQuotes(this.nbt.toString()))); } catch (CommandSyntaxException ignored) { } @@ -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(new StringNBT("\u00A7r\u00A7eItem Name:")); - lore.add(new StringNBT("\u00A7r\u00A7e" + id)); + lore.add(StringNBT.func_229705_a_("\u00A7r\u00A7eItem Name:")); + lore.add(StringNBT.func_229705_a_("\u00A7r\u00A7e" + this.id)); display.put("Lore", lore); } @@ -116,43 +116,43 @@ public class ItemStackData implements IDataElement { } private void loadTag() { - isTag = true; - tagGeneration = ItemTags.getGeneration(); + this.isTag = true; + this.tagGeneration = ItemTags.getGeneration(); - Tag values = ItemTags.getCollection().get(new ResourceLocation(tag)); + Tag values = ItemTags.getCollection().get(new ResourceLocation(this.tag)); if (values != null) { - items = values.getAllElements().stream().map(ItemStack::new).collect(Collectors.toCollection(NonNullList::create)); + this.items = values.getAllElements().stream().map(ItemStack::new).collect(Collectors.toCollection(NonNullList::create)); } else { - items = NonNullList.create(); + this.items = NonNullList.create(); } } @Override public void load(BookRepository source) { - if (customData) { + if (this.customData) { return; } - if (!StringUtils.isNullOrEmpty(tag) && ResourceLocation.isResouceNameValid(tag)) { - loadTag(); - id = "->itemList"; + if (!StringUtils.isNullOrEmpty(this.tag) && ResourceLocation.isResouceNameValid(this.tag)) { + this.loadTag(); + this.id = "->itemList"; return; } - ResourceLocation location = source.getResourceLocation(itemList); + ResourceLocation location = source.getResourceLocation(this.itemList); if (location != null) { - id = "->itemList"; + this.id = "->itemList"; if (source.resourceExists(location)) { try { ItemsList itemsList = BookLoader.GSON .fromJson(source.resourceToString(source.getResource(location)), ItemsList.class); - items = NonNullList.withSize(itemsList.items.length, ItemStack.EMPTY); + this.items = NonNullList.withSize(itemsList.items.length, ItemStack.EMPTY); for (int i = 0; i < itemsList.items.length; i++) { - items.set(i, itemsList.items[i].getItem()); + this.items.set(i, itemsList.items[i].getItem()); } this.action = itemsList.action; diff --git a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java index 168b689..b42c9c3 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java @@ -2,8 +2,9 @@ package slimeknights.mantle.client.model; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; @@ -11,38 +12,22 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; import net.minecraftforge.client.model.PerspectiveMapWrapper; -import net.minecraftforge.common.model.TRSRTransformation; - -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; -import java.util.Random; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; +import java.util.List; +import java.util.Random; public class BakedSimple implements IBakedModel { private final List quads; - private final ImmutableMap transforms; + private final ImmutableMap transforms; private final TextureAtlasSprite particle; private final boolean ambientOcclusion; private final boolean isGui3d; private final ItemOverrideList overrides; - public BakedSimple(ImmutableList quads, ImmutableMap transforms, IBakedModel base) { - this( - (List) quads, - transforms, - base.getParticleTexture(), - base.isAmbientOcclusion(), - base.isGui3d(), - base.getOverrides() - ); - } - - public BakedSimple(List quads, ImmutableMap transforms, IBakedModel base) { + public BakedSimple(ImmutableList quads, ImmutableMap transforms, IBakedModel base) { this( quads, transforms, @@ -53,7 +38,18 @@ public class BakedSimple implements IBakedModel { ); } - public BakedSimple(List quads, ImmutableMap transforms, TextureAtlasSprite particle, boolean ambientOcclusion, boolean isGui3d, ItemOverrideList overrides) { + public BakedSimple(List quads, ImmutableMap transforms, IBakedModel base) { + this( + quads, + transforms, + base.getParticleTexture(), + base.isAmbientOcclusion(), + base.isGui3d(), + base.getOverrides() + ); + } + + public BakedSimple(List quads, ImmutableMap transforms, TextureAtlasSprite particle, boolean ambientOcclusion, boolean isGui3d, ItemOverrideList overrides) { this.quads = quads; this.particle = particle; this.transforms = transforms; @@ -65,17 +61,17 @@ public class BakedSimple implements IBakedModel { @Nonnull @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { - return quads; + return this.quads; } @Override public boolean isAmbientOcclusion() { - return ambientOcclusion; + return this.ambientOcclusion; } @Override public boolean isGui3d() { - return isGui3d; + return this.isGui3d; } @Override @@ -86,7 +82,7 @@ public class BakedSimple implements IBakedModel { @Nonnull @Override public TextureAtlasSprite getParticleTexture() { - return particle; + return this.particle; } @Nonnull @@ -98,12 +94,12 @@ public class BakedSimple implements IBakedModel { @Nonnull @Override public ItemOverrideList getOverrides() { - return overrides; + return this.overrides; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType); + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { + return PerspectiveMapWrapper.handlePerspective(this, this.transforms, cameraTransformType, mat); } public static class Wrapper extends BakedSimple { @@ -113,13 +109,13 @@ public class BakedSimple implements IBakedModel { public Wrapper(ImmutableList quads, IBakedModel base) { super(quads, null, base); - parent = base; + this.parent = base; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - Pair pair = parent.handlePerspective(cameraTransformType); - return Pair.of(this, pair.getRight()); + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { + this.parent.handlePerspective(cameraTransformType, mat); + return this; } } } diff --git a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java index 441c8f1..f2d9d2a 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java @@ -1,8 +1,9 @@ package slimeknights.mantle.client.model; import com.google.common.collect.ImmutableMap; - +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; @@ -10,16 +11,11 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; import net.minecraftforge.client.model.PerspectiveMapWrapper; -import net.minecraftforge.common.model.TRSRTransformation; - -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; -import java.util.Random; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; +import java.util.List; +import java.util.Random; public class BakedWrapper implements IBakedModel { @@ -32,54 +28,54 @@ public class BakedWrapper implements IBakedModel { @Nonnull @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { - return parent.getQuads(state, side, rand); + return this.parent.getQuads(state, side, rand); } @Override public boolean isAmbientOcclusion() { - return parent.isAmbientOcclusion(); + return this.parent.isAmbientOcclusion(); } @Override public boolean isGui3d() { - return parent.isGui3d(); + return this.parent.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return parent.isBuiltInRenderer(); + return this.parent.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { - return parent.getParticleTexture(); + return this.parent.getParticleTexture(); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { - return parent.getItemCameraTransforms(); + return this.parent.getItemCameraTransforms(); } @Nonnull @Override public ItemOverrideList getOverrides() { - return parent.getOverrides(); + return this.parent.getOverrides(); } public static class Perspective extends BakedWrapper implements IBakedModel { - protected final ImmutableMap transforms; + protected final ImmutableMap transforms; - public Perspective(IBakedModel parent, ImmutableMap transforms) { + public Perspective(IBakedModel parent, ImmutableMap transforms) { super(parent); this.transforms = transforms; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType); + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { + return PerspectiveMapWrapper.handlePerspective(this, this.transforms, cameraTransformType, mat); } } } diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index 23e0495..c9613ee 100644 --- a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java @@ -1,23 +1,20 @@ package slimeknights.mantle.client.model; +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; - -import org.apache.commons.lang3.tuple.Pair; - -import java.util.List; -import java.util.Random; +import slimeknights.mantle.client.ModelHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; - -import slimeknights.mantle.client.ModelHelper; +import java.util.List; +import java.util.Random; /** * Takes a blockmodel and applies the standard-block-perspective for third_person to it @@ -31,23 +28,26 @@ public class BlockItemModelWrapper implements IBakedModel { } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - Matrix4f matrix = null; + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { + TransformationMatrix transform = null; // fix transformation in hand if (cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND) { - matrix = ModelHelper.BLOCK_THIRD_PERSON_RIGHT.getMatrixVec(); + transform = ModelHelper.BLOCK_THIRD_PERSON_RIGHT; } else if (cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND) { - matrix = ModelHelper.BLOCK_THIRD_PERSON_LEFT.getMatrixVec(); + transform = ModelHelper.BLOCK_THIRD_PERSON_LEFT; } - return Pair.of(this, matrix); + if (transform != null) { + mat.func_227866_c_().func_227870_a_().func_226595_a_(transform.func_227988_c_()); + } + return this; } @Nonnull @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { - return parent.getQuads(state, side, rand); + return this.parent.getQuads(state, side, rand); } @Override @@ -57,24 +57,24 @@ public class BlockItemModelWrapper implements IBakedModel { @Override public boolean isGui3d() { - return parent.isGui3d(); + return this.parent.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return parent.isBuiltInRenderer(); + return this.parent.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { - return parent.getParticleTexture(); + return this.parent.getParticleTexture(); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { - return parent.getItemCameraTransforms(); + return this.parent.getItemCameraTransforms(); } @Nonnull diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index d170d26..c4848fa 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -2,36 +2,34 @@ package slimeknights.mantle.client.model; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.Matrix3f; +import net.minecraft.client.renderer.Matrix4f; +import net.minecraft.client.renderer.TransformationMatrix; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.Vector4f; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverride; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.world.World; -import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; import net.minecraftforge.client.model.pipeline.VertexTransformer; -import net.minecraftforge.common.model.TRSRTransformation; - -import java.util.List; -import java.util.Random; +import net.minecraftforge.common.model.TransformationHelper; import javax.annotation.Nonnull; -import javax.vecmath.Matrix3f; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; +import java.util.List; +import java.util.Random; // for those wondering TRSR stands for Translation Rotation Scale Rotation public class TRSRBakedModel implements IBakedModel { protected final IBakedModel original; - protected final TRSRTransformation transformation; + protected final TransformationMatrix transformation; private final TRSROverride override; private final int faceOffset; @@ -44,15 +42,15 @@ public class TRSRBakedModel implements IBakedModel { } public TRSRBakedModel(IBakedModel original, float x, float y, float z, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ) { - this(original, new TRSRTransformation(new Vector3f(x, y, z), + this(original, new TransformationMatrix(new Vector3f(x, y, z), null, new Vector3f(scaleX, scaleY, scaleZ), - TRSRTransformation.quatFromXYZ(rotX, rotY, rotZ))); + TransformationHelper.quatFromXYZ(new float[] { rotX, rotY, rotZ }, false))); } - public TRSRBakedModel(IBakedModel original, TRSRTransformation transform) { + public TRSRBakedModel(IBakedModel original, TransformationMatrix transform) { this.original = original; - this.transformation = TRSRTransformation.blockCenterToCorner(transform); + this.transformation = transform.blockCenterToCorner(); this.override = new TRSROverride(this); this.faceOffset = 0; } @@ -65,8 +63,7 @@ public class TRSRBakedModel implements IBakedModel { this.faceOffset = 4 + Direction.NORTH.getHorizontalIndex() - facing.getHorizontalIndex(); double r = Math.PI * (360 - facing.getOpposite().getHorizontalIndex() * 90) / 180d; - TRSRTransformation t = new TRSRTransformation(null, null, null, TRSRTransformation.quatFromXYZ(0, (float) r, 0)); - this.transformation = TRSRTransformation.blockCenterToCorner(t); + this.transformation = new TransformationMatrix(null, null, null, TransformationHelper.quatFromXYZ(new float[] { 0, (float) r, 0 }, false)).blockCenterToCorner(); } @Nonnull @@ -76,14 +73,14 @@ public class TRSRBakedModel implements IBakedModel { ImmutableList.Builder builder = ImmutableList.builder(); - if (!original.isBuiltInRenderer()) { + if (!this.original.isBuiltInRenderer()) { try { // adjust side to facing-rotation if (side != null && side.getHorizontalIndex() > -1) { - side = Direction.byHorizontalIndex((side.getHorizontalIndex() + faceOffset) % 4); + side = Direction.byHorizontalIndex((side.getHorizontalIndex() + this.faceOffset) % 4); } - for (BakedQuad quad : original.getQuads(state, side, rand)) { - Transformer transformer = new Transformer(transformation, quad.getFormat()); + for (BakedQuad quad : this.original.getQuads(state, side, rand)) { + Transformer transformer = new Transformer(this.transformation, quad.getSprite()); quad.pipe(transformer); builder.add(transformer.build()); } @@ -103,30 +100,30 @@ public class TRSRBakedModel implements IBakedModel { @Override public boolean isGui3d() { - return original.isGui3d(); + return this.original.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return original.isBuiltInRenderer(); + return this.original.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { - return original.getParticleTexture(); + return this.original.getParticleTexture(); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { - return original.getItemCameraTransforms(); + return this.original.getItemCameraTransforms(); } @Nonnull @Override public ItemOverrideList getOverrides() { - return override; + return this.override; } private static class TRSROverride extends ItemOverrideList { @@ -134,7 +131,7 @@ public class TRSRBakedModel implements IBakedModel { private final TRSRBakedModel model; public TRSROverride(TRSRBakedModel model) { - super(null, null, null, ImmutableList.of()); + super(null, null, null, ImmutableList.of()); this.model = model; } @@ -142,9 +139,9 @@ public class TRSRBakedModel implements IBakedModel { @Nonnull @Override public IBakedModel getModelWithOverrides(@Nonnull IBakedModel originalModel, ItemStack stack, @Nonnull World world, @Nonnull LivingEntity entity) { - IBakedModel baked = model.original.getOverrides().getModelWithOverrides(originalModel, stack, world, entity); + IBakedModel baked = this.model.original.getOverrides().getModelWithOverrides(originalModel, stack, world, entity); - return new TRSRBakedModel(baked, model.transformation); + return new TRSRBakedModel(baked, this.model.transformation); } } @@ -153,40 +150,44 @@ public class TRSRBakedModel implements IBakedModel { protected Matrix4f transformation; protected Matrix3f normalTransformation; - public Transformer(TRSRTransformation transformation, VertexFormat format) { - super(new UnpackedBakedQuad.Builder(format)); + public Transformer(TransformationMatrix transformation, TextureAtlasSprite textureAtlasSprite) { + super(new BakedQuadBuilder(textureAtlasSprite)); // position transform - this.transformation = transformation.getMatrixVec(); + this.transformation = transformation.func_227988_c_(); // normal transform - this.normalTransformation = new Matrix3f(); - this.transformation.getRotationScale(this.normalTransformation); - this.normalTransformation.invert(); - this.normalTransformation.transpose(); + this.normalTransformation = new Matrix3f(this.transformation); + this.normalTransformation.func_226123_f_(); + this.normalTransformation.func_226110_a_(); } @Override public void put(int element, float... data) { - VertexFormatElement.Usage usage = parent.getVertexFormat().getElement(element).getUsage(); + VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().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); - transformation.transform(vec); + vec.func_229372_a_(this.transformation); data = new float[4]; - vec.get(data); + data[0] = vec.getX(); + data[1] = vec.getY(); + data[2] = vec.getZ(); + data[3] = vec.getW(); } else if (usage == VertexFormatElement.Usage.NORMAL && data.length >= 3) { Vector3f vec = new Vector3f(data); - normalTransformation.transform(vec); - vec.normalize(); + vec.func_229188_a_(this.normalTransformation); + vec.func_229194_d_(); data = new float[4]; - vec.get(data); + data[0] = vec.getX(); + data[1] = vec.getY(); + data[2] = vec.getZ(); } super.put(element, data); } - public UnpackedBakedQuad build() { - return ((UnpackedBakedQuad.Builder) parent).build(); + public BakedQuad build() { + return ((BakedQuadBuilder) this.parent).build(); } } } diff --git a/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java b/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java index 88ebb3d..f69b755 100644 --- a/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java +++ b/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java @@ -2,6 +2,7 @@ package slimeknights.mantle.client.screen; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.renderer.Rectangle2d; @@ -82,17 +83,17 @@ public class MultiModuleScreen extends Container for (ModuleScreen module : this.modules) { // set correct state for the module - GlStateManager.pushMatrix(); - GlStateManager.translatef(-this.guiLeft, -this.guiTop, 0.0F); - GlStateManager.translatef(module.guiLeft, module.guiTop, 0.0F); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.pushMatrix(); + RenderSystem.translatef(-this.guiLeft, -this.guiTop, 0.0F); + RenderSystem.translatef(module.guiLeft, module.guiTop, 0.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); module.handleDrawGuiContainerForegroundLayer(mouseX, mouseY); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } } protected void drawBackground(ResourceLocation background) { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); this.minecraft.getTextureManager().bindTexture(background); this.blit(this.cornerX, this.cornerY, 0, 0, this.realWidth, this.realHeight); } diff --git a/src/main/java/slimeknights/mantle/client/screen/WidgetTabs.java b/src/main/java/slimeknights/mantle/client/screen/WidgetTabs.java index 6955c46..35b956f 100644 --- a/src/main/java/slimeknights/mantle/client/screen/WidgetTabs.java +++ b/src/main/java/slimeknights/mantle/client/screen/WidgetTabs.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.screen; import com.google.common.collect.Lists; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; @@ -144,7 +144,6 @@ public class WidgetTabs extends Widget { ItemStack icon = this.icons.get(i); if (icon != null) { - RenderHelper.enableGUIStandardItemLighting(); this.drawItemStack(icon, x + (actualTab.w - 16) / 2, y + (actualTab.h - 16) / 2); RenderHelper.disableStandardItemLighting(); //RenderHelper.enableStandardItemLighting(); @@ -155,7 +154,7 @@ public class WidgetTabs extends Widget { // guiContainer.drawItemStack private void drawItemStack(ItemStack stack, int x, int y) { ItemRenderer itemRender = Minecraft.getInstance().getItemRenderer(); - GlStateManager.translatef(0.0F, 0.0F, 32.0F); + RenderSystem.translatef(0.0F, 0.0F, 32.0F); itemRender.zLevel = 200; //FontRenderer font = stack.getItem().getFontRenderer(stack); diff --git a/src/main/java/slimeknights/mantle/client/screen/book/ArrowButton.java b/src/main/java/slimeknights/mantle/client/screen/book/ArrowButton.java index 16a0897..e464170 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/ArrowButton.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/ArrowButton.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client.screen.book; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraftforge.api.distmarker.Dist; @@ -40,7 +40,7 @@ public class ArrowButton extends Button { float g = ((color >> 8) & 0xff) / 255.F; float b = (color & 0xff) / 255.F; - GlStateManager.color3f(r, g, b); + RenderSystem.color3f(r, g, b); blit(this.x, this.y, this.width, this.height, this.arrowType.x, this.arrowType.y, this.width, this.height, 512, 512); this.renderBg(minecraft, mouseX, mouseY); } 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 915f2bf..6635576 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.screen.book; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; @@ -106,14 +106,14 @@ public class BookScreen extends Screen { fontRenderer.drawString("DEBUG", 2, 2, 0xFFFFFFFF); } - GlStateManager.enableAlphaTest(); - GlStateManager.enableBlend(); + RenderSystem.enableAlphaTest(); + RenderSystem.enableBlend(); // The books are unreadable at Gui Scale set to small, so we'll double the scale /* if(mc.gameSettings.guiScale == 1) { float f = 1.5f; - GlStateManager.scale(f, f, 1); + RenderSystem.scale(f, f, 1); float ox = this.width/6; float oy = this.height/6; @@ -121,11 +121,11 @@ public class BookScreen extends Screen { mouseX = (int)((float)mouseX / f); mouseY = (int)((float)mouseY / f); - GlStateManager.translate(ox, oy, 0); + RenderSystem.translate(ox, oy, 0); } else if(mc.gameSettings.guiScale == 2) { float f = 3f/2f; - GlStateManager.scale(f, f, 1); + RenderSystem.scale(f, f, 1); float ox = -this.width/6; float oy = -this.height/6; @@ -133,11 +133,11 @@ public class BookScreen extends Screen { mouseX = (int)(((float)mouseX - ox)/f); mouseY = (int)(((float)mouseY - oy)/f); - GlStateManager.translate(ox, oy, 0); + RenderSystem.translate(ox, oy, 0); } */ - GlStateManager.pushMatrix(); - GlStateManager.color3f(1F, 1F, 1F); + RenderSystem.pushMatrix(); + RenderSystem.color3f(1F, 1F, 1F); float coverR = ((this.book.appearance.coverColor >> 16) & 0xff) / 255.F; float coverG = ((this.book.appearance.coverColor >> 8) & 0xff) / 255.F; @@ -149,45 +149,45 @@ public class BookScreen extends Screen { render.bindTexture(TEX_BOOKFRONT); RenderHelper.disableStandardItemLighting(); - GlStateManager.color3f(coverR, coverG, coverB); + RenderSystem.color3f(coverR, coverG, coverB); blit(this.width / 2 - PAGE_WIDTH_UNSCALED / 2, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, 0, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.color3f(1F, 1F, 1F); + RenderSystem.color3f(1F, 1F, 1F); if (!this.book.appearance.title.isEmpty()) { blit(this.width / 2 - PAGE_WIDTH_UNSCALED / 2, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, PAGE_HEIGHT_UNSCALED, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.pushMatrix(); + RenderSystem.pushMatrix(); float scale = fontRenderer.getStringWidth(this.book.appearance.title) <= 67 ? 2.5F : 2F; - GlStateManager.scalef(scale, scale, 1F); + RenderSystem.scalef(scale, scale, 1F); fontRenderer.drawStringWithShadow(this.book.appearance.title, (this.width / 2) / scale + 3 - fontRenderer.getStringWidth(this.book.appearance.title) / 2, (this.height / 2 - fontRenderer.FONT_HEIGHT / 2) / scale - 4, 0xAE8000); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } if (!this.book.appearance.subtitle.isEmpty()) { - GlStateManager.pushMatrix(); - GlStateManager.scalef(1.5F, 1.5F, 1F); + RenderSystem.pushMatrix(); + RenderSystem.scalef(1.5F, 1.5F, 1F); fontRenderer.drawStringWithShadow(this.book.appearance.subtitle, (this.width / 2) / 1.5F + 7 - fontRenderer.getStringWidth(this.book.appearance.subtitle) / 2, (this.height / 2 + 100 - fontRenderer.FONT_HEIGHT * 2) / 1.5F, 0xAE8000); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } } else { render.bindTexture(TEX_BOOK); RenderHelper.disableStandardItemLighting(); - GlStateManager.color3f(coverR, coverG, coverB); + RenderSystem.color3f(coverR, coverG, coverB); blit(this.width / 2 - PAGE_WIDTH_UNSCALED, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, 0, PAGE_WIDTH_UNSCALED * 2, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.color3f(1F, 1F, 1F); + RenderSystem.color3f(1F, 1F, 1F); if (this.page != 0) { blit(this.width / 2 - PAGE_WIDTH_UNSCALED, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, PAGE_HEIGHT_UNSCALED, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.pushMatrix(); + RenderSystem.pushMatrix(); this.drawerTransform(false); - GlStateManager.scalef(PAGE_SCALE, PAGE_SCALE, 1F); + RenderSystem.scalef(PAGE_SCALE, PAGE_SCALE, 1F); if (this.book.appearance.drawPageNumbers) { String pNum = (this.page - 1) * 2 + 2 + ""; @@ -201,7 +201,7 @@ public class BookScreen extends Screen { for (int i = 0; i < this.leftElements.size(); i++) { BookElement element = this.leftElements.get(i); - GlStateManager.color4f(1F, 1F, 1F, 1F); + RenderSystem.color4f(1F, 1F, 1F, 1F); element.draw(mX, mY, partialTicks, fontRenderer); } @@ -209,27 +209,27 @@ public class BookScreen extends Screen { for (int i = 0; i < this.leftElements.size(); i++) { BookElement element = this.leftElements.get(i); - GlStateManager.color4f(1F, 1F, 1F, 1F); + RenderSystem.color4f(1F, 1F, 1F, 1F); element.drawOverlay(mX, mY, partialTicks, fontRenderer); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } // Rebind texture as the font renderer binds its own texture render.bindTexture(TEX_BOOK); // Set color back to white - GlStateManager.color4f(1F, 1F, 1F, 1F); + RenderSystem.color4f(1F, 1F, 1F, 1F); RenderHelper.disableStandardItemLighting(); int fullPageCount = this.book.getFullPageCount(this.advancementCache); if (this.page < fullPageCount - 1 || this.book.getPageCount(this.advancementCache) % 2 != 0) { blit(this.width / 2, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.pushMatrix(); + RenderSystem.pushMatrix(); this.drawerTransform(true); - GlStateManager.scalef(PAGE_SCALE, PAGE_SCALE, 1F); + RenderSystem.scalef(PAGE_SCALE, PAGE_SCALE, 1F); if (this.book.appearance.drawPageNumbers) { String pNum = (this.page - 1) * 2 + 3 + ""; @@ -243,7 +243,7 @@ public class BookScreen extends Screen { for (int i = 0; i < this.rightElements.size(); i++) { BookElement element = this.rightElements.get(i); - GlStateManager.color4f(1F, 1F, 1F, 1F); + RenderSystem.color4f(1F, 1F, 1F, 1F); element.draw(mX, mY, partialTicks, fontRenderer); } @@ -251,17 +251,17 @@ public class BookScreen extends Screen { for (int i = 0; i < this.rightElements.size(); i++) { BookElement element = this.rightElements.get(i); - GlStateManager.color4f(1F, 1F, 1F, 1F); + RenderSystem.color4f(1F, 1F, 1F, 1F); element.drawOverlay(mX, mY, partialTicks, fontRenderer); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } } super.render(mouseX, mouseY, partialTicks); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } @Override @@ -508,10 +508,10 @@ public class BookScreen extends Screen { public void drawerTransform(boolean rightSide) { if (rightSide) { - GlStateManager.translatef(this.width / 2 + PAGE_PADDING_RIGHT + PAGE_MARGIN, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); + RenderSystem.translatef(this.width / 2 + PAGE_PADDING_RIGHT + PAGE_MARGIN, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); } else { - GlStateManager.translatef(this.width / 2 - PAGE_WIDTH_UNSCALED + PAGE_PADDING_LEFT + PAGE_MARGIN, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); + RenderSystem.translatef(this.width / 2 - PAGE_WIDTH_UNSCALED + PAGE_PADDING_LEFT + PAGE_MARGIN, this.height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); } } @@ -532,11 +532,11 @@ public class BookScreen extends Screen { } protected int getMouseX(boolean rightSide) { - return (int) ((Minecraft.getInstance().mouseHelper.getMouseX() * this.width / this.minecraft.mainWindow.getFramebufferWidth() - this.leftOffset(rightSide)) / PAGE_SCALE); + return (int) ((Minecraft.getInstance().mouseHelper.getMouseX() * this.width / this.minecraft.func_228018_at_().getFramebufferWidth() - this.leftOffset(rightSide)) / PAGE_SCALE); } protected int getMouseY() { - return (int) ((Minecraft.getInstance().mouseHelper.getMouseY() * this.height / this.minecraft.mainWindow.getFramebufferHeight() - 1 - this.topOffset()) / PAGE_SCALE); + return (int) ((Minecraft.getInstance().mouseHelper.getMouseY() * this.height / this.minecraft.func_228018_at_().getFramebufferHeight() - 1 - this.topOffset()) / PAGE_SCALE); } public int openPage(int page) { diff --git a/src/main/java/slimeknights/mantle/client/screen/book/BookmarkButton.java b/src/main/java/slimeknights/mantle/client/screen/book/BookmarkButton.java index 566cd32..7b24b3a 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/BookmarkButton.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/BookmarkButton.java @@ -1,8 +1,7 @@ package slimeknights.mantle.client.screen.book; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; @@ -42,14 +41,14 @@ public class BookmarkButton extends Button { float g = ((this.data.color >> 8) & 0xff) / 255.F; float b = (this.data.color & 0xff) / 255.F; - GlStateManager.color3f(r, g, b); + RenderSystem.color3f(r, g, b); blit(this.x, this.y, this.width, this.height, TEX_X, tex_y, WIDTH, HEIGHT, 512, 512); if (this.data.text != null && !this.data.text.isEmpty()) { TextDataRenderer.drawScaledString(minecraft.fontRenderer, this.data.text, this.x + 1, this.y + this.height / 2 - minecraft.fontRenderer.FONT_HEIGHT * TEXT_SCALE / 2 + 1, 0xFFFFFFFF, true, TEXT_SCALE); } - GlStateManager.color3f(1F, 1F, 1F); + RenderSystem.color3f(1F, 1F, 1F); if (this.data.page.equals("ADD")) { blit(this.x + this.width / 2 - ADD_W / 2, this.y + this.height / 2 - ADD_H / 2, ADD_X, ADD_Y, ADD_W, ADD_H, 512, 512); 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 fe3333a..c8961e8 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/TextDataRenderer.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client.screen.book; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.RenderHelper; @@ -227,16 +227,16 @@ public class TextDataRenderer { } public static void drawScaledString(FontRenderer font, String text, float x, float y, int color, boolean dropShadow, float scale) { - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, y, 0); - GlStateManager.scalef(scale, scale, 1F); + RenderSystem.pushMatrix(); + RenderSystem.translatef(x, y, 0); + RenderSystem.scalef(scale, scale, 1F); if (dropShadow) { font.drawStringWithShadow(text, 0, 0, color); } else { font.drawString(text, 0, 0, color); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } private static void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor) { @@ -248,21 +248,21 @@ public class TextDataRenderer { float f5 = (float) (endColor >> 16 & 255) / 255.0F; float f6 = (float) (endColor >> 8 & 255) / 255.0F; float f7 = (float) (endColor & 255) / 255.0F; - GlStateManager.disableTexture(); - GlStateManager.disableAlphaTest(); - GlStateManager.blendFuncSeparate(770, 771, 1, 0); - GlStateManager.shadeModel(7425); + RenderSystem.disableTexture(); + RenderSystem.disableAlphaTest(); + RenderSystem.blendFuncSeparate(770, 771, 1, 0); + RenderSystem.shadeModel(7425); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexBuffer = tessellator.getBuffer(); vertexBuffer.begin(7, DefaultVertexFormats.POSITION_COLOR); - 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(); + 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(); tessellator.draw(); - GlStateManager.shadeModel(7424); - GlStateManager.enableAlphaTest(); - GlStateManager.enableTexture(); + RenderSystem.shadeModel(7424); + RenderSystem.enableAlphaTest(); + RenderSystem.enableTexture(); } //END METHODS FROM GUI } \ No newline at end of file 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 5b4f7a5..5a667ed 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 @@ -61,13 +61,13 @@ public abstract class BookElement extends AbstractGui { if (font == null) { font = fontRenderer; } - drawHoveringText(list1, x, y, font); + this.drawHoveringText(list1, x, y, font); RenderHelper.disableStandardItemLighting(); } } public void drawHoveringText(List textLines, int x, int y, FontRenderer font) { - GuiUtils.drawHoveringText(textLines, x, y, parent.width, parent.height, -1, font); + GuiUtils.drawHoveringText(textLines, x, y, this.parent.width, this.parent.height, -1, font); RenderHelper.disableStandardItemLighting(); } } diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementImage.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementImage.java index b1c50fb..025ff85 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementImage.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementImage.java @@ -1,6 +1,7 @@ package slimeknights.mantle.client.screen.book.element; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraftforge.api.distmarker.Dist; @@ -55,7 +56,7 @@ public class ElementImage extends SizedBookElement { this.colorMultiplier = colorMultiplier; if(image.item != null) { - itemElement = new ElementItem(0, 0, 1F, image.item.getItems()); + this.itemElement = new ElementItem(0, 0, 1F, image.item.getItems()); } } @@ -65,20 +66,20 @@ public class ElementImage extends SizedBookElement { float g = ((this.colorMultiplier >> 8) & 0xff) / 255.F; float b = (this.colorMultiplier & 0xff) / 255.F; - GlStateManager.color3f(r, g, b); + RenderSystem.color3f(r, g, b); if (this.image.item == null) { this.renderEngine.bindTexture(this.image.location); - blitRaw(x, y, width, height, image.u, image.u + image.uw, image.v, image.v + image.vh, image.texWidth, image.texHeight); + blitRaw(this.x, this.y, this.width, this.height, this.image.u, this.image.u + this.image.uw, this.image.v, this.image.v + this.image.vh, this.image.texWidth, this.image.texHeight); } else { - GlStateManager.pushMatrix(); - GlStateManager.translatef(this.x, this.y, 0F); - GlStateManager.scalef(this.width / 16F, this.height / 16F, 1F); - itemElement.draw(mouseX, mouseY, partialTicks, fontRenderer); + RenderSystem.pushMatrix(); + RenderSystem.translatef(this.x, this.y, 0F); + RenderSystem.scalef(this.width / 16F, this.height / 16F, 1F); + this.itemElement.draw(mouseX, mouseY, partialTicks, fontRenderer); RenderHelper.disableStandardItemLighting(); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } } diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementItem.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementItem.java index 750b237..8986cc8 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementItem.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementItem.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client.screen.book.element; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; @@ -81,16 +81,15 @@ public class ElementItem extends SizedBookElement { } } - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.pushMatrix(); - GlStateManager.translatef(this.x, this.y, 0); - GlStateManager.scalef(this.scale, this.scale, 1.0F); + RenderSystem.pushMatrix(); + RenderSystem.translatef(this.x, this.y, 0); + RenderSystem.scalef(this.scale, this.scale, 1.0F); if (this.currentItem < this.itemCycle.size()) { this.mc.getItemRenderer().renderItemAndEffectIntoGUI(this.itemCycle.get(this.currentItem), 0, 0); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementSection.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementSection.java index 2d9a5f1..92b5bd1 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ElementSection.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ElementSection.java @@ -1,6 +1,7 @@ package slimeknights.mantle.client.screen.book.element; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.text.TextFormatting; import slimeknights.mantle.client.book.data.SectionData; @@ -26,9 +27,9 @@ public class ElementSection extends SizedBookElement { this.section = section; - iconX = this.x + WIDTH / 2 - IMG_SIZE / 2; - iconY = this.y + HEIGHT / 2 - IMG_SIZE / 2; - iconRenderer = new ElementImage(iconX, iconY, IMG_SIZE, IMG_SIZE, section.icon); + this.iconX = this.x + WIDTH / 2 - IMG_SIZE / 2; + this.iconY = this.y + HEIGHT / 2 - IMG_SIZE / 2; + this.iconRenderer = new ElementImage(this.iconX, this.iconY, IMG_SIZE, IMG_SIZE, section.icon); } @Override @@ -37,19 +38,19 @@ public class ElementSection extends SizedBookElement { boolean hover = this.isHovered(mouseX, mouseY); if (hover) { - fill(iconX, iconY, iconX + IMG_SIZE, iconY + IMG_SIZE, this.parent.book.appearance.hoverColor); + fill(this.iconX, this.iconY, this.iconX + IMG_SIZE, this.iconY + IMG_SIZE, this.parent.book.appearance.hoverColor); } if (unlocked) { - GlStateManager.color4f(1F, 1F, 1F, hover ? 1F : 0.5F); + RenderSystem.color4f(1F, 1F, 1F, hover ? 1F : 0.5F); } else { float r = ((this.parent.book.appearance.lockedSectionColor >> 16) & 0xff) / 255.F; float g = ((this.parent.book.appearance.lockedSectionColor >> 8) & 0xff) / 255.F; float b = (this.parent.book.appearance.lockedSectionColor & 0xff) / 255.F; - GlStateManager.color4f(r, g, b, 0.75F); + RenderSystem.color4f(r, g, b, 0.75F); } - iconRenderer.draw(mouseX, mouseY, partialTicks, fontRenderer); + this.iconRenderer.draw(mouseX, mouseY, partialTicks, fontRenderer); if (this.section.parent.appearance.drawSectionListText) { int textW = fontRenderer.getStringWidth(this.section.getTitle()); 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 fc97c0e..e23b45b 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 @@ -1,6 +1,7 @@ package slimeknights.mantle.client.screen.book.element; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -179,8 +180,8 @@ public class ElementStructure extends SizedBookElement { int yOffPartial = (structureHeight - 1) * 16 + structureWidth * 8 + structureLength * 8; int yOffTotal = Math.max(52, yOffPartial + 16); - GlStateManager.enableRescaleNormal(); - GlStateManager.pushMatrix(); + RenderSystem.enableRescaleNormal(); + RenderSystem.pushMatrix(); RenderHelper.disableStandardItemLighting(); // GL11.glEnable(GL11.GL_DEPTH_TEST); // GL11.glDepthFunc(GL11.GL_ALWAYS); @@ -192,26 +193,26 @@ public class ElementStructure extends SizedBookElement { float f = (float) Math.sqrt(structureHeight * structureHeight + structureWidth * structureWidth + structureLength * structureLength); yOffTotal = 10 + Math.max(10 + (structureHeight > 1 ? 36 : 0), (int) (f * this.scale)); - //GlStateManager.translate(x + 60, y + 10 + f / 2 * scale, Math.max(structureHeight, Math.max(structureWidth, structureLength))); - GlStateManager.translatef(this.xTranslate, this.yTranslate, Math.max(structureHeight, Math.max(structureWidth, structureLength))); + //RenderSystem.translate(x + 60, y + 10 + f / 2 * scale, Math.max(structureHeight, Math.max(structureWidth, structureLength))); + RenderSystem.translatef(this.xTranslate, this.yTranslate, Math.max(structureHeight, Math.max(structureWidth, structureLength))); // todo: translate where it actually needs to be and to counter z-layer of the book - GlStateManager.scalef(this.scale, -this.scale, 1); - GlStateManager.rotatef(this.rotX, 1, 0, 0); - GlStateManager.rotatef(this.rotY, 0, 1, 0); + RenderSystem.scalef(this.scale, -this.scale, 1); + RenderSystem.rotatef(this.rotX, 1, 0, 0); + RenderSystem.rotatef(this.rotY, 0, 1, 0); - GlStateManager.translatef((float) structureLength / -2f, (float) structureHeight / -2f, (float) structureWidth / -2f); + RenderSystem.translatef((float) structureLength / -2f, (float) structureHeight / -2f, (float) structureWidth / -2f); - GlStateManager.disableLighting(); + RenderSystem.disableLighting(); if (Minecraft.isAmbientOcclusionEnabled()) { - GlStateManager.shadeModel(GL11.GL_SMOOTH); + RenderSystem.shadeModel(GL11.GL_SMOOTH); } else { - GlStateManager.shadeModel(GL11.GL_FLAT); + RenderSystem.shadeModel(GL11.GL_FLAT); } if (structureWidth % 2 == 1) { - //GlStateManager.translate(-.5f, 0, 0); + //RenderSystem.translate(-.5f, 0, 0); } int iterator = 0; @@ -226,19 +227,19 @@ public class ElementStructure extends SizedBookElement { BufferBuilder buffer = tessellator.getBuffer(); buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); Random random = new Random(); - blockRender.renderBlock(state, pos, this.blockAccess, buffer, random, net.minecraftforge.client.model.data.EmptyModelData.INSTANCE); + //blockRender.renderBlock(state, pos, this.blockAccess, buffer, random, net.minecraftforge.client.model.data.EmptyModelData.INSTANCE); tessellator.draw(); } } } } // GL11.glTranslated(0, 0, -i); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderHelper.disableStandardItemLighting(); - GlStateManager.disableRescaleNormal(); - GlStateManager.shadeModel(GL11.GL_FLAT); - GlStateManager.enableBlend(); + RenderSystem.disableRescaleNormal(); + RenderSystem.shadeModel(GL11.GL_FLAT); + RenderSystem.enableBlend(); RenderHelper.disableStandardItemLighting(); /* fontRenderer.setUnicodeFlag(true); 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 96c7070..80bf7c2 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 @@ -22,7 +22,7 @@ public class ElementTooltip extends SizedBookElement { @Override public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) { if (this.isHovered(mouseX, mouseY)) { - drawHoveringText(tooltip, mouseX, mouseY, fontRenderer); + this.drawHoveringText(this.tooltip, mouseX, mouseY, fontRenderer); } } } diff --git a/src/main/java/slimeknights/mantle/inventory/WrapperSlot.java b/src/main/java/slimeknights/mantle/inventory/WrapperSlot.java index d17e854..7c17e8e 100644 --- a/src/main/java/slimeknights/mantle/inventory/WrapperSlot.java +++ b/src/main/java/slimeknights/mantle/inventory/WrapperSlot.java @@ -1,6 +1,6 @@ package slimeknights.mantle.inventory; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import com.mojang.datafixers.util.Pair; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; @@ -78,8 +78,13 @@ public class WrapperSlot extends Slot { @Override @OnlyIn(Dist.CLIENT) - public String getSlotTexture() { - return this.parent.getSlotTexture(); + public Pair func_225517_c_() { + return this.parent.func_225517_c_(); + } + + @Override + public Slot setBackground(ResourceLocation atlas, ResourceLocation sprite) { + return this.parent.setBackground(atlas, sprite); } @Nonnull @@ -88,28 +93,6 @@ public class WrapperSlot extends Slot { return this.parent.decrStackSize(amount); } - @Nonnull - @Override - public ResourceLocation getBackgroundLocation() { - return this.parent.getBackgroundLocation(); - } - - @Override - public void setBackgroundName(@Nonnull String name) { - this.parent.setBackgroundName(name); - } - - @Nonnull - @Override - public TextureAtlasSprite getBackgroundSprite() { - return this.parent.getBackgroundSprite(); - } - - @Override - public void setBackgroundLocation(@Nonnull ResourceLocation texture) { - this.parent.setBackgroundLocation(texture); - } - @OnlyIn(Dist.CLIENT) @Override public boolean isEnabled() { diff --git a/src/main/java/slimeknights/mantle/util/TagHelper.java b/src/main/java/slimeknights/mantle/util/TagHelper.java index 147eff5..a01b3ad 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 = (new StringNBT()).getId(); + public static int TAG_TYPE_STRING = (StringNBT.func_229705_a_("")).getId(); public static int TAG_TYPE_COMPOUND = (new CompoundNBT()).getId(); private TagHelper() { diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index fa0dd1f..0a68cd8 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -8,5 +8,9 @@ public net.minecraft.client.gui.screen.inventory.ContainerScreen field_147003_i public net.minecraft.client.gui.screen.inventory.ContainerScreen func_146977_a(Lnet/minecraft/inventory/container/Slot;)V # drawSlot public net.minecraft.client.gui.screen.inventory.ContainerScreen func_195362_a(Lnet/minecraft/inventory/container/Slot;DD)Z # isSlotSelected +# Slot +public-f net.minecraft.inventory.container.Slot field_75223_e # xPos +public-f net.minecraft.inventory.container.Slot field_75221_f # yPos + # Screen public net.minecraft.client.gui.screen.Screen buttons # buttons \ No newline at end of file