Backport current build to 1.20.4-1.20.1

tr7zw · May 25, 2024 · e3f58c8 · e3f58c8
1 parent ac8bee1
commit e3f58c8
Show file tree

Hide file tree

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

diff --git a/settings.json b/settings.json
@@ -1,5 +1,13 @@
 {
     "versions": [
+        "1.20.1-forge",
+        "1.20.1-fabric",
+        "1.20.2-forge",
+        "1.20.2-neoforge",
+        "1.20.2-fabric",
+        "1.20.4-forge",
+        "1.20.4-neoforge",
+        "1.20.4-fabric",
         "1.20.6-forge",
         "1.20.6-neoforge",
         "1.20.6-fabric"

diff --git a/src/main/java/dev/tr7zw/entityculling/EntityCullingMod.java b/src/main/java/dev/tr7zw/entityculling/EntityCullingMod.java
@@ -9,13 +9,18 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 //#elseif NEOFORGE
+//#if MC >= 12005
+//$$ import net.neoforged.neoforge.client.event.ClientTickEvent;
+//$$ import net.neoforged.neoforge.event.tick.LevelTickEvent;
+//#else
+//$$ import net.neoforged.neoforge.event.TickEvent.ClientTickEvent;
+//$$ import net.neoforged.neoforge.event.TickEvent.LevelTickEvent;
+//#endif
 //$$ import net.neoforged.fml.IExtensionPoint;
 //$$ import net.neoforged.fml.ModLoadingContext;
 //$$ import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 //$$ import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
-//$$ import net.neoforged.neoforge.client.event.ClientTickEvent;
 //$$ import net.neoforged.neoforge.common.NeoForge;
-//$$ import net.neoforged.neoforge.event.tick.LevelTickEvent;
 //#else
 //$$ import net.minecraftforge.common.MinecraftForge;
 //$$ import net.minecraftforge.event.TickEvent.ClientTickEvent;
@@ -72,15 +77,15 @@ public void initModloader() {
     //#endif
   //$$    }
   //$$
-    //#if NEOFORGE
+    //#if NEOFORGE && MC >= 12005
   //$$    private void doClientTick(ClientTickEvent.Pre event) {
     //#else
   //$$    private void doClientTick(ClientTickEvent event) {
     //#endif
   //$$       this.clientTick();
   //$$    }
   //$$
-  //#if NEOFORGE
+  //#if NEOFORGE && MC >= 12005
   //$$   private void doWorldTick(LevelTickEvent.Pre event) {
   //#else
   //$$   private void doWorldTick(LevelTickEvent event) {

diff --git a/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java
@@ -22,14 +22,28 @@ public boolean shadowShouldShowName(T entity) {
     @Override
     public void shadowRenderNameTag(T entity, Component component, PoseStack poseStack,
             MultiBufferSource multiBufferSource, int light, float f) {
-        renderNameTag(entity, component, poseStack, multiBufferSource, light, f);
+        renderNameTag(entity, component, poseStack, multiBufferSource, light
+        // spotless:off
+                //#if MC >= 12005
+                    , f);
+                //#else
+                //$$);
+                //#endif
+                //spotless:on
     }
 
     @Shadow
     public abstract boolean shouldShowName(T entity);
 
     @Shadow
     public abstract void renderNameTag(T entity, Component component, PoseStack poseStack,
-            MultiBufferSource multiBufferSource, int i, float f);
+            MultiBufferSource multiBufferSource, int i
+            // spotless:off
+          //#if MC >= 12005
+            , float f);
+          //#else
+          //$$);
+          //#endif
+          //spotless:on
 
 }