From efc8e7a74c0de5ef7057e4e64875dff7cce89013 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 12 Apr 2020 15:24:23 -0700 Subject: [PATCH] Update Forge and MCP versions --- gradle.properties | 4 ++-- .../jei/api/constants/VanillaRecipeCategoryUid.java | 1 - .../java/mezz/jei/gui/overlay/IngredientGrid.java | 1 - .../mezz/jei/gui/textures/JeiSpriteUploader.java | 2 +- .../vanilla/ingredients/fluid/FluidStackHelper.java | 3 +-- .../ingredients/fluid/FluidStackRenderer.java | 5 ++--- .../vanilla/ingredients/item/ItemStackRenderer.java | 2 +- .../mezz/jei/render/IngredientListBatchRenderer.java | 12 ++++++------ .../java/mezz/jei/render/ItemStackFastRenderer.java | 6 +++--- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 387e996fd..81bab6d50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.daemon=false mcversion=1.15.2 -forgeversion=31.0.0 +forgeversion=31.1.43 forgegroup=net.minecraftforge -mcp_mappings=20200122-1.15.1 +mcp_mappings=20200411-1.15.1 curse_project_id=238222 version_major=6 diff --git a/src/api/java/mezz/jei/api/constants/VanillaRecipeCategoryUid.java b/src/api/java/mezz/jei/api/constants/VanillaRecipeCategoryUid.java index 1d463898e..6ba7aa3be 100644 --- a/src/api/java/mezz/jei/api/constants/VanillaRecipeCategoryUid.java +++ b/src/api/java/mezz/jei/api/constants/VanillaRecipeCategoryUid.java @@ -68,7 +68,6 @@ public final class VanillaRecipeCategoryUid { * The brewing recipe category. * * Automatically tries to generate all potion variations from the basic ingredients. - * You can get the list of known potion reagents from {@link IIngredientManager#getPotionIngredients()}. * * Also automatically adds modded potions from {@link BrewingRecipeRegistry#getRecipes()}. * JEI can only understand modded potion recipes that are built into vanilla or Forge. diff --git a/src/main/java/mezz/jei/gui/overlay/IngredientGrid.java b/src/main/java/mezz/jei/gui/overlay/IngredientGrid.java index f43e814f0..142535e93 100644 --- a/src/main/java/mezz/jei/gui/overlay/IngredientGrid.java +++ b/src/main/java/mezz/jei/gui/overlay/IngredientGrid.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraftforge.items.ItemHandlerHelper; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.Rectangle2d; diff --git a/src/main/java/mezz/jei/gui/textures/JeiSpriteUploader.java b/src/main/java/mezz/jei/gui/textures/JeiSpriteUploader.java index ff2514380..2a2459239 100644 --- a/src/main/java/mezz/jei/gui/textures/JeiSpriteUploader.java +++ b/src/main/java/mezz/jei/gui/textures/JeiSpriteUploader.java @@ -24,7 +24,7 @@ public void registerSprite(ResourceLocation location) { } @Override - protected Stream func_225640_a_() { + protected Stream getResourceLocations() { return Collections.unmodifiableSet(registeredSprites).stream(); } diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java index b7933e388..4155adac8 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java @@ -7,7 +7,6 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; @@ -73,7 +72,7 @@ public Iterable getColors(FluidStack ingredient) { ResourceLocation fluidStill = attributes.getStillTexture(ingredient); if (fluidStill != null) { Minecraft minecraft = Minecraft.getInstance(); - TextureAtlasSprite fluidStillSprite = minecraft.getTextureGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); + TextureAtlasSprite fluidStillSprite = minecraft.getAtlasSpriteGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); int renderColor = attributes.getColor(ingredient); return ColorGetter.getColors(fluidStillSprite, renderColor, 1); } diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java index 83e8c25a6..765d2c9ab 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java @@ -11,7 +11,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.util.ITooltipFlag; @@ -106,7 +105,7 @@ private void drawFluid(final int xPosition, final int yPosition, @Nullable Fluid private void drawTiledSprite(final int xPosition, final int yPosition, final int tiledWidth, final int tiledHeight, int color, int scaledAmount, TextureAtlasSprite sprite) { Minecraft minecraft = Minecraft.getInstance(); - minecraft.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + minecraft.getTextureManager().bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); setGLColorFromInt(color); final int xTileCount = tiledWidth / TEX_WIDTH; @@ -137,7 +136,7 @@ private static TextureAtlasSprite getStillFluidSprite(FluidStack fluidStack) { Fluid fluid = fluidStack.getFluid(); FluidAttributes attributes = fluid.getAttributes(); ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); - return minecraft.getTextureGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); + return minecraft.getAtlasSpriteGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); } private static void setGLColorFromInt(int color) { diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java index 756b34940..2565a9f3d 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java @@ -30,7 +30,7 @@ public class ItemStackRenderer implements IIngredientRenderer { public void render(int xPosition, int yPosition, @Nullable ItemStack ingredient) { if (ingredient != null) { RenderSystem.enableDepthTest(); - RenderHelper.func_227780_a_(); + RenderHelper.enableStandardItemLighting(); Minecraft minecraft = Minecraft.getInstance(); FontRenderer font = getFontRenderer(minecraft, ingredient); ItemRenderer itemRenderer = minecraft.getItemRenderer(); diff --git a/src/main/java/mezz/jei/render/IngredientListBatchRenderer.java b/src/main/java/mezz/jei/render/IngredientListBatchRenderer.java index c8267aeff..d1600e3ae 100644 --- a/src/main/java/mezz/jei/render/IngredientListBatchRenderer.java +++ b/src/main/java/mezz/jei/render/IngredientListBatchRenderer.java @@ -10,8 +10,8 @@ import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.item.ItemStack; import com.google.common.base.Preconditions; @@ -148,14 +148,14 @@ public IngredientListElementRenderer getHovered(double mouseX, double mouseY) { * renders all ItemStacks */ public void render(Minecraft minecraft) { - RenderHelper.func_227780_a_(); + RenderHelper.enableStandardItemLighting(); ItemRenderer itemRenderer = minecraft.getItemRenderer(); TextureManager textureManager = minecraft.getTextureManager(); itemRenderer.zLevel += 50.0F; - textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - textureManager.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false); + textureManager.bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); + textureManager.getTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE).setBlurMipmapDirect(false, false); RenderSystem.enableRescaleNormal(); RenderSystem.enableAlphaTest(); RenderSystem.alphaFunc(GL11.GL_GREATER, 0.1F); @@ -181,8 +181,8 @@ public void render(Minecraft minecraft) { RenderSystem.disableRescaleNormal(); RenderSystem.disableLighting(); - textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - textureManager.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap(); + textureManager.bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); + textureManager.getTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap(); itemRenderer.zLevel -= 50.0F; diff --git a/src/main/java/mezz/jei/render/ItemStackFastRenderer.java b/src/main/java/mezz/jei/render/ItemStackFastRenderer.java index 63b1eb2ab..140971f79 100644 --- a/src/main/java/mezz/jei/render/ItemStackFastRenderer.java +++ b/src/main/java/mezz/jei/render/ItemStackFastRenderer.java @@ -58,9 +58,9 @@ private void uncheckedRenderItemAndEffectIntoGUI(IEditModeConfig editModeConfig, matrixStack.translate(-0.5, -0.5, -0.5); Minecraft minecraft = Minecraft.getInstance(); ItemRenderer itemRenderer = minecraft.getItemRenderer(); - IRenderTypeBuffer.Impl iRenderTypeBuffer = minecraft.func_228019_au_().func_228487_b_(); - itemRenderer.func_229111_a_(itemStack, ItemCameraTransforms.TransformType.GUI, false, matrixStack, iRenderTypeBuffer, 15728880, OverlayTexture.DEFAULT_LIGHT, bakedModel); - iRenderTypeBuffer.func_228461_a_(); + IRenderTypeBuffer.Impl iRenderTypeBuffer = minecraft.getRenderTypeBuffers().getBufferSource(); + itemRenderer.renderItem(itemStack, ItemCameraTransforms.TransformType.GUI, false, matrixStack, iRenderTypeBuffer, 15728880, OverlayTexture.NO_OVERLAY, bakedModel); + iRenderTypeBuffer.finish(); }