build: update to forge 4.2.0

Author: WakelessSloth56

.github/workflows/auto-release.yml

@@ -14,7 +14,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - run: |
                   prop() { grep -P "^\s*[^#]?${1}=.*$" './gradle.properties' | cut -d'=' -f2; }
@@ -32,14 +32,14 @@ jobs:
             packages: write
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - name: Set up JDK 17
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3
               with:
                   java-version: '17'
                   distribution: 'temurin'
-                  architecture: x64
+                  architecture: 'x64'
 
             - name: Build and publish with Gradle
               env:
@@ -54,18 +54,16 @@ jobs:
                   ./gradlew build publish genUpdateJson
 
             - name: Update update JSON
-              uses: JamesIves/github-pages-deploy-action@4.1.5
+              uses: JamesIves/github-pages-deploy-action@v4
               with:
                   clean: false
                   target-folder: update
                   branch: gh-pages
                   folder: tmp
 
             - name: Github release
-              uses: marvinpinto/action-automatic-releases@latest
+              uses: softprops/action-gh-release@v1
               with:
-                  repo_token: ${{secrets.GITHUB_TOKEN}}
-                  prerelease: false
                   files: |
                       build/libs/*.jar
                       build/libs/*.asc

.github/workflows/dev-build.yml

@@ -5,8 +5,8 @@ name: dev-build
 
 on:
     push:
-        branches:
-            - 1.18-forge
+        branches-ignore:
+            - 'test*'
         tags-ignore:
             - 'v*'
 
@@ -17,14 +17,15 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - name: Set up JDK 17
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3
               with:
                   java-version: '17'
                   distribution: 'temurin'
-                  architecture: x64
+                  architecture: 'x64'
+                  cache: 'gradle'
 
             - name: Build with Gradle
               run: |

.gitignore

@@ -4,6 +4,7 @@ bin
 .metadata
 .classpath
 .project
+.factorypath
 .vscode
 tmp
 
@@ -22,6 +23,7 @@ run
 forge*changelog.txt
 
 test*.*
-libs
 
 mcmodsrepo
+
+src/generated

README.md

@@ -4,12 +4,11 @@
 
 [![GitHub license](https://img.shields.io/github/license/auioc/NotEnoughLuck?style=flat-square)](/LICENSE)
 [![GitHub release](https://img.shields.io/github/v/release/auioc/NotEnoughLuck?style=flat-square)](https://github.com/auioc/NotEnoughLuck/releases/latest)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/auioc/NotEnoughLuck/auto-release?label=release%20build&style=flat-square)](https://github.com/auioc/NotEnoughLuck/actions/workflows/auto-release.yml)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/auioc/NotEnoughLuck/dev-build?label=dev%20build&style=flat-square)](https://github.com/auioc/NotEnoughLuck/actions/workflows/dev-build.yml)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/auioc/NotEnoughLuck/dev-build.yml?branch=1.18-forge&label=dev%20build&style=flat-square)](https://github.com/auioc/NotEnoughLuck/actions/workflows/dev-build.yml)
 <br/>
 ![Minecraft](https://img.shields.io/static/v1?label=Minecraft&message=1.18.2&color=00aa00&style=flat-square)
-[![Forge](https://img.shields.io/static/v1?label=Forge&message=40.1.0&color=e04e14&logo=Conda-Forge&style=flat-square)](http://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html)
-[![AdoptiumOpenJDK](https://img.shields.io/static/v1?label=AdoptiumOpenJDK&message=17.0.4%2B8&color=brightgreen&logo=java&style=flat-square)](https://adoptium.net)
+[![Forge](https://img.shields.io/static/v1?label=Forge&message=40.2.0&color=e04e14&logo=Conda-Forge&style=flat-square)](http://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html)
+![OpenJDK](https://img.shields.io/static/v1?label=OpenJDK&message=17&color=brightgreen&logo=java&style=flat-square)
 [![Gradle](https://img.shields.io/static/v1?label=Gradle&message=7.3&color=brightgreen&logo=gradle&style=flat-square)](https://docs.gradle.org/7.3/release-notes.html)
 
 </div>

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
 minecraft_version=1.18.2
-forge_version=40.1.0
+forge_version=40.2.0
 
 mappings_channel=official
 mappings_version=1.18.2
 
 mixin_version=0.8.5
 
-arnicalib_version=5.6.3
-hulsealib_version=1.0.1
+arnicalib_version=5.7.3
+hulsealib_version=1.1.1
 
 github_repo=auioc/NotEnoughLuck
 group=org.auioc.mcmod

src/main/java/org/auioc/mcmod/notenoughluck/client/gui/screen/tungshing/ClassicTungShingScreen.java

@@ -41,21 +41,18 @@ public ClassicTungShingScreen() {
     }
 
     @Override
-    protected void init() {
-        int divX = center(this.width, DIV_WIDTH);
-        int divY = center(this.height, DIV_HEIGHT);
-
+    protected void subInit() {
         this.editbox = new EditBox(
             this.font,
-            divX + EDITBOX_X_OFFSET, divY + EDITBOX_Y_OFFSET,
+            boxX1 + EDITBOX_X_OFFSET, boxY1 + EDITBOX_Y_OFFSET,
             EDITBOX_WIDTH, EDITBOX_HEIGHT,
             i18n("editbox")
         );
         this.editbox.setFilter(TungShingScreenUtils.IS_INTEGER_STRING);
         this.addWidget(this.editbox);
 
         this.button = new Button(
-            divX + BUTTON_X_OFFSET, divY + BUTTON_Y_OFFSET,
+            boxX1 + BUTTON_X_OFFSET, boxY1 + BUTTON_Y_OFFSET,
             BUTTON_WIDTH, BUTTON_HEIGHT,
             i18n("button.request"),
             (button) -> {
@@ -93,7 +90,7 @@ protected void subRender(PoseStack poseStack, int mouseX, int mouseY, float part
             this.font.drawShadow(
                 poseStack,
                 text,
-                this.divX + UNSEI_LINE_X_OFFSET, this.divY + UNSEI_LINE_Y_OFFSET + (i + 1) * UNSEI_LINE_Y_ADDEND,
+                boxX1 + UNSEI_LINE_X_OFFSET, boxY1 + UNSEI_LINE_Y_OFFSET + (i + 1) * UNSEI_LINE_Y_ADDEND,
                 0x000000
             );
         }

src/main/java/org/auioc/mcmod/notenoughluck/common/item/base/DiceItem.java

@@ -3,7 +3,7 @@
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.auioc.mcmod.notenoughluck.client.renderer.DiceItemRenderer;
 import org.auioc.mcmod.notenoughluck.common.itemgroup.NELItemGroups;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
@@ -64,7 +64,7 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot,
 
         afterPickup(player, pips);
 
-        EffectUtils.removeEffect(player, (e) -> e.getEffect() == MobEffects.LUCK || e.getEffect() == MobEffects.UNLUCK);
+        MobEffectUtils.remove(player, (e) -> e.getEffect() == MobEffects.LUCK || e.getEffect() == MobEffects.UNLUCK);
 
         var effect = getEffect(pips, nbt);
         if (effect != null) {

src/main/java/org/auioc/mcmod/notenoughluck/common/item/impl/IndulgenceItem.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.notenoughluck.common.item.impl;
 
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.auioc.mcmod.hulsealib.game.item.UsableItem;
 import org.auioc.mcmod.notenoughluck.common.effect.NELMobEffects;
 import org.auioc.mcmod.notenoughluck.common.itemgroup.NELItemGroups;
@@ -33,7 +33,7 @@ public IndulgenceItem() {
     public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity living) {
         if (living instanceof ServerPlayer player) {
             player.addEffect(
-                EffectUtils.makeIncurable(
+                MobEffectUtils.makeIncurable(
                     new MobEffectInstance(NELMobEffects.REDEMPTION.get(), REDEMPTION_DURATION)
                 )
             );

src/main/java/org/auioc/mcmod/notenoughluck/mixin/server/MixinBowItem.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.notenoughluck.mixin.server;
 
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.auioc.mcmod.notenoughluck.api.mixin.server.IMixinAbstractArrow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -36,8 +36,8 @@ public void releaseUsing(
         Player player, boolean flag, ItemStack itemstack, int i, float f, boolean flag1, ArrowItem arrowitem, AbstractArrow abstractarrow, int j, int k
     ) {
         IMixinAbstractArrow mixinabstractarrow = ((IMixinAbstractArrow) abstractarrow);
-        mixinabstractarrow.setLuck(EffectUtils.getEffectLevel(player, MobEffects.LUCK));
-        mixinabstractarrow.setUnluck(EffectUtils.getEffectLevel(player, MobEffects.UNLUCK));
+        mixinabstractarrow.setLuck(MobEffectUtils.getLevel(player, MobEffects.LUCK));
+        mixinabstractarrow.setUnluck(MobEffectUtils.getLevel(player, MobEffects.UNLUCK));
     }
 
 }

src/main/java/org/auioc/mcmod/notenoughluck/mixin/server/MixinCrossbowItem.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.notenoughluck.mixin.server;
 
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.auioc.mcmod.notenoughluck.api.mixin.server.IMixinAbstractArrow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -33,8 +33,8 @@ private static void getArrow(
     ) {
         if (p_40916_ instanceof ServerPlayer) {
             IMixinAbstractArrow mixinabstractarrow = ((IMixinAbstractArrow) abstractarrow);
-            mixinabstractarrow.setLuck(EffectUtils.getEffectLevel(p_40916_, MobEffects.LUCK));
-            mixinabstractarrow.setUnluck(EffectUtils.getEffectLevel(p_40916_, MobEffects.UNLUCK));
+            mixinabstractarrow.setLuck(MobEffectUtils.getLevel(p_40916_, MobEffects.LUCK));
+            mixinabstractarrow.setUnluck(MobEffectUtils.getLevel(p_40916_, MobEffects.UNLUCK));
         }
     }
 

src/main/java/org/auioc/mcmod/notenoughluck/mixin/server/MixinPlayer.java

@@ -5,7 +5,7 @@
 import java.util.function.Function;
 import org.apache.commons.lang3.tuple.Triple;
 import org.auioc.mcmod.arnicalib.base.random.RandomUtils;
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
@@ -65,12 +65,12 @@ private float modifyAttackDamage(float f) {
             return f;
         }
 
-        int unluck = EffectUtils.getEffectLevel(player, MobEffects.UNLUCK);
+        int unluck = MobEffectUtils.getLevel(player, MobEffects.UNLUCK);
         if (unluck > 0 && !(player.getRandom().nextDouble() < Math.pow(0.8, (double) unluck))) {
             return 0.0F;
         }
 
-        int luck = EffectUtils.getEffectLevel(player, MobEffects.LUCK);
+        int luck = MobEffectUtils.getLevel(player, MobEffects.LUCK);
         if (luck > 0) {
             Triple<Integer, Function<Integer, Float>, Function<Integer, Float>> bonusTriple =
                 ATTACK_LUCK_BONUS_MAP.get(Math.min(luck - 1, ATTACK_LUCK_BONUS_MAP.size() - 1));

src/main/java/org/auioc/mcmod/notenoughluck/server/command/impl/UnseiCommand.java

@@ -9,7 +9,7 @@
 import org.apache.commons.lang3.RandomUtils;
 import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import org.auioc.mcmod.arnicalib.game.command.CommandExceptions;
-import org.auioc.mcmod.arnicalib.mod.mixinapi.common.IMixinCommandSourceStack;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import org.auioc.mcmod.notenoughluck.common.network.NELPacketHandler;
 import org.auioc.mcmod.notenoughluck.common.network.packet.client.ClearClientUnseiCachePacket;
 import org.auioc.mcmod.notenoughluck.server.unsei.ServerUnseiCache;
@@ -49,7 +49,8 @@ private static int clearClientCache(CommandContext<CommandSourceStack> ctx) thro
     private static int clearServerCache(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
         var source = ctx.getSource();
 
-        if ((source.getServer() instanceof DedicatedServer) && !(((IMixinCommandSourceStack) source).getSource() instanceof DedicatedServer)) {
+
+        if (!(CommandSourceUtils.getRealSource(source) instanceof DedicatedServer)) {
             throw CommandExceptions.NOT_DEDICATED_SERVER_ERROR.create();
         }
 

src/main/java/org/auioc/mcmod/notenoughluck/server/event/handler/PotionAddedHandler.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.notenoughluck.server.event.handler;
 
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import org.auioc.mcmod.notenoughluck.common.effect.NELMobEffects;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffects;
@@ -12,13 +12,13 @@ public static void handle(final PotionAddedEvent event) {
         if (event.getEntityLiving() instanceof ServerPlayer player) {
             var newEffect = event.getPotionEffect();
             if (newEffect.getEffect() == MobEffects.UNLUCK) {
-                int redemption = EffectUtils.getEffectLevel(player, NELMobEffects.REDEMPTION.get());
+                int redemption = MobEffectUtils.getLevel(player, NELMobEffects.REDEMPTION.get());
                 if (redemption > 0) {
                     if (newEffect.getAmplifier() > 0) {
                         int newUnluckAmplifier = newEffect.getAmplifier() - redemption;
-                        EffectUtils.setAmplifier(newEffect, Math.max(newUnluckAmplifier, 0));
+                        MobEffectUtils.setAmplifier(newEffect, Math.max(newUnluckAmplifier, 0));
                     } else {
-                        EffectUtils.setDuration(newEffect, 1);
+                        MobEffectUtils.setDuration(newEffect, 1);
                     }
                 }
             }

src/main/java/org/auioc/mcmod/notenoughluck/utils/LuckUtils.java

@@ -1,7 +1,7 @@
 package org.auioc.mcmod.notenoughluck.utils;
 
 import org.auioc.mcmod.arnicalib.base.random.RandomUtils;
-import org.auioc.mcmod.arnicalib.game.effect.EffectUtils;
+import org.auioc.mcmod.arnicalib.game.effect.MobEffectUtils;
 import net.minecraft.util.Mth;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
@@ -10,11 +10,11 @@
 public class LuckUtils {
 
     public static int getLuckEffectLevel(LivingEntity living) {
-        return EffectUtils.getEffectLevel(living, MobEffects.LUCK);
+        return MobEffectUtils.getLevel(living, MobEffects.LUCK);
     }
 
     public static int getUnluckEffectLevel(LivingEntity living) {
-        return EffectUtils.getEffectLevel(living, MobEffects.UNLUCK);
+        return MobEffectUtils.getLevel(living, MobEffects.UNLUCK);
     }
 
     public static int getLuckValueByEffect(LivingEntity living) {

src/main/resources/META-INF/mods.toml

@@ -19,24 +19,24 @@ Not Enough Luck
 [[dependencies.notenoughluck]]
     modId="forge"
     mandatory=true
-    versionRange="[40,)"
+    versionRange="[40.2.0,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.notenoughluck]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.18.1,1.19)"
+    versionRange="[1.18.2,1.19)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.notenoughluck]]
     modId="arnicalib"
     mandatory=true
-    versionRange="[5.6.3,)"
+    versionRange="[5.7.3,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.notenoughluck]]
     modId="hulsealib"
     mandatory=true
-    versionRange="[1.0.1,)"
+    versionRange="[1.1.1,)"
     ordering="NONE"
     side="BOTH"