move DataPackContentsMixin to common

platforms/fabric/src/main/resources/terra.fabric.mixins.json

@@ -4,7 +4,6 @@
     "package": "com.dfsek.terra.fabric.mixin",
     "compatibilityLevel": "JAVA_17",
     "mixins": [
-        "lifecycle.DataPackContentsMixin",
         "lifecycle.MinecraftServerMixin",
         "lifecycle.NoiseConfigMixin",
         "lifecycle.RegistryMixin"

platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/DataPackContentsMixin.java

@@ -1,31 +0,0 @@
-package com.dfsek.terra.forge.mixin.lifecycle;
-
-import com.dfsek.terra.forge.util.BiomeUtil;
-import com.dfsek.terra.mod.util.MinecraftUtil;
-
-import com.dfsek.terra.mod.util.TagUtil;
-
-import net.minecraft.server.DataPackContents;
-import net.minecraft.util.registry.DynamicRegistryManager;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-
-@Mixin(DataPackContents.class)
-public class DataPackContentsMixin {
-    /*
-     * #refresh populates all tags in the registries
-     */
-    @Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN"))
-    private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
-        TagUtil.registerWorldPresetTags(dynamicRegistryManager.get(Registry.WORLD_PRESET_KEY));
-        
-        Registry<Biome> biomeRegistry = dynamicRegistryManager.get(Registry.BIOME_KEY);
-        TagUtil.registerBiomeTags(biomeRegistry);
-        MinecraftUtil.registerFlora(biomeRegistry);
-    }
-}

platforms/forge/src/main/resources/terra.forge.mixins.json

@@ -4,7 +4,6 @@
     "package": "com.dfsek.terra.forge.mixin",
     "compatibilityLevel": "JAVA_17",
     "mixins": [
-      "lifecycle.DataPackContentsMixin",
       "lifecycle.NoiseConfigMixin"
     ],
     "client": [

platforms/mod-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin.lifecycle;
+package com.dfsek.terra.mod.mixin.lifecycle;
 
 import com.dfsek.terra.mod.util.TagUtil;
 import com.dfsek.terra.mod.util.MinecraftUtil;

platforms/mod-common/src/main/resources/terra.common.mixins.json

@@ -1,46 +1,47 @@
 {
-    "required": true,
+  "required": true,
-    "minVersion": "0.8",
+  "minVersion": "0.8",
-    "package": "com.dfsek.terra.mod.mixin",
+  "package": "com.dfsek.terra.mod.mixin",
-    "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_17",
-    "mixins": [
+  "mixins": [
-        "access.MobSpawnerLogicAccessor",
+    "access.MobSpawnerLogicAccessor",
-        "access.StateAccessor",
+    "access.StateAccessor",
-        "access.StructureAccessorAccessor",
+    "access.StructureAccessorAccessor",
-        "fix.BeeMoveGoalsUnsynchronizedRandomAccessFix",
+    "fix.BeeMoveGoalsUnsynchronizedRandomAccessFix",
-        "fix.NetherFossilOptimization",
+    "fix.NetherFossilOptimization",
-        "implementations.compat.GenerationSettingsFloraFeaturesMixin",
+    "implementations.compat.GenerationSettingsFloraFeaturesMixin",
-        "implementations.terra.BiomeMixin",
+    "implementations.terra.BiomeMixin",
-        "implementations.terra.HandleImplementationMixin",
+    "implementations.terra.HandleImplementationMixin",
-        "implementations.terra.block.BlockMixin",
+    "implementations.terra.block.BlockMixin",
-        "implementations.terra.block.entity.BlockEntityMixin",
+    "implementations.terra.block.entity.BlockEntityMixin",
-        "implementations.terra.block.entity.LootableContainerBlockEntityMixin",
+    "implementations.terra.block.entity.LootableContainerBlockEntityMixin",
-        "implementations.terra.block.entity.MobSpawnerBlockEntityMixin",
+    "implementations.terra.block.entity.MobSpawnerBlockEntityMixin",
-        "implementations.terra.block.entity.SignBlockEntityMixin",
+    "implementations.terra.block.entity.SignBlockEntityMixin",
-        "implementations.terra.block.state.BlockStateMixin",
+    "implementations.terra.block.state.BlockStateMixin",
-        "implementations.terra.block.state.PropertyMixin",
+    "implementations.terra.block.state.PropertyMixin",
-        "implementations.terra.chunk.ChunkRegionMixin",
+    "implementations.terra.chunk.ChunkRegionMixin",
-        "implementations.terra.chunk.WorldChunkMixin",
+    "implementations.terra.chunk.WorldChunkMixin",
-        "implementations.terra.chunk.data.ProtoChunkMixin",
+    "implementations.terra.chunk.data.ProtoChunkMixin",
-        "implementations.terra.entity.EntityMixin",
+    "implementations.terra.entity.EntityMixin",
-        "implementations.terra.entity.EntityTypeMixin",
+    "implementations.terra.entity.EntityTypeMixin",
-        "implementations.terra.entity.PlayerEntityMixin",
+    "implementations.terra.entity.PlayerEntityMixin",
-        "implementations.terra.entity.ServerCommandSourceMixin",
+    "implementations.terra.entity.ServerCommandSourceMixin",
-        "implementations.terra.inventory.LockableContainerBlockEntityMixin",
+    "implementations.terra.inventory.LockableContainerBlockEntityMixin",
-        "implementations.terra.inventory.item.ItemMixin",
+    "implementations.terra.inventory.item.ItemMixin",
-        "implementations.terra.inventory.item.ItemStackMixin",
+    "implementations.terra.inventory.item.ItemStackMixin",
-        "implementations.terra.inventory.meta.EnchantmentMixin",
+    "implementations.terra.inventory.meta.EnchantmentMixin",
-        "implementations.terra.inventory.meta.ItemStackDamageableMixin",
+    "implementations.terra.inventory.meta.ItemStackDamageableMixin",
-        "implementations.terra.inventory.meta.ItemStackMetaMixin",
+    "implementations.terra.inventory.meta.ItemStackMetaMixin",
-        "implementations.terra.world.ChunkRegionMixin",
+    "implementations.terra.world.ChunkRegionMixin",
-        "implementations.terra.world.ServerWorldMixin"
+    "implementations.terra.world.ServerWorldMixin",
-    ],
+    "lifecycle.DataPackContentsMixin"
-    "client": [
+  ],
-    ],
+  "client": [
-    "server": [
+  ],
-    ],
+  "server": [
-    "injectors": {
+  ],
-        "defaultRequire": 1
+  "injectors": {
-    },
+    "defaultRequire": 1
-    "refmap": "terra-common-refmap.json"
+  },
+  "refmap": "terra-common-refmap.json"
 }