From 4e83a3997dc4d7b2f1c5f508333c3d3c32fefda2 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 19 Dec 2019 22:38:06 +0100 Subject: [PATCH] More error fixing --- .../apiimpl/autocrafting/AllowedTagList.java | 2 +- .../autocrafting/CraftingPatternFactory.java | 4 +- .../FluidCraftingMonitorElement.java | 7 +- .../ItemCraftingMonitorElement.java | 7 +- .../preview/FluidCraftingPreviewElement.java | 7 +- .../preview/ItemCraftingPreviewElement.java | 7 +- .../apiimpl/network/grid/GridTab.java | 3 +- .../render/CraftingMonitorElementDrawers.java | 9 +- .../render/CraftingPreviewElementDrawers.java | 5 +- .../jei/GhostIngredientHandler.java | 68 --------------- .../jei/GridRecipeTransferHandler.java | 87 ------------------- .../integration/jei/GuiContainerHandler.java | 40 --------- .../integration/jei/RSJeiPlugin.java | 40 --------- .../network/grid/GridTransferMessage.java | 12 +-- .../refinedstorage/render/FluidRenderer.java | 18 ++-- .../render/model/DelegateBakedModel.java | 5 +- .../render/model/FullbrightBakedModel.java | 1 + .../tesr/StorageMonitorTileRenderer.java | 1 + .../refinedstorage/screen/BaseScreen.java | 45 +++++----- .../screen/ControllerScreen.java | 7 +- .../screen/grid/AlternativesScreen.java | 4 +- .../screen/grid/CraftingPreviewScreen.java | 19 ++-- .../screen/grid/GridScreen.java | 13 +-- .../screen/widget/ScrollbarWidget.java | 8 +- .../screen/widget/SearchWidget.java | 3 +- .../screen/widget/sidebutton/SideButton.java | 13 +-- .../refinedstorage/tile/DiskDriveTile.java | 2 +- .../tile/DiskManipulatorTile.java | 2 +- .../refinedstorage/util/DirectionUtils.java | 6 +- 29 files changed, 115 insertions(+), 330 deletions(-) delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java delete mode 100755 src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java index 3ef59b9cf..e81fe3a42 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java @@ -56,7 +56,7 @@ public class AllowedTagList { for (Set tags : tagsPerSlot) { ListNBT subList = new ListNBT(); - tags.forEach(t -> subList.add(new StringNBT(t.toString()))); + tags.forEach(t -> subList.add(StringNBT.func_229705_a_(t.toString()))); list.add(subList); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 0bbaf95a2..4488bc0ba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -133,7 +133,7 @@ public class CraftingPatternFactory { possibilities.add(input.copy()); if (allowedTagList != null) { - Collection tagsOfFluid = FluidTags.getCollection().getOwningTags(input.getFluid()); + Collection tagsOfFluid = FluidTags.func_226157_a_().getOwningTags(input.getFluid()); Set declaredAllowedTags = allowedTagList.getAllowedFluidTags().get(i); for (ResourceLocation declaredAllowedTag : declaredAllowedTags) { @@ -146,7 +146,7 @@ public class CraftingPatternFactory { ) ); } else { - for (Fluid element : FluidTags.getCollection().get(declaredAllowedTag).getAllElements()) { + for (Fluid element : FluidTags.func_226157_a_().get(declaredAllowedTag).getAllElements()) { possibilities.add(new FluidStack(element, input.getAmount())); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 1c096e59a..5a50e53a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; @@ -57,8 +58,8 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; - GlStateManager.pushMatrix(); - GlStateManager.scalef(scale, scale, 1); + RenderSystem.pushMatrix(); + RenderSystem.scalef(scale, scale, 1); int yy = y + 7; @@ -90,7 +91,7 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { drawers.getStringDrawer().draw(RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index ee0d62e8d..7c7275b4c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; @@ -58,8 +59,8 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; - GlStateManager.pushMatrix(); - GlStateManager.scalef(scale, scale, 1); + RenderSystem.pushMatrix(); + RenderSystem.scalef(scale, scale, 1); int yy = y + 7; @@ -91,7 +92,7 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { drawers.getStringDrawer().draw(RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.crafting", crafting)); } - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index 4ac10a54e..30353dd8b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; @@ -72,8 +73,8 @@ public class FluidCraftingPreviewElement implements ICraftingPreviewElement 0) { String format = hasMissing() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; @@ -86,7 +87,7 @@ public class FluidCraftingPreviewElement implements ICraftingPreviewElement 0) { String format = hasMissing() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; @@ -86,7 +87,7 @@ public class ItemCraftingPreviewElement implements ICraftingPreviewElement overlayDrawer = (x, y, color) -> { - GlStateManager.color4f(1, 1, 1, 1); - GlStateManager.disableLighting(); + RenderSystem.color4f(1, 1, 1, 1); + RenderSystem.disableLighting(); AbstractGui.fill(x, y, x + itemWidth, y + itemHeight, color); }; private IElementDrawer errorDrawer = (x, y, nothing) -> { - GlStateManager.color4f(1, 1, 1, 1); - GlStateManager.disableLighting(); + RenderSystem.color4f(1, 1, 1, 1); + RenderSystem.disableLighting(); screen.bindTexture(RS.ID, "gui/crafting_preview.png"); screen.blit(x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java index 2079ff7bd..66ffa9c8a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.render; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; import com.raoulvdberge.refinedstorage.screen.grid.CraftingPreviewScreen; import net.minecraft.client.gui.FontRenderer; @@ -8,8 +9,8 @@ import net.minecraft.client.gui.FontRenderer; public class CraftingPreviewElementDrawers extends ElementDrawers { private CraftingPreviewScreen screen; private IElementDrawer overlayDrawer = (x, y, colour) -> { - GlStateManager.color4f(1, 1, 1, 1); - GlStateManager.disableLighting(); + RenderSystem.color4f(1, 1, 1, 1); + RenderSystem.disableLighting(); screen.fill(x, y, x + 73, y + 29, colour); }; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java deleted file mode 100644 index 8c683b609..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.raoulvdberge.refinedstorage.integration.jei; - -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyFilterSlot; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import mezz.jei.api.gui.handlers.IGhostIngredientHandler; -import net.minecraft.client.renderer.Rectangle2d; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import java.util.ArrayList; -import java.util.List; - -public class GhostIngredientHandler implements IGhostIngredientHandler { - @Override - public List> getTargets(BaseScreen gui, I ingredient, boolean doStart) { - List> targets = new ArrayList<>(); - - for (Slot slot : gui.getContainer().inventorySlots) { - if (!slot.isEnabled()) { - continue; - } - - Rectangle2d bounds = new Rectangle2d(gui.getGuiLeft() + slot.xPos, gui.getGuiTop() + slot.yPos, 17, 17); - - if (ingredient instanceof ItemStack) { - if (slot instanceof LegacyFilterSlot || slot instanceof FilterSlot) { - targets.add(new Target() { - @Override - public Rectangle2d getArea() { - return bounds; - } - - @Override - public void accept(I ingredient) { - slot.putStack((ItemStack) ingredient); - - // RS.INSTANCE.network.sendToServer(new MessageSlotFilterSet(slot.slotNumber, (ItemStack) ingredient)); - } - }); - } - } else if (ingredient instanceof FluidStack) { - if (slot instanceof FluidFilterSlot) { - targets.add(new Target() { - @Override - public Rectangle2d getArea() { - return bounds; - } - - @Override - public void accept(I ingredient) { - // RS.INSTANCE.network.sendToServer(new MessageSlotFilterSetFluid(slot.slotNumber, StackUtils.copy((FluidStack) ingredient, Fluid.BUCKET_VOLUME))); - } - }); - } - } - } - - return targets; - } - - @Override - public void onComplete() { - // NO OP - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java deleted file mode 100644 index f5b74b73a..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.raoulvdberge.refinedstorage.integration.jei; - -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.network.grid.GridProcessingTransferMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridTransferMessage; -import mezz.jei.api.constants.VanillaRecipeCategoryUid; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ingredient.IGuiIngredient; -import mezz.jei.api.recipe.category.IRecipeCategory; -import mezz.jei.api.recipe.transfer.IRecipeTransferError; -import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; - -public class GridRecipeTransferHandler implements IRecipeTransferHandler { - public static final long TRANSFER_SCROLLBAR_DELAY_MS = 200; - public static long LAST_TRANSFER_TIME; - - @Override - public Class getContainerClass() { - return GridContainer.class; - } - - @Override - public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer, boolean doTransfer) { - IGrid grid = ((GridContainer) container).getGrid(); - - if (doTransfer) { - LAST_TRANSFER_TIME = System.currentTimeMillis(); - - if (grid.getGridType() == GridType.PATTERN && !isCraftingRecipe(recipeLayout.getRecipeCategory())) { - List inputs = new LinkedList<>(); - List outputs = new LinkedList<>(); - - List fluidInputs = new LinkedList<>(); - List fluidOutputs = new LinkedList<>(); - - for (IGuiIngredient guiIngredient : recipeLayout.getItemStacks().getGuiIngredients().values()) { - if (guiIngredient != null && guiIngredient.getDisplayedIngredient() != null) { - ItemStack ingredient = guiIngredient.getDisplayedIngredient().copy(); - - if (guiIngredient.isInput()) { - inputs.add(ingredient); - } else { - outputs.add(ingredient); - } - } - } - - for (IGuiIngredient guiIngredient : recipeLayout.getFluidStacks().getGuiIngredients().values()) { - if (guiIngredient != null && guiIngredient.getDisplayedIngredient() != null) { - FluidStack ingredient = guiIngredient.getDisplayedIngredient().copy(); - - if (guiIngredient.isInput()) { - fluidInputs.add(ingredient); - } else { - fluidOutputs.add(ingredient); - } - } - } - - RS.NETWORK_HANDLER.sendToServer(new GridProcessingTransferMessage(inputs, outputs, fluidInputs, fluidOutputs)); - } else { - RS.NETWORK_HANDLER.sendToServer(new GridTransferMessage( - recipeLayout.getItemStacks().getGuiIngredients(), - container.inventorySlots.stream().filter(s -> s.inventory instanceof CraftingInventory).collect(Collectors.toList()) - )); - } - } - - return null; - } - - private boolean isCraftingRecipe(IRecipeCategory recipeCategory) { - return recipeCategory.getUid().equals(VanillaRecipeCategoryUid.CRAFTING); - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java deleted file mode 100644 index c84f662cd..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.raoulvdberge.refinedstorage.integration.jei; - -import com.raoulvdberge.refinedstorage.container.BaseContainer; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; -import mezz.jei.api.gui.handlers.IGuiContainerHandler; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nullable; - -public class GuiContainerHandler implements IGuiContainerHandler { - @Nullable - @Override - public Object getIngredientUnderMouse(BaseScreen screen, double mouseX, double mouseY) { - mouseX -= screen.getGuiLeft(); - mouseY -= screen.getGuiTop(); - - if (screen instanceof GridScreen) { - GridScreen grid = (GridScreen) screen; - - if (!grid.getSearchField().isFocused() && grid.isOverSlotArea(mouseX, mouseY)) { - return grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size() ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null; - } - } - - if (screen.getContainer() instanceof BaseContainer) { - for (FluidFilterSlot slot : ((BaseContainer) screen.getContainer()).getFluidSlots()) { - FluidStack fluidInSlot = slot.getFluidInventory().getFluid(slot.getSlotIndex()); - - if (!fluidInSlot.isEmpty() && RenderUtils.inBounds(slot.xPos, slot.yPos, 18, 18, mouseX, mouseY)) { - return fluidInSlot; - } - } - } - - return null; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java deleted file mode 100755 index fcd06600e..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.raoulvdberge.refinedstorage.integration.jei; - -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.JeiPlugin; -import mezz.jei.api.registration.IGuiHandlerRegistration; -import mezz.jei.api.registration.IRecipeTransferRegistration; -import mezz.jei.api.runtime.IJeiRuntime; -import net.minecraft.util.ResourceLocation; - -@JeiPlugin -public class RSJeiPlugin implements IModPlugin { - private static final ResourceLocation ID = new ResourceLocation(RS.ID, "plugin"); - - public static IJeiRuntime RUNTIME; - - @Override - public ResourceLocation getPluginUid() { - return ID; - } - - @Override - public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) { - registration.addUniversalRecipeTransferHandler(new GridRecipeTransferHandler()); - } - - @Override - public void registerGuiHandlers(IGuiHandlerRegistration registration) { - registration.addGuiContainerHandler(BaseScreen.class, new GuiContainerHandler()); - - // TODO: https://github.com/mezz/JustEnoughItems/issues/1307 - // registration.addGhostIngredientHandler(BaseScreen.class, new GhostIngredientHandler()); - } - - @Override - public void onRuntimeAvailable(IJeiRuntime runtime) { - RUNTIME = runtime; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java index 47c6cbd31..9fa63aad1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java @@ -4,7 +4,6 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.util.StackUtils; -import mezz.jei.api.gui.ingredient.IGuiIngredient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; @@ -16,8 +15,9 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; +// TODO public class GridTransferMessage { - private Map> inputs; + //private Map> inputs; private List slots; private ItemStack[][] recipe = new ItemStack[9][]; @@ -25,10 +25,10 @@ public class GridTransferMessage { public GridTransferMessage() { } - public GridTransferMessage(Map> inputs, List slots) { + /*public GridTransferMessage(Map> inputs, List slots) { this.inputs = inputs; this.slots = slots; - } + }*/ public static GridTransferMessage decode(PacketBuffer buf) { GridTransferMessage msg = new GridTransferMessage(); @@ -52,7 +52,7 @@ public class GridTransferMessage { buf.writeInt(message.slots.size()); for (Slot slot : message.slots) { - IGuiIngredient ingredient = message.inputs.get(slot.getSlotIndex() + 1); + /*IGuiIngredient ingredient = message.inputs.get(slot.getSlotIndex() + 1); List ingredients = new ArrayList<>(); @@ -68,7 +68,7 @@ public class GridTransferMessage { for (ItemStack possibleStack : ingredients) { StackUtils.writeItemStack(buf, possibleStack); - } + }*/ } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java index 08548669f..b47276a66 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.render; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; @@ -8,6 +9,7 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.fluid.Fluid; +import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; @@ -36,15 +38,15 @@ public class FluidRenderer { } public void render(final int xPosition, final int yPosition, @Nonnull FluidStack fluidStack) { - GlStateManager.enableBlend(); - GlStateManager.enableAlphaTest(); + RenderSystem.enableBlend(); + RenderSystem.enableAlphaTest(); drawFluid(xPosition, yPosition, fluidStack); - GlStateManager.color4f(1, 1, 1, 1); + RenderSystem.color4f(1, 1, 1, 1); - GlStateManager.disableAlphaTest(); - GlStateManager.disableBlend(); + RenderSystem.disableAlphaTest(); + RenderSystem.disableBlend(); } private void drawFluid(final int xPosition, final int yPosition, @Nonnull FluidStack fluidStack) { @@ -73,7 +75,7 @@ public class FluidRenderer { 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.field_226615_c_); setGLColorFromInt(color); final int xTileCount = tiledWidth / TEX_WIDTH; @@ -104,7 +106,7 @@ public class FluidRenderer { AtlasTexture textureMapBlocks = minecraft.getTextureMap(); Fluid fluid = fluidStack.getFluid(); FluidAttributes attributes = fluid.getAttributes(); - ResourceLocation fluidStill = attributes.getStill(fluidStack); + ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); return textureMapBlocks.getSprite(fluidStill); } @@ -114,7 +116,7 @@ public class FluidRenderer { float blue = (color & 0xFF) / 255.0F; float alpha = ((color >> 24) & 0xFF) / 255F; - GlStateManager.color4f(red, green, blue, alpha); + RenderSystem.color4f(red, green, blue, alpha); } private static void drawTextureWithMasking(double xCoord, double yCoord, TextureAtlasSprite textureSprite, int maskTop, int maskRight, double zLevel) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java index d80541b72..269c176f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.render.model; +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; @@ -61,7 +62,7 @@ public class DelegateBakedModel implements IBakedModel { @Override @SuppressWarnings("deprecation") - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return base.handlePerspective(cameraTransformType); + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack matrixStack) { + return base.handlePerspective(cameraTransformType, matrixStack); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java index 25307bae9..ca21a4015 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java @@ -15,6 +15,7 @@ import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexLighterFlat; +import net.minecraftforge.common.model.TransformationHelper; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index 5b450ca9f..ec0ccfa04 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -136,6 +136,7 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer extends ContainerScreen @Override protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); renderBackground(guiLeft, guiTop, mouseX, mouseY); @@ -143,7 +144,7 @@ public abstract class BaseScreen extends ContainerScreen @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); mouseX -= guiLeft; mouseY -= guiTop; @@ -299,28 +300,28 @@ public abstract class BaseScreen extends ContainerScreen public void renderQuantity(int x, int y, String qty, int color) { boolean large = minecraft.getForceUnicodeFont() || RS.CLIENT_CONFIG.getGrid().getLargeFont(); - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, y, 1); + RenderSystem.pushMatrix(); + RenderSystem.translatef(x, y, 1); if (!large) { - GlStateManager.scalef(0.5f, 0.5f, 1); + RenderSystem.scalef(0.5f, 0.5f, 1); } - GlStateManager.disableLighting(); - GlStateManager.disableRescaleNormal(); - GlStateManager.depthMask(false); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 771); - GlStateManager.disableDepthTest(); + RenderSystem.disableLighting(); + RenderSystem.disableRescaleNormal(); + RenderSystem.depthMask(false); + RenderSystem.enableBlend(); + RenderSystem.blendFunc(770, 771); + RenderSystem.disableDepthTest(); font.drawStringWithShadow(qty, (large ? 16 : 30) - font.getStringWidth(qty), large ? 8 : 22, color); - GlStateManager.enableDepthTest(); - GlStateManager.enableTexture(); - GlStateManager.depthMask(true); - GlStateManager.enableLighting(); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); + RenderSystem.enableDepthTest(); + RenderSystem.enableTexture(); + RenderSystem.depthMask(true); + RenderSystem.enableLighting(); + RenderSystem.disableBlend(); + RenderSystem.popMatrix(); } public void renderString(int x, int y, String message) { @@ -328,9 +329,9 @@ public abstract class BaseScreen extends ContainerScreen } public void renderString(int x, int y, String message, int color) { - GlStateManager.disableLighting(); + RenderSystem.disableLighting(); font.drawString(message, x, y, color); - GlStateManager.enableLighting(); + RenderSystem.enableLighting(); } public void renderTooltip(int x, int y, String lines) { @@ -342,9 +343,9 @@ public abstract class BaseScreen extends ContainerScreen } public void renderTooltip(@Nonnull ItemStack stack, int x, int y, List lines) { - GlStateManager.disableLighting(); + RenderSystem.disableLighting(); GuiUtils.drawHoveringText(stack, lines, x, y, width - guiLeft, height, -1, font); - GlStateManager.enableLighting(); + RenderSystem.enableLighting(); } protected void onPreInit() { @@ -352,7 +353,7 @@ public abstract class BaseScreen extends ContainerScreen } public static boolean isKeyDown(KeyBinding keybinding) { - return InputMappings.isKeyDown(Minecraft.getInstance().mainWindow.getHandle(), keybinding.getKey().getKeyCode()) && + return InputMappings.isKeyDown(Minecraft.getInstance().func_228018_at_().getHandle(), keybinding.getKey().getKeyCode()) && keybinding.getKeyConflictContext().isActive() && keybinding.getKeyModifier().isActive(keybinding.getKeyConflictContext()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java index a653bacb5..4d97dcc02 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.network.Network; import com.raoulvdberge.refinedstorage.container.ControllerContainer; @@ -102,8 +103,8 @@ public class ControllerScreen extends BaseScreen { float scale = minecraft.getForceUnicodeFont() ? 1F : 0.5F; - GlStateManager.pushMatrix(); - GlStateManager.scalef(scale, scale, 1); + RenderSystem.pushMatrix(); + RenderSystem.scalef(scale, scale, 1); renderString( RenderUtils.getOffsetOnScale(x + 1, scale), @@ -112,7 +113,7 @@ public class ControllerScreen extends BaseScreen { ); renderString(RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY)) { hoveringNode = node; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java index d0e24c214..22ecea7a9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java @@ -97,14 +97,14 @@ public class AlternativesScreen extends BaseScreen { } else if (fluid != null) { lines.add(new FluidLine(fluid)); - for (ResourceLocation owningTag : FluidTags.getCollection().getOwningTags(fluid.getFluid())) { + for (ResourceLocation owningTag : FluidTags.func_226157_a_().getOwningTags(fluid.getFluid())) { lines.add(new TagLine(owningTag, GridTile.ALLOWED_FLUID_TAGS.getValue().get(slot).contains(owningTag))); int fluidCount = 0; FluidListLine line = new FluidListLine(); - for (Fluid fluid : FluidTags.getCollection().get(owningTag).getAllElements()) { + for (Fluid fluid : FluidTags.func_226157_a_().get(owningTag).getAllElements()) { if (fluidCount > 0 && fluidCount % 8 == 0) { lines.add(line); line = new FluidListLine(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java index ebf0853e1..9564ff334 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.screen.grid; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; @@ -115,8 +116,8 @@ public class CraftingPreviewScreen extends BaseScreen { float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; if (getErrorType() != null) { - GlStateManager.pushMatrix(); - GlStateManager.scalef(scale, scale, 1); + RenderSystem.pushMatrix(); + RenderSystem.scalef(scale, scale, 1); renderString(RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.format("gui.refinedstorage.crafting_preview.error")); @@ -129,20 +130,20 @@ public class CraftingPreviewScreen extends BaseScreen { renderString(RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.4")); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); ICraftingPattern pattern = PatternItem.fromCache(parent.getMinecraft().world, (ItemStack) stacks.get(0).getElement()); int yy = 83; for (ItemStack output : pattern.getOutputs()) { if (output != null) { - GlStateManager.pushMatrix(); - GlStateManager.scalef(scale, scale, 1); + RenderSystem.pushMatrix(); + RenderSystem.scalef(scale, scale, 1); renderString(RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getDisplayName().getFormattedText()); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableDepthTest(); + RenderSystem.enableDepthTest(); renderItem(x + 5, yy, output); RenderHelper.disableStandardItemLighting(); @@ -156,7 +157,7 @@ public class CraftingPreviewScreen extends BaseScreen { renderString(RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.format("gui.refinedstorage.crafting_preview.error.too_complex.0")); renderString(RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.format("gui.refinedstorage.crafting_preview.error.too_complex.1")); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); break; } @@ -165,7 +166,7 @@ public class CraftingPreviewScreen extends BaseScreen { int slot = scrollbar != null ? (scrollbar.getOffset() * 3) : 0; RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableDepthTest(); + RenderSystem.enableDepthTest(); this.hoveringStack = null; this.hoveringFluid = null; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java index 2c806378b..650a8bcce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.screen.grid; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSKeyBindings; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; @@ -364,13 +365,13 @@ public class GridScreen extends BaseScreen implements IScreenInfo if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isActive()) { int color = grid.isActive() ? -2130706433 : 0xFF5B5B5B; - GlStateManager.disableLighting(); - GlStateManager.disableDepthTest(); - GlStateManager.colorMask(true, true, true, false); + RenderSystem.disableLighting(); + RenderSystem.disableDepthTest(); + RenderSystem.colorMask(true, true, true, false); fillGradient(x, y, x + 16, y + 16, color, color); - GlStateManager.colorMask(true, true, true, true); - GlStateManager.enableLighting(); - GlStateManager.enableDepthTest(); + RenderSystem.colorMask(true, true, true, true); + RenderSystem.enableLighting(); + RenderSystem.enableDepthTest(); } slot++; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java index 640d35780..8c669df0f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java @@ -1,8 +1,8 @@ package com.raoulvdberge.refinedstorage.screen.widget; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.integration.jei.GridRecipeTransferHandler; import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -58,7 +58,7 @@ public class ScrollbarWidget implements IGuiEventListener { } public void render() { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); screen.bindTexture(RS.ID, "icons.png"); screen.blit(screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, 15); @@ -71,9 +71,9 @@ public class ScrollbarWidget implements IGuiEventListener { if (button == 0 && RenderUtils.inBounds(x, y, width, height, mx, my)) { // Prevent accidental scrollbar click after clicking recipe transfer button - if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) { + /* TODO if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) { return false; - } + }*/ updateOffset(my); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java index 53ea5b975..a8c664ac2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java @@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.screen.widget; import com.raoulvdberge.refinedstorage.RSKeyBindings; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; -import com.raoulvdberge.refinedstorage.integration.jei.RSJeiPlugin; import com.raoulvdberge.refinedstorage.render.RenderSettings; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.FontRenderer; @@ -29,7 +28,7 @@ public class SearchWidget extends TextFieldWidget { public void updateJei() { if (JeiIntegration.isLoaded() && (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { - RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText()); + /// TODO RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java index 6bec6b5e4..6b1d7aa63 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -22,8 +23,8 @@ public abstract class SideButton extends Button { @Override public void renderButton(int mouseX, int mouseY, float partialTicks) { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.enableAlphaTest(); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.enableAlphaTest(); isHovered = RenderUtils.inBounds(x, y, width, height, mouseX, mouseY); @@ -33,11 +34,11 @@ public abstract class SideButton extends Button { renderButtonIcon(x + 1, y + 1); if (isHovered) { - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1.0f, 1.0f, 1.0f, 0.5f); + RenderSystem.enableBlend(); + RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderSystem.color4f(1.0f, 1.0f, 1.0f, 0.5f); screen.blit(x, y, 238, 54, 18, 18); - GlStateManager.disableBlend(); + RenderSystem.disableBlend(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java index 8b85e3865..3a219055b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java @@ -106,7 +106,7 @@ public class DiskDriveTile extends NetworkNodeTile { ListNBT list = new ListNBT(); for (DiskState state : getNode().getDiskState()) { - list.add(new IntNBT(state.ordinal())); + list.add(IntNBT.func_229692_a_(state.ordinal())); } tag.put(NBT_DISK_STATE, list); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java index c3644dafc..2849d18cf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java @@ -63,7 +63,7 @@ public class DiskManipulatorTile extends NetworkNodeTile