loot & go-fish compat

Author: DaFuqs

src/main/java/de/dafuqs/spectrum/compat/gofish/GoFishCompat.java

@@ -4,45 +4,45 @@
 import net.minecraft.component.type.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
+import net.minecraft.loot.*;
 import net.minecraft.registry.*;
 import net.minecraft.registry.entry.*;
 import net.minecraft.util.*;
-import net.minecraft.world.*;
-
-import java.util.*;
 
 public class GoFishCompat {
 
-	public static final Identifier DEFAULT_CRATES_LOOT_TABLE_ID = Identifier.of("gofish", "gameplay/fishing/crates");
-	public static final Identifier NETHER_CRATES_LOOT_TABLE_ID = Identifier.of("gofish", "gameplay/fishing/nether/crates");
-	public static final Identifier END_CRATES_LOOT_TABLE_ID = Identifier.of("gofish", "gameplay/fishing/end/crates");
+	public static final String MOD_ID = "go-fish";
+	public static final String NAMESPACE = "gofish";
+	
+	public static final RegistryKey<LootTable> DEFAULT_CRATES_LOOT_TABLE_ID = lootTableKey("gameplay/fishing/crates");
+	public static final RegistryKey<LootTable> NETHER_CRATES_LOOT_TABLE_ID = lootTableKey("gameplay/fishing/nether/crates");
+	public static final RegistryKey<LootTable> END_CRATES_LOOT_TABLE_ID = lootTableKey("gameplay/fishing/end/crates");
+	
+	public static final RegistryKey<LootTable> NETHER_FISH_LOOT_TABLE_ID = lootTableKey("gameplay/fishing/nether/fish");
+	public static final RegistryKey<LootTable> END_FISH_LOOT_TABLE_ID = lootTableKey("gameplay/fishing/end/fish");
 
-	public static final Identifier NETHER_FISH_LOOT_TABLE_ID = Identifier.of("gofish", "gameplay/fishing/nether/fish");
-	public static final Identifier END_FISH_LOOT_TABLE_ID = Identifier.of("gofish", "gameplay/fishing/end/fish");
+	public static final RegistryKey<Enchantment> DEEPFRY_ENCHANTMENT_ID = RegistryKey.of(RegistryKeys.ENCHANTMENT, Identifier.of(NAMESPACE, "deepfry"));
 
-	public static final Identifier DEEPFRY_ENCHANTMENT_ID = Identifier.of("gofish", "deepfry");
+	public static RegistryKey<LootTable> lootTableKey(String id) {
+		return RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.of(NAMESPACE, id));
+	}
 
 	public static boolean isLoaded() {
-		return FabricLoader.getInstance().isModLoaded("go-fish");
+		return FabricLoader.getInstance().isModLoaded(MOD_ID);
 	}
 
-	public static boolean hasDeepfry(World world, ItemStack itemStack) {
+	public static boolean hasDeepfry(ItemStack itemStack) {
 		if (!isLoaded()) {
 			return false;
 		}
 
 		ItemEnchantmentsComponent enchantments = itemStack.getEnchantments();
 		for (RegistryEntry<Enchantment> enchantment : enchantments.getEnchantments()) {
-			if (isDeepfry(world, enchantment)) {
+			if (enchantment.matchesKey(DEEPFRY_ENCHANTMENT_ID)) {
 				return true;
 			}
 		}
 		return false;
 	}
 
-	public static boolean isDeepfry(World world, RegistryEntry<Enchantment> enchantment) {
-		Identifier id = world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getId(enchantment.value());
-		return id != null && id.equals(GoFishCompat.DEEPFRY_ENCHANTMENT_ID);
-	}
-	
 }

src/main/java/de/dafuqs/spectrum/entity/predicates/LizardPredicate.java

@@ -1,13 +1,13 @@
 package de.dafuqs.spectrum.entity.predicates;
 
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.mojang.serialization.*;
+import com.mojang.serialization.codecs.*;
 import de.dafuqs.spectrum.api.energy.color.*;
 import de.dafuqs.spectrum.entity.*;
 import de.dafuqs.spectrum.entity.entity.*;
 import de.dafuqs.spectrum.entity.variants.*;
 import net.minecraft.entity.*;
-import net.minecraft.predicate.entity.EntitySubPredicate;
+import net.minecraft.predicate.entity.*;
 import net.minecraft.server.world.*;
 import net.minecraft.util.math.*;
 import org.jetbrains.annotations.*;

src/main/java/de/dafuqs/spectrum/items/tools/SpectrumFishingRodItem.java

@@ -49,7 +49,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
 				int bigCatchLevel = SpectrumEnchantmentHelper.getLevel(drm, SpectrumEnchantments.BIG_CATCH, itemStack);
 				int serendipityReelLevel = SpectrumEnchantmentHelper.getLevel(drm, SpectrumEnchantments.SERENDIPITY_REEL, itemStack);
 				boolean inventoryInsertion = SpectrumEnchantmentHelper.getLevel(drm, SpectrumEnchantments.INVENTORY_INSERTION, itemStack) > 0;
-				boolean shouldSmeltDrops = shouldSmeltDrops(itemStack, user);
+				boolean shouldSmeltDrops = shouldSmeltDrops(itemStack);
 				spawnBobber(user, world, luckOfTheSeaLevel, lureLevel, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, shouldSmeltDrops);
 			}
 
@@ -66,8 +66,8 @@ public boolean canFishIn(FluidState fluidState) {
 		return fluidState.isIn(FluidTags.WATER);
 	}
 
-	public boolean shouldSmeltDrops(ItemStack itemStack, PlayerEntity user) {
-		return EnchantmentHelper.hasAnyEnchantmentsIn(itemStack, SpectrumEnchantmentTags.SMELTS_MORE_LOOT) || GoFishCompat.hasDeepfry(user.getWorld(), itemStack);
+	public boolean shouldSmeltDrops(ItemStack itemStack) {
+		return EnchantmentHelper.hasAnyEnchantmentsIn(itemStack, SpectrumEnchantmentTags.SMELTS_MORE_LOOT) || GoFishCompat.hasDeepfry(itemStack);
 	}
 
 	@Override

src/main/java/de/dafuqs/spectrum/loot/SpectrumLootConditionTypes.java

@@ -12,6 +12,7 @@ public class SpectrumLootFunctionTypes {
 	public static LootFunctionType<FermentRandomlyLootFunction> FERMENT_RANDOMLY = register("ferment_randomly", FermentRandomlyLootFunction.CODEC);
 	public static LootFunctionType<MergeNbtRandomlyLootFunction> MERGE_NBT_RANDOMLY = register("merge_nbt_randomly", MergeNbtRandomlyLootFunction.CODEC);
 	public static LootFunctionType<FillPotionFillableLootFunction> FILL_POTION_FILLABLE = register("fill_potion_fillable", FillPotionFillableLootFunction.CODEC);
+	public static LootFunctionType<GrantAdvancementLootFunction> GRANT_ADVANCEMENT = register("grant_advancement", GrantAdvancementLootFunction.CODEC);
 
 	private static <T extends LootFunction> LootFunctionType<T> register(String id, MapCodec<T> codec) {
 		return Registry.register(Registries.LOOT_FUNCTION_TYPE, SpectrumCommon.locate(id), new LootFunctionType<>(codec));