Update to 1.20.5

.github/workflows/build.yml

@@ -10,34 +10,32 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: setup jdk 17
-        uses: actions/setup-java@v1
+      - name: setup jdk 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: temurin
+          java-version: 21
       # to cache gradle files
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
-          cache-read-only: false
           gradle-home-cache-cleanup: true
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlecw
+          dependency-graph: generate-and-submit
+# Already needs to be executable, so the dirty check is correct
+#      - name: make gradle wrapper executable
+#        if: ${{ runner.os != 'Windows' }}
+#        run: chmod +x ./gradlecw
       - name: build
         run: ./gradlecw build
       - name: capture build artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: |
-            EntityCulling-Fabric/build/libs/*
-            EntityCulling-Forge/build/libs/*
-            EntityCulling-Neo/build/libs/*
-            EntityCulling-Versionless/build/libs/*
-      - name: Test Report
-        uses: dorny/test-reporter@v1
-        if: success() || failure()
-        with:
-          name: JUnit Tests
-          path: '**/build/test-results/test/TEST-*.xml'
-          reporter: java-junit        
+          path: 'versions/**/build/libs/*.jar'
+#      - name: Test Report
+#        uses: dorny/test-reporter@v1
+#        if: success() || failure()
+#        with:
+#          name: JUnit Tests
+#          path: '**/build/test-results/test/TEST-*.xml'
+#          reporter: java-junit        

.github/workflows/tag.yml

@@ -8,68 +8,33 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: setup jdk 17
+      - name: setup jdk 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: make gradle wrapper executable
         run: chmod +x ./gradlecw
       - name: build
         run: ./gradlecw build -Pbuild.release=true
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: |
-            EntityCulling-Fabric/build/libs/*
-            EntityCulling-Forge/build/libs/*
-            EntityCulling-Neo/build/libs/*
-            EntityCulling-Versionless/build/libs/*
-      - name: Publish-Neo-Curseforge
+          files: 'versions/**/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+      - name: Publish-1.20.5-fabric-Curseforge
         uses: Kir-Antipov/[email protected]
         with:
           curseforge-id: 448233
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}  
-          loaders: neoforge
-          name: ${{github.ref_name}} - NeoForge
-          version-type: beta
-          files: '*Neo/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
-      - name: Publish-Neo-Modrinth
-        uses: Kir-Antipov/[email protected]
-        with:
-          modrinth-id: NNAgCjsB
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          loaders: neoforge
-          name: ${{github.ref_name}} - NeoForge
-          files: '*Neo/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
-      - name: Publish-Forge-Curseforge
-        uses: Kir-Antipov/[email protected]
-        with:
-          curseforge-id: 448233
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}  
-          loaders: forge
-          name: ${{github.ref_name}} - Forge
-          version-type: beta
-          files: '*Forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
-      - name: Publish-Forge-Modrinth
-        uses: Kir-Antipov/[email protected]
-        with:
-          modrinth-id: NNAgCjsB
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          loaders: forge
-          name: ${{github.ref_name}} - Forge
-          files: '*Forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
-      - name: Publish-Fabric
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.20.5 - Fabric
+          files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.5
+      - name: Publish-1.20.5-fabric-Modrinth
         uses: Kir-Antipov/[email protected]
         with:
           modrinth-id: NNAgCjsB
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          curseforge-id: 448233
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}  
           loaders: fabric
-          name: ${{github.ref_name}} - Fabric
-          files: '*Fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
+          name: ${{github.ref_name}}-1.20.5 - Fabric
+          files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.5

.gitignore

@@ -41,3 +41,11 @@ gradle/wrapper
 VersionShared
 UtilityCode
 formatter.xml
+src/main/fabric-resources/fabric.mod.json
+src/main/forge-resources/META-INF/mods.toml
+src/main/neoforge-resources/META-INF/mods.toml
+**/src/main/java/dev/tr7zw/config/CustomConfigScreen.java
+**/src/main/java/dev/tr7zw/util/ComponentProvider.java
+src/main/resources/pack.mcmeta
+src/main/java/dev/tr7zw/util/ModLoaderUtil.java
+src/main/java/dev/tr7zw/util/NMSHelper.java

gradle-compose.yml

@@ -1,5 +1,5 @@
 version: '0.0.2'
-source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.20.4"
+source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master"
 replacements:
   name: "EntityCulling"
   id: "entityculling"
@@ -8,51 +8,27 @@ replacements:
   homepageUrl: "https://modrinth.com/mod/entityculling"
   sourcesUrl: "https://github.com/tr7zw/EntityCulling"
   issuesUrl: "https://github.com/tr7zw/EntityCulling/issues"
+  fabric_entrypoint: "dev.tr7zw.entityculling.EntityCullingMod"
+  fabric_modmenu_entrypoint: "none"
   relocationpackage: "dev.tr7zw.entityculling"
   dependencies: '
   	inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT"
-
-    inc project(":EntityCulling-Versionless")
   '
   licensename: "LICENSE-EntityCulling"
   modrinthid: NNAgCjsB
   curseforgeid: 448233
+  versionlessname: "EntityCulling-Versionless"
 enabledFlags:
   - autopublish
   - publishFabric
   - publishForge
   - publishNeo
   - modrinth
   - curseforge
+  - versionless
 rootProject:
   template: "."
 subProjects:
-  EntityCulling-Fabric:
-    template: "Fabric"
-  EntityCulling-Forge:
-    template: "Forge"
-    replacements:
-      dependencies: '
-        inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT"
-
-        forgeRuntimeLibrary "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT"
-
-        inc project(":EntityCulling-Versionless")
-
-        forgeRuntimeLibrary project(":EntityCulling-Versionless")
-      '
-  EntityCulling-Neo:
-    template: "Neo"
-    replacements:
-      dependencies: '
-        inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT"
-
-        forgeRuntimeLibrary "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT"
-
-        inc project(":EntityCulling-Versionless")
-
-        forgeRuntimeLibrary project(":EntityCulling-Versionless")
-      '
   EntityCulling-Versionless:
     template: "Versionless"
     replacements:

settings.json

@@ -0,0 +1,5 @@
+{
+    "versions": [
+        "1.20.5-fabric"
+    ]
+}

Shared/src/main/java/dev/tr7zw/entityculling/access/EntityRendererInter.java → src/main/java/dev/tr7zw/entityculling/access/EntityRendererInter.java

@@ -11,6 +11,6 @@ public interface EntityRendererInter<T extends Entity> {
     boolean shadowShouldShowName(T entity);
 
     void shadowRenderNameTag(T entity, Component component, PoseStack poseStack, MultiBufferSource multiBufferSource,
-            int light);
+            int light, float f);
 
 }

Shared/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java → src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java

@@ -21,15 +21,15 @@ public boolean shadowShouldShowName(T entity) {
 
     @Override
     public void shadowRenderNameTag(T entity, Component component, PoseStack poseStack,
-            MultiBufferSource multiBufferSource, int light) {
-        renderNameTag(entity, component, poseStack, multiBufferSource, light);
+            MultiBufferSource multiBufferSource, int light, float f) {
+        renderNameTag(entity, component, poseStack, multiBufferSource, light, f);
     }
 
     @Shadow
     public abstract boolean shouldShowName(T entity);
 
     @Shadow
     public abstract void renderNameTag(T entity, Component component, PoseStack poseStack,
-            MultiBufferSource multiBufferSource, int i);
+            MultiBufferSource multiBufferSource, int i, float f);
 
 }

Shared/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java → src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java

@@ -49,7 +49,7 @@ private void renderEntity(Entity entity, double cameraX, double cameraY, double
                 matrices.pushPose();
                 matrices.translate(d, e, f);
                 entityRendererInter.shadowRenderNameTag(entity, entity.getDisplayName(), matrices, vertexConsumers,
-                        this.entityRenderDispatcher.getPackedLightCoords(entity, tickDelta));
+                        this.entityRenderDispatcher.getPackedLightCoords(entity, tickDelta), tickDelta);
                 matrices.popPose();
             }
             EntityCullingModBase.instance.skippedEntities++;

Shared/src/main/resources/assets/entityculling/lang/zh_tw.json → src/main/resources/assets/entityculling/lang/zh_tw.json

@@ -1,4 +1,4 @@
-{
-    "text.entityculling.title": "EntityCulling",
-    "key.entityculling.toggle": "開關剔除除錯"
-}
+{
+    "text.entityculling.title": "EntityCulling",
+    "key.entityculling.toggle": "開關剔除除錯"
+}

versions/mainProject

@@ -0,0 +1 @@
+1.20.5-fabric