From 3f8a0c477ed2728620fe458fb17f43c1eee01834 Mon Sep 17 00:00:00 2001 From: Lisio Date: Tue, 20 Jun 2023 01:54:30 +0200 Subject: [PATCH] Update to 1.20 (#156) * Update to 1.20 * Fixed background for SettingsScreen * Update to 1.20.1 (#3) * Add range to support 1.20.x --------- Co-authored-by: KennyT <47287125+KennyDevT@users.noreply.github.com> Co-authored-by: LambdAurora --- .github/workflows/gradle_build.yml | 1 + CHANGELOG.md | 3 +++ gradle.properties | 10 +++++----- .../lambdynlights/gui/InnerBackground.java | 12 ++++++------ .../lambdynlights/gui/LightSourceListWidget.java | 12 +++++------- .../lambdynlights/gui/RandomPrideFlagBackground.java | 10 +++++----- .../lambdynlights/gui/SettingsScreen.java | 11 +++-------- .../lambdynlights/mixin/VideoOptionsScreenMixin.java | 6 +++--- .../lightsource/AbstractMinecartEntityMixin.java | 2 +- .../mixin/lightsource/LivingEntityMixin.java | 2 +- .../mixin/lightsource/PlayerEntityMixin.java | 2 +- src/main/resources/fabric.mod.json | 10 +++++----- 12 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index b225e097..5c5a339f 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -1,6 +1,7 @@ name: Gradle Build on: + workflow_dispatch: push: branches: - '*' diff --git a/CHANGELOG.md b/CHANGELOG.md index ca921933..5ee3c5cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -144,9 +144,12 @@ - Updated [SpruceUI]. - Updated [pridelib]. + ### 2.3.1 - Fixed ATLauncher configuration somehow ([#152](https://github.com/LambdAurora/LambDynamicLights/pull/152)). + - Updated to Minecraft 1.20 ([#156](https://github.com/LambdAurora/LambDynamicLights/pull/156)) + - Updated [SpruceUI]. - Updated night config. [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page" diff --git a/gradle.properties b/gradle.properties index bccdff2e..1ce89195 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.19.4 -quilt_mappings=5 +minecraft_version=1.20.1 +quilt_mappings=1 loader_version=0.14.21 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_api_version=0.76.0+1.19.4 +fabric_api_version=0.83.1+1.20.1 # Mod Properties mod_version = 2.3.1 @@ -18,6 +18,6 @@ curseforge_id=393442 # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -spruceui_version=4.2.0+1.19.4 +spruceui_version=5.0.0+1.20 pridelib_version=1.2.0+1.19.4 -modmenu_version=6.2.3 +modmenu_version=7.0.1 diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/InnerBackground.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/InnerBackground.java index e52df27c..6ff049a9 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/InnerBackground.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/InnerBackground.java @@ -13,18 +13,18 @@ import dev.lambdaurora.spruceui.background.DirtTexturedBackground; import dev.lambdaurora.spruceui.widget.SpruceWidget; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.GuiGraphics; + +public class InnerBackground implements Background { -public class InnerBackground extends DrawableHelper implements Background { @Override - public void render(MatrixStack matrices, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) { + public void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) { if (MinecraftClient.getInstance().world != null) { - this.fillGradient(matrices, widget.getX(), widget.getY(), + graphics.fillGradient(widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), 0xc0060606, 0xd0060606); } else { - DirtTexturedBackground.DARKENED.render(matrices, widget, vOffset, mouseX, mouseY, delta); + DirtTexturedBackground.DARKENED.render(graphics, widget, vOffset, mouseX, mouseY, delta); } } } diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/LightSourceListWidget.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/LightSourceListWidget.java index bf728f6a..9193e37a 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/LightSourceListWidget.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/LightSourceListWidget.java @@ -22,9 +22,9 @@ import dev.lambdaurora.spruceui.widget.WithBackground; import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget; import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.screen.narration.NarrationPart; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; @@ -203,14 +203,12 @@ protected boolean onCharTyped(char chr, int keyCode) { /* Rendering */ - @Override - protected void renderWidget(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.forEach(widget -> widget.render(matrices, mouseX, mouseY, delta)); + protected void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + this.forEach(widget -> widget.render(graphics, mouseX, mouseY, delta)); } - @Override - protected void renderBackground(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.background.render(matrices, this, 0, mouseX, mouseY, delta); + protected void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + this.background.render(graphics, this, 0, mouseX, mouseY, delta); } /* Narration */ diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java index 5a68dbef..10ce6cd0 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java @@ -18,8 +18,8 @@ import io.github.queerbric.pride.PrideFlag; import io.github.queerbric.pride.PrideFlagShapes; import io.github.queerbric.pride.PrideFlags; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import org.joml.Matrix4f; import org.joml.Vector4f; @@ -46,13 +46,13 @@ public RandomPrideFlagBackground(PrideFlag flag) { } @Override - public void render(MatrixStack matrices, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) { + public void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) { int x = widget.getX(); int y = widget.getY(); RenderSystem.setShader(GameRenderer::getPositionColorShader); if (this.flag.getShape() == PrideFlagShapes.get(new Identifier("pride", "horizontal_stripes"))) { - var model = matrices.peek().getModel(); + var model = graphics.getMatrices().peek().getModel(); var tessellator = Tessellator.getInstance(); var vertices = tessellator.getBufferBuilder(); vertices.begin(VertexFormat.DrawMode.TRIANGLES, VertexFormats.POSITION_COLOR); @@ -96,10 +96,10 @@ public void render(MatrixStack matrices, SpruceWidget widget, int vOffset, int m tessellator.draw(); } else { - this.flag.render(matrices, x, y, widget.getWidth(), widget.getHeight()); + this.flag.render(graphics.getMatrices(), x, y, widget.getWidth(), widget.getHeight()); } - SECOND_LAYER.render(matrices, widget, vOffset, mouseX, mouseY, delta); + SECOND_LAYER.render(graphics, widget, vOffset, mouseX, mouseY, delta); } /** diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java index 1923646b..3d4d2a7c 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java @@ -31,7 +31,6 @@ import dev.lambdaurora.spruceui.widget.container.tabbed.SpruceTabbedWidget; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.registry.Registries; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -134,12 +133,12 @@ private SpruceContainerWidget buildTabContainer(int width, int height, SpruceTab innerWidget.getPosition().setRelativeY(43); container.addChild(innerWidget); - container.setBackground((matrices, widget, vOffset, mouseX, mouseY, delta) -> { + container.setBackground((graphics, widget, vOffset, mouseX, mouseY, delta) -> { if (this.client.world != null) { - this.fillGradient(matrices, widget.getX(), widget.getY(), + graphics.fillGradient(widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), innerWidget.getY(), 0xc0101010, 0xd0101010); - this.fillGradient(matrices, widget.getX(), innerWidget.getY() + innerWidget.getHeight(), + graphics.fillGradient(widget.getX(), innerWidget.getY() + innerWidget.getHeight(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), 0xc0101010, 0xd0101010); } else { @@ -197,8 +196,4 @@ private LightSourceListWidget buildLightSourcesTab(int width, int height, List[] addOptionButton(Option[] old) { } @Inject(method = "render", at = @At("TAIL")) - private void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { - Tooltip.renderAll(this, matrices); + private void onRender(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) { + Tooltip.renderAll(graphics); } } diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/AbstractMinecartEntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/AbstractMinecartEntityMixin.java index 6b263f38..6e043bad 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/AbstractMinecartEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/AbstractMinecartEntityMixin.java @@ -46,7 +46,7 @@ public AbstractMinecartEntityMixin(EntityType type, World world) { @Inject(method = "tick", at = @At("HEAD")) private void onTick(CallbackInfo ci) { // We do not want to update the entity on the server. - if (this.world.isClient()) { + if (this.getWorld().isClient()) { if (this.isRemoved()) { this.setDynamicLightEnabled(false); } else { diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java index 22d7e7d7..892f2d43 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java @@ -41,7 +41,7 @@ public void dynamicLightTick() { } else { int luminance = 0; var eyePos = BlockPos.create(this.getX(), this.getEyeY(), this.getZ()); - boolean submergedInFluid = !this.world.getFluidState(eyePos).isEmpty(); + boolean submergedInFluid = !this.getWorld().getFluidState(eyePos).isEmpty(); for (var equipped : this.getItemsEquipped()) { if (!equipped.isEmpty()) luminance = Math.max(luminance, LambDynLights.getLuminanceFromItemStack(equipped, submergedInFluid)); diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java index a365c1ec..c23b13b4 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java @@ -49,7 +49,7 @@ public void dynamicLightTick() { int luminance = DynamicLightHandlers.getLuminanceFrom((Entity) this); var eyePos = BlockPos.create(this.getX(), this.getEyeY(), this.getZ()); - boolean submergedInFluid = !this.world.getFluidState(eyePos).isEmpty(); + boolean submergedInFluid = !this.getWorld().getFluidState(eyePos).isEmpty(); for (var equipped : this.getItemsEquipped()) { if (!equipped.isEmpty()) luminance = Math.max(luminance, LambDynLights.getLuminanceFromItemStack(equipped, submergedInFluid)); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e1dd2a5c..b4e6f831 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,14 +29,14 @@ "lambdynlights.lightsource.mixins.json" ], "depends": { - "fabricloader": ">=0.14.11", - "fabric": ">=0.76.0+1.19.4", - "minecraft": "1.19.4", - "spruceui": ">=4.2.0", + "fabricloader": ">=0.14.21", + "fabric": ">=0.83.1+1.20.1", + "minecraft": ">=1.20 <=1.20.1", + "spruceui": ">=5.0.0", "java": ">=17" }, "recommends": { - "modmenu": ">=6.2.3", + "modmenu": ">=7.0.1", "quilt_loader": ">=0.19.1" }, "suggests": {