From 8570fecf6bcc674c027a7837e65b525954976153 Mon Sep 17 00:00:00 2001 From: motwnb Date: Sun, 28 Jul 2024 21:06:49 +0800 Subject: [PATCH 1/3] Updated to 1.21 --- .gitignore | 1 + gradle.properties | 11 +++++---- .../minenash/action_hunger/ActionHunger.java | 23 ++++++++----------- .../FoodLevelForSprintPacket.java | 2 +- .../action_hunger/config/HealthEffect.java | 5 +++- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 09cd281..3944b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ bin/ # fabric run/ +/remappedSrc/ diff --git a/gradle.properties b/gradle.properties index 0d2ad19..1fc2a24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,18 +3,19 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.20.5 - yarn_mappings=1.20.5+build.1 - loader_version=0.15.10 + minecraft_version=1.21 + yarn_mappings=1.21+build.9 + loader_version=0.15.11 + # Mod Properties - mod_version = 0.2.0+1.20.5 + mod_version = 0.2.0+1.21 maven_group = com.minenash archives_base_name = action_hunger # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.97.6+1.20.5 + fabric_version=0.100.7+1.21 # Optional # bewitchment_version=4048571 diff --git a/src/main/java/com/minenash/action_hunger/ActionHunger.java b/src/main/java/com/minenash/action_hunger/ActionHunger.java index 2ac1078..63fc4e4 100644 --- a/src/main/java/com/minenash/action_hunger/ActionHunger.java +++ b/src/main/java/com/minenash/action_hunger/ActionHunger.java @@ -15,7 +15,6 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.server.command.CommandManager; -import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -32,15 +31,13 @@ public void onInitialize() { Config.init("action_hunger", "ActionHunger", Config.class); mapHealthEffects(); - CommandRegistrationCallback.EVENT.register((dispatcher, access, env) -> { - dispatcher.register(CommandManager.literal("action_hunger_reload").executes( context -> { - Config.init("action_hunger", "ActionHunger", Config.class); - mapHealthEffects(); - context.getSource().getServer().getPlayerManager().sendToAll(ServerPlayNetworking.createS2CPacket(new FoodLevelForSprintPacket(Config.foodLevelForSprint))); - context.getSource().sendMessage(Text.literal("§2[ActionHunger]:§a Config reload complete")); - return 1; - } )); - }); + CommandRegistrationCallback.EVENT.register((dispatcher, access, env) -> dispatcher.register(CommandManager.literal("action_hunger_reload").executes(context -> { + Config.init("action_hunger", "ActionHunger", Config.class); + mapHealthEffects(); + context.getSource().getServer().getPlayerManager().sendToAll(ServerPlayNetworking.createS2CPacket(new FoodLevelForSprintPacket(Config.foodLevelForSprint))); + context.getSource().sendMessage(Text.literal("§2[ActionHunger]:§a Config reload complete")); + return 1; + } ))); ServerTickEvents.END_SERVER_TICK.register(server -> { for (HealthEffect effect : Config.effects) { @@ -64,15 +61,13 @@ public void onInitialize() { }); - ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, destination) -> { - ((LivingEntityAccessor)player).setActiveItemStack(ItemStack.EMPTY); - }); + ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, destination) -> ((LivingEntityAccessor)player).setActiveItemStack(ItemStack.EMPTY)); } private void mapHealthEffects() { for (HealthEffect effect : Config.effects) - effect.statusEffect = Registries.STATUS_EFFECT.get(new Identifier(effect.effect)); + effect.statusEffect = Registries.STATUS_EFFECT.get(Identifier.of(effect.effect)); } public static double getCurveModifier(float stepper, Config.Curve curve, float multiplier) { diff --git a/src/main/java/com/minenash/action_hunger/FoodLevelForSprintPacket.java b/src/main/java/com/minenash/action_hunger/FoodLevelForSprintPacket.java index 2528621..ee5bd58 100644 --- a/src/main/java/com/minenash/action_hunger/FoodLevelForSprintPacket.java +++ b/src/main/java/com/minenash/action_hunger/FoodLevelForSprintPacket.java @@ -7,7 +7,7 @@ import net.minecraft.util.Identifier; public record FoodLevelForSprintPacket(int foodLevel) implements CustomPayload { - public static final CustomPayload.Id PACKET_ID = new CustomPayload.Id<>(new Identifier("action_hunger", "food_level_for_sprint")); + public static final CustomPayload.Id PACKET_ID = new CustomPayload.Id<>(Identifier.of("action_hunger", "food_level_for_sprint")); public static final PacketCodec PACKET_CODEC = PacketCodecs.VAR_INT.xmap(FoodLevelForSprintPacket::new, FoodLevelForSprintPacket::foodLevel).cast(); @Override diff --git a/src/main/java/com/minenash/action_hunger/config/HealthEffect.java b/src/main/java/com/minenash/action_hunger/config/HealthEffect.java index 3d1ce1e..56feba2 100644 --- a/src/main/java/com/minenash/action_hunger/config/HealthEffect.java +++ b/src/main/java/com/minenash/action_hunger/config/HealthEffect.java @@ -1,7 +1,10 @@ package com.minenash.action_hunger.config; import net.minecraft.entity.effect.StatusEffect; -import static com.minenash.action_hunger.config.Config.*; + +import com.minenash.action_hunger.config.Config.AmplifierCurveSource; +import com.minenash.action_hunger.config.Config.Curve; +import com.minenash.action_hunger.config.Config.RequiredBounds; public class HealthEffect { From 706cf2d7501c1058fe5e1ea489d722a526bc9490 Mon Sep 17 00:00:00 2001 From: MotWnb <98505614+MotWnb@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:22:25 +0800 Subject: [PATCH 2/3] Update build.yml --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31c38ee..0e0fe85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,18 +4,14 @@ # against bad commits. name: build -on: [pull_request, push] +on: [pull_request, push, workflow_dispatch] jobs: build: strategy: matrix: # Use these Java versions - java: [ - 1.8, # Minimum supported by Minecraft - 11, # Current Java LTS - 15 # Latest version - ] + java: [21] # and run on both Linux and Windows os: [ubuntu-20.04, windows-latest] runs-on: ${{ matrix.os }} From 1af76046b79b5dde9e703c61cffb5bb24b3c0035 Mon Sep 17 00:00:00 2001 From: MotWnb <98505614+MotWnb@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:25:34 +0800 Subject: [PATCH 3/3] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e0fe85..8017d0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '11' }} # Only upload artifacts built from LTS java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS uses: actions/upload-artifact@v2 with: name: Artifacts