maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #235 from YesVRC/1.20.1

Browse Source 
Fixes for #232
This commit is contained in:
DrMangoTea
2025-09-18 23:44:38 +02:00
committed by GitHub
parent 22748959e0 c2c51abe97
commit fab00f0fda
20 changed files with 26 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541
View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-07-24T14:48:59.5659809 TFMG's Processing Recipes
// 1.20.1 2025-08-19T11:46:11.8907784 TFMG's Processing Recipes
ae24d73a2ef5b8059806e660641bcb9dff2a15f4 data/tfmg/recipes/coking/charcoal.json
9000fbf96dc2c2b822aa4e526b1c8686d5413e5a data/tfmg/recipes/coking/coal.json
2b33a020ed88511979447005053ceea2b3ff3c08 data/tfmg/recipes/compacting/bitumen.json
@@ -18,9 +18,9 @@ d95d95710ffd322ba1248f8fd305c58c09f05c3c data/tfmg/recipes/crushing/raw_lithium_
8a83ba25a8412f503d750c73dd8b5c5e9fdb063f data/tfmg/recipes/crushing/slag_block.json
f218b0fa35bdb632066225082134f6ba297d49fb data/tfmg/recipes/crushing/sulfur.json
c4023ecc489f52b2b08eb6d8bdfdcea87a185a56 data/tfmg/recipes/deploying/coated_circuit_board.json
55a40ebeb7612a9ba4a938e18adcfe6da4388fff data/tfmg/recipes/distillation/crude_oil.json
c53735f5bedbc3e6fd8c03f2dcc18047e9391d6a data/tfmg/recipes/distillation/crude_oil_light_distillation.json
2ef242c09ecf8dc0dbd554dac9ec924b65bdd17d data/tfmg/recipes/distillation/crude_oil_no_naphtha.json
3906cf193eb9d1b3747e3bfe37d60da4dabd5860 data/tfmg/recipes/distillation/crude_oil.json
86b54781380e759cf4c5eb7cb6dcd1944e769a43 data/tfmg/recipes/distillation/crude_oil_light_distillation.json
5d72fedf5882b6a6e75513f085e1edfc27fbc637 data/tfmg/recipes/distillation/crude_oil_no_naphtha.json
8c80e612bd4187241a90e40c68241826e222b1c3 data/tfmg/recipes/distillation/heavy_oil.json
001bc3e8ddeb2fc3d633faf873553157b5c1878c data/tfmg/recipes/distillation/heavy_oil_light_distillation.json
e4b71e1cfabc347dccef6426d722bb6369f018e6 data/tfmg/recipes/distillation/heavy_oil_no_naphtha.json

4
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View File

@@ -1,9 +1,9 @@
// 1.20.1 2025-06-02T17:55:45.0307406 Recipes
// 1.20.1 2025-08-19T12:15:05.6622524 Recipes
8e18331462285f0f09e5897f4cd797c89b6ffc23 data/tfmg/recipes/sequenced_assembly/capacitor.json
782800c146c9d0485149cf0c1c552274ca6e78da data/tfmg/recipes/sequenced_assembly/generator.json
1ec9510103d905de21001b87c64f4d4db0a9299f data/tfmg/recipes/sequenced_assembly/heavy_plate.json
3dcce4adf59b0d9041fb7dd8316223af1696ec81 data/tfmg/recipes/sequenced_assembly/motor.json
6943441658b1aa9175e6dce859896609b2d7aa28 data/tfmg/recipes/sequenced_assembly/potentiometer.json
fa180f8f12a0e27125b0eae636afdd7c0309b1be data/tfmg/recipes/sequenced_assembly/steel_mechanism.json
a2b2311863219150397b12d30d84e12113ba3dd2 data/tfmg/recipes/sequenced_assembly/steel_mechanism.json
70be470bb0b72de21713f1c0e08a529780a199c0 data/tfmg/recipes/sequenced_assembly/transistor.json
cdf0bd7304a854c1db7e9caf65e1490b146931c5 data/tfmg/recipes/sequenced_assembly/unfinished_circuit_board.json

4
src/generated/resources/.cache/a4f054e33f64259067ca26a447a1fd4d4705e7dd
View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-07-09T18:18:33.1137676 TFMG's Recipes
// 1.20.1 2025-08-19T11:46:11.8917904 TFMG's Recipes
9195362b7e061e947c4de657ce3b7c49c1e271d1 data/tfmg/advancements/recipes/misc/blasting/lead_ingot_blasting.json
14f26d532b7adf630370bfc99bf32a0ce4dc7e77 data/tfmg/advancements/recipes/misc/blasting/lead_ingot_from_crushed_blasting.json
c918937eba17a031abe7355ef190d20cc1e41f3c data/tfmg/advancements/recipes/misc/blasting/lithium_ingot_blasting.json
@@ -299,7 +299,7 @@ cb579a4ab0ff4bc8d843e78fe3ec0f5b3267d0ee data/tfmg/recipes/casting/cinderblock.j
b8046892f4b2e40ef25f4d7f6e6be5d6cc02ee70 data/tfmg/recipes/casting/plastic_sheet.json
4ca0426d93219655bbff0c359a5cc9c3ea9201ff data/tfmg/recipes/casting/silicon.json
02ad3d1f8c3fa29349d2a48216146b05e30f2060 data/tfmg/recipes/casting/slag_block.json
bcc188834b31ab695c9dd610e06d17707f5167a9 data/tfmg/recipes/casting/steel.json
51400cd773409554cd8f841948ed7f0aa4709546 data/tfmg/recipes/casting/steel.json
3032d7f8ddeda567a78664d6a8574f656263113e data/tfmg/recipes/crafting/kinetics/accumulator.json
5a862ab9f6982644f1452df3ef0fa130b57adf2d data/tfmg/recipes/crafting/kinetics/accumulatorfrom_lithium.json
7f965b40cda04e83d51b0e388b6e5a364f5affdb data/tfmg/recipes/crafting/kinetics/air_intake.json

4
src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9
View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-07-24T14:48:59.5355109 Registrate Provider for tfmg [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.20.1 2025-08-19T11:21:09.9744599 Registrate Provider for tfmg [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
ff5a5721633b83465ab501cbdfdc579a0f20e938 assets/tfmg/blockstates/accumulator.json
e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json
e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json
@@ -139,7 +139,7 @@ e6c37a1b35654860e8e7bce70c17bb9c463cbcf0 assets/tfmg/blockstates/cyan_caution_bl
da3ce72a164ba44b83d2e0a34aba7a2e0bf1f7e0 assets/tfmg/blockstates/deepslate_lead_ore.json
29fabca149c689611b3066ffd546b48e305b795b assets/tfmg/blockstates/deepslate_lithium_ore.json
0c1f4a179de5361677ab6a190f3b3279374dfdf0 assets/tfmg/blockstates/deepslate_nickel_ore.json
c9291b06874778c72b970c234fdf7b48cbc443cb assets/tfmg/blockstates/diagonal_cable_block.json
b893f9afd6bd02e680fcc301ec1d7ad5c790f1b0 assets/tfmg/blockstates/diagonal_cable_block.json
03983ce3de10310cd75b98f17c9161653b7034cd assets/tfmg/blockstates/diesel.json
9e5371b956a65a7a49581208e331ee1fc8b8acc2 assets/tfmg/blockstates/electrical_switch.json
fce44cbe5ec7bc7ec527327088be37cea56ac85c assets/tfmg/blockstates/electric_diode.json

3
src/generated/resources/data/tfmg/recipes/casting/steel.json
View File

@@ -3,8 +3,7 @@
"ingredients": [
{
"amount": 144,
"fluid": "tfmg:molten_steel",
"nbt": {}
"fluidTag": "forge:molten_steel"
}
],
"processingTime": 200,

3
src/generated/resources/data/tfmg/recipes/distillation/crude_oil.json
View File

@@ -3,8 +3,7 @@
"ingredients": [
{
"amount": 340,
"fluid": "tfmg:crude_oil",
"nbt": {}
"fluidTag": "forge:crude_oil"
}
],
"results": [

3
src/generated/resources/data/tfmg/recipes/distillation/crude_oil_light_distillation.json
View File

@@ -3,8 +3,7 @@
"ingredients": [
{
"amount": 200,
"fluid": "tfmg:crude_oil",
"nbt": {}
"fluidTag": "forge:crude_oil"
}
],
"results": [

3
src/generated/resources/data/tfmg/recipes/distillation/crude_oil_no_naphtha.json
View File

@@ -3,8 +3,7 @@
"ingredients": [
{
"amount": 330,
"fluid": "tfmg:crude_oil",
"nbt": {}
"fluidTag": "forge:crude_oil"
}
],
"results": [

4
src/generated/resources/data/tfmg/recipes/sequenced_assembly/steel_mechanism.json
View File

@@ -42,7 +42,7 @@
"item": "tfmg:unfinished_steel_mechanism"
},
{
"item": "tfmg:nickel_sheet"
"tag": "forge:plates/nickel"
}
],
"results": [
@@ -74,7 +74,7 @@
"item": "tfmg:unfinished_steel_mechanism"
},
{
"item": "tfmg:lead_sheet"
"tag": "forge:plates/lead"
}
],
"results": [

21
src/generated/resources/data/tfmg/tags/blocks/concrete/concrete.json
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:concrete",
"tfmg:white_concrete",
"tfmg:blue_concrete",
"tfmg:light_blue_concrete",
"tfmg:red_concrete",
"tfmg:green_concrete",
"tfmg:lime_concrete",
"tfmg:pink_concrete",
"tfmg:magenta_concrete",
"tfmg:yellow_concrete",
"tfmg:gray_concrete",
"tfmg:light_gray_concrete",
"tfmg:brown_concrete",
"tfmg:cyan_concrete",
"tfmg:purple_concrete",
"tfmg:orange_concrete",
"tfmg:black_concrete"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/concrete_slabs
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:concrete_slabs",
"tfmg:white_concrete_slabs",
"tfmg:blue_concrete_slabs",
"tfmg:light_blue_concrete_slabs",
"tfmg:red_concrete_slabs",
"tfmg:green_concrete_slabs",
"tfmg:lime_concrete_slabs",
"tfmg:pink_concrete_slabs",
"tfmg:magenta_concrete_slabs",
"tfmg:yellow_concrete_slabs",
"tfmg:gray_concrete_slabs",
"tfmg:light_gray_concrete_slabs",
"tfmg:brown_concrete_slabs",
"tfmg:cyan_concrete_slabs",
"tfmg:purple_concrete_slabs",
"tfmg:orange_concrete_slabs",
"tfmg:black_concrete_slabs"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/concrete_stairs
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:concrete_stairs",
"tfmg:white_concrete_stairs",
"tfmg:blue_concrete_stairs",
"tfmg:light_blue_concrete_stairs",
"tfmg:red_concrete_stairs",
"tfmg:green_concrete_stairs",
"tfmg:lime_concrete_stairs",
"tfmg:pink_concrete_stairs",
"tfmg:magenta_concrete_stairs",
"tfmg:yellow_concrete_stairs",
"tfmg:gray_concrete_stairs",
"tfmg:light_gray_concrete_stairs",
"tfmg:brown_concrete_stairs",
"tfmg:cyan_concrete_stairs",
"tfmg:purple_concrete_stairs",
"tfmg:orange_concrete_stairs",
"tfmg:black_concrete_stairs"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/concrete_walls
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:concrete_walls",
"tfmg:white_concrete_walls",
"tfmg:blue_concrete_walls",
"tfmg:light_blue_concrete_walls",
"tfmg:red_concrete_walls",
"tfmg:green_concrete_walls",
"tfmg:lime_concrete_walls",
"tfmg:pink_concrete_walls",
"tfmg:magenta_concrete_walls",
"tfmg:yellow_concrete_walls",
"tfmg:gray_concrete_walls",
"tfmg:light_gray_concrete_walls",
"tfmg:brown_concrete_walls",
"tfmg:cyan_concrete_walls",
"tfmg:purple_concrete_walls",
"tfmg:orange_concrete_walls",
"tfmg:black_concrete_walls"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/rebar_concrete.json
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:rebar_concrete",
"tfmg:white_rebar_concrete",
"tfmg:blue_rebar_concrete",
"tfmg:light_blue_rebar_concrete",
"tfmg:red_rebar_concrete",
"tfmg:green_rebar_concrete",
"tfmg:lime_rebar_concrete",
"tfmg:pink_rebar_concrete",
"tfmg:magenta_rebar_concrete",
"tfmg:yellow_rebar_concrete",
"tfmg:gray_rebar_concrete",
"tfmg:light_gray_rebar_concrete",
"tfmg:brown_rebar_concrete",
"tfmg:cyan_rebar_concrete",
"tfmg:purple_rebar_concrete",
"tfmg:orange_rebar_concrete",
"tfmg:black_rebar_concrete"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/rebar_concrete_slabs
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:rebar_concrete_slabs",
"tfmg:white_rebar_concrete_slabs",
"tfmg:blue_rebar_concrete_slabs",
"tfmg:light_blue_rebar_concrete_slabs",
"tfmg:red_rebar_concrete_slabs",
"tfmg:green_rebar_concrete_slabs",
"tfmg:lime_rebar_concrete_slabs",
"tfmg:pink_rebar_concrete_slabs",
"tfmg:magenta_rebar_concrete_slabs",
"tfmg:yellow_rebar_concrete_slabs",
"tfmg:gray_rebar_concrete_slabs",
"tfmg:light_gray_rebar_concrete_slabs",
"tfmg:brown_rebar_concrete_slabs",
"tfmg:cyan_rebar_concrete_slabs",
"tfmg:purple_rebar_concrete_slabs",
"tfmg:orange_rebar_concrete_slabs",
"tfmg:black_rebar_concrete_slabs"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/rebar_concrete_stairs
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:rebar_concrete_stairs",
"tfmg:white_rebar_concrete_stairs",
"tfmg:blue_rebar_concrete_stairs",
"tfmg:light_blue_rebar_concrete_stairs",
"tfmg:red_rebar_concrete_stairs",
"tfmg:green_rebar_concrete_stairs",
"tfmg:lime_rebar_concrete_stairs",
"tfmg:pink_rebar_concrete_stairs",
"tfmg:magenta_rebar_concrete_stairs",
"tfmg:yellow_rebar_concrete_stairs",
"tfmg:gray_rebar_concrete_stairs",
"tfmg:light_gray_rebar_concrete_stairs",
"tfmg:brown_rebar_concrete_stairs",
"tfmg:cyan_rebar_concrete_stairs",
"tfmg:purple_rebar_concrete_stairs",
"tfmg:orange_rebar_concrete_stairs",
"tfmg:black_rebar_concrete_stairs"
]
}

21
src/generated/resources/data/tfmg/tags/blocks/concrete/rebar_concrete_walls
View File

@@ -1,21 +0,0 @@
{
"values": [
"tfmg:rebar_concrete_walls",
"tfmg:white_rebar_concrete_walls",
"tfmg:blue_rebar_concrete_walls",
"tfmg:light_blue_rebar_concrete_walls",
"tfmg:red_rebar_concrete_walls",
"tfmg:green_rebar_concrete_walls",
"tfmg:lime_rebar_concrete_walls",
"tfmg:pink_rebar_concrete_walls",
"tfmg:magenta_rebar_concrete_walls",
"tfmg:yellow_rebar_concrete_walls",
"tfmg:gray_rebar_concrete_walls",
"tfmg:light_gray_rebar_concrete_walls",
"tfmg:brown_rebar_concrete_walls",
"tfmg:cyan_rebar_concrete_walls",
"tfmg:purple_rebar_concrete_walls",
"tfmg:orange_rebar_concrete_walls",
"tfmg:black_rebar_concrete_walls"
]
}

6
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java
View File

@@ -6,6 +6,8 @@ import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider;
import com.drmangotea.tfmg.recipes.WindingRecipe;
import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGItems;
import com.drmangotea.tfmg.registry.TFMGTags;
import com.simibubi.create.AllTags;
import com.simibubi.create.api.data.recipe.BaseRecipeProvider;
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
@@ -80,9 +82,9 @@ public class TFMGSequencedAssemblyRecipeGen extends TFMGRecipeProvider {
.addOutput(TFMGItems.STEEL_INGOT, 4)
.loops(2)
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGBlocks.STEEL_COGWHEEL))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGItems.NICKEL_SHEET))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(nickelSheet()))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGBlocks.LARGE_STEEL_COGWHEEL))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGItems.LEAD_SHEET))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(leadSheet()))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGItems.SCREW))
.addStep(DeployerApplicationRecipe::new, rb -> rb.require(TFMGItems.SCREWDRIVER))

7
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java
View File

@@ -1,10 +1,7 @@
package com.drmangotea.tfmg.datagen.recipes.values.tfmg;
import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen;
import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGFluids;
import com.drmangotea.tfmg.registry.TFMGItems;
import com.drmangotea.tfmg.registry.TFMGRecipeTypes;
import com.drmangotea.tfmg.registry.*;
import net.minecraft.data.PackOutput;
public class CastingRecipeGen extends TFMGProcessingRecipeGen {
@@ -12,7 +9,7 @@ public class CastingRecipeGen extends TFMGProcessingRecipeGen {
GeneratedRecipe
STEEL_INGOT = create("steel", b ->b
.require(TFMGFluids.MOLTEN_STEEL.get(),144)
.require(TFMGTags.TFMGFluidTags.MOLTEN_STEEL.tag, 144)
.output(TFMGItems.STEEL_INGOT)
.duration(200)),

7
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/DistillationRecipeGen.java
View File

@@ -2,6 +2,7 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg;
import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen;
import com.drmangotea.tfmg.registry.TFMGRecipeTypes;
import com.drmangotea.tfmg.registry.TFMGTags;
import net.minecraft.data.PackOutput;
import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*;
@@ -11,7 +12,7 @@ public class DistillationRecipeGen extends TFMGProcessingRecipeGen {
GeneratedRecipe
CRUDE_OIL = create("crude_oil", b ->b
.require(crudeOil(),340)
.require(TFMGTags.TFMGFluidTags.CRUDE_OIL.tag,340)
.output(heavyOil(), 120)
.output(diesel(), 60)
.output(kerosene(), 30)
@@ -19,14 +20,14 @@ public class DistillationRecipeGen extends TFMGProcessingRecipeGen {
.output(gasoline(), 60)
.output(lpg(), 60)),
CRUDE_OIL_NO_NAPHTHA = create("crude_oil_no_naphtha", b ->b
.require(crudeOil(),330)
.require(TFMGTags.TFMGFluidTags.CRUDE_OIL.tag,330)
.output(heavyOil(), 120)
.output(diesel(), 60)
.output(kerosene(), 30)
.output(gasoline(), 60)
.output(lpg(), 60)),
CRUDE_OIL_LIGHT_DISTILLATION = create("crude_oil_light_distillation", b ->b
.require(crudeOil(),200)
.require(TFMGTags.TFMGFluidTags.CRUDE_OIL.tag,200)
.output(heavyOil(), 150)
.output(diesel(), 45)
.output(gasoline(), 5)),