diff options
Diffstat (limited to 'src')
41 files changed, 170 insertions, 187 deletions
diff --git a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java index fb1334989..b0e1fdcc1 100644 --- a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java +++ b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java @@ -27,7 +27,7 @@ public class Scissors { * @param height the height of the bounds */ public static void scissor(int x, int y, int width, int height) { - Window window = MinecraftClient.getInstance().window; + Window window = MinecraftClient.getInstance().method_22683(); int sw = window.getWidth(); int sh = window.getHeight(); diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index 40b56a5b8..1b6d91e5b 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -136,7 +136,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer { registerClothEvents(); discoverPluginEntries(); - FabricLoader.getInstance().getAllMods().stream().map(ModContainer::getMetadata).filter(metadata -> metadata.containsCustomElement("roughlyenoughitems:plugins")).forEach(modMetadata -> { + FabricLoader.getInstance().getAllMods().stream().map(ModContainer::getMetadata).filter(metadata -> metadata.containsCustomValue("roughlyenoughitems:plugins")).forEach(modMetadata -> { RoughlyEnoughItemsCore.LOGGER.error("[REI] REI plugin from " + modMetadata.getId() + " is not loaded because it is too old!"); }); diff --git a/src/main/java/me/shedaniel/rei/api/Renderer.java b/src/main/java/me/shedaniel/rei/api/Renderer.java index cb356be5e..c2b6b133c 100644 --- a/src/main/java/me/shedaniel/rei/api/Renderer.java +++ b/src/main/java/me/shedaniel/rei/api/Renderer.java @@ -159,8 +159,9 @@ public abstract class Renderer extends DrawableHelper { * * @return the blit offset */ + @Override public int getBlitOffset() { - return this.blitOffset; + return super.getBlitOffset(); } /** @@ -168,8 +169,9 @@ public abstract class Renderer extends DrawableHelper { * * @param offset the new blit offset */ + @Override public void setBlitOffset(int offset) { - this.blitOffset = offset; + super.setBlitOffset(offset); } /** diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 8fee4b2bd..024da33d0 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -6,9 +6,9 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; -import me.shedaniel.math.compat.RenderHelper; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; @@ -74,7 +74,7 @@ public class ContainerScreenOverlay extends Widget { this.shouldReInit = false; //Update Variables this.children().clear(); - this.window = MinecraftClient.getInstance().window; + this.window = MinecraftClient.getInstance().method_22683(); DisplayHelper.DisplayBoundsHandler boundsHandler = RoughlyEnoughItemsCore.getDisplayHelper().getResponsibleBoundsHandler(MinecraftClient.getInstance().currentScreen.getClass()); this.rectangle = RoughlyEnoughItemsCore.getConfigManager().getConfig().isLeftHandSidePanel() ? boundsHandler.getLeftBounds(MinecraftClient.getInstance().currentScreen) : boundsHandler.getRightBounds(MinecraftClient.getInstance().currentScreen); widgets.add(entryListWidget = new EntryListWidget(page)); @@ -145,7 +145,7 @@ public class ContainerScreenOverlay extends Widget { fill(getBounds().x, getBounds().y, getBounds().x + 20, getBounds().y + 20, 1476440063); } MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); blit(getBounds().x + 3, getBounds().y + 3, 0, 0, 14, 14); } @@ -205,7 +205,7 @@ public class ContainerScreenOverlay extends Widget { super.render(mouseX, mouseY, delta); GuiLighting.disable(); MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); blit(getBounds().x + 3, getBounds().y + 3, weather.getId() * 14, 14, 14, 14); } @@ -269,7 +269,7 @@ public class ContainerScreenOverlay extends Widget { @Override public void lateRender(int mouseX, int mouseY, float delta) { - blitOffset = 300; + setBlitOffset(300); super.lateRender(mouseX, mouseY, delta); } }); @@ -374,7 +374,7 @@ public class ContainerScreenOverlay extends Widget { } if (SearchFieldWidget.isSearching) { GuiLighting.disable(); - blitOffset = 200; + setBlitOffset(200); if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) { ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen; int left = hooks.rei_getContainerLeft(), top = hooks.rei_getContainerTop(); @@ -382,9 +382,9 @@ public class ContainerScreenOverlay extends Widget { if (!slot.hasStack() || !entryListWidget.filterEntry(Entry.create(slot.getStack()), entryListWidget.getLastSearchArgument())) fillGradient(left + slot.xPosition, top + slot.yPosition, left + slot.xPosition + 16, top + slot.yPosition + 16, -601874400, -601874400); } - blitOffset = 0; + setBlitOffset(0); } - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); GuiLighting.disable(); this.renderWidgets(mouseX, mouseY, delta); if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen && RoughlyEnoughItemsCore.getConfigManager().getConfig().areClickableRecipeArrowsEnabled()) { @@ -426,10 +426,10 @@ public class ContainerScreenOverlay extends Widget { int width = lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(); int height = lines.size() <= 1 ? 8 : lines.size() * 10; ScreenHelper.drawHoveringWidget(mouseX, mouseY, (x, y, aFloat) -> { - RenderHelper.disableRescaleNormal(); + RenderSystem.disableRescaleNormal(); GuiLighting.disable(); - RenderHelper.disableLighting(); - this.blitOffset = 1000; + RenderSystem.disableLighting(); + setBlitOffset(1000); this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); this.fillGradient(x - 3, y + height + 3, x + width + 3, y + height + 4, -267386864, -267386864); this.fillGradient(x - 3, y - 3, x + width + 3, y + height + 3, -267386864, -267386864); @@ -441,15 +441,15 @@ public class ContainerScreenOverlay extends Widget { this.fillGradient(x - 3, y + height + 2, x + width + 3, y + height + 3, 1344798847, 1344798847); int currentY = y; for (int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { - RenderHelper.disableDepthTest(); + RenderSystem.disableDepthTest(); font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); - RenderHelper.enableDepthTest(); + RenderSystem.enableDepthTest(); currentY += lineIndex == 0 ? 12 : 10; } - this.blitOffset = 0; - RenderHelper.enableLighting(); + setBlitOffset(0); + RenderSystem.enableLighting(); GuiLighting.enable(); - RenderHelper.enableRescaleNormal(); + RenderSystem.enableRescaleNormal(); }, width, height, 0); } diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index ac53cd35a..11df019f3 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -6,8 +6,8 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.math.api.Rectangle; -import me.shedaniel.math.compat.RenderHelper; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; @@ -55,7 +55,7 @@ public class RecipeViewingScreen extends Screen { this.categoryPages = 0; this.preWidgets = Lists.newArrayList(); this.widgets = Lists.newArrayList(); - Window window = MinecraftClient.getInstance().window; + Window window = MinecraftClient.getInstance().method_22683(); this.bounds = new Rectangle(window.getScaledWidth() / 2 - guiWidth / 2, window.getScaledHeight() / 2 - guiHeight / 2, 176, 186); this.categoriesMap = categoriesMap; this.categories = Lists.newArrayList(); @@ -386,16 +386,16 @@ public class RecipeViewingScreen extends Screen { GuiLighting.disable(); widget.render(mouseX, mouseY, delta); }); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); GuiLighting.disable(); tabs.stream().filter(TabWidget::isSelected).forEach(tabWidget -> tabWidget.render(mouseX, mouseY, delta)); GuiLighting.disable(); ScreenHelper.getLastOverlay().render(mouseX, mouseY, delta); ScreenHelper.getLastOverlay().lateRender(mouseX, mouseY, delta); if (choosePageActivated) { - blitOffset = 500; + setBlitOffset(500); this.fillGradient(0, 0, this.width, this.height, -1072689136, -804253680); - blitOffset = 0; + setBlitOffset(0); recipeChoosePageWidget.render(mouseX, mouseY, delta); } } diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 9f2b0cc91..41fb88c5d 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -10,7 +10,7 @@ import com.google.common.collect.Maps; import com.zeitheron.hammercore.client.utils.Scissors; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; -import me.shedaniel.math.compat.RenderHelper; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; @@ -223,7 +223,7 @@ public class VillagerRecipeViewingScreen extends Screen { @Override public void render(int mouseX, int mouseY, float delta) { - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); font.draw((isHovered(mouseX, mouseY) ? Formatting.UNDERLINE.toString() : "") + text, x - font.getStringWidth(text) / 2, y, getDefaultColor()); if (clickable && getTooltips().isPresent()) if (!focused && containsMouse(mouseX, mouseY)) @@ -336,7 +336,7 @@ public class VillagerRecipeViewingScreen extends Screen { }); GuiLighting.disable(); ScreenHelper.getLastOverlay().render(mouseX, mouseY, delta); - RenderHelper.pushMatrix(); + RenderSystem.pushMatrix(); Scissors.begin(); Scissors.scissor(0, scrollListBounds.y + 1, width, scrollListBounds.height - 2); for (int i = 0; i < buttonWidgets.size(); i++) { @@ -368,11 +368,11 @@ public class VillagerRecipeViewingScreen extends Screen { minY = this.scrollListBounds.y + 1; double scrollbarPositionMinX = scrollListBounds.getMaxX() - 6, scrollbarPositionMaxX = scrollListBounds.getMaxX() - 2; GuiLighting.disable(); - RenderHelper.disableTexture(); - RenderHelper.enableBlend(); - RenderHelper.disableAlphaTest(); - RenderHelper.blendFuncSeparate(770, 771, 1, 0); - RenderHelper.shadeModel(7425); + RenderSystem.disableTexture(); + RenderSystem.enableBlend(); + RenderSystem.disableAlphaTest(); + RenderSystem.blendFuncSeparate(770, 771, 1, 0); + RenderSystem.shadeModel(7425); buffer.begin(7, VertexFormats.POSITION_COLOR); float b = ScreenHelper.isDarkModeEnabled() ? 0.37f : 1f; buffer.vertex(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next(); @@ -380,13 +380,13 @@ public class VillagerRecipeViewingScreen extends Screen { buffer.vertex(scrollbarPositionMaxX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); buffer.vertex(scrollbarPositionMinX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); tessellator.draw(); - RenderHelper.shadeModel(7424); - RenderHelper.disableBlend(); - RenderHelper.enableAlphaTest(); - RenderHelper.enableTexture(); + RenderSystem.shadeModel(7424); + RenderSystem.disableBlend(); + RenderSystem.enableAlphaTest(); + RenderSystem.enableTexture(); } Scissors.end(); - RenderHelper.popMatrix(); + RenderSystem.popMatrix(); ScreenHelper.getLastOverlay().lateRender(mouseX, mouseY, delta); } diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java index e67d1361a..b6f33d2e2 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -6,11 +6,10 @@ package me.shedaniel.rei.gui.credits; import com.google.common.collect.Lists; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import me.shedaniel.rei.gui.credits.CreditsEntryListWidget.CreditsItem; import me.shedaniel.rei.impl.ScreenHelper; import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.metadata.CustomValue; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.client.gui.widget.AbstractPressableButtonWidget; @@ -18,7 +17,6 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.text.LiteralText; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; public class CreditsScreen extends Screen { @@ -50,13 +48,13 @@ public class CreditsScreen extends Screen { List<String> translators = Lists.newArrayList(); FabricLoader.getInstance().getModContainer("roughlyenoughitems").ifPresent(rei -> { try { - if (rei.getMetadata().containsCustomElement("rei:translators")) { - JsonObject jsonObject = rei.getMetadata().getCustomElement("rei:translators").getAsJsonObject(); - for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) { - JsonElement value = entry.getValue(); - String behind = value.isJsonArray() ? Lists.newArrayList(value.getAsJsonArray().iterator()).stream().map(json -> json.getAsString()).sorted(String::compareToIgnoreCase).collect(Collectors.joining(", ")) : value.getAsString(); + if (rei.getMetadata().containsCustomValue("rei:translators")) { + CustomValue.CvObject jsonObject = rei.getMetadata().getCustomValue("rei:translators").getAsObject(); + jsonObject.forEach(entry -> { + CustomValue value = entry.getValue(); + String behind = value.getType() == CustomValue.CvType.ARRAY ? Lists.newArrayList(value.getAsArray().iterator()).stream().map(json -> json.getAsString()).sorted(String::compareToIgnoreCase).collect(Collectors.joining(", ")) : value.getAsString(); translators.add(String.format(" %s - %s", entry.getKey(), behind)); - } + }); } translators.sort(String::compareToIgnoreCase); } catch (Exception e) { diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java index 069c15af1..972545ec1 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java @@ -70,13 +70,13 @@ public abstract class FluidRenderer extends Renderer { Tessellator tess = Tessellator.getInstance(); BufferBuilder bb = tess.getBufferBuilder(); bb.begin(7, VertexFormats.POSITION_UV_COLOR); - bb.vertex(x + 16, y, blitOffset).texture(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next(); - bb.vertex(x, y, blitOffset).texture(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next(); - bb.vertex(x, y + 16, blitOffset).texture(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next(); - bb.vertex(x + 16, y + 16, blitOffset).texture(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next(); + bb.vertex(x + 16, y, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next(); + bb.vertex(x, y, getBlitOffset()).texture(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next(); + bb.vertex(x, y + 16, getBlitOffset()).texture(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next(); + bb.vertex(x + 16, y + 16, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next(); tess.draw(); } - this.blitOffset = 0; + setBlitOffset(0); } @Nullable diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java index f916843b8..5eb581240 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java @@ -6,7 +6,7 @@ package me.shedaniel.rei.gui.renderers; import com.google.common.collect.Lists; -import me.shedaniel.math.compat.RenderHelper; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.ItemStackRenderOverlayHook; @@ -38,18 +38,18 @@ public abstract class ItemStackRenderer extends Renderer { int l = x - 8, i1 = y - 6; ItemStack stack = getItemStack(); ((ItemStackRenderOverlayHook) (Object) stack).rei_setRenderOverlay(renderOverlay()); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); - itemRenderer.zOffset = blitOffset; + itemRenderer.zOffset = getBlitOffset(); GuiLighting.enableForItems(); - RenderHelper.colorMask(true, true, true, true); - RenderHelper.enableLighting(); - RenderHelper.enableRescaleNormal(); - RenderHelper.enableDepthTest(); + RenderSystem.colorMask(true, true, true, true); + RenderSystem.enableLighting(); + RenderSystem.enableRescaleNormal(); + RenderSystem.enableDepthTest(); itemRenderer.renderGuiItem(stack, l, i1); itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, stack, l, i1, getCounts()); itemRenderer.zOffset = 0.0F; - this.blitOffset = 0; + setBlitOffset(0); } /** diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java index ddf764e4a..74ca3d8f9 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java @@ -6,10 +6,10 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; -import me.shedaniel.math.compat.RenderHelper; import me.shedaniel.rei.api.*; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; @@ -112,11 +112,11 @@ public class AutoCraftingButtonWidget extends ButtonWidget { } int x = getBounds().x, y = getBounds().y, width = getBounds().width, height = getBounds().height; minecraft.getTextureManager().bindTexture(ScreenHelper.isDarkModeEnabled() ? BUTTON_LOCATION_DARK : BUTTON_LOCATION); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); int textureOffset = this.getTextureId(isHovered(mouseX, mouseY)); - RenderHelper.enableBlend(); - RenderHelper.blendFuncSeparate(770, 771, 1, 0); - RenderHelper.blendFunc(770, 771); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 1, 0); + RenderSystem.blendFunc(770, 771); //Four Corners blit(x, y, 0, textureOffset * 80, 4, 4); blit(x + width - 4, y, 252, textureOffset * 80, 4, 4); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index f694180eb..7a98f36f4 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -5,9 +5,10 @@ package me.shedaniel.rei.gui.widget; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; -import me.shedaniel.math.compat.RenderHelper; +import com.mojang.blaze3d.systems.RenderSystem; import me.shedaniel.rei.impl.ScreenHelper; import net.minecraft.client.gui.Element; import net.minecraft.client.sound.PositionedSoundInstance; @@ -66,11 +67,11 @@ public abstract class ButtonWidget extends WidgetWithBounds { public void render(int mouseX, int mouseY, float delta) { int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; minecraft.getTextureManager().bindTexture(ScreenHelper.isDarkModeEnabled() ? BUTTON_LOCATION_DARK : BUTTON_LOCATION); - RenderHelper.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); int textureOffset = this.getTextureId(isHovered(mouseX, mouseY)); - RenderHelper.enableBlend(); - RenderHelper.blendFuncSeparate(770, 771, 1, 0); - RenderHelper.blendFunc(770, 771); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(770, 771, 1, 0); + RenderSystem.blendFunc(770, 771); //Four Corners blit(x, y, 0, textureOffset * 80, 4, 4); blit(x + width - 4, y, 252, textureOffset * 80, 4, 4); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java index b11b9c600..a0e5db1eb 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -5,8 +5,8 @@ package me.shedaniel.rei.gui.widget; +import com.mojang.blaze3d.systems.RenderSystem; |