Merge pull request #945 from L-Lawlite/1.21.1

mrh0 · web-flow · commit b448aa9f9f25 · 2025-04-19T11:45:37.000+02:00
1.21.1
diff --git a/src/main/resources/data/createaddition/recipe/compat/tconstruct/amethyst_bronze.json b/src/main/resources/data/createaddition/recipe/compat/tconstruct/amethyst_bronze.json
@@ -10,7 +10,7 @@
   ],
   "results": [
     {
-      "item": "tconstruct:amethyst_bronze_ingot",
+      "id": "tconstruct:amethyst_bronze_ingot",
       "count": 1
     }
   ],
diff --git a/src/main/resources/data/createaddition/recipe/compat/tconstruct/blaze_blood.json b/src/main/resources/data/createaddition/recipe/compat/tconstruct/blaze_blood.json
@@ -1,10 +1,12 @@
 {
 	"type":"createaddition:liquid_burning",
 	"input": {
+		"type": "fluid_stack",
 		"fluid": "tconstruct:blazing_blood",
       	"amount": 1000
 	},
 	"burnTime": 6400,
+	"superheated": true,
 	"neoforge:conditions": [
     	{
     		"type": "neoforge:mod_loaded",
diff --git a/src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron_2.json b/src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron_2.json
@@ -48,9 +48,9 @@
     }
   ],
   "heatRequirement": "heated",
-  "conditions": [
+  "neoforge:conditions": [
     {
-    	"type": "forge:mod_loaded",
+    	"type": "neoforge:mod_loaded",
     	"modid": "tconstruct"
   	}
   ]
diff --git a/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/heavy_oil.json b/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/heavy_oil.json
@@ -1,7 +1,7 @@
 {
 	"type":"createaddition:liquid_burning",
 	"input": {
-		"type": "fluid_tag",
+		"type": "fluid_stack",
 		"fluid_tag": "thermal:heavy_oil",
 		"amount": 1000
 	},
diff --git a/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/light_oil.json b/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/light_oil.json
@@ -1,15 +1,15 @@
 {
 	"type":"createaddition:liquid_burning",
 	"input": {
-		"type": "fluid_tag",
+		"type": "fluid_stack",
 		"fluid_tag": "thermal:light_oil",
 		"amount": 1000
 	},
 	"burnTime": 9600,
-	"conditions": [
-    {
-    	"type": "forge:mod_loaded",
-    	"modid": "thermal"
-  	}
-  ]
+	"neoforge:conditions": [
+		{
+			"type": "neoforge:mod_loaded",
+			"modid": "thermal"
+		}
+	]
 }
diff --git a/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/refined_fuel.json b/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/refined_fuel.json
@@ -1,16 +1,16 @@
 {
 	"type":"createaddition:liquid_burning",
 	"input": {
-		"type": "fluid_tag",
+		"type": "fluid_stack",
 		"fluid_tag": "thermal:refined_fuel",
 		"amount": 1000
 	},
 	"burnTime": 24000,
 	"superheated": true,
-	"conditions": [
-    {
-    	"type": "forge:mod_loaded",
-    	"modid": "thermal"
-  	}
-  ]
+	"neoforge:conditions": [
+		{
+			"type": "neoforge:mod_loaded",
+			"modid": "thermal"
+		}
+	]
 }
diff --git a/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/tree_oil.json b/src/main/resources/data/createaddition/recipe/liquid_burning/compat/thermal/tree_oil.json
@@ -1,15 +1,15 @@
 {
 	"type":"createaddition:liquid_burning",
 	"input": {
-		"type": "fluid_tag",
+		"type": "fluid_stack",
 		"fluid_tag": "thermal:tree_oil",
 		"amount": 1000
 	},
 	"burnTime": 4800,
-	"conditions": [
-    {
-    	"type": "forge:mod_loaded",
-    	"modid": "thermal"
-  	}
-  ]
+	"neoforge:conditions": [
+		{
+			"type": "neoforge:mod_loaded",
+			"modid": "thermal"
+		}
+	]
 }
diff --git a/src/main/resources/data/createaddition/recipe/pressing/compat/immersiveengineering/steel_ingot.json b/src/main/resources/data/createaddition/recipe/pressing/compat/immersiveengineering/steel_ingot.json
@@ -1,13 +1,13 @@
 {
 	"type":"create:pressing",
 	"ingredients": [{
-      	"tag": "forge:ingots/steel"
+      	"tag": "c:ingots/steel"
 	}],
 	"results": [{
 		"id": "immersiveengineering:plate_steel"
 	}],
-	"conditions": [{
-		"type": "forge:mod_loaded",
+	"neoforge:conditions": [{
+		"type": "neoforge:mod_loaded",
 		"modid": "immersiveengineering"
     }]
 }
diff --git a/src/main/resources/data/createaddition/recipe/rolling/aluminum_ingot.json b/src/main/resources/data/createaddition/recipe/rolling/aluminum_ingot.json
diff --git a/src/main/resources/data/createaddition/recipe/rolling/aluminum_plate.json b/src/main/resources/data/createaddition/recipe/rolling/aluminum_plate.json
diff --git a/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/aluminum_ingot.json b/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/aluminum_ingot.json
@@ -0,0 +1,14 @@
+{
+	"type":"createaddition:rolling",
+	"input": {
+      	"tag": "c:ingots/aluminum"
+	},
+	"result": {
+		"id": "immersiveengineering:stick_aluminum",
+		"count": 2
+	},
+	"neoforge:conditions": [ {
+		"type": "neoforge:mod_loaded",
+		"modid": "immersiveengineering"
+    } ]
+}
diff --git a/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/aluminum_plate.json b/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/aluminum_plate.json
@@ -0,0 +1,14 @@
+{
+	"type":"createaddition:rolling",
+	"input": {
+      	"tag": "c:plates/aluminum"
+	},
+	"result": {
+		"id": "immersiveengineering:wire_aluminum",
+		"count": 2
+	},
+	"neoforge:conditions": [ {
+		"type": "neoforge:mod_loaded",
+		"modid": "immersiveengineering"
+	} ]
+}
diff --git a/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/lead_plate.json b/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/lead_plate.json
@@ -0,0 +1,14 @@
+{
+	"type":"createaddition:rolling",
+	"input": {
+      	"tag": "c:plates/lead"
+	},
+	"result": {
+		"id": "immersiveengineering:wire_lead",
+		"count": 2
+	},
+	"neoforge:conditions": [ {
+		"type": "neoforge:mod_loaded",
+		"modid": "immersiveengineering"
+	} ]
+}
diff --git a/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/steel_ingot.json b/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/steel_ingot.json
@@ -0,0 +1,14 @@
+{
+	"type":"createaddition:rolling",
+	"input": {
+      	"tag": "c:ingots/steel"
+	},
+	"result": {
+		"id": "immersiveengineering:stick_steel",
+		"count": 2
+	},
+	"neoforge:conditions": [ {
+		"type": "neoforge:mod_loaded",
+		"modid": "immersiveengineering"
+	} ]
+}
diff --git a/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/steel_plate.json b/src/main/resources/data/createaddition/recipe/rolling/compat/immersiveengineering/steel_plate.json
@@ -0,0 +1,14 @@
+{
+	"type":"createaddition:rolling",
+	"input": {
+      	"tag": "c:plates/steel"
+	},
+	"result": {
+		"id": "immersiveengineering:wire_steel",
+		"count": 2
+	},
+	"neoforge:conditions": [ {
+		"type": "neoforge:mod_loaded",
+		"modid": "immersiveengineering"
+	} ]
+}
diff --git a/src/main/resources/data/createaddition/recipe/rolling/lead_plate.json b/src/main/resources/data/createaddition/recipe/rolling/lead_plate.json
diff --git a/src/main/resources/data/createaddition/recipe/rolling/steel_ingot.json b/src/main/resources/data/createaddition/recipe/rolling/steel_ingot.json
diff --git a/src/main/resources/data/createaddition/recipe/rolling/steel_plate.json b/src/main/resources/data/createaddition/recipe/rolling/steel_plate.json

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`],`
`11`	`11`	`"results": [`
`12`	`12`	`{`
`13`		`- "item": "tconstruct:amethyst_bronze_ingot",`
	`13`	`+ "id": "tconstruct:amethyst_bronze_ingot",`
`14`	`14`	`"count": 1`
`15`	`15`	`}`
`16`	`16`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"type":"createaddition:liquid_burning",`
`3`	`3`	`"input": {`
	`4`	`+ "type": "fluid_stack",`
`4`	`5`	`"fluid": "tconstruct:blazing_blood",`
`5`	`6`	`"amount": 1000`
`6`	`7`	`},`
`7`	`8`	`"burnTime": 6400,`
	`9`	`+ "superheated": true,`
`8`	`10`	`"neoforge:conditions": [`
`9`	`11`	`{`
`10`	`12`	`"type": "neoforge:mod_loaded",`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@`
`48`	`48`	`}`
`49`	`49`	`],`
`50`	`50`	`"heatRequirement": "heated",`
`51`		`- "conditions": [`
	`51`	`+ "neoforge:conditions": [`
`52`	`52`	`{`
`53`		`- "type": "forge:mod_loaded",`
	`53`	`+ "type": "neoforge:mod_loaded",`
`54`	`54`	`"modid": "tconstruct"`
`55`	`55`	`}`
`56`	`56`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type":"createaddition:liquid_burning",`
`3`	`3`	`"input": {`
`4`		`- "type": "fluid_tag",`
	`4`	`+ "type": "fluid_stack",`
`5`	`5`	`"fluid_tag": "thermal:heavy_oil",`
`6`	`6`	`"amount": 1000`
`7`	`7`	`},`