1.21 Port (#113)

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}
 
       - name: build
-        run: ./gradlew build
+        run: ./gradlew build --stacktrace
       - name: capture build artifacts
         uses: actions/upload-artifact@v2
         with:

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id "com.modrinth.minotaur"
 }
 
-archivesBaseName = project.archives_base_name
+def archivesBaseName = project.archives_base_name
 version = System.getenv("MOD_VERSION")
         ? System.getenv("MOD_VERSION")
         : "0.0.0"
@@ -86,10 +86,11 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
+    def version = project.version
+    inputs.property "version", version
 
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand "version": version
     }
 }
 
@@ -158,7 +159,7 @@ tasks.withType(JavaCompile).configureEach {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}"}
+        rename { "${it}_${archivesBaseName}"}
     }
 }
 
@@ -257,9 +258,9 @@ if (System.getenv("CURSEFORGE_API_KEY") && !version.endsWith("-SNAPSHOT")) {
             changelogType = "markdown"
             delegate.changelog = changelog
 
-            addGameVersion "1.20.4"
+            addGameVersion "1.21"
             addGameVersion "NeoForge"
-            addGameVersion "Java 17"
+            addGameVersion "Java 21"
 
             mainArtifact(jar.archiveFile) {
                 displayName = "Modern Dynamics v${version}"
@@ -283,7 +284,7 @@ if (System.getenv("MODRINTH_API_KEY") && !version.endsWith("-SNAPSHOT")) {
         delegate.changelog = changelog
         versionType = releaseChannel.toUpperCase()
         uploadFile = jar.archiveFile
-        gameVersions = ["1.20.4"]
+        gameVersions = ["1.21"]
         loaders = ["neoforge"]
     }
 }

settings.gradle

@@ -5,7 +5,7 @@ pluginManagement {
     }
     plugins {
         id 'net.neoforged.moddev' version '0.1.105'
-        id 'com.diffplug.spotless' version '5.14.0'
+        id 'com.diffplug.spotless' version '6.25.0'
         id 'com.matthewprenger.cursegradle' version '1.4.0'
         id "com.modrinth.minotaur" version "2.+"
     }

src/generated/resources/data/moderndynamics/advancements/recipes/tools/wrench.json → src/generated/resources/data/moderndynamics/advancement/recipes/tools/wrench.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:iron_ingot"
-            ]
+            "items": "minecraft:iron_ingot"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/attractor.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/attractor.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:ender_pearl"
-            ]
+            "items": "minecraft:ender_pearl"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/extractor.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/extractor.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:hopper"
-            ]
+            "items": "minecraft:hopper"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/filter.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/filter.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:lapis_lazuli"
-            ]
+            "items": "minecraft:lapis_lazuli"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/fluid_pipe.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/fluid_pipe.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "items": "minecraft:copper_ingot"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/inhibitor.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/inhibitor.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "moderndynamics:item_pipe"
-            ]
+            "items": "moderndynamics:item_pipe"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/item_pipe.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/item_pipe.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:iron_ingot"
-            ]
+            "items": "minecraft:iron_ingot"
           }
         ]
       },

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/machine_extender.json → src/generated/resources/data/moderndynamics/advancement/recipes/transportation/machine_extender.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "moderndynamics:fluid_pipe"
-            ]
+            "items": "moderndynamics:fluid_pipe"
           }
         ]
       },
@@ -17,9 +15,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "moderndynamics:item_pipe"
-            ]
+            "items": "moderndynamics:item_pipe"
           }
         ]
       },

src/generated/resources/data/moderndynamics/recipes/attractor.json → src/generated/resources/data/moderndynamics/recipe/attractor.json

@@ -21,6 +21,7 @@
     " p "
   ],
   "result": {
-    "item": "moderndynamics:attractor"
+    "count": 1,
+    "id": "moderndynamics:attractor"
   }
 }

src/generated/resources/data/moderndynamics/recipes/extractor.json → src/generated/resources/data/moderndynamics/recipe/extractor.json

@@ -21,6 +21,7 @@
     " p "
   ],
   "result": {
-    "item": "moderndynamics:extractor"
+    "count": 1,
+    "id": "moderndynamics:extractor"
   }
 }

src/generated/resources/data/moderndynamics/recipes/filter.json → src/generated/resources/data/moderndynamics/recipe/filter.json

@@ -21,6 +21,7 @@
     " p "
   ],
   "result": {
-    "item": "moderndynamics:filter"
+    "count": 1,
+    "id": "moderndynamics:filter"
   }
 }

src/generated/resources/data/moderndynamics/recipes/fluid_pipe.json → src/generated/resources/data/moderndynamics/recipe/fluid_pipe.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "count": 8,
-    "item": "moderndynamics:fluid_pipe"
+    "id": "moderndynamics:fluid_pipe"
   }
 }

src/generated/resources/data/moderndynamics/recipes/inhibitor.json → src/generated/resources/data/moderndynamics/recipe/inhibitor.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "moderndynamics:inhibitor"
+    "id": "moderndynamics:inhibitor"
   }
 }

src/generated/resources/data/moderndynamics/recipes/item_pipe.json → src/generated/resources/data/moderndynamics/recipe/item_pipe.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "count": 8,
-    "item": "moderndynamics:item_pipe"
+    "id": "moderndynamics:item_pipe"
   }
 }

src/generated/resources/data/moderndynamics/recipes/machine_extender.json → src/generated/resources/data/moderndynamics/recipe/machine_extender.json

@@ -19,6 +19,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "moderndynamics:machine_extender"
+    "id": "moderndynamics:machine_extender"
   }
 }

src/generated/resources/data/moderndynamics/recipes/wrench.json → src/generated/resources/data/moderndynamics/recipe/wrench.json

@@ -15,6 +15,7 @@
     "il "
   ],
   "result": {
-    "item": "moderndynamics:wrench"
+    "count": 1,
+    "id": "moderndynamics:wrench"
   }
 }

src/main/java/dev/technici4n/moderndynamics/MdBlockEntity.java

@@ -20,6 +20,7 @@
 
 import com.google.common.base.Preconditions;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.server.level.ServerLevel;
@@ -48,42 +49,42 @@ public void sync() {
         sync(true);
     }
 
-    public abstract void toTag(CompoundTag tag);
+    public abstract void toTag(CompoundTag tag, HolderLookup.Provider registries);
 
-    public abstract void fromTag(CompoundTag tag);
+    public abstract void fromTag(CompoundTag tag, HolderLookup.Provider registries);
 
-    public abstract void toClientTag(CompoundTag tag);
+    public abstract void toClientTag(CompoundTag tag, HolderLookup.Provider registries);
 
-    public abstract void fromClientTag(CompoundTag tag);
+    public abstract void fromClientTag(CompoundTag tag, HolderLookup.Provider registries);
 
     @Override
     public final ClientboundBlockEntityDataPacket getUpdatePacket() {
         return ClientboundBlockEntityDataPacket.create(this);
     }
 
     @Override
-    public final CompoundTag getUpdateTag() {
-        CompoundTag nbt = super.getUpdateTag();
-        toClientTag(nbt);
+    public final CompoundTag getUpdateTag(HolderLookup.Provider registries) {
+        CompoundTag nbt = super.getUpdateTag(registries);
+        toClientTag(nbt, registries);
         nbt.putBoolean("#c", shouldClientRemesh); // mark client tag
         shouldClientRemesh = false;
         return nbt;
     }
 
     @Override
-    protected final void saveAdditional(CompoundTag nbt) {
-        toTag(nbt);
+    protected final void saveAdditional(CompoundTag nbt, HolderLookup.Provider registries) {
+        toTag(nbt, registries);
     }
 
     @Override
-    public final void load(CompoundTag nbt) {
+    public final void loadAdditional(CompoundTag nbt, HolderLookup.Provider registries) {
         if (nbt.contains("#c")) {
-            fromClientTag(nbt);
+            fromClientTag(nbt, registries);
             if (nbt.getBoolean("#c")) {
                 remesh();
             }
         } else {
-            fromTag(nbt);
+            fromTag(nbt, registries);
         }
     }
 

src/main/java/dev/technici4n/moderndynamics/ModernDynamics.java

@@ -37,9 +37,9 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.neoforge.event.server.ServerStoppedEvent;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
+import net.neoforged.neoforge.event.tick.ServerTickEvent;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.registries.RegisterEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -50,18 +50,16 @@ public class ModernDynamics {
 
     public ModernDynamics(IEventBus modEvents) {
         modEvents.addListener(RegisterEvent.class, this::register);
-        modEvents.addListener(RegisterPayloadHandlerEvent.class, this::registerPayloadHandler);
+        modEvents.addListener(RegisterPayloadHandlersEvent.class, this::registerPayloadHandlers);
 
         modEvents.addListener(MdBlockEntities::registerCapabilities);
         NeoForge.EVENT_BUS.addListener(ServerStoppedEvent.class, e -> {
             NetworkManager.onServerStopped();
             SimulatedInsertionTargets.clear();
         });
-        NeoForge.EVENT_BUS.addListener(TickEvent.ServerTickEvent.class, e -> {
-            if (e.phase == TickEvent.Phase.END) {
-                TickHelper.onEndTick();
-                NetworkManager.onEndTick();
-            }
+        NeoForge.EVENT_BUS.addListener(ServerTickEvent.Post.class, e -> {
+            TickHelper.onEndTick();
+            NetworkManager.onEndTick();
         });
         NeoForge.EVENT_BUS.addListener(WrenchHelper::handleEvent);
         AttachmentUpgradesLoader.setup();
@@ -88,7 +86,7 @@ private void register(RegisterEvent registerEvent) {
         }
     }
 
-    private void registerPayloadHandler(RegisterPayloadHandlerEvent e) {
+    private void registerPayloadHandlers(RegisterPayloadHandlersEvent e) {
         var registrar = e.registrar(MdId.MOD_ID);
         MdPackets.register(registrar);
     }

src/main/java/dev/technici4n/moderndynamics/attachment/AttachmentItem.java

@@ -20,6 +20,7 @@
 
 import dev.technici4n.moderndynamics.attachment.attached.AttachedAttachment;
 import dev.technici4n.moderndynamics.network.NodeHost;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;
 
@@ -31,5 +32,5 @@ public AttachmentItem(RenderedAttachment attachment) {
         this.attachment = attachment;
     }
 
-    public abstract AttachedAttachment createAttached(NodeHost host, CompoundTag configTag);
+    public abstract AttachedAttachment createAttached(NodeHost host, CompoundTag configTag, HolderLookup.Provider registries);
 }

src/main/java/dev/technici4n/moderndynamics/attachment/InhibitorAttachmentItem.java

@@ -20,6 +20,7 @@
 
 import dev.technici4n.moderndynamics.attachment.attached.AttachedInhibitor;
 import dev.technici4n.moderndynamics.network.NodeHost;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 
 public class InhibitorAttachmentItem extends AttachmentItem {
@@ -28,7 +29,7 @@ public InhibitorAttachmentItem(RenderedAttachment attachment) {
     }
 
     @Override
-    public AttachedInhibitor createAttached(NodeHost host, CompoundTag configTag) {
+    public AttachedInhibitor createAttached(NodeHost host, CompoundTag configTag, HolderLookup.Provider registries) {
         return new AttachedInhibitor(this, configTag);
     }
 }