From 8f9a6005f5847ada939def21aa07825f99aff6ea Mon Sep 17 00:00:00 2001 From: kawaiizenbo <48113593+kawaiizenbo@users.noreply.github.com> Date: Sat, 9 Nov 2024 18:47:28 -0700 Subject: [PATCH 1/2] 1.21.3 support --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/me/kawaiizenbo/moonlight/Moonlight.java | 2 +- .../kawaiizenbo/moonlight/module/modules/NoFall.java | 2 +- .../kawaiizenbo/moonlight/module/modules/Reach.java | 12 ++++++------ .../kawaiizenbo/moonlight/module/modules/Speed.java | 6 +++--- .../kawaiizenbo/moonlight/module/modules/Step.java | 6 +++--- .../moonlight/ui/clickgui/CategoryPane.java | 3 ++- .../moonlight/ui/hud/editor/HUDModuleButton.java | 3 ++- .../moonlight/ui/hud/editor/HUDModuleList.java | 3 ++- .../moonlight/ui/hud/modules/ArmorDisplay.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 13 files changed, 31 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index e20e0f0..87ccbb0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 405dc6c..b0c9ee2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.21.1 - yarn_mappings=1.21.1+build.3 - loader_version=0.16.3 + minecraft_version=1.21.3 + yarn_mappings=1.21.3+build.2 + loader_version=0.16.9 # Mod Properties - mod_version = 0.3.0 + mod_version = 0.3.1 maven_group = me.kawaiizenbo archives_base_name = moonlight # Dependencies - fabric_version=0.103.0+1.21.1 + fabric_version=0.107.3+1.21.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java b/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java index 628dca0..768beac 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java +++ b/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java @@ -27,7 +27,7 @@ public class Moonlight implements ModInitializer public static final Moonlight INSTANCE = new Moonlight(); public static final Logger LOGGER = LoggerFactory.getLogger("Moonlight"); public static final String clientTag = ColorUtils.aqua + "Moonlight Meadows"; - public static final String versionTag = ColorUtils.magenta + "v0.3.0"; + public static final String versionTag = ColorUtils.magenta + "v0.3.1"; public static Config CONFIG = new Config(); @Override diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/modules/NoFall.java b/src/main/java/me/kawaiizenbo/moonlight/module/modules/NoFall.java index 2e2b160..102dc8c 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/modules/NoFall.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/modules/NoFall.java @@ -14,6 +14,6 @@ public class NoFall extends Module @Override public void tick() { - if(mc.player.fallDistance >= 2.5) mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true)); + if(mc.player.fallDistance >= 2.5) mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true, false)); } } diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Reach.java b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Reach.java index 2a6a078..af245ab 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Reach.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Reach.java @@ -23,22 +23,22 @@ public class Reach extends Module public void onEnable() { super.onEnable(); - oldBe = mc.player.getAttributeInstance(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE).getBaseValue(); - oldEe = mc.player.getAttributeInstance(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE).getBaseValue(); + oldBe = mc.player.getAttributeInstance(EntityAttributes.BLOCK_INTERACTION_RANGE).getBaseValue(); + oldEe = mc.player.getAttributeInstance(EntityAttributes.ENTITY_INTERACTION_RANGE).getBaseValue(); } @Override public void tick() { - mc.player.getAttributeInstance(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE).setBaseValue(blockRange.value); - mc.player.getAttributeInstance(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE).setBaseValue(entityRange.value); + mc.player.getAttributeInstance(EntityAttributes.BLOCK_INTERACTION_RANGE).setBaseValue(blockRange.value); + mc.player.getAttributeInstance(EntityAttributes.ENTITY_INTERACTION_RANGE).setBaseValue(entityRange.value); } @Override public void onDisable() { super.onDisable(); - mc.player.getAttributeInstance(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE).setBaseValue(oldBe); - mc.player.getAttributeInstance(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE).setBaseValue(oldEe); + mc.player.getAttributeInstance(EntityAttributes.BLOCK_INTERACTION_RANGE).setBaseValue(oldBe); + mc.player.getAttributeInstance(EntityAttributes.ENTITY_INTERACTION_RANGE).setBaseValue(oldEe); } } diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Speed.java b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Speed.java index e14ae48..385f571 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Speed.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Speed.java @@ -20,20 +20,20 @@ public class Speed extends Module public void onEnable() { super.onEnable(); - old = mc.player.getAttributeInstance(EntityAttributes.GENERIC_MOVEMENT_SPEED).getBaseValue(); + old = mc.player.getAttributeInstance(EntityAttributes.MOVEMENT_SPEED).getBaseValue(); } @Override public void tick() { - mc.player.getAttributeInstance(EntityAttributes.GENERIC_MOVEMENT_SPEED).setBaseValue(speed.value/10d); + mc.player.getAttributeInstance(EntityAttributes.MOVEMENT_SPEED).setBaseValue(speed.value/10d); } @Override public void onDisable() { super.onDisable(); - mc.player.getAttributeInstance(EntityAttributes.GENERIC_MOVEMENT_SPEED).setBaseValue(old); + mc.player.getAttributeInstance(EntityAttributes.MOVEMENT_SPEED).setBaseValue(old); } } diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Step.java b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Step.java index 5b57ad4..ac115d1 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/modules/Step.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/modules/Step.java @@ -20,19 +20,19 @@ public class Step extends Module public void onEnable() { super.onEnable(); - old = mc.player.getAttributeInstance(EntityAttributes.GENERIC_STEP_HEIGHT).getBaseValue(); + old = mc.player.getAttributeInstance(EntityAttributes.STEP_HEIGHT).getBaseValue(); } @Override public void tick() { - mc.player.getAttributeInstance(EntityAttributes.GENERIC_STEP_HEIGHT).setBaseValue(stepHeight.value); + mc.player.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(stepHeight.value); } @Override public void onDisable() { super.onDisable(); - mc.player.getAttributeInstance(EntityAttributes.GENERIC_STEP_HEIGHT).setBaseValue(old); + mc.player.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(old); } } diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/clickgui/CategoryPane.java b/src/main/java/me/kawaiizenbo/moonlight/ui/clickgui/CategoryPane.java index 9ccfb67..e1be47e 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/ui/clickgui/CategoryPane.java +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/clickgui/CategoryPane.java @@ -7,6 +7,7 @@ import me.kawaiizenbo.moonlight.module.ModuleManager; import me.kawaiizenbo.moonlight.module.Module; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class CategoryPane @@ -44,7 +45,7 @@ public class CategoryPane } drawContext.fill(x, y, x+width, collapsed ? y+16 : y+height, category.color); drawContext.fill(x+2, y+2, x+(width-2), y+14, hovered(mouseX, mouseY) ? 0xFF333333 : 0xFF222222); - drawContext.drawGuiTexture(icon, x+2, y+2, 12, 12); + drawContext.drawGuiTexture(RenderLayer::getGuiTextured, icon, x+2, y+2, 12, 12); drawContext.drawText(textRenderer, category.name, x+16, y+4, 0xFFFFFFFF, false); if (!collapsed) { diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleButton.java b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleButton.java index 7be04fa..bcfd66f 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleButton.java +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleButton.java @@ -4,6 +4,7 @@ import me.kawaiizenbo.moonlight.ui.hud.HUDModule; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class HUDModuleButton @@ -24,7 +25,7 @@ public class HUDModuleButton this.y = y; drawContext.fill(x, y, x + width, y + height, hovered(mouseX, mouseY) ? 0xFF333333 : 0xFF222222); drawContext.drawText(textRenderer, module.name, x+2, y+2, module.enabled ? 0x55FFFF : 0xFFFFFF, false); - if (!module.settings.isEmpty()) drawContext.drawGuiTexture(Identifier.of("moonlight", "settings"), x+width-12, y, 12, 12); + if (!module.settings.isEmpty()) drawContext.drawGuiTexture(RenderLayer::getGuiTextured, Identifier.of("moonlight", "settings"), x+width-12, y, 12, 12); } public boolean hovered(int mouseX, int mouseY) diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleList.java b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleList.java index 69120b3..3676463 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleList.java +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/editor/HUDModuleList.java @@ -6,6 +6,7 @@ import me.kawaiizenbo.moonlight.ui.hud.HUDModule; import me.kawaiizenbo.moonlight.ui.hud.HUDModuleManager; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class HUDModuleList @@ -39,7 +40,7 @@ public class HUDModuleList } drawContext.fill(x, y, x+width, collapsed ? y+16 : y+height, 0xFF55FFFF); drawContext.fill(x+2, y+2, x+(width-2), y+14, hovered(mouseX, mouseY) ? 0xFF333333 : 0xFF222222); - drawContext.drawGuiTexture(Identifier.of("moonlight", "hud"), x+2, y+2, 12, 12); + drawContext.drawGuiTexture(RenderLayer::getGuiTextured, Identifier.of("moonlight", "hud"), x+2, y+2, 12, 12); drawContext.drawText(textRenderer, "HUD Modules", x+16, y+4, 0xFFFFFFFF, false); if (!collapsed) { diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/modules/ArmorDisplay.java b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/modules/ArmorDisplay.java index eff197e..62a5850 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/ui/hud/modules/ArmorDisplay.java +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/hud/modules/ArmorDisplay.java @@ -28,7 +28,7 @@ public class ArmorDisplay extends HUDModule { ItemStack piece = mc.player.getInventory().getStack(i); drawContext.drawItem(piece, x, y+yOffset); - drawContext.drawItemInSlot(textRenderer, piece, x, y+yOffset); + drawContext.drawStackOverlay(textRenderer, piece, x, y+yOffset); yOffset += 16; } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 476fc9c..ed9e58a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "moonlight", - "version": "v0.3.0", + "version": "v0.3.1", "name": "Moonlight Meadows", "description": "Utility mod with a focus on stability.", "authors": [ @@ -29,9 +29,9 @@ ], "depends": { - "fabricloader": ">=0.16.3", + "fabricloader": ">=0.16.9", "fabric-api": "*", - "minecraft": "~1.21.1", + "minecraft": "~1.21.3", "java": ">=21" } } From 2e01a65ab4cc1017751a827f863718bd346b60cf Mon Sep 17 00:00:00 2001 From: kawaiizenbo <48113593+kawaiizenbo@users.noreply.github.com> Date: Sat, 9 Nov 2024 18:55:24 -0700 Subject: [PATCH 2/2] clean up ci --- .github/workflows/build.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98b3f6d..c1b0523 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,3 @@ -# Automatically build the project and run any configured tests for every push -# and submitted pull request. This can help catch issues that only occur on -# certain platforms or Java versions, and provides a first line of defence -# against bad commits. - name: build on: [pull_request, push] @@ -10,12 +5,11 @@ jobs: build: strategy: matrix: - # Use these Java versions java: [ - 21, # Current Java LTS & minimum supported by Minecraft + 21, # java version used since 1.20.5 ] - # and run on both Linux and Windows - os: [ubuntu-22.04] + # only linux + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: checkout repository @@ -28,12 +22,10 @@ jobs: java-version: ${{ matrix.java }} distribution: 'microsoft' - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS uses: actions/upload-artifact@v3 with: name: Artifacts