feat: ✨ Moved Infernal Tear item to xp poitns mappings to datapack and rebalanced them

P3pp3rF1y · P3pp3rF1y · commit 7aa4d2a3a0f1 · 2026-05-07T20:56:16.000+02:00
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ loader_version_range=[4,)
 mod_id=reliquary
 mod_name=Reliquary Reincarnations
 mod_license=All Rights Reserved
-mod_version=2.0.69
+mod_version=2.0.70
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y
 mod_description=Two words: magical swag. Oh, and a gun.
diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json
@@ -1,36 +1,36 @@
 {
   "entries": [
-    "reliquary:chests/stronghold_corridor",
-    "reliquary:chests/desert_pyramid",
+    "reliquary:chests/simple_dungeon",
     "reliquary:chests/jungle_temple",
-    "reliquary:chests/village/village_weaponsmith",
-    "reliquary:chests/end_city_treasure",
+    "reliquary:chests/stronghold_corridor",
     "reliquary:chests/nether_bridge",
-    "reliquary:chests/simple_dungeon",
     "reliquary:chests/stronghold_library",
-    "reliquary:chests/igloo_chest",
+    "reliquary:chests/desert_pyramid",
+    "reliquary:chests/village/village_weaponsmith",
     "reliquary:chests/stronghold_crossing",
     "reliquary:chests/abandoned_mineshaft",
+    "reliquary:chests/end_city_treasure",
+    "reliquary:chests/igloo_chest",
     "reliquary:entities/blaze",
-    "reliquary:entities/husk",
-    "reliquary:entities/skeleton",
     "reliquary:entities/creeper",
-    "reliquary:entities/slime",
     "reliquary:entities/wither_skeleton",
-    "reliquary:entities/ghast",
-    "reliquary:entities/squid",
-    "reliquary:entities/cave_spider",
+    "reliquary:entities/husk",
+    "reliquary:entities/enderman",
     "reliquary:entities/magma_cube",
-    "reliquary:entities/snow_golem",
     "reliquary:entities/spider",
-    "reliquary:entities/zombified_piglin",
-    "reliquary:entities/guardian",
     "reliquary:entities/zombie_villager",
-    "reliquary:entities/bat",
-    "reliquary:entities/enderman",
+    "reliquary:entities/snow_golem",
+    "reliquary:entities/guardian",
+    "reliquary:entities/squid",
+    "reliquary:entities/skeleton",
+    "reliquary:entities/ghast",
     "reliquary:entities/stray",
-    "reliquary:entities/witch",
-    "reliquary:entities/zombie"
+    "reliquary:entities/cave_spider",
+    "reliquary:entities/slime",
+    "reliquary:entities/zombie",
+    "reliquary:entities/zombified_piglin",
+    "reliquary:entities/bat",
+    "reliquary:entities/witch"
   ],
   "replace": false
 }
diff --git a/src/generated/resources/data/reliquary/recipe/alkahestry/crafting/copper_ingot.json b/src/generated/resources/data/reliquary/recipe/alkahestry/crafting/copper_ingot.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:ingots/copper"
+        "tag": "c:ingots/copper"
       }
     },
     {
@@ -13,6 +13,6 @@
   ],
   "type": "reliquary:alkahestry_crafting",
   "charge": 8,
-  "ingredient": "#forge:ingots/copper",
+  "ingredient": "#c:ingots/copper",
   "result_count": 5
 }
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/blaze_rod.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/blaze_rod.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:blaze_rod",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/charcoal.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/charcoal.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:charcoal",
+  "xp": 2
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/chorus_fruit.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/chorus_fruit.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:chorus_fruit",
+  "xp": 2
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/clay.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/clay.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:clay",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/copper_ingot.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/copper_ingot.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:ingots/copper",
+  "xp": 5
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/diamond.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/diamond.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:gems/diamond",
+  "xp": 32
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/emerald.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/emerald.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:gems/emerald",
+  "xp": 16
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/end_stone.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/end_stone.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:end_stones",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/ender_pearl.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/ender_pearl.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:ender_pearl",
+  "xp": 2
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/flint.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/flint.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:flint",
+  "xp": 2
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/ghast_tear.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/ghast_tear.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:ghast_tear",
+  "xp": 8
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/gold_ingot.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/gold_ingot.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:ingots/gold",
+  "xp": 6
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/gravel.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/gravel.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:gravels",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/gunpowder.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/gunpowder.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:gunpowders",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/honeycomb.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/honeycomb.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:honeycomb",
+  "xp": 3
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/iron_ingot.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/iron_ingot.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:ingots/iron",
+  "xp": 6
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/lapis_lazuli.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/lapis_lazuli.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:gems/lapis",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/magma_cream.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/magma_cream.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:magma_cream",
+  "xp": 3
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/nether_star.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/nether_star.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:nether_stars",
+  "xp": 192
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/netherite_scrap.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/netherite_scrap.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:netherite_scrap",
+  "xp": 96
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/netherrack.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/netherrack.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:netherracks",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/obsidian.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/obsidian.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:obsidians",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/phantom_membrane.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/phantom_membrane.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:phantom_membrane",
+  "xp": 3
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/prismarine_crystals.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/prismarine_crystals.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:prismarine_crystals",
+  "xp": 4
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/prismarine_shard.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/prismarine_shard.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:prismarine_shard",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/quartz.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/quartz.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:quartz",
+  "xp": 5
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/sandstone.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/sandstone.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "#c:sandstone/blocks",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/shulker_shell.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/shulker_shell.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:shulker_shell",
+  "xp": 10
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/slime_ball.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/slime_ball.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:slime_ball",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/soul_sand.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/soul_sand.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:soul_sand",
+  "xp": 2
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/spider_eye.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/spider_eye.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:spider_eye",
+  "xp": 1
+}
diff --git a/src/generated/resources/data/reliquary/recipe/infernal_tear/wither_skeleton_skull.json b/src/generated/resources/data/reliquary/recipe/infernal_tear/wither_skeleton_skull.json
@@ -0,0 +1,5 @@
+{
+  "type": "reliquary:infernal_tear_value",
+  "ingredient": "minecraft:wither_skeleton_skull",
+  "xp": 16
+}
diff --git a/src/main/java/reliquary/Reliquary.java b/src/main/java/reliquary/Reliquary.java
@@ -13,6 +13,7 @@
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.common.NeoForgeMod;
+import net.neoforged.neoforge.event.OnDatapackSyncEvent;
 import reliquary.client.init.ModParticles;
 import reliquary.crafting.AlkahestryRecipeRegistry;
 import reliquary.data.DataGenerators;
@@ -62,10 +63,15 @@ public Reliquary(IEventBus modBus, Dist dist, ModContainer container) {
 		CommonEventHandler.registerEventBusListeners(eventBus);
 		eventBus.addListener(MobCharmRegistry::handleAddingFragmentDrops);
 		eventBus.addListener(AlkahestryRecipeRegistry::onResourceReload);
+		eventBus.addListener(Reliquary::onDatapackSync);
 
 		ModCompat.initCompats(modBus);
 	}
 
+	private static void onDatapackSync(OnDatapackSyncEvent event) {
+		event.sendRecipes(ModItems.INFERNAL_TEAR_VALUE_TYPE.get());
+	}
+
 	public static void setup(FMLCommonSetupEvent event) {
 		event.enqueueWork(ModItems::registerDispenseBehaviors);
 		PotionMap.initPotionMap();
diff --git a/src/main/java/reliquary/compat/jei/infernaltear/InfernalTearRecipeMaker.java b/src/main/java/reliquary/compat/jei/infernaltear/InfernalTearRecipeMaker.java
@@ -1,31 +1,29 @@
 package reliquary.compat.jei.infernaltear;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import reliquary.reference.Config;
+import reliquary.crafting.InfernalTearValueHelper;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 
 public class InfernalTearRecipeMaker {
 	private InfernalTearRecipeMaker() {
 	}
 
 	public static List<InfernalTearRecipe> getRecipes() {
 		ArrayList<InfernalTearRecipe> recipes = new ArrayList<>();
-
-		for (Map.Entry<String, Integer> entry : Config.COMMON.items.infernalTear.getItemExperiences().entrySet()) {
-			Item item = BuiltInRegistries.ITEM.getValue(ResourceLocation.parse(entry.getKey()));
-
-			if (item != Items.AIR) {
-				recipes.add(new InfernalTearRecipe(new ItemStack(item), entry.getValue()));
-			}
+		Minecraft minecraft = Minecraft.getInstance();
+		if (minecraft.level == null) {
+			return recipes;
 		}
 
+		InfernalTearValueHelper.getItemExperiences(minecraft.level).entrySet().stream()
+				.sorted(Comparator.comparing(entry -> BuiltInRegistries.ITEM.getKey(entry.getKey()).toString()))
+				.forEach(entry -> recipes.add(new InfernalTearRecipe(new ItemStack(entry.getKey()), entry.getValue())));
+
 		return recipes;
 	}
 }
diff --git a/src/main/java/reliquary/crafting/InfernalTearValueHelper.java b/src/main/java/reliquary/crafting/InfernalTearValueHelper.java
diff --git a/src/main/java/reliquary/crafting/InfernalTearValueRecipe.java b/src/main/java/reliquary/crafting/InfernalTearValueRecipe.java
diff --git a/src/main/java/reliquary/crafting/InfernalTearValueRecipeBuilder.java b/src/main/java/reliquary/crafting/InfernalTearValueRecipeBuilder.java
diff --git a/src/main/java/reliquary/data/ReliquaryRecipeProvider.java b/src/main/java/reliquary/data/ReliquaryRecipeProvider.java
diff --git a/src/main/java/reliquary/init/ModItems.java b/src/main/java/reliquary/init/ModItems.java
diff --git a/src/main/java/reliquary/item/InfernalTearItem.java b/src/main/java/reliquary/item/InfernalTearItem.java
diff --git a/src/main/java/reliquary/reference/Config.java b/src/main/java/reliquary/reference/Config.java
diff --git a/src/main/resources/assets/reliquary/lang/en_us.json b/src/main/resources/assets/reliquary/lang/en_us.json

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"type": "neoforge:not",`
`5`	`5`	`"value": {`
`6`	`6`	`"type": "neoforge:tag_empty",`
`7`		`- "tag": "forge:ingots/copper"`
	`7`	`+ "tag": "c:ingots/copper"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`@@ -13,6 +13,6 @@`
`13`	`13`	`],`
`14`	`14`	`"type": "reliquary:alkahestry_crafting",`
`15`	`15`	`"charge": 8,`
`16`		`- "ingredient": "#forge:ingots/copper",`
	`16`	`+ "ingredient": "#c:ingots/copper",`
`17`	`17`	`"result_count": 5`
`18`	`18`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "type": "reliquary:infernal_tear_value",
 +  "ingredient": "minecraft:blaze_rod",
 +  "xp": 4
 +}