Add a netherite nugget to allow recycling outputs, closes #5956

BluSunrize · Jun 18, 2024 · f5241a0 · f5241a0
1 parent 9779c0b
commit f5241a0
Show file tree

Hide file tree

Showing 18 changed files with 137 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,6 @@
 ##### Version 1.20.4-11.4.1-pre
+- Add a netherite nugget (BluSunrize)
+    - This is to allow recycling outputs of nuggets
 - Fix incorrect output on high-cetane diesel recipe (BluSunrize)
 
 ##### Version 1.20.4-11.4.0-175

diff --git a/src/api/java/blusunrize/immersiveengineering/api/IETags.java b/src/api/java/blusunrize/immersiveengineering/api/IETags.java
@@ -84,6 +84,7 @@ public class IETags
 	public static final TagKey<Item> metalRods = createItemWrapper(getRod("all_metal"));
 	public static final TagKey<Item> aluminumRod = createItemWrapper(getRod("aluminum"));
 	public static final TagKey<Item> netheriteRod = createItemWrapper(getRod("netherite"));
+	public static final TagKey<Item> netheriteNugget = createItemWrapper(getNugget("netherite"));
 	public static final TagKey<Item> seedsHemp = createItemWrapper(forgeLoc("seeds/hemp"));
 	public static final TagKey<Item> fiberHemp = createItemWrapper(forgeLoc("fiber_hemp"));
 	public static final TagKey<Item> fabricHemp = createItemWrapper(forgeLoc("fabric_hemp"));

diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/ItemModels.java b/src/datagen/java/blusunrize/immersiveengineering/data/ItemModels.java
@@ -236,6 +236,7 @@ private void createItemModels()
 				Ingredients.LIGHT_BULB, Ingredients.ELECTRON_TUBE, Ingredients.CIRCUIT_BOARD,
 				Ingredients.DUROPLAST_PLATE, Ingredients.COMPONENT_ELECTRONIC, Ingredients.COMPONENT_ELECTRONIC_ADV
 		);
+		addItemModels("metal_", Ingredients.NUGGET_NETHERITE);
 
 		addItemModels(
 				"tool_", mcLoc("item/handheld"), Tools.HAMMER, Tools.WIRECUTTER, Tools.SCREWDRIVER,

diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/recipes/IngredientRecipes.java b/src/datagen/java/blusunrize/immersiveengineering/data/recipes/IngredientRecipes.java
@@ -75,6 +75,7 @@ protected void buildRecipes(RecipeOutput out)
 				.group("sticks")
 				.unlockedBy("has_netherite_ingot", has(Tags.Items.INGOTS_NETHERITE))
 				.save(out, toRL(toPath(Ingredients.STICK_NETHERITE)));
+		add3x3Conversion(Items.NETHERITE_INGOT, Ingredients.NUGGET_NETHERITE, IETags.netheriteNugget, out);
 		shapedMisc(Ingredients.HEMP_FABRIC)
 				.pattern("fff")
 				.pattern("fsf")

diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java
@@ -97,6 +97,8 @@ protected void addTags(Provider p_256380_)
 		tag(IETags.steelRod).add(Ingredients.STICK_STEEL.get());
 		tag(IETags.aluminumRod).add(Ingredients.STICK_ALUMINUM.get());
 		tag(IETags.netheriteRod).add(Ingredients.STICK_NETHERITE.get());
+		tag(IETags.netheriteNugget).add(Ingredients.NUGGET_NETHERITE.asItem());
+		tag(Tags.Items.NUGGETS).add(Ingredients.NUGGET_NETHERITE.asItem());
 		tag(IETags.fiberHemp).add(Ingredients.HEMP_FIBER.get());
 		tag(IETags.fabricHemp).add(Ingredients.HEMP_FABRIC.get());
 		tag(IETags.coalCoke).add(Ingredients.COAL_COKE.get());

diff --git a/src/generated/resources/.cache/85b4efb209ec8df708a7c6b9a88a9ff268a8b1d0 b/src/generated/resources/.cache/85b4efb209ec8df708a7c6b9a88a9ff268a8b1d0
diff --git a/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee b/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
diff --git a/src/generated/resources/assets/immersiveengineering/models/item/nugget_netherite.json b/src/generated/resources/assets/immersiveengineering/models/item/nugget_netherite.json
diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json
diff --git a/src/generated/resources/data/forge/tags/items/nuggets/netherite.json b/src/generated/resources/data/forge/tags/items/nuggets/netherite.json
diff --git a/...veengineering/advancements/recipes/misc/crafting/netherite_ingot_to_nugget_netherite.json b/...veengineering/advancements/recipes/misc/crafting/netherite_ingot_to_nugget_netherite.json
diff --git a/...veengineering/advancements/recipes/misc/crafting/nugget_netherite_to_netherite_ingot.json b/...veengineering/advancements/recipes/misc/crafting/nugget_netherite_to_netherite_ingot.json
diff --git a/...urces/data/immersiveengineering/recipes/crafting/netherite_ingot_to_nugget_netherite.json b/...urces/data/immersiveengineering/recipes/crafting/netherite_ingot_to_nugget_netherite.json
diff --git a/...urces/data/immersiveengineering/recipes/crafting/nugget_netherite_to_netherite_ingot.json b/...urces/data/immersiveengineering/recipes/crafting/nugget_netherite_to_netherite_ingot.json
diff --git a/src/main/java/blusunrize/immersiveengineering/common/register/IEItems.java b/src/main/java/blusunrize/immersiveengineering/common/register/IEItems.java
@@ -70,6 +70,7 @@ public static final class Ingredients
 		public static final ItemRegObject<IEBaseItem> STICK_STEEL = simple("stick_steel");
 		public static final ItemRegObject<IEBaseItem> STICK_ALUMINUM = simple("stick_aluminum");
 		public static final ItemRegObject<IEBaseItem> STICK_NETHERITE = simple("stick_netherite");
+		public static final ItemRegObject<IEBaseItem> NUGGET_NETHERITE = simple("nugget_netherite");
 		public static final ItemRegObject<IEBaseItem> HEMP_FIBER = simple("hemp_fiber");
 		public static final ItemRegObject<IEBaseItem> HEMP_FABRIC = simple("hemp_fabric");
 		public static final ItemRegObject<IEBaseItem> ERSATZ_LEATHER = simple("ersatz_leather");

diff --git a/src/main/resources/assets/immersiveengineering/lang/en_us.json b/src/main/resources/assets/immersiveengineering/lang/en_us.json
@@ -1199,6 +1199,7 @@
   "item.immersiveengineering.stick_steel": "Steel Rod",
   "item.immersiveengineering.stick_aluminum": "Aluminium Rod",
   "item.immersiveengineering.stick_netherite": "Netherite Rod",
+  "item.immersiveengineering.nugget_netherite": "Netherite Nugget",
   "item.immersiveengineering.hemp_fiber": "Industrial Hemp Fiber",
   "item.immersiveengineering.hemp_fabric": "Tough Fabric",
   "item.immersiveengineering.ersatz_leather": "Ersatz Leather",

diff --git a/.../resources/assets/immersiveengineering/textures/item/metal_nugget_netherite.png b/.../resources/assets/immersiveengineering/textures/item/metal_nugget_netherite.png