Skip to content

Commit 4502aec

Browse files
GeorgeRNGGeorgeRNG
committed
Fix compiler errors
1 parent 0c201e6 commit 4502aec

28 files changed

+168
-185
lines changed

‎src/main/java/io/github/techstreet/dfscript/event/HudRenderEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.github.techstreet.dfscript.event;
22

33
import io.github.techstreet.dfscript.event.system.Event;
4+
import net.minecraft.client.gui.DrawContext;
45
import net.minecraft.client.util.math.MatrixStack;
56

6-
public record HudRenderEvent(MatrixStack stack) implements Event {
7+
public record HudRenderEvent(DrawContext context) implements Event {
78

89
}

‎src/main/java/io/github/techstreet/dfscript/mixin/render/MInGameHUD.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.github.techstreet.dfscript.event.system.EventManager;
66
import io.github.techstreet.dfscript.screen.overlay.OverlayManager;
77
import net.minecraft.client.MinecraftClient;
8+
import net.minecraft.client.gui.DrawContext;
89
import net.minecraft.client.gui.hud.InGameHud;
910
import net.minecraft.client.util.math.MatrixStack;
1011
import org.spongepowered.asm.mixin.Mixin;
@@ -24,10 +25,10 @@ private void renderScoreboardSidebar(CallbackInfo info) {
2425
}
2526

2627
@Inject(at = @At("HEAD"), method = "render")
27-
private void render(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
28-
OverlayManager.getInstance().render(matrices);
28+
private void render(DrawContext context, float tickDelta, CallbackInfo ci) {
29+
OverlayManager.getInstance().render(context);
2930
EventManager em = EventManager.getInstance();
30-
em.dispatch(new HudRenderEvent(matrices));
31+
em.dispatch(new HudRenderEvent(context));
3132
em.resetEvents();
3233
}
3334
}

‎src/main/java/io/github/techstreet/dfscript/screen/CScreen.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.ArrayList;
77
import java.util.List;
88
import net.minecraft.client.MinecraftClient;
9+
import net.minecraft.client.gui.DrawContext;
910
import net.minecraft.client.gui.screen.Screen;
1011
import net.minecraft.client.util.math.MatrixStack;
1112
import net.minecraft.text.Text;
@@ -24,11 +25,13 @@ protected CScreen(int width, int height) {
2425
}
2526

2627
@Override
27-
public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
28-
renderBackground(stack);
29-
stack.push();
28+
public void render(@NotNull DrawContext context, int mouseX, int mouseY, float tickDelta) {
29+
renderBackground(context);
30+
context.getMatrices().push();
3031
MinecraftClient mc = DFScript.MC;
3132

33+
MatrixStack stack = context.getMatrices();
34+
3235
stack.translate(mc.currentScreen.width/2f, mc.currentScreen.height/2f, 0);
3336

3437
// float scaleFactor = (float) mc.getWindow().getScaleFactor();
@@ -37,7 +40,7 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
3740

3841
stack.translate(-width/2f, -height/2f, 0);
3942

40-
RenderUtil.renderGui(stack,0,0,width,height);
43+
RenderUtil.renderGui(context,0,0,width,height);
4144

4245
mouseX += -mc.currentScreen.width/2;
4346
mouseY += -mc.currentScreen.height/2;
@@ -49,13 +52,13 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
4952
mouseY += height/2;
5053

5154
for (CWidget cWidget : widgets) {
52-
cWidget.render(stack, mouseX, mouseY, tickDelta);
55+
cWidget.render(context, mouseX, mouseY, tickDelta);
5356
}
5457
for (CWidget cWidget : widgets) {
55-
cWidget.renderOverlay(stack, mouseX, mouseY, tickDelta);
58+
cWidget.renderOverlay(context, mouseX, mouseY, tickDelta);
5659
}
5760
stack.pop();
58-
super.render(stack, mouseX, mouseY, tickDelta);
61+
super.render(context, mouseX, mouseY, tickDelta);
5962
}
6063

6164
@Override

‎src/main/java/io/github/techstreet/dfscript/screen/overlay/OverlayManager.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.github.techstreet.dfscript.DFScript;
44
import io.github.techstreet.dfscript.loader.Loadable;
5+
import net.minecraft.client.gui.DrawContext;
56
import net.minecraft.client.util.math.MatrixStack;
67
import net.minecraft.text.Text;
78

@@ -42,7 +43,7 @@ public void add(Text text) {
4243
overlayText.add(new Overlay(text));
4344
}
4445

45-
public void render(MatrixStack stack) {
46+
public void render(DrawContext context) {
4647
while (overlayText.size() > 10) {
4748
overlayText.remove(0);
4849
}
@@ -55,7 +56,7 @@ public void render(MatrixStack stack) {
5556
if(fadeout < now) {
5657
opacity = (int) ((fadeout - now + 1000) * 255 / 1000);
5758
}
58-
DFScript.MC.textRenderer.drawWithShadow(stack, text.text, 10, y, 0xFF5555 + ((opacity) << 24));
59+
context.drawText(DFScript.MC.textRenderer, text.text, 10, y, 0xFF5555 + ((opacity) << 24), true);
5960
y += 9;
6061
}
6162
}

‎src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddSettingSubtypeScreen.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import io.github.techstreet.dfscript.script.options.ScriptOption;
1010
import io.github.techstreet.dfscript.script.options.ScriptOptionEnum;
1111
import io.github.techstreet.dfscript.util.chat.ChatUtil;
12-
import net.minecraft.client.gui.DrawableHelper;
13-
import net.minecraft.client.gui.screen.Screen;
12+
import net.minecraft.client.gui.DrawContext;
1413
import net.minecraft.client.util.math.MatrixStack;
1514
import net.minecraft.item.ItemStack;
1615
import net.minecraft.item.Items;
@@ -95,10 +94,10 @@ public void reloadMenu()
9594

9695
if(optionPos == i) citem = new CItem(x, y, icon) {
9796
@Override
98-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
99-
super.render(stack, mouseX, mouseY, tickDelta);
97+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
98+
super.render(context, mouseX, mouseY, tickDelta);
10099
Rectangle b = getBounds();
101-
DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x3300ff00);
100+
context.fill(b.x, b.y, b.x + b.width, b.y + b.height, 0x3300ff00);
102101
}
103102
};
104103
else citem = new CItem(x, y, icon);

‎src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditPartScreen.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,20 @@
55
import io.github.techstreet.dfscript.screen.widget.*;
66
import io.github.techstreet.dfscript.script.Script;
77
import io.github.techstreet.dfscript.script.ScriptParametrizedPart;
8-
import io.github.techstreet.dfscript.script.ScriptPart;
98
import io.github.techstreet.dfscript.script.argument.*;
10-
11-
import java.awt.Rectangle;
12-
import java.math.RoundingMode;
13-
import java.text.DecimalFormat;
14-
import java.util.ArrayList;
15-
import java.util.List;
16-
import net.minecraft.client.gui.DrawableHelper;
9+
import net.minecraft.client.gui.DrawContext;
1710
import net.minecraft.client.sound.PositionedSoundInstance;
18-
import net.minecraft.client.util.math.MatrixStack;
1911
import net.minecraft.item.ItemStack;
2012
import net.minecraft.item.Items;
2113
import net.minecraft.sound.SoundEvents;
2214
import net.minecraft.text.Text;
2315

16+
import java.awt.*;
17+
import java.math.RoundingMode;
18+
import java.text.DecimalFormat;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
2422
public class ScriptEditPartScreen extends CScreen {
2523

2624
private final Script script;
@@ -76,10 +74,10 @@ public ScriptEditPartScreen(ScriptParametrizedPart action, Script script) {
7674

7775
panel.add(new CButton(5, y-1, 85, 10, "",() -> {}) {
7876
@Override
79-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
77+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
8078
Rectangle b = getBounds();
8179
if (b.contains(mouseX, mouseY)) {
82-
DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
80+
context.fill(b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
8381
}
8482
}
8583

‎src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,20 @@
55
import io.github.techstreet.dfscript.screen.ContextMenuButton;
66
import io.github.techstreet.dfscript.screen.widget.*;
77
import io.github.techstreet.dfscript.script.Script;
8-
import io.github.techstreet.dfscript.script.ScriptComment;
98
import io.github.techstreet.dfscript.script.ScriptManager;
10-
import io.github.techstreet.dfscript.script.ScriptPart;
11-
import io.github.techstreet.dfscript.script.action.ScriptAction;
12-
import io.github.techstreet.dfscript.script.action.ScriptActionType;
13-
import io.github.techstreet.dfscript.script.event.ScriptEvent;
14-
import java.awt.Rectangle;
15-
import java.util.ArrayList;
16-
import java.util.List;
17-
189
import io.github.techstreet.dfscript.script.event.ScriptHeader;
1910
import net.minecraft.client.font.TextRenderer;
20-
import net.minecraft.client.gui.DrawableHelper;
11+
import net.minecraft.client.gui.DrawContext;
2112
import net.minecraft.client.sound.PositionedSoundInstance;
2213
import net.minecraft.client.util.math.MatrixStack;
23-
import net.minecraft.item.ItemStack;
24-
import net.minecraft.item.Items;
2514
import net.minecraft.sound.SoundEvents;
26-
import net.minecraft.text.Style;
2715
import net.minecraft.text.Text;
28-
import net.minecraft.text.TextColor;
29-
import net.minecraft.util.Formatting;
3016
import net.minecraft.util.Identifier;
3117

18+
import java.awt.*;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
3222
public class ScriptEditScreen extends CScreen {
3323
private final Identifier identifier_main = new Identifier(DFScript.MOD_ID + ":wrench.png");
3424

@@ -293,13 +283,13 @@ public void reload()
293283
int currentIndex = index;
294284
panel.add(new CButton(5, origY-1, 115, 10, "",() -> {}) {
295285
@Override
296-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
286+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
297287
Rectangle b = getBounds();
298288

299289
if (b.contains(mouseX, mouseY)) {
300290
int color = 0x33000000;
301291

302-
DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, color);
292+
context.fill(b.x, b.y, b.x + b.width, b.y + b.height, color);
303293
}
304294
}
305295

@@ -352,8 +342,8 @@ public void createIndent(int indent, int y)
352342
int ypos = y;
353343
panel.add(new CWidget() {
354344
@Override
355-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
356-
DrawableHelper.fill(stack, xpos, ypos, xpos + 1, ypos + 8, 0xFF333333);
345+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
346+
context.fill(xpos, ypos, xpos + 1, ypos + 8, 0xFF333333);
357347
}
358348

359349
@Override

‎src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import io.github.techstreet.dfscript.script.ScriptManager;
1010
import io.github.techstreet.dfscript.script.VirtualScript;
1111
import io.github.techstreet.dfscript.script.util.UploadResponse;
12-
import net.minecraft.client.gui.DrawableHelper;
13-
import net.minecraft.client.util.math.MatrixStack;
12+
import net.minecraft.client.gui.DrawContext;
1413
import net.minecraft.text.MutableText;
1514
import net.minecraft.text.Text;
1615
import net.minecraft.util.Formatting;
@@ -56,9 +55,9 @@ public ScriptListScreen(boolean allowEditAndUpload) {
5655

5756
panel.add(new CButton(4, y-1, 153, 10, "",() -> {}) {
5857
@Override
59-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
58+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
6059
Rectangle b = getBounds();
61-
DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
60+
context.fill(b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
6261
}
6362

6463
@Override

‎src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
import io.github.techstreet.dfscript.screen.widget.*;
66
import io.github.techstreet.dfscript.script.Script;
77
import io.github.techstreet.dfscript.script.ScriptManager;
8-
import io.github.techstreet.dfscript.script.action.ScriptActionType;
98
import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
10-
import io.github.techstreet.dfscript.script.options.ScriptOption;
11-
import io.github.techstreet.dfscript.util.chat.ChatUtil;
12-
import net.minecraft.client.gui.DrawableHelper;
9+
import net.minecraft.client.gui.DrawContext;
1310
import net.minecraft.client.sound.PositionedSoundInstance;
14-
import net.minecraft.client.util.math.MatrixStack;
1511
import net.minecraft.sound.SoundEvents;
1612
import net.minecraft.text.Text;
1713

@@ -82,10 +78,10 @@ public void reloadMenu() {
8278
int finalIndex = index;
8379
if(owned) panel.add(new CButton(5, y, 115, height, "",() -> {}) {
8480
@Override
85-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
81+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
8682
Rectangle b = getBounds();
8783
if (b.contains(mouseX, mouseY)) {
88-
DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
84+
context.fill(b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000);
8985
}
9086
}
9187

‎src/main/java/io/github/techstreet/dfscript/screen/widget/CButton.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.github.techstreet.dfscript.util.RenderUtil;
55
import java.awt.Rectangle;
66
import net.minecraft.client.font.TextRenderer;
7+
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.sound.PositionedSoundInstance;
89
import net.minecraft.client.util.math.MatrixStack;
910
import net.minecraft.sound.SoundEvents;
@@ -38,7 +39,8 @@ public CButton(int x, int y, int width, int height, String text, Runnable onClic
3839

3940

4041
@Override
41-
public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
42+
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
43+
MatrixStack stack = context.getMatrices();
4244
stack.push();
4345
stack.translate(x, y, 0);
4446

@@ -47,7 +49,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
4749

4850
Rectangle rect = new Rectangle(x, y, width, height);
4951

50-
RenderUtil.renderButton(stack, 0, 0, width * 2, height * 2, rect.contains(mouseX, mouseY), disabled);
52+
RenderUtil.renderButton(context, 0, 0, width * 2, height * 2, rect.contains(mouseX, mouseY), disabled);
5153
stack.pop();
5254

5355
TextRenderer f = DFScript.MC.textRenderer;
@@ -56,7 +58,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
5658
stack.scale(0.5f * textScale, 0.5f * textScale, 0.5f * textScale);
5759
stack.translate(-f.getWidth(text) / 2f, -f.fontHeight / 2f, 0);
5860

59-
f.drawWithShadow(stack, text, 0, 0, 0xFFFFFF);
61+
context.drawText(f, text, 0, 0, 0xFFFFFF, true);
6062

6163
stack.pop();
6264
}

0 commit comments

Comments
 (0)