- move loot table into mod_integration folder

- add missing load condition for loot table - Register LootTableEvents.REPLACE in FD compat
f-raZ0R · Oct 7, 2024 · 2f3a155 · 2f3a155
1 parent eb201ed
commit 2f3a155
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/compat/farmersdelight/FDCompat.java b/src/main/java/de/dafuqs/spectrum/compat/farmersdelight/FDCompat.java
@@ -1,17 +1,28 @@
 package de.dafuqs.spectrum.compat.farmersdelight;
 
-import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
+import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.compat.*;
+import net.fabricmc.api.*;
+import net.fabricmc.fabric.api.loot.v2.*;
+import net.minecraft.util.*;
 
-public class FDCompat extends SpectrumIntegrationPacks.ModIntegrationPack{
-    public void register() {
-
-    }
-
-    @Environment(EnvType.CLIENT)
-    @Override
-    public void registerClient() {
-
-    }
+public class FDCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
+
+	private static final Identifier AMARANTH_LOOT_TABLE_ID = SpectrumCommon.locate("blocks/amaranth");
+
+	public void register() {
+		LootTableEvents.REPLACE.register((resourceManager, lootManager, id, original, source) -> {
+			if (AMARANTH_LOOT_TABLE_ID.equals(id)) {
+				return lootManager.getLootTable(SpectrumCommon.locate("mod_integration/farmers_delight/amaranth"));
+			}
+			return original;
+		});
+	}
+
+	@Environment(EnvType.CLIENT)
+	@Override
+	public void registerClient() {
+
+	}
+
 }
diff --git a/src/main/java/de/dafuqs/spectrum/loot/SpectrumLootPoolModifiers.java b/src/main/java/de/dafuqs/spectrum/loot/SpectrumLootPoolModifiers.java
@@ -3,12 +3,9 @@
 import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.api.energy.color.*;
 import de.dafuqs.spectrum.blocks.mob_head.*;
-import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks;
-import de.dafuqs.spectrum.compat.farmersdelight.FDCompat;
 import de.dafuqs.spectrum.compat.gofish.*;
 import de.dafuqs.spectrum.entity.type_specific_predicates.*;
 import de.dafuqs.spectrum.loot.conditions.*;
-import de.dafuqs.spectrum.recipe.titration_barrel.FermentationData;
 import de.dafuqs.spectrum.registries.*;
 import net.fabricmc.fabric.api.loot.v2.*;
 import net.minecraft.entity.passive.*;
@@ -209,13 +206,6 @@ else if (id.equals(new Identifier("gameplay/sniffer_digging"))) {
 				}
 			}
 		});
-		LootTableEvents.REPLACE.register((resourceManager, lootManager, id, original, source) -> {
-			if (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.FARMERSDELIGHT_ID) && id.equals(SpectrumCommon.locate("blocks/amaranth")))
-			{
-				return lootManager.getLootTable(SpectrumCommon.locate("blocks/amaranth_fd"));
-			}
-			return original;
-		});
 	}
 
 	private static LootPool getLootPool(TreasureHunterDropDefinition treasureHunterDropDefinition) {

diff --git a/...ctrum/loot_tables/blocks/amaranth_fd.json → ...integration/farmers_delight/amaranth.json b/...ctrum/loot_tables/blocks/amaranth_fd.json → ...integration/farmers_delight/amaranth.json
@@ -108,5 +108,13 @@
     {
       "function": "minecraft:explosion_decay"
     }
+  ],
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "farmersdelight"
+      ]
+    }
   ]
 }