do tag stuff at proper time

2026-04-04 23:06:05 +00:00 · 2022-04-04 16:30:29 -07:00
parent 60ead9f7a0
commit b4d34589d8
2 changed files with 77 additions and 48 deletions
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
@@ -0,0 +1,28 @@
+package com.dfsek.terra.fabric.mixin.lifecycle;
+
+import com.dfsek.terra.fabric.util.FabricUtil;
+
+import net.minecraft.server.DataPackContents;
+import net.minecraft.util.registry.DynamicRegistryManager;
+import net.minecraft.util.registry.Registry;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+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 {
+    @Shadow
+    @Final
+    private static Logger LOGGER;
+    
+    @Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN"))
+    private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
+        LOGGER.info("Doing tag garbage....");
+        FabricUtil.registerTags(dynamicRegistryManager.get(Registry.BIOME_KEY));
+    }
+}
--- a/platforms/fabric/src/main/resources/terra.mixins.json
+++ b/platforms/fabric/src/main/resources/terra.mixins.json
@@ -1,50 +1,51 @@
 {
-    "required": true,
-    "minVersion": "0.8",
-    "package": "com.dfsek.terra.fabric.mixin",
-    "compatibilityLevel": "JAVA_16",
-    "mixins": [
-        "access.BiomeEffectsAccessor",
-        "access.MobSpawnerLogicAccessor",
-        "access.StateAccessor",
-        "access.StructureAccessorAccessor",
-        "implementations.BiomeMixin",
-        "implementations.HandleImplementationMixin",
-        "implementations.block.BlockMixin",
-        "implementations.block.entity.BlockEntityMixin",
-        "implementations.block.entity.LootableContainerBlockEntityMixin",
-        "implementations.block.entity.MobSpawnerBlockEntityMixin",
-        "implementations.block.entity.SignBlockEntityMixin",
-        "implementations.block.state.BlockStateMixin",
-        "implementations.block.state.PropertyMixin",
-        "implementations.chunk.ChunkRegionMixin",
-        "implementations.chunk.WorldChunkMixin",
-        "implementations.chunk.data.ProtoChunkMixin",
-        "implementations.entity.EntityMixin",
-        "implementations.entity.EntityTypeMixin",
-        "implementations.entity.PlayerEntityMixin",
-        "implementations.entity.ServerCommandSourceMixin",
-        "implementations.inventory.LockableContainerBlockEntityMixin",
-        "implementations.inventory.item.ItemMixin",
-        "implementations.inventory.item.ItemStackMixin",
-        "implementations.inventory.meta.EnchantmentMixin",
-        "implementations.inventory.meta.ItemStackDamageableMixin",
-        "implementations.inventory.meta.ItemStackMetaMixin",
-        "implementations.world.ChunkRegionMixin",
-        "implementations.world.ServerWorldMixin",
-        "lifecycle.ChunkGenerator_ChunkGeneratorRegistrationMixin",
-        "lifecycle.MinecraftServerMixin"
-    ],
-    "client": [
-        "access.GeneratorTypeAccessor",
-        "lifecycle.client.MinecraftClientMixin"
-    ],
-    "server": [
-        "lifecycle.server.GeneratorOptionsMixin",
-        "lifecycle.server.ServerMainMixin"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    },
-    "refmap": "terra-refmap.json"
+  "required": true,
+  "minVersion": "0.8",
+  "package": "com.dfsek.terra.fabric.mixin",
+  "compatibilityLevel": "JAVA_16",
+  "mixins": [
+    "access.BiomeEffectsAccessor",
+    "access.MobSpawnerLogicAccessor",
+    "access.StateAccessor",
+    "access.StructureAccessorAccessor",
+    "implementations.BiomeMixin",
+    "implementations.HandleImplementationMixin",
+    "implementations.block.BlockMixin",
+    "implementations.block.entity.BlockEntityMixin",
+    "implementations.block.entity.LootableContainerBlockEntityMixin",
+    "implementations.block.entity.MobSpawnerBlockEntityMixin",
+    "implementations.block.entity.SignBlockEntityMixin",
+    "implementations.block.state.BlockStateMixin",
+    "implementations.block.state.PropertyMixin",
+    "implementations.chunk.ChunkRegionMixin",
+    "implementations.chunk.WorldChunkMixin",
+    "implementations.chunk.data.ProtoChunkMixin",
+    "implementations.entity.EntityMixin",
+    "implementations.entity.EntityTypeMixin",
+    "implementations.entity.PlayerEntityMixin",
+    "implementations.entity.ServerCommandSourceMixin",
+    "implementations.inventory.LockableContainerBlockEntityMixin",
+    "implementations.inventory.item.ItemMixin",
+    "implementations.inventory.item.ItemStackMixin",
+    "implementations.inventory.meta.EnchantmentMixin",
+    "implementations.inventory.meta.ItemStackDamageableMixin",
+    "implementations.inventory.meta.ItemStackMetaMixin",
+    "implementations.world.ChunkRegionMixin",
+    "implementations.world.ServerWorldMixin",
+    "lifecycle.ChunkGenerator_ChunkGeneratorRegistrationMixin",
+    "lifecycle.DataPackContentsMixin",
+    "lifecycle.MinecraftServerMixin"
+  ],
+  "client": [
+    "access.GeneratorTypeAccessor",
+    "lifecycle.client.MinecraftClientMixin"
+  ],
+  "server": [
+    "lifecycle.server.GeneratorOptionsMixin",
+    "lifecycle.server.ServerMainMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "refmap": "terra-refmap.json"
 }