Skip to content

Commit 6e9b3c9

Browse files
committed
Fix building on older versions
1 parent 7238636 commit 6e9b3c9

File tree

4 files changed

+38
-12
lines changed

4 files changed

+38
-12
lines changed

src/main/java/btw/lowercase/skyboxify/screen/SkyLayerListScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SkyLayerListScreen extends DebugScreen {
4242
public SkyLayerListScreen(final Screen parent, final Skybox skybox) {
4343
super(Component.literal(
4444
//? >=1.21.11 {
45-
/*skybox.getWorldKey().identifier().toString()
45+
/*skybox.getWorldKey().location().toString()
4646
*///?} else {
4747
skybox.getWorldKey().location().toString()
4848
//?}

src/main/java/btw/lowercase/skyboxify/screen/widget/SimpleButton.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
package btw.lowercase.skyboxify.screen.widget;
2525

2626
import btw.lowercase.skyboxify.screen.widget.components.Box;
27-
import com.mojang.blaze3d.platform.cursor.CursorTypes;
2827
import net.minecraft.client.Minecraft;
2928
import net.minecraft.client.gui.GuiGraphics;
3029
import net.minecraft.network.chat.Component;
@@ -59,9 +58,11 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
5958
super.render(guiGraphics, mouseX, mouseY);
6059
this.text.setColor(this.box().contains(mouseX, mouseY) ? ARGB.color(255, 0xFFFFA0) : ARGB.color(255, 0xE0E0E0));
6160
this.text.render(guiGraphics, mouseX, mouseY);
61+
//? >=1.21.9 {
6262
if (this.box().contains(mouseX, mouseY)) {
63-
guiGraphics.requestCursor(CursorTypes.POINTING_HAND);
63+
guiGraphics.requestCursor(com.mojang.blaze3d.platform.cursor.CursorTypes.POINTING_HAND);
6464
}
65+
//?}
6566
}
6667

6768
@Override

src/main/java/btw/lowercase/skyboxify/screen/widget/Text.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
package btw.lowercase.skyboxify.screen.widget;
2525

2626
import btw.lowercase.skyboxify.screen.widget.components.Box;
27-
import com.mojang.blaze3d.platform.cursor.CursorTypes;
2827
import lombok.Getter;
2928
import lombok.Setter;
3029
import net.minecraft.client.gui.Font;
@@ -75,9 +74,11 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
7574
}
7675

7776
guiGraphics.drawString(this.font, this.text, finalX, finalY, this.color, this.shadow);
77+
//? >=1.21.9 {
7878
if (new Box(finalX, finalY, this.box.width(), this.box.height()).contains(mouseX, mouseY)) {
79-
guiGraphics.requestCursor(CursorTypes.IBEAM);
79+
guiGraphics.requestCursor(com.mojang.blaze3d.platform.cursor.CursorTypes.IBEAM);
8080
}
81+
//?}
8182
}
8283

8384
public Builder builder() {

src/main/java/btw/lowercase/skyboxify/screen/widget/components/Scrollbar.java

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525

2626
import btw.lowercase.skyboxify.Skyboxify;
2727
import btw.lowercase.skyboxify.screen.widget.Gidget;
28-
import com.mojang.blaze3d.platform.cursor.CursorType;
29-
import com.mojang.blaze3d.platform.cursor.CursorTypes;
3028
import lombok.Getter;
3129
import net.minecraft.client.gui.GuiGraphics;
32-
import net.minecraft.client.renderer.RenderPipelines;
3330
import net.minecraft.resources.ResourceLocation;
3431
import net.minecraft.util.ARGB;
3532

@@ -51,14 +48,28 @@ public Scrollbar(int x, int y, int height) {
5148
public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
5249
super.render(guiGraphics, mouseX, mouseY);
5350
this.knob.render(guiGraphics, mouseX, mouseY);
51+
//? >=1.21.9 {
5452
if (this.box().contains(mouseX, mouseY) && !this.knob.box().contains(mouseX, mouseY)) {
55-
guiGraphics.requestCursor(CursorTypes.RESIZE_NS);
53+
guiGraphics.requestCursor(com.mojang.blaze3d.platform.cursor.CursorTypes.RESIZE_NS);
5654
}
55+
//?}
5756
}
5857

5958
@Override
6059
public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY) {
61-
guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, BAR_TEXTURE, this.box().left(), this.box().top(), this.box().width(), this.box().height(), ARGB.color(128, 0xFFFFFF));
60+
guiGraphics.blitSprite(
61+
//? >=1.21.6 {
62+
net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
63+
//?} else {
64+
/*net.minecraft.client.renderer.RenderType::guiTextured,
65+
*///?}
66+
BAR_TEXTURE,
67+
this.box().left(),
68+
this.box().top(),
69+
this.box().width(),
70+
this.box().height(),
71+
ARGB.color(128, 0xFFFFFF)
72+
);
6273
}
6374

6475
public void setScrollY(double scrollY) {
@@ -89,14 +100,27 @@ public void setY(int y) {
89100
@Override
90101
public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
91102
super.render(guiGraphics, mouseX, mouseY);
103+
//? >=1.21.9 {
92104
if (this.box().contains(mouseX, mouseY)) {
93-
guiGraphics.requestCursor(CursorTypes.RESIZE_ALL);
105+
guiGraphics.requestCursor(com.mojang.blaze3d.platform.cursor.CursorTypes.RESIZE_ALL);
94106
}
107+
//?}
95108
}
96109

97110
@Override
98111
public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY) {
99-
guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, KNOB_TEXTURE, this.box().left(), this.box().top(), this.box().width(), this.box().height());
112+
guiGraphics.blitSprite(
113+
//? >=1.21.6 {
114+
net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
115+
//?} else {
116+
/*net.minecraft.client.renderer.RenderType::guiTextured,
117+
*///?}
118+
KNOB_TEXTURE,
119+
this.box().left(),
120+
this.box().top(),
121+
this.box().width(),
122+
this.box().height()
123+
);
100124
}
101125
}
102126
}

0 commit comments

Comments
 (0)