Skip to content

Commit d0bdcbc

Browse files
connorsladeconnorslade
authored
Merge pull request #25 from Basicprogrammer10/1-20-update
Update for Minecraft 1.20
2 parents 25d4b0a + 19dbec6 commit d0bdcbc

Some content is hidden

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

42 files changed

+211
-198
lines changed

‎gradle.properties‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
3-
43
# Fabric Properties
5-
minecraft_version=1.19.4
6-
yarn_mappings=1.19.4+build.1
7-
loader_version=0.14.17
4+
minecraft_version=1.20
5+
yarn_mappings=1.20+build.1
6+
loader_version=0.14.21
87
# Mod Properties
9-
mod_version=0.1.3_alpha
8+
mod_version=0.1.4_alpha
109
maven_group=com.connorcode
1110
archives_base_name=sigma-utils
1211
# Dependencies
13-
fabric_version=0.76.0+1.19.4
14-
mod_menu_version=6.1.0-rc.4
12+
fabric_version=0.83.0+1.20
13+
mod_menu_version=7.0.1

‎src/main/java/com/connorcode/sigmautils/commands/Note.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.mojang.brigadier.context.CommandContext;
55
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
66
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
7+
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.Screen;
8-
import net.minecraft.client.util.math.MatrixStack;
99
import net.minecraft.text.StringVisitable;
1010
import net.minecraft.text.Text;
1111

@@ -142,19 +142,19 @@ protected void init() {
142142
}
143143

144144
@Override
145-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
146-
renderBackground(matrices);
145+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
146+
renderBackground(drawContext);
147147

148148
var lines = textRenderer.wrapLines(StringVisitable.plain(note.text), noteWidth);
149149
var startX = width / 2f - noteWidth / 2f;
150150
var height = lines.size() * 10;
151151

152-
fill(matrices, (int) startX, 0, (int) (startX + noteWidth), height, 0x7F000000);
152+
drawContext.fill((int) startX, 0, (int) (startX + noteWidth), height, 0x7F000000);
153153

154154
for (int i = 0; i < lines.size(); i++)
155-
textRenderer.draw(matrices, lines.get(i), startX, i * 10, 0xFFFFFF);
155+
drawContext.drawText(textRenderer, lines.get(i), (int) startX, i * 10, 0xFFFFFF, false);
156156

157-
super.render(matrices, mouseX, mouseY, delta);
157+
super.render(drawContext, mouseX, mouseY, delta);
158158
}
159159
}
160160
}

‎src/main/java/com/connorcode/sigmautils/config/ConfigGui.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.connorcode.sigmautils.module.Category;
55
import com.connorcode.sigmautils.module.Module;
66
import com.connorcode.sigmautils.modules.meta.Padding;
7+
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.Screen;
89
import net.minecraft.client.gui.widget.ButtonWidget;
9-
import net.minecraft.client.util.math.MatrixStack;
1010
import net.minecraft.text.Text;
1111
import net.minecraft.util.Util;
1212

@@ -69,15 +69,15 @@ protected void init() {
6969
}).position(width - githubLen - padding * 5, height - 20 - padding).size(githubLen + padding * 4, 20).build());
7070
}
7171

72-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
72+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
7373
int padding = getPadding();
74-
this.renderBackground(matrices);
74+
this.renderBackground(drawContext);
7575

7676
for (int x = 0; x < Category.values().length; x++)
77-
drawCenteredTextWithShadow(matrices, textRenderer, Text.of("§f§n§l" + Category.values()[x].toString()),
77+
drawContext.drawCenteredTextWithShadow(textRenderer, Text.of("§f§n§l" + Category.values()[x].toString()),
7878
75 + padding + x * (150 + padding), padding, 0);
7979

80-
super.render(matrices, mouseX, mouseY, delta);
80+
super.render(drawContext, mouseX, mouseY, delta);
8181
}
8282

8383
public void close() {

‎src/main/java/com/connorcode/sigmautils/config/ModuleConfigGui.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.connorcode.sigmautils.config.settings.Setting;
44
import com.connorcode.sigmautils.misc.util.Util;
55
import com.connorcode.sigmautils.module.Module;
6+
import net.minecraft.client.gui.DrawContext;
67
import net.minecraft.client.gui.screen.Screen;
78
import net.minecraft.client.gui.tooltip.Tooltip;
89
import net.minecraft.client.gui.widget.ButtonWidget;
9-
import net.minecraft.client.util.math.MatrixStack;
1010
import net.minecraft.text.Text;
1111
import net.minecraft.util.Pair;
1212

@@ -83,26 +83,26 @@ public void close() {
8383
}
8484

8585
@Override
86-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
87-
Setting.RenderData renderData = new Setting.RenderData(this, matrices, mouseX, mouseY, delta);
86+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
87+
Setting.RenderData renderData = new Setting.RenderData(this, drawContext, mouseX, mouseY, delta);
8888
int padding = getPadding();
8989

90-
this.renderBackground(matrices);
91-
super.render(matrices, mouseX, mouseY, delta);
90+
this.renderBackground(drawContext);
91+
super.render(drawContext, mouseX, mouseY, delta);
9292

9393
int x = -75 + 20 + padding;
9494
for (Pair<String, List<Setting<?>>> entry : settings) {
9595
x += 150 + padding;
9696
if (entry.getLeft() != null)
97-
drawCenteredTextWithShadow(matrices, textRenderer, Text.of(String.format("§f§n§l%s", entry.getLeft())),
98-
x,
99-
padding * 2 + textRenderer.fontHeight, 0);
97+
drawContext.drawCenteredTextWithShadow(textRenderer,
98+
Text.of(String.format("§f§n§l%s", entry.getLeft())),
99+
x, padding * 2 + textRenderer.fontHeight, 0);
100100

101101
for (Setting<?> setting : entry.getRight())
102102
setting.render(renderData, x - 75, elementPositions.get(setting.getName()));
103103
}
104104

105-
drawCenteredTextWithShadow(matrices, textRenderer, Text.of(String.format("§f§n§l%s Settings", module.name)),
105+
drawContext.drawCenteredTextWithShadow(textRenderer, Text.of(String.format("§f§n§l%s Settings", module.name)),
106106
width / 2,
107107
padding, 0);
108108
}

‎src/main/java/com/connorcode/sigmautils/config/settings/BoolSetting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public int initRender(Screen screen, int x, int y, int width) {
100100
(button -> BoolSetting.this.value = button.isChecked()),
101101
((button, matrices, mouseX, mouseY) -> {
102102
if (this.description == null) return;
103-
screen.renderOrderedTooltip(matrices,
103+
matrices.drawOrderedTooltip(client.textRenderer,
104104
client.textRenderer.wrapLines(getDescription(), 200),
105105
mouseX, mouseY);
106106
})));

‎src/main/java/com/connorcode/sigmautils/config/settings/DynamicListSetting.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import com.connorcode.sigmautils.misc.Components;
55
import com.connorcode.sigmautils.misc.util.Util;
66
import com.connorcode.sigmautils.module.Module;
7+
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.Screen;
89
import net.minecraft.client.gui.tooltip.Tooltip;
910
import net.minecraft.client.gui.widget.ButtonWidget;
1011
import net.minecraft.client.gui.widget.TextFieldWidget;
11-
import net.minecraft.client.util.math.MatrixStack;
1212
import net.minecraft.nbt.NbtCompound;
1313
import net.minecraft.nbt.NbtElement;
1414
import net.minecraft.text.Text;
@@ -171,10 +171,10 @@ public void close() {
171171
}
172172

173173
@Override
174-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
175-
renderBackground(matrices);
176-
super.render(matrices, mouseX, mouseY, delta);
177-
this.searchField.render(matrices, mouseX, mouseY, delta);
174+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
175+
renderBackground(drawContext);
176+
super.render(drawContext, mouseX, mouseY, delta);
177+
this.searchField.render(drawContext, mouseX, mouseY, delta);
178178
}
179179

180180
@Override
@@ -250,9 +250,9 @@ public void close() {
250250
}
251251

252252
@Override
253-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
254-
renderBackground(matrices);
255-
super.render(matrices, mouseX, mouseY, delta);
253+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
254+
renderBackground(drawContext);
255+
super.render(drawContext, mouseX, mouseY, delta);
256256
}
257257

258258
@Override

‎src/main/java/com/connorcode/sigmautils/config/settings/KeyBindSetting.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public int initRender(Screen screen, int x, int y, int width) {
100100
else editing = true;
101101
}, (((button, matrices, mouseX, mouseY) -> {
102102
if (this.description == null) return;
103-
screen.renderOrderedTooltip(matrices,
103+
matrices.drawOrderedTooltip(client.textRenderer,
104104
client.textRenderer.wrapLines(getDescription(), 200), mouseX,
105105
mouseY);
106106
}))) {
@@ -116,7 +116,7 @@ public Text getMessage() {
116116
@Override
117117
public void render(RenderData data, int x, int y) {
118118
if (!showTitle) return;
119-
client.textRenderer.draw(data.matrices(), String.format("§f%s:", this.name), x, y, 0);
119+
data.drawContext().drawText(client.textRenderer, String.format("§f%s:", this.name), x, y, 0, false);
120120
}
121121

122122
@Override

‎src/main/java/com/connorcode/sigmautils/config/settings/NumberSetting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public int initRender(Screen screen, SliderText slider, int x, int y, int width)
137137
Util.addChild(screen, new Components.TooltipSlider(x, y, width, 20, slider.getText(),
138138
MathHelper.clamp((this.value - this.min) / this.max, 0, 1)) {
139139
@Override
140-
protected Text getTooltip() {
140+
protected Text tooltip() {
141141
return Text.of(NumberSetting.this.description);
142142
}
143143

‎src/main/java/com/connorcode/sigmautils/config/settings/SelectorSetting.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
77
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
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.gui.screen.narration.NarrationMessageBuilder;
1112
import net.minecraft.client.gui.tooltip.Tooltip;
1213
import net.minecraft.client.gui.widget.ButtonWidget;
1314
import net.minecraft.client.gui.widget.EntryListWidget;
14-
import net.minecraft.client.util.math.MatrixStack;
1515
import net.minecraft.nbt.NbtCompound;
1616
import net.minecraft.text.Text;
1717
import org.jetbrains.annotations.Nullable;
@@ -136,9 +136,9 @@ protected void init() {
136136
}
137137

138138
@Override
139-
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
140-
this.selectorWidget.render(matrices, mouseX, mouseY, delta);
141-
super.render(matrices, mouseX, mouseY, delta);
139+
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
140+
this.selectorWidget.render(drawContext, mouseX, mouseY, delta);
141+
super.render(drawContext, mouseX, mouseY, delta);
142142
}
143143

144144
@Override
@@ -183,9 +183,9 @@ public boolean equals(Object obj) {
183183
}
184184

185185
@Override
186-
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
187-
SelectorWidget.this.client.textRenderer.drawWithShadow(matrices, this.value,
188-
width / 2f - client.textRenderer.getWidth(this.value) / 2f, y + 1, 16777215, true);
186+
public void render(DrawContext drawContext, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
187+
drawContext.drawText(SelectorWidget.this.client.textRenderer, this.value,
188+
(int) (width / 2f - client.textRenderer.getWidth(this.value) / 2f), y + 1, 16777215, true);
189189
}
190190

191191
@Override

‎src/main/java/com/connorcode/sigmautils/config/settings/Setting.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.connorcode.sigmautils.config.Config;
55
import com.connorcode.sigmautils.misc.util.Util;
66
import com.connorcode.sigmautils.module.Module;
7+
import net.minecraft.client.gui.DrawContext;
78
import net.minecraft.client.gui.screen.Screen;
8-
import net.minecraft.client.util.math.MatrixStack;
99
import net.minecraft.nbt.NbtCompound;
1010
import net.minecraft.text.Text;
1111
import org.jetbrains.annotations.Nullable;
@@ -89,6 +89,6 @@ public boolean onKeypress(int key, int scanCode, int modifiers) {
8989
public void onClose() {
9090
}
9191

92-
public record RenderData(Screen screen, MatrixStack matrices, int mouseX, int mouseY, float delta) {
92+
public record RenderData(Screen screen, DrawContext drawContext, int mouseX, int mouseY, float delta) {
9393
}
9494
}

0 commit comments

Comments
 (0)