Skip to content

Commit 2cc5d1e

Browse files
mezzmezz
committed
Update to 1.21.5
1 parent 26845e0 commit 2cc5d1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+120
-426
lines changed

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableIngredient.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mezz.jei.common.gui.elements;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
43
import mezz.jei.api.gui.drawable.IDrawable;
54
import mezz.jei.api.ingredients.IIngredientRenderer;
65
import mezz.jei.api.ingredients.ITypedIngredient;
@@ -28,8 +27,6 @@ public int getHeight() {
2827

2928
@Override
3029
public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) {
31-
RenderSystem.enableDepthTest();
3230
SafeIngredientUtil.render(guiGraphics, ingredientRenderer, typedIngredient, xOffset, yOffset);
33-
RenderSystem.disableDepthTest();
3431
}
3532
}

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableNineSliceTexture.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package mezz.jei.common.gui.elements;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
4-
import com.mojang.blaze3d.vertex.BufferBuilder;
5-
import com.mojang.blaze3d.vertex.BufferUploader;
6-
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
7-
import com.mojang.blaze3d.vertex.Tesselator;
8-
import com.mojang.blaze3d.vertex.VertexFormat;
3+
import com.mojang.blaze3d.vertex.VertexConsumer;
94
import mezz.jei.api.gui.drawable.IScalableDrawable;
105
import mezz.jei.common.Constants;
116
import mezz.jei.common.gui.textures.JeiSpriteUploader;
127
import mezz.jei.common.util.ImmutableRect2i;
8+
import net.minecraft.client.Minecraft;
139
import net.minecraft.client.gui.GuiGraphics;
14-
import net.minecraft.client.renderer.CoreShaders;
10+
import net.minecraft.client.renderer.RenderType;
1511
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1612
import net.minecraft.resources.ResourceLocation;
1713
import org.joml.Matrix4f;
@@ -56,8 +52,8 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int width, i
5652
int textureWidth = this.width;
5753
int textureHeight = this.height;
5854

59-
RenderSystem.setShader(CoreShaders.POSITION_TEX);
60-
RenderSystem.setShaderTexture(0, Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
55+
RenderType rendertype = RenderType.guiTextured(Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
56+
VertexConsumer bufferBuilder = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(rendertype);
6157

6258
float uMin = sprite.getU0();
6359
float uMax = sprite.getU1();
@@ -71,8 +67,6 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int width, i
7167
float vTop = vMin + vSize * (topHeight / (float) textureHeight);
7268
float vBottom = vMax - vSize * (bottomHeight / (float) textureHeight);
7369

74-
Tesselator tesselator = Tesselator.getInstance();
75-
BufferBuilder bufferBuilder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
7670
Matrix4f matrix = guiGraphics.pose().last().pose();
7771

7872
// TODO Investigate GuiGraphics helper for the same thing (nineSliced)
@@ -106,11 +100,9 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int width, i
106100
// middle area
107101
drawTiled(bufferBuilder, matrix, uLeft, vTop, uRight, vBottom, xOffset + leftWidth, yOffset + topHeight, tiledMiddleWidth, tiledMiddleHeight, middleWidth, middleHeight);
108102
}
109-
110-
BufferUploader.drawWithShader(bufferBuilder.buildOrThrow());
111103
}
112104

113-
private static void drawTiled(BufferBuilder bufferBuilder, Matrix4f matrix, float uMin, float vMin, float uMax, float vMax, int xOffset, int yOffset, int tiledWidth, int tiledHeight, int width, int height) {
105+
private static void drawTiled(VertexConsumer bufferBuilder, Matrix4f matrix, float uMin, float vMin, float uMax, float vMax, int xOffset, int yOffset, int tiledWidth, int tiledHeight, int width, int height) {
114106
int xTileCount = tiledWidth / width;
115107
int xRemainder = tiledWidth - (xTileCount * width);
116108
int yTileCount = tiledHeight / height;
@@ -139,14 +131,18 @@ private static void drawTiled(BufferBuilder bufferBuilder, Matrix4f matrix, floa
139131
}
140132
}
141133

142-
private static void draw(BufferBuilder bufferBuilder, Matrix4f matrix, float minU, double minV, float maxU, float maxV, int xOffset, int yOffset, int width, int height) {
134+
private static void draw(VertexConsumer bufferBuilder, Matrix4f matrix, float minU, double minV, float maxU, float maxV, int xOffset, int yOffset, int width, int height) {
143135
bufferBuilder.addVertex(matrix, xOffset, yOffset + height, 0)
136+
.setColor(255, 255, 255, 255)
144137
.setUv(minU, maxV);
145138
bufferBuilder.addVertex(matrix, xOffset + width, yOffset + height, 0)
139+
.setColor(255, 255, 255, 255)
146140
.setUv(maxU, maxV);
147141
bufferBuilder.addVertex(matrix, xOffset + width, yOffset, 0)
142+
.setColor(255, 255, 255, 255)
148143
.setUv(maxU, (float) minV);
149144
bufferBuilder.addVertex(matrix, xOffset, yOffset, 0)
145+
.setColor(255, 255, 255, 255)
150146
.setUv(minU, (float) minV);
151147
}
152148
}

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableResource.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package mezz.jei.common.gui.elements;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
4-
import com.mojang.blaze3d.vertex.BufferBuilder;
5-
import com.mojang.blaze3d.vertex.BufferUploader;
6-
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
7-
import com.mojang.blaze3d.vertex.Tesselator;
8-
import com.mojang.blaze3d.vertex.VertexFormat;
3+
import com.mojang.blaze3d.vertex.VertexConsumer;
94
import mezz.jei.api.gui.drawable.IDrawableStatic;
5+
import net.minecraft.client.Minecraft;
106
import net.minecraft.client.gui.GuiGraphics;
11-
import net.minecraft.client.renderer.CoreShaders;
7+
import net.minecraft.client.renderer.RenderType;
128
import net.minecraft.resources.ResourceLocation;
139
import org.joml.Matrix4f;
1410

@@ -60,8 +56,8 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) {
6056

6157
@Override
6258
public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, int maskRight) {
63-
RenderSystem.setShader(CoreShaders.POSITION_TEX);
64-
RenderSystem.setShaderTexture(0, this.resourceLocation);
59+
RenderType rendertype = RenderType.guiTextured(this.resourceLocation);
60+
VertexConsumer bufferBuilder = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(rendertype);
6561

6662
int x = xOffset + this.paddingLeft + maskLeft;
6763
int y = yOffset + this.paddingTop + maskTop;
@@ -71,13 +67,19 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop,
7167
int height = this.height - maskBottom - maskTop;
7268
float f = 1.0F / this.textureWidth;
7369
float f1 = 1.0F / this.textureHeight;
74-
Tesselator tesselator = Tesselator.getInstance();
75-
BufferBuilder bufferBuilder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
70+
7671
Matrix4f matrix = guiGraphics.pose().last().pose();
77-
bufferBuilder.addVertex(matrix, x, y + height, 0).setUv(u * f, (v + (float) height) * f1);
78-
bufferBuilder.addVertex(matrix, x + width, y + height, 0).setUv((u + (float) width) * f, (v + (float) height) * f1);
79-
bufferBuilder.addVertex(matrix, x + width, y, 0).setUv((u + (float) width) * f, v * f1);
80-
bufferBuilder.addVertex(matrix, x, y, 0).setUv(u * f, v * f1);
81-
BufferUploader.drawWithShader(bufferBuilder.buildOrThrow());
72+
bufferBuilder.addVertex(matrix, x, y + height, 0)
73+
.setColor(255, 255, 255, 255)
74+
.setUv(u * f, (v + (float) height) * f1);
75+
bufferBuilder.addVertex(matrix, x + width, y + height, 0)
76+
.setColor(255, 255, 255, 255)
77+
.setUv((u + (float) width) * f, (v + (float) height) * f1);
78+
bufferBuilder.addVertex(matrix, x + width, y, 0)
79+
.setColor(255, 255, 255, 255)
80+
.setUv((u + (float) width) * f, v * f1);
81+
bufferBuilder.addVertex(matrix, x, y, 0)
82+
.setColor(255, 255, 255, 255)
83+
.setUv(u * f, v * f1);
8284
}
8385
}

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableSprite.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package mezz.jei.common.gui.elements;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
4-
import com.mojang.blaze3d.vertex.BufferBuilder;
5-
import com.mojang.blaze3d.vertex.BufferUploader;
6-
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
7-
import com.mojang.blaze3d.vertex.Tesselator;
8-
import com.mojang.blaze3d.vertex.VertexFormat;
3+
import com.mojang.blaze3d.vertex.VertexConsumer;
94
import mezz.jei.api.gui.drawable.IDrawableStatic;
105
import mezz.jei.common.Constants;
116
import mezz.jei.common.gui.textures.JeiSpriteUploader;
7+
import net.minecraft.client.Minecraft;
128
import net.minecraft.client.gui.GuiGraphics;
13-
import net.minecraft.client.renderer.CoreShaders;
9+
import net.minecraft.client.renderer.RenderType;
1410
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1511
import net.minecraft.resources.ResourceLocation;
1612
import org.joml.Matrix4f;
@@ -61,8 +57,8 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop,
6157
int textureWidth = this.width;
6258
int textureHeight = this.height;
6359

64-
RenderSystem.setShader(CoreShaders.POSITION_TEX);
65-
RenderSystem.setShaderTexture(0, Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
60+
RenderType rendertype = RenderType.guiTextured(Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
61+
VertexConsumer bufferBuilder = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(rendertype);
6662

6763
maskTop += trimTop;
6864
maskBottom += trimBottom;
@@ -81,18 +77,18 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop,
8177
float maxU = sprite.getU1() - uSize * (maskRight / (float) textureWidth);
8278
float maxV = sprite.getV1() - vSize * (maskBottom / (float) textureHeight);
8379

84-
Tesselator tesselator = Tesselator.getInstance();
85-
BufferBuilder bufferBuilder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
8680
Matrix4f matrix = guiGraphics.pose().last().pose();
8781
bufferBuilder.addVertex(matrix, x, y + height, 0)
82+
.setColor(255, 255, 255, 255)
8883
.setUv(minU, maxV);
8984
bufferBuilder.addVertex(matrix, x + width, y + height, 0)
85+
.setColor(255, 255, 255, 255)
9086
.setUv(maxU, maxV);
9187
bufferBuilder.addVertex(matrix, x + width, y, 0)
88+
.setColor(255, 255, 255, 255)
9289
.setUv(maxU, minV);
9390
bufferBuilder.addVertex(matrix, x, y, 0)
91+
.setColor(255, 255, 255, 255)
9492
.setUv(minU, minV);
95-
96-
BufferUploader.drawWithShader(bufferBuilder.buildOrThrow());
9793
}
9894
}

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableText.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mezz.jei.common.gui.elements;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
43
import mezz.jei.api.gui.drawable.IDrawable;
54
import net.minecraft.client.Minecraft;
65
import net.minecraft.client.gui.Font;
@@ -37,6 +36,5 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) {
3736
int textCenterY = yOffset + (height / 2) - 3;
3837
int stringCenter = fontRenderer.width(text) / 2;
3938
guiGraphics.drawString(fontRenderer, text, textCenterX - stringCenter, textCenterY, color);
40-
RenderSystem.setShaderColor(1, 1, 1, 1);
4139
}
4240
}

‎Common/src/main/java/mezz/jei/common/gui/textures/Textures.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ public class Textures {
1717
private final DrawableNineSliceTexture bookmarkListSlotBackground;
1818
private final IDrawableStatic tabSelected;
1919
private final IDrawableStatic tabUnselected;
20-
private final DrawableNineSliceTexture buttonDisabled;
21-
private final DrawableNineSliceTexture buttonEnabled;
22-
private final DrawableNineSliceTexture buttonHighlight;
23-
private final DrawableNineSliceTexture buttonPressed;
24-
private final DrawableNineSliceTexture buttonPressedHighlight;
2520
private final DrawableNineSliceTexture recipeGuiBackground;
2621
private final DrawableNineSliceTexture ingredientListBackground;
2722
private final DrawableNineSliceTexture bookmarkListBackground;
@@ -66,11 +61,6 @@ public Textures(JeiSpriteUploader spriteUploader) {
6661
this.bookmarkListSlotBackground = createNineSliceGuiSprite("bookmark_list_slot_background", 18, 18, 4, 4, 4, 4);
6762
this.tabSelected = createGuiSprite("tab_selected", 24, 24);
6863
this.tabUnselected = createGuiSprite("tab_unselected", 24, 24);
69-
this.buttonDisabled = createNineSliceGuiSprite("button_disabled", 20, 20, 6, 6, 6, 6);
70-
this.buttonEnabled = createNineSliceGuiSprite("button_enabled", 20, 20, 6, 6, 6, 6);
71-
this.buttonHighlight = createNineSliceGuiSprite("button_highlight", 20, 20, 6, 6, 6, 6);
72-
this.buttonPressed = createNineSliceGuiSprite("button_pressed", 20, 20, 6, 6, 6, 6);
73-
this.buttonPressedHighlight = createNineSliceGuiSprite("button_pressed_highlight", 20, 20, 6, 6, 6, 6);
7464
this.recipeGuiBackground = createNineSliceGuiSprite("gui_background", 64, 64, 16, 16, 16, 16);
7565
this.ingredientListBackground = createNineSliceGuiSprite("ingredient_list_background", 64, 64, 16, 16, 16, 16);
7666
this.bookmarkListBackground = createNineSliceGuiSprite("bookmark_list_background", 64, 64, 16, 16, 16, 16);
@@ -185,18 +175,6 @@ public IDrawableStatic getBookmarkButtonEnabledIcon() {
185175
return bookmarkButtonEnabledIcon;
186176
}
187177

188-
public DrawableNineSliceTexture getButtonForState(boolean pressed, boolean enabled, boolean hovered) {
189-
if (!enabled) {
190-
return buttonDisabled;
191-
}
192-
193-
if (hovered) {
194-
return pressed ? buttonPressedHighlight : buttonHighlight;
195-
} else {
196-
return pressed ? buttonPressed : buttonEnabled;
197-
}
198-
}
199-
200178
public DrawableNineSliceTexture getRecipeGuiBackground() {
201179
return recipeGuiBackground;
202180
}

‎Common/src/main/java/mezz/jei/common/platform/IPlatformRecipeHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Optional;
1212

1313
public interface IPlatformRecipeHelper {
14-
Optional<Ingredient> getBase(SmithingRecipe recipe);
14+
Ingredient getBase(SmithingRecipe recipe);
1515
Optional<Ingredient> getAddition(SmithingRecipe recipe);
1616
Optional<Ingredient> getTemplate(SmithingRecipe recipe);
1717

‎Common/src/main/java/mezz/jei/common/platform/IPlatformRenderHelper.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.minecraft.client.gui.GuiGraphics;
88
import net.minecraft.client.renderer.MultiBufferSource;
99
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
10-
import net.minecraft.client.resources.model.BakedModel;
1110
import net.minecraft.network.chat.Component;
1211
import net.minecraft.network.chat.FormattedText;
1312
import net.minecraft.tags.TagKey;
@@ -23,15 +22,11 @@ public interface IPlatformRenderHelper {
2322

2423
boolean shouldRender(MobEffectInstance potionEffect);
2524

26-
TextureAtlasSprite getParticleIcon(BakedModel bakedModel);
27-
2825
Optional<NativeImage> getMainImage(TextureAtlasSprite sprite);
2926

3027
void renderTooltip(GuiGraphics guiGraphics, List<Either<FormattedText, TooltipComponent>> elements, int x, int y, Font font, ItemStack stack);
3128

3229
Component getName(TagKey<?> tagKey);
3330

34-
BakedModel createLimitedQuadItemModel(BakedModel bakedModel);
35-
3631
MultiBufferSource getBufferSource(GuiGraphics guiGraphics);
3732
}

‎Common/src/main/java/mezz/jei/common/util/QuadUtil.java‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Common/src/main/java/mezz/jei/common/util/RectDebugger.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mezz.jei.common.util;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
43
import net.minecraft.client.gui.GuiGraphics;
54
import net.minecraft.client.renderer.RenderType;
65

@@ -25,8 +24,6 @@ public void add(ImmutableRect2i rect, int color, String id) {
2524
}
2625

2726
public void draw(GuiGraphics guiGraphics) {
28-
RenderSystem.disableDepthTest();
29-
3027
for (Rect rect : rects.values()) {
3128
ImmutableRect2i rect1 = rect.rect;
3229
guiGraphics.fill(
@@ -38,6 +35,5 @@ public void draw(GuiGraphics guiGraphics) {
3835
rect.color
3936
);
4037
}
41-
RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
4238
}
4339
}

0 commit comments

Comments
 (0)