Minecraft 1.21.6/7 support

.github/workflows/build.yml

@@ -23,18 +23,10 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-      - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
-      - name: Cache gradle files
-        uses: actions/cache@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ./.gradle/loom-cache
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle.properties', '**/*.accesswidener', 'settings.json') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master' && github.ref != 'refs/heads/dev' }}
       - name: Build and publish with gradle
         if: ${{ inputs.build_publish == true }}
         run: |

.github/workflows/publish.yml

@@ -198,7 +198,7 @@ jobs:
           curseforge-token: ${{ secrets.CF_API_TOKEN || '${undefined}' }}
           files: ${{ steps.file_info.outputs.path }}
           changelog: ${{ steps.changelog.outputs.result }}
-          name: ${{ needs.create_github_release.outputs.release_title }}
+          name: ${{ needs.create_github_release.outputs.release_title }} for MC ${{ matrix.mc_ver }} (${{ matrix.platform }})
           version: ${{ format('v{0}.{1}-mc{2}-{3}', needs.create_github_release.outputs.mod_version, needs.create_github_release.outputs.commit_count, matrix.mc_ver, matrix.platform) }}
           version-type: alpha
           loaders: ${{ steps.publish_info.outputs.publish_loaders }}
@@ -217,7 +217,7 @@ jobs:
           curseforge-token: ${{ secrets.CF_API_TOKEN || '${undefined}' }}
           files: ${{ steps.file_info.outputs.path }}
           changelog: ${{ steps.changelog.outputs.result }}
-          name: ${{ needs.create_github_release.outputs.release_title }}
+          name: ${{ needs.create_github_release.outputs.release_title }} for MC ${{ matrix.mc_ver }} (${{ matrix.platform }})
           version: ${{ format('v{0}.{1}-mc{2}-{3}', needs.create_github_release.outputs.mod_version, needs.create_github_release.outputs.commit_count, matrix.mc_ver, matrix.platform) }}
           version-type: ${{ github.event.release.prerelease && 'beta' || 'release' }}
           loaders: ${{ steps.publish_info.outputs.publish_loaders }}

build.gradle

@@ -27,6 +27,7 @@ preprocess {
     Node mc12103_fabric = createNode("1.21.3-fabric", 1_21_03, "mojang")
     Node mc12104_fabric = createNode("1.21.4-fabric", 1_21_04, "mojang")
     Node mc12105_fabric = createNode("1.21.5-fabric", 1_21_05, "mojang")
+    Node mc12107_fabric = createNode("1.21.7-fabric", 1_21_07, "mojang")
 
     mc11502_fabric.link(mc11404_fabric, file("versions/mapping-fabric-1.15.2-1.14.4.txt"))
     mc11605_fabric.link(mc11502_fabric, file("versions/mapping-fabric-1.16.5-1.15.2.txt"))
@@ -43,6 +44,7 @@ preprocess {
     mc12101_fabric.link(mc12103_fabric, file("versions/mapping-fabric-1.21.1-1.21.3.txt"))
     mc12103_fabric.link(mc12104_fabric, file("versions/mapping-fabric-1.21.3-1.21.4.txt"))
     mc12104_fabric.link(mc12105_fabric, file("versions/mapping-fabric-1.21.4-1.21.5.txt"))
+    mc12105_fabric.link(mc12107_fabric, file("versions/mapping-fabric-1.21.5-1.21.7.txt"))
 
     // NeoForge
     Node mc12101_neoforge = createNode("1.21.1-neoforge", 1_21_01, "mojang")

gradle.properties

@@ -18,13 +18,13 @@ mod.version=4.0
 ## Annotation processor
 dependencies.lombok_version=1.18.38
 ## MagicLib
-dependencies.magiclib_dependency=0.8.706
-dependencies.magiclib_version=0.8.706-beta
+dependencies.magiclib_dependency=0.8.721
+dependencies.magiclib_version=0.8.721-beta
 dependencies.pinin_version=1.6.0
 
 # Gradle Plugins
 architectury_loom_version=1.10-SNAPSHOT
 grgit_version=5.3.0
-preprocessor_version=9d21b33
+preprocessor_version=0a04a56
 replace_token_version=1.1.3
 yamlang_version=1.4.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.json

@@ -16,6 +16,7 @@
     "1.21.3-fabric",
     "1.21.4-fabric",
     "1.21.5-fabric",
+    "1.21.7-fabric",
 
     "1.21.1-neoforge"
   ]

src/main/java/com/plusls/MasaGadget/impl/feature/entityInfo/EntityInfoRenderer.java

@@ -6,6 +6,7 @@
 import com.plusls.MasaGadget.util.SyncUtil;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.Position;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
@@ -18,8 +19,11 @@
 import top.hendrixshen.magiclib.MagicLib;
 import top.hendrixshen.magiclib.api.event.minecraft.render.RenderEntityListener;
 import top.hendrixshen.magiclib.api.event.minecraft.render.RenderLevelListener;
+import top.hendrixshen.magiclib.api.render.context.LevelRenderContext;
 import top.hendrixshen.magiclib.api.render.context.RenderContext;
 import top.hendrixshen.magiclib.impl.render.TextRenderer;
+import top.hendrixshen.magiclib.impl.render.context.EntityRenderContext;
+import top.hendrixshen.magiclib.util.minecraft.render.RenderUtil;
 
 import java.util.Queue;
 
@@ -42,12 +46,12 @@ private static TextRenderer rotationAround(@NotNull TextRenderer renderer, @NotN
     }
 
     @Override
-    public void preRenderEntity(Entity entity, RenderContext renderContext, float partialTicks) {
+    public void preRenderEntity(Entity entity, EntityRenderContext renderContext) {
         // NO-OP
     }
 
     @Override
-    public void postRenderEntity(Entity entity, RenderContext renderContext, float partialTicks) {
+    public void postRenderEntity(Entity entity, EntityRenderContext renderContext) {
         if ((entity instanceof Villager &&
                 (Configs.renderNextRestockTime.getBooleanValue() || Configs.renderTradeEnchantedBook.getBooleanValue())) ||
                 (entity instanceof ZombieVillager && (Configs.renderZombieVillagerConvertTime.getBooleanValue()))) {
@@ -56,12 +60,14 @@ public void postRenderEntity(Entity entity, RenderContext renderContext, float p
     }
 
     @Override
-    public void preRenderLevel(Level level, RenderContext renderContext, float partialTicks) {
+    public void preRenderLevel(ClientLevel level, LevelRenderContext renderContext) {
         // NO-OP
     }
 
     @Override
-    public void postRenderLevel(Level level, RenderContext renderContext, float partialTicks) {
+    public void postRenderLevel(ClientLevel level, LevelRenderContext renderContext) {
+        float partialTick = RenderUtil.getPartialTick();
+
         for (Entity entity : this.queue) {
             if (entity instanceof Villager) {
                 Villager villager = MiscUtil.cast(SyncUtil.syncEntityDataFromIntegratedServer(entity));
@@ -80,10 +86,10 @@ public void postRenderLevel(Level level, RenderContext renderContext, float part
                 }
 
                 if (villager.isSleeping()) {
-                    Position position = entity.getEyePosition(partialTicks);
+                    Position position = entity.getEyePosition(partialTick);
                     renderer.at(position.x(), position.y() + 0.4F, position.z());
                 } else {
-                    EntityInfoRenderer.rotationAround(renderer, entity.getEyePosition(partialTicks), 0.6);
+                    EntityInfoRenderer.rotationAround(renderer, entity.getEyePosition(partialTick), 0.6);
                 }
 
                 renderer.bgColor((int) (Minecraft.getInstance().options.getBackgroundOpacity(0.25F) * 255.0F) << 24)
@@ -92,7 +98,7 @@ public void postRenderLevel(Level level, RenderContext renderContext, float part
                         .render();
             } else if (entity instanceof ZombieVillager) {
                 ZombieVillager zombieVillager = MiscUtil.cast(SyncUtil.syncEntityDataFromIntegratedServer(entity));
-                EntityInfoRenderer.rotationAround(TextRenderer.create(), entity.getEyePosition(partialTicks), 0.6)
+                EntityInfoRenderer.rotationAround(TextRenderer.create(), entity.getEyePosition(partialTick), 0.6)
                         .text(ZombieVillagerConvertTimeInfo.getInfo(zombieVillager))
                         .bgColor((int) (Minecraft.getInstance().options.getBackgroundOpacity(0.25F) * 255.0F) << 24)
                         .fontScale(0.015F)

src/main/java/com/plusls/MasaGadget/impl/feature/entityTrace/EntityTraceRenderer.java

@@ -7,6 +7,7 @@
 import com.plusls.MasaGadget.util.SyncUtil;
 import fi.dy.masa.malilib.util.Color4f;
 import lombok.Getter;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.npc.Villager;
@@ -16,7 +17,9 @@
 import top.hendrixshen.magiclib.MagicLib;
 import top.hendrixshen.magiclib.api.event.minecraft.render.RenderEntityListener;
 import top.hendrixshen.magiclib.api.event.minecraft.render.RenderLevelListener;
+import top.hendrixshen.magiclib.api.render.context.LevelRenderContext;
 import top.hendrixshen.magiclib.api.render.context.RenderContext;
+import top.hendrixshen.magiclib.impl.render.context.EntityRenderContext;
 import top.hendrixshen.magiclib.impl.render.context.RenderGlobal;
 
 import java.util.Queue;
@@ -33,12 +36,12 @@ public void init() {
     }
 
     @Override
-    public void preRenderEntity(Entity entity, RenderContext renderContext, float partialTicks) {
+    public void preRenderEntity(Entity entity, EntityRenderContext renderContext) {
         // NO-OP
     }
 
     @Override
-    public void postRenderEntity(Entity entity, RenderContext renderContext, float partialTicks) {
+    public void postRenderEntity(Entity entity, EntityRenderContext renderContext) {
         if (entity instanceof Villager &&
                 Configs.renderVillageHomeTracer.getBooleanValue() ||
                 Configs.renderVillageJobSiteTracer.getBooleanValue()) {
@@ -47,19 +50,21 @@ public void postRenderEntity(Entity entity, RenderContext renderContext, float p
     }
 
     @Override
-    public void preRenderLevel(Level level, RenderContext renderContext, float partialTicks) {
+    public void preRenderLevel(ClientLevel level, LevelRenderContext renderContext) {
         // NO-OP
     }
 
     @Override
-    public void postRenderLevel(Level level, RenderContext renderContext, float partialTicks) {
+    public void postRenderLevel(ClientLevel level, LevelRenderContext renderContext) {
+        float partialTick = top.hendrixshen.magiclib.util.minecraft.render.RenderUtil.getPartialTick();
+
         for (Entity entity : this.queue) {
             if (entity instanceof Villager) {
                 Villager villager = MiscUtil.cast(SyncUtil.syncEntityDataFromIntegratedServer(entity));
 
                 if (Configs.renderVillageHomeTracer.getBooleanValue()) {
                     villager.getBrain().getMemory(MemoryModuleType.HOME).ifPresent(globalPos -> {
-                        Vec3 eyeVec3 = entity.getEyePosition(partialTicks);
+                        Vec3 eyeVec3 = entity.getEyePosition(partialTick);
                         Vec3 bedVec3 = new Vec3(globalPos.pos().getX() + 0.5, globalPos.pos().getY() + 0.5, globalPos.pos().getZ() + 0.5);
                         RenderGlobal.disableDepthTest();
                         RenderUtil.drawConnectLine(eyeVec3, bedVec3, 0.05,
@@ -72,7 +77,7 @@ public void postRenderLevel(Level level, RenderContext renderContext, float part
 
                 if (Configs.renderVillageJobSiteTracer.getBooleanValue()) {
                     villager.getBrain().getMemory(MemoryModuleType.JOB_SITE).ifPresent(globalPos -> {
-                        Vec3 eyeVec3 = entity.getEyePosition(partialTicks);
+                        Vec3 eyeVec3 = entity.getEyePosition(partialTick);
                         Vec3 jobVev3 = new Vec3(globalPos.pos().getX() + 0.5, globalPos.pos().getY() + 0.5, globalPos.pos().getZ() + 0.5);
                         RenderGlobal.disableDepthTest();
                         RenderUtil.drawConnectLine(eyeVec3, jobVev3, 0.05,

src/main/java/com/plusls/MasaGadget/impl/gui/MasaGadgetIcons.java

@@ -52,12 +52,15 @@ public int getV() {
 
     @Override
     public void renderAt(
+            //#if MC >= 12106
+            //$$ GuiGraphics guiGraphics,
+            //#endif
             int x,
             int y,
             float zLevel,
             boolean enabled,
             boolean selected
-            //#if MC > 12101
+            //#if 12106 > MC && MC > 12101
             //$$ , GuiGraphics guiGraphics
             //#endif
     ) {
@@ -73,19 +76,22 @@ public void renderAt(
         }
 
         RenderUtils.drawTexturedRect(
-            //#if MC > 12104
-            //$$ this.getTexture(),
-            //#endif
-            x,
-            y,
-            u,
-            v,
-            this.w,
-            this.h,
-            zLevel
-            //#if MC > 12104
-            //$$ , guiGraphics
-            //#endif
+                //#if MC >= 12106
+                //$$ guiGraphics,
+                //#endif
+                //#if MC > 12104
+                //$$ this.getTexture(),
+                //#endif
+                x,
+                y,
+                u,
+                v,
+                this.w,
+                this.h,
+                zLevel
+                //#if 12106 > MC && MC > 12104
+                //$$ , guiGraphics
+                //#endif
         );
     }