Rolling Recipe fix & Datagen

src/generated/resources/data/createaddition/recipe/liquid_burning/biodiesel.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:biodiesel"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 24000,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:biodiesel"
+  }
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/creosote.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:creosote"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 4800,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:creosote"
+  }
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/crude_oil.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:crude_oil"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 9600,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:crude_oil"
+  }
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/diesel.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:diesel"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 24000,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:diesel"
+  }
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/ethanol.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:ethanol"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 8000,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:ethanol"
+  }
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/gasoline.json

@@ -0,0 +1,15 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "createaddition:has_fluid_tag",
+      "fluidTag": "c:gasoline"
+    }
+  ],
+  "type": "createaddition:liquid_burning",
+  "burnTime": 24000,
+  "input": {
+    "type": "fluid_tag",
+    "amount": 1000,
+    "fluid_tag": "c:gasoline"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/brass_ingot.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:ingots/brass"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:brass_rod"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/copper_ingot.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:ingots/copper"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:copper_rod"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/copper_plate.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:plates/copper"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:copper_wire"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/electrum_ingot.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:ingots/electrum"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:electrum_rod"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/electrum_plate.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:plates/electrum"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:electrum_wire"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/gold_ingot.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:ingots/gold"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:gold_rod"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/gold_plate.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:plates/gold"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:gold_wire"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/iron_ingot.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:ingots/iron"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:iron_rod"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/iron_plate.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "tag": "c:plates/iron"
+  },
+  "result": {
+    "count": 2,
+    "id": "createaddition:iron_wire"
+  }
+}

src/generated/resources/data/createaddition/recipe/rolling/straw.json

@@ -0,0 +1,10 @@
+{
+  "type": "createaddition:rolling",
+  "input": {
+    "item": "minecraft:bamboo"
+  },
+  "result": {
+    "count": 1,
+    "id": "createaddition:straw"
+  }
+}

src/main/java/com/mrh0/createaddition/blocks/rolling_mill/RollingMillBlockEntity.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.mrh0.createaddition.config.CommonConfig;
 import com.mrh0.createaddition.index.CABlockEntities;
 import com.mrh0.createaddition.index.CARecipes;
 import com.mrh0.createaddition.recipe.rolling.RollingRecipe;
@@ -23,6 +24,7 @@
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -115,13 +117,13 @@ public void tick() {
 				sendData();
 			} else {
 				lastRecipe = recipe.get().value();
-				timer = lastRecipe.getProcessingDuration();
+				timer = CommonConfig.ROLLING_MILL_PROCESSING_DURATION.get();
 				sendData();
 			}
 			return;
 		}
 
-		timer = lastRecipe.getProcessingDuration();
+		timer = CommonConfig.ROLLING_MILL_PROCESSING_DURATION.get();
 		sendData();
 	}
 
@@ -151,8 +153,7 @@ private void process() {
 		ItemStack stackInSlot = inputInv.getStackInSlot(0);
 		stackInSlot.shrink(1);
 		inputInv.setStackInSlot(0, stackInSlot);
-		lastRecipe.rollResults()
-				.forEach(stack -> ItemHandlerHelper.insertItemStacked(outputInv, stack, false));
+		ItemHandlerHelper.insertItemStacked(outputInv, lastRecipe.getResultItem().copy(), false);
 
 		sendData();
 		setChanged();
@@ -236,9 +237,9 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
 	}
 
 	public Optional<RecipeHolder<RollingRecipe>> find(RecipeWrapper inv, Level level) {
-		var sequenced = SequencedAssemblyRecipe.getRecipe(level, inv.getItem(0), CARecipes.ROLLING_TYPE.get(), RollingRecipe.class);
-		if(sequenced.isPresent()) {
-			return sequenced;
+		var recipe = level.getRecipeManager().getRecipeFor(CARecipes.ROLLING_TYPE.get(), inv, level);
+		if(recipe.isPresent()) {
+			return recipe;
 		}
 		return level.getRecipeManager().getRecipeFor(CARecipes.ROLLING_TYPE.get(), inv, level);
 	}

src/main/java/com/mrh0/createaddition/datagen/RecipeBuilders/CARollingRecipeBuilder.java

@@ -7,6 +7,7 @@
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
@@ -54,6 +55,11 @@ public CARollingRecipeBuilder require(Ingredient ingredient) {
         return this;
     }
 
+    public CARollingRecipeBuilder require(TagKey<Item> tag) {
+        this.require(Ingredient.of(tag));
+        return this;
+    }
+
     public CARollingRecipeBuilder require(ItemLike item) {
         this.require(Ingredient.of(item));
         return this;
@@ -83,7 +89,7 @@ public void save(RecipeOutput recipeOutput, ResourceLocation resourceLocation) {
 
     @Override
     public void save(RecipeOutput recipeOutput) {
-        save(recipeOutput, BuiltInRegistries.ITEM.getKey(this.result.getItem()));
+        save(recipeOutput, BuiltInRegistries.ITEM.getKey(this.result.getItem()).getPath());
     }
 
     @Override

src/main/java/com/mrh0/createaddition/datagen/RecipeBuilders/ChargingRecipeBuilder.java

@@ -98,7 +98,7 @@ public void save(RecipeOutput recipeOutput, ResourceLocation resourceLocation) {
 
     @Override
     public void save(RecipeOutput recipeOutput) {
-        save(recipeOutput, BuiltInRegistries.ITEM.getKey(this.result.getItem()));
+        save(recipeOutput, BuiltInRegistries.ITEM.getKey(this.result.getItem()).getPath());
     }
 
     @Override

src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CARollingRecipeProvider.java

@@ -1,12 +1,17 @@
 package com.mrh0.createaddition.datagen.RecipeProvider;
 
+import com.mrh0.createaddition.datagen.RecipeBuilders.CARollingRecipeBuilder;
+import com.mrh0.createaddition.index.CAItems;
 import com.mrh0.createaddition.index.CARecipes;
+import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.item.crafting.RecipeSerializer;
@@ -45,29 +50,30 @@ public CARollingRecipeProvider(PackOutput output, CompletableFuture<HolderLookup
         }
     }
 
+    private void metalRolling(@NotNull RecipeOutput output, Item rod, Item wire, String metal) {
+        CARollingRecipeBuilder.rolling(rod, 2)
+                .require(AllTags.commonItemTag("ingots/" + metal))
+                .save(output, metal + "_ingot");
+
+        CARollingRecipeBuilder.rolling(wire, 2)
+                .require(AllTags.commonItemTag("plates/" + metal))
+                .save(output, metal + "_plate");
+    }
+
     @Override
     protected void buildRecipes(@NotNull RecipeOutput output) {
-        /*
+        metalRolling(output, CAItems.COPPER_ROD.get(), CAItems.COPPER_WIRE.get(), "copper");
+        metalRolling(output, CAItems.ELECTRUM_ROD.get(), CAItems.ELECTRUM_WIRE.get(), "electrum");
+        metalRolling(output, CAItems.GOLD_ROD.get(), CAItems.GOLD_WIRE.get(), "gold");
+        metalRolling(output, CAItems.IRON_ROD.get(), CAItems.IRON_WIRE.get(), "iron");
+
+        CARollingRecipeBuilder.rolling(CAItems.BRASS_ROD.get(), 2)
+                .require(AllTags.commonItemTag("ingots/brass"))
+                .save(output, "brass_ingot");
+
         CARollingRecipeBuilder.rolling(CAItems.STRAW)
                 .require(Items.BAMBOO)
                 .save(output);
-
-        CARollingRecipeBuilder.rolling(CAItems.BRASS_ROD)
-                .require(AllItems.BRASS_INGOT)
-                .save(output);
-        CARollingRecipeBuilder.rolling(CAItems.COPPER_ROD)
-                .require(Items.COPPER_INGOT)
-                .save(output);
-        CARollingRecipeBuilder.rolling(CAItems.ELECTRUM_ROD)
-                .require(CAItems.ELECTRUM_INGOT)
-                .save(output);
-        CARollingRecipeBuilder.rolling(CAItems.IRON_ROD)
-                .require(Items.IRON_INGOT)
-                .save(output);
-        CARollingRecipeBuilder.rolling(CAItems.GOLD_ROD)
-                .require(Items.GOLD_INGOT)
-                .save(output);
-        */
     }
 
     @Override