Backport to 1.19.4 and 1.19.3

tr7zw · Aug 28, 2024 · ebd2410 · ebd2410
1 parent 1c96819
commit ebd2410
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 2 deletions.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -20,6 +20,80 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: 'versions/**/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+      - name: Publish-1.19.3-forge-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 448233
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.19.3 - Forge
+          version-type: beta
+          files: 'versions/1.19.3-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.3
+      - name: Publish-1.19.3-forge-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: NNAgCjsB
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.19.3 - Forge
+          files: 'versions/1.19.3-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.3
+      - name: Publish-1.19.3-fabric-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 448233
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.19.3 - Fabric
+          files: 'versions/1.19.3-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.3
+      - name: Publish-1.19.3-fabric-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: NNAgCjsB
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.19.3 - Fabric
+          files: 'versions/1.19.3-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.3
+      - name: Publish-1.19.4-forge-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 448233
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.19.4 - Forge
+          version-type: beta
+          files: 'versions/1.19.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.4
+      - name: Publish-1.19.4-forge-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: NNAgCjsB
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.19.4 - Forge
+          files: 'versions/1.19.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.4
+      - name: Publish-1.19.4-fabric-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 448233
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.19.4 - Fabric
+          files: 'versions/1.19.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.4
+      - name: Publish-1.19.4-fabric-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: NNAgCjsB
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.19.4 - Fabric
+          files: 'versions/1.19.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.19.4
       - name: Publish-1.20.1-forge-Curseforge
         uses: Kir-Antipov/[email protected]
         with:

diff --git a/settings.json b/settings.json
@@ -1,5 +1,9 @@
 {
     "versions": [
+        "1.19.3-forge",
+        "1.19.3-fabric",
+        "1.19.4-forge",
+        "1.19.4-fabric",
         "1.20.1-forge",
         "1.20.1-fabric",
         "1.20.2-forge",

diff --git a/src/main/java/dev/tr7zw/entityculling/CullTask.java b/src/main/java/dev/tr7zw/entityculling/CullTask.java
@@ -93,7 +93,8 @@ private void cullEntities(Vec3 cameraMC, Vec3d camera) {
                        // overhead probably than trying to sync stuff up for no really good reason
             }
             if (entity == null) {
-                // assume the iterator is broken, cancel the loop https://github.com/tr7zw/EntityCulling/issues/168
+                // assume the iterator is broken, cancel the loop
+                // https://github.com/tr7zw/EntityCulling/issues/168
                 break;
             }
             if (!(entity instanceof Cullable)) {
@@ -150,7 +151,8 @@ private void cullBlockEntities(Vec3 cameraMC, Vec3d camera) {
                                // overhead probably than trying to sync stuff up for no really good reason
                     }
                     if (entry == null) {
-                        // assume the iterator is broken, cancel the loop https://github.com/tr7zw/EntityCulling/issues/168
+                        // assume the iterator is broken, cancel the loop
+                        // https://github.com/tr7zw/EntityCulling/issues/168
                         break;
                     }
                     if (blockEntityWhitelist.contains(entry.getValue().getType())) {