Skip to content

Commit 5859011

Browse files
TarLaboratoriesTarLaboratories
authored
Large Bronze Tank (#3796)
1 parent 455d6a1 commit 5859011

10 files changed

Lines changed: 298 additions & 0 deletions

File tree

‎src/generated/resources/assets/gtceu/blockstates/bronze_multiblock_tank.json‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"variants": {
3+
"facing=down,upwards_facing=east": {
4+
"gtceu:z": 90,
5+
"model": "gtceu:block/machine/bronze_multiblock_tank",
6+
"x": 90
7+
},
8+
"facing=down,upwards_facing=north": {
9+
"model": "gtceu:block/machine/bronze_multiblock_tank",
10+
"x": 90
11+
},
12+
"facing=down,upwards_facing=south": {
13+
"gtceu:z": 180,
14+
"model": "gtceu:block/machine/bronze_multiblock_tank",
15+
"x": 90
16+
},
17+
"facing=down,upwards_facing=west": {
18+
"gtceu:z": 270,
19+
"model": "gtceu:block/machine/bronze_multiblock_tank",
20+
"x": 90
21+
},
22+
"facing=east,upwards_facing=east": {
23+
"gtceu:z": 270,
24+
"model": "gtceu:block/machine/bronze_multiblock_tank",
25+
"y": 90
26+
},
27+
"facing=east,upwards_facing=north": {
28+
"model": "gtceu:block/machine/bronze_multiblock_tank",
29+
"y": 90
30+
},
31+
"facing=east,upwards_facing=south": {
32+
"gtceu:z": 180,
33+
"model": "gtceu:block/machine/bronze_multiblock_tank",
34+
"y": 90
35+
},
36+
"facing=east,upwards_facing=west": {
37+
"gtceu:z": 90,
38+
"model": "gtceu:block/machine/bronze_multiblock_tank",
39+
"y": 90
40+
},
41+
"facing=north,upwards_facing=east": {
42+
"gtceu:z": 270,
43+
"model": "gtceu:block/machine/bronze_multiblock_tank"
44+
},
45+
"facing=north,upwards_facing=north": {
46+
"model": "gtceu:block/machine/bronze_multiblock_tank"
47+
},
48+
"facing=north,upwards_facing=south": {
49+
"gtceu:z": 180,
50+
"model": "gtceu:block/machine/bronze_multiblock_tank"
51+
},
52+
"facing=north,upwards_facing=west": {
53+
"gtceu:z": 90,
54+
"model": "gtceu:block/machine/bronze_multiblock_tank"
55+
},
56+
"facing=south,upwards_facing=east": {
57+
"gtceu:z": 270,
58+
"model": "gtceu:block/machine/bronze_multiblock_tank",
59+
"y": 180
60+
},
61+
"facing=south,upwards_facing=north": {
62+
"model": "gtceu:block/machine/bronze_multiblock_tank",
63+
"y": 180
64+
},
65+
"facing=south,upwards_facing=south": {
66+
"gtceu:z": 180,
67+
"model": "gtceu:block/machine/bronze_multiblock_tank",
68+
"y": 180
69+
},
70+
"facing=south,upwards_facing=west": {
71+
"gtceu:z": 90,
72+
"model": "gtceu:block/machine/bronze_multiblock_tank",
73+
"y": 180
74+
},
75+
"facing=up,upwards_facing=east": {
76+
"gtceu:z": 90,
77+
"model": "gtceu:block/machine/bronze_multiblock_tank",
78+
"x": 270
79+
},
80+
"facing=up,upwards_facing=north": {
81+
"gtceu:z": 180,
82+
"model": "gtceu:block/machine/bronze_multiblock_tank",
83+
"x": 270
84+
},
85+
"facing=up,upwards_facing=south": {
86+
"model": "gtceu:block/machine/bronze_multiblock_tank",
87+
"x": 270
88+
},
89+
"facing=up,upwards_facing=west": {
90+
"gtceu:z": 270,
91+
"model": "gtceu:block/machine/bronze_multiblock_tank",
92+
"x": 270
93+
},
94+
"facing=west,upwards_facing=east": {
95+
"gtceu:z": 270,
96+
"model": "gtceu:block/machine/bronze_multiblock_tank",
97+
"y": 270
98+
},
99+
"facing=west,upwards_facing=north": {
100+
"model": "gtceu:block/machine/bronze_multiblock_tank",
101+
"y": 270
102+
},
103+
"facing=west,upwards_facing=south": {
104+
"gtceu:z": 180,
105+
"model": "gtceu:block/machine/bronze_multiblock_tank",
106+
"y": 270
107+
},
108+
"facing=west,upwards_facing=west": {
109+
"gtceu:z": 90,
110+
"model": "gtceu:block/machine/bronze_multiblock_tank",
111+
"y": 270
112+
}
113+
}
114+
}

‎src/generated/resources/assets/gtceu/blockstates/bronze_tank_valve.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtceu:block/machine/bronze_tank_valve",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtceu:block/machine/bronze_tank_valve",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtceu:block/machine/bronze_tank_valve"
13+
},
14+
"facing=south": {
15+
"model": "gtceu:block/machine/bronze_tank_valve",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtceu:block/machine/bronze_tank_valve",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtceu:block/machine/bronze_tank_valve",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtceu/lang/en_ud.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@
130130
"block.gtceu.bronze_gearbox": "buısɐƆ xoqɹɐǝ⅁ ǝzuoɹᗺ",
131131
"block.gtceu.bronze_large_boiler": "ɹǝןıoᗺ ǝzuoɹᗺ ǝbɹɐꞀ",
132132
"block.gtceu.bronze_machine_casing": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ",
133+
"block.gtceu.bronze_multiblock_tank": "ʞuɐ⟘ ʞɔoןqıʇןnW ǝzuoɹᗺ",
133134
"block.gtceu.bronze_pipe_casing": "buısɐƆ ǝdıԀ ǝzuoɹᗺ",
135+
"block.gtceu.bronze_tank_valve": "ǝʌןɐΛ ʞuɐ⟘ ǝzuoɹᗺ",
134136
"block.gtceu.brown_borderless_lamp": "dɯɐꞀ ssǝןɹǝpɹoᗺ uʍoɹᗺ",
135137
"block.gtceu.brown_lamp": "dɯɐꞀ uʍoɹᗺ",
136138
"block.gtceu.brown_large_metal_sheet": "ʇǝǝɥS ןɐʇǝW ǝbɹɐꞀ uʍoɹᗺ",

‎src/generated/resources/assets/gtceu/lang/en_us.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@
130130
"block.gtceu.bronze_gearbox": "Bronze Gearbox Casing",
131131
"block.gtceu.bronze_large_boiler": "Large Bronze Boiler",
132132
"block.gtceu.bronze_machine_casing": "Bronze Machine Casing",
133+
"block.gtceu.bronze_multiblock_tank": "Bronze Multiblock Tank",
133134
"block.gtceu.bronze_pipe_casing": "Bronze Pipe Casing",
135+
"block.gtceu.bronze_tank_valve": "Bronze Tank Valve",
134136
"block.gtceu.brown_borderless_lamp": "Brown Borderless Lamp",
135137
"block.gtceu.brown_lamp": "Brown Lamp",
136138
"block.gtceu.brown_large_metal_sheet": "Brown Large Metal Sheet",

‎src/generated/resources/assets/gtceu/models/block/machine/bronze_multiblock_tank.json‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtceu:bronze_multiblock_tank",
5+
"texture_overrides": {
6+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks"
7+
},
8+
"variants": {
9+
"is_formed=false,recipe_logic_status=idle": {
10+
"model": {
11+
"parent": "gtceu:block/machine/template/cube_all/sided",
12+
"textures": {
13+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
14+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front"
15+
}
16+
}
17+
},
18+
"is_formed=false,recipe_logic_status=suspend": {
19+
"model": {
20+
"parent": "gtceu:block/machine/template/cube_all/sided",
21+
"textures": {
22+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
23+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front"
24+
}
25+
}
26+
},
27+
"is_formed=false,recipe_logic_status=waiting": {
28+
"model": {
29+
"parent": "gtceu:block/machine/template/cube_all/sided",
30+
"textures": {
31+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
32+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front_active"
33+
}
34+
}
35+
},
36+
"is_formed=false,recipe_logic_status=working": {
37+
"model": {
38+
"parent": "gtceu:block/machine/template/cube_all/sided",
39+
"textures": {
40+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
41+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front_active"
42+
}
43+
}
44+
},
45+
"is_formed=true,recipe_logic_status=idle": {
46+
"model": {
47+
"parent": "gtceu:block/machine/template/cube_all/sided",
48+
"textures": {
49+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
50+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front"
51+
}
52+
}
53+
},
54+
"is_formed=true,recipe_logic_status=suspend": {
55+
"model": {
56+
"parent": "gtceu:block/machine/template/cube_all/sided",
57+
"textures": {
58+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
59+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front"
60+
}
61+
}
62+
},
63+
"is_formed=true,recipe_logic_status=waiting": {
64+
"model": {
65+
"parent": "gtceu:block/machine/template/cube_all/sided",
66+
"textures": {
67+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
68+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front_active"
69+
}
70+
}
71+
},
72+
"is_formed=true,recipe_logic_status=working": {
73+
"model": {
74+
"parent": "gtceu:block/machine/template/cube_all/sided",
75+
"textures": {
76+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
77+
"overlay_front": "gtceu:block/multiblock/multiblock_tank/overlay_front_active"
78+
}
79+
}
80+
}
81+
}
82+
}

‎src/generated/resources/assets/gtceu/models/block/machine/bronze_tank_valve.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtceu:bronze_tank_valve",
5+
"texture_overrides": {
6+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks"
7+
},
8+
"variants": {
9+
"recipe_logic_status=idle": {
10+
"model": {
11+
"parent": "gtceu:block/machine/template/cube_all/sided",
12+
"textures": {
13+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
14+
"overlay_front": "gtceu:block/multiblock/tank_valve/overlay_front"
15+
}
16+
}
17+
},
18+
"recipe_logic_status=suspend": {
19+
"model": {
20+
"parent": "gtceu:block/machine/template/cube_all/sided",
21+
"textures": {
22+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
23+
"overlay_front": "gtceu:block/multiblock/tank_valve/overlay_front"
24+
}
25+
}
26+
},
27+
"recipe_logic_status=waiting": {
28+
"model": {
29+
"parent": "gtceu:block/machine/template/cube_all/sided",
30+
"textures": {
31+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
32+
"overlay_front": "gtceu:block/multiblock/tank_valve/overlay_front_active"
33+
}
34+
}
35+
},
36+
"recipe_logic_status=working": {
37+
"model": {
38+
"parent": "gtceu:block/machine/template/cube_all/sided",
39+
"textures": {
40+
"all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
41+
"overlay_front": "gtceu:block/multiblock/tank_valve/overlay_front_active"
42+
}
43+
}
44+
}
45+
}
46+
}

‎src/generated/resources/assets/gtceu/models/item/bronze_multiblock_tank.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "gtceu:block/machine/bronze_multiblock_tank"
3+
}

‎src/generated/resources/assets/gtceu/models/item/bronze_tank_valve.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "gtceu:block/machine/bronze_tank_valve"
3+
}

‎src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,17 @@ public class GTMultiMachines {
11161116
new PropertyFluidFilter(340, false, false, false, false),
11171117
(builder, overlay) -> builder.sidedWorkableCasingModel(GTCEu.id("block/casings/wood_wall"), overlay));
11181118

1119+
public static final MachineDefinition BRONZE_TANK_VALVE = GTMachineUtils.registerTankValve(
1120+
"bronze_tank_valve", "Bronze Tank Valve", true,
1121+
(builder, overlay) -> builder
1122+
.workableCasingModel(GTCEu.id("block/casings/solid/machine_casing_bronze_plated_bricks"), overlay));
1123+
public static final MultiblockMachineDefinition BRONZE_MULTIBLOCK_TANK = registerMultiblockTank(
1124+
"bronze_multiblock_tank", "Bronze Multiblock Tank", 500 * 1000,
1125+
CASING_BRONZE_BRICKS, BRONZE_TANK_VALVE::getBlock,
1126+
new PropertyFluidFilter(1696, true, false, false, false),
1127+
(builder, overlay) -> builder
1128+
.workableCasingModel(GTCEu.id("block/casings/solid/machine_casing_bronze_plated_bricks"), overlay));
1129+
11191130
public static final MachineDefinition STEEL_TANK_VALVE = GTMachineUtils.registerTankValve(
11201131
"steel_tank_valve", "Steel Tank Valve", true,
11211132
(builder, overlay) -> builder.workableCasingModel(

‎src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,13 +756,20 @@ public static void init(Consumer<FinishedRecipe> provider) {
756756
VanillaRecipeHelper.addShapedRecipe(provider, true, "wood_multiblock_tank",
757757
GTMultiMachines.WOODEN_MULTIBLOCK_TANK.asStack(), " R ", "rCs", " R ", 'R',
758758
new MaterialEntry(TagPrefix.ring, GTMaterials.Copper), 'C', GTBlocks.CASING_WOOD_WALL.asStack());
759+
VanillaRecipeHelper.addShapedRecipe(provider, true, "bronze_multiblock_tank",
760+
GTMultiMachines.BRONZE_MULTIBLOCK_TANK.asStack(), " R ", "hCw", " R ", 'R',
761+
new MaterialEntry(TagPrefix.ring, GTMaterials.Bronze), 'C', GTBlocks.CASING_BRONZE_BRICKS.asStack());
759762
VanillaRecipeHelper.addShapedRecipe(provider, true, "steel_multiblock_tank",
760763
GTMultiMachines.STEEL_MULTIBLOCK_TANK.asStack(), " R ", "hCw", " R ", 'R',
761764
new MaterialEntry(TagPrefix.ring, GTMaterials.Steel), 'C', GTBlocks.CASING_STEEL_SOLID.asStack());
762765
VanillaRecipeHelper.addShapedRecipe(provider, true, "wood_tank_valve",
763766
GTMultiMachines.WOODEN_TANK_VALVE.asStack(),
764767
" R ", "rCs", " O ", 'O', new MaterialEntry(TagPrefix.rotor, GTMaterials.Copper), 'R',
765768
new MaterialEntry(TagPrefix.ring, GTMaterials.Copper), 'C', GTBlocks.CASING_WOOD_WALL.asStack());
769+
VanillaRecipeHelper.addShapedRecipe(provider, true, "bronze_tank_valve",
770+
GTMultiMachines.BRONZE_TANK_VALVE.asStack(),
771+
" R ", "hCw", " O ", 'O', new MaterialEntry(TagPrefix.rotor, GTMaterials.Bronze), 'R',
772+
new MaterialEntry(TagPrefix.ring, GTMaterials.Bronze), 'C', GTBlocks.CASING_BRONZE_BRICKS);
766773
VanillaRecipeHelper.addShapedRecipe(provider, true, "steel_tank_valve",
767774
GTMultiMachines.STEEL_TANK_VALVE.asStack(),
768775
" R ", "hCw", " O ", 'O', new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel), 'R',

0 commit comments

Comments
 (0)