Better Pipe Registry

- Also change the brass palette to match other Brass components.
- Encased Pipes now have connected textures.
- Improved pipe registry with TFMGPipeEntry.
- Coke Ovens now output still fluids.
This commit is contained in:
PouffyDev
2025-07-25 19:44:10 +01:00
parent b5daa2c12b
commit d47ea56c28
115 changed files with 3121 additions and 390 deletions

View File

@@ -0,0 +1,196 @@
{
"variants": {
"axis_along_first=false,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/aluminum_fluid_valve/block_vertical_open",
"y": 90
}
}
}

View File

@@ -0,0 +1,196 @@
{
"variants": {
"axis_along_first=false,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/brass_fluid_valve/block_vertical_open",
"y": 90
}
}
}

View File

@@ -0,0 +1,196 @@
{
"variants": {
"axis_along_first=false,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/cast_iron_fluid_valve/block_vertical_open",
"y": 90
}
}
}

View File

@@ -0,0 +1,196 @@
{
"variants": {
"axis_along_first=false,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/plastic_fluid_valve/block_vertical_open",
"y": 90
}
}
}

View File

@@ -0,0 +1,196 @@
{
"variants": {
"axis_along_first=false,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 270
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 180
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed"
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 270,
"y": 90
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 270
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 180
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open"
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 90,
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=false,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 90
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=down,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=east,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 270
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=north,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"y": 180
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=south,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed"
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=up,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_closed",
"x": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=false,facing=west,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_closed",
"y": 90
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=down,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=east,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 270
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=north,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"y": 180
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=south,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open"
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=up,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_horizontal_open",
"x": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=false": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 90
},
"axis_along_first=true,enabled=true,facing=west,waterlogged=true": {
"model": "tfmg:block/steel_fluid_valve/block_vertical_open",
"y": 90
}
}
}

View File

@@ -9,6 +9,7 @@
"block.tfmg.aluminum_cogwheel": "ןǝǝɥʍboƆ ɯnuıɯnןⱯ",
"block.tfmg.aluminum_door": "ɹooᗡ ɯnuıɯnןⱯ",
"block.tfmg.aluminum_fluid_tank": "ʞuɐ⟘ pınןɯnuıɯnןⱯ",
"block.tfmg.aluminum_fluid_valve": "ǝʌןɐΛ pınןɯnuıɯnןⱯ",
"block.tfmg.aluminum_flywheel": "ןǝǝɥʍʎןℲ ɯnuıɯnןⱯ",
"block.tfmg.aluminum_frame": "ǝɯɐɹℲ ɯnuıɯnןⱯ",
"block.tfmg.aluminum_ladder": "ɹǝppɐꞀ ɯnuıɯnןⱯ",
@@ -54,6 +55,7 @@
"block.tfmg.blue_rebar_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɹɐqǝᴚ ǝnןᗺ",
"block.tfmg.blue_rebar_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɹɐqǝᴚ ǝnןᗺ",
"block.tfmg.brass_cable_hub": "qnH ǝןqɐƆ ssɐɹᗺ",
"block.tfmg.brass_fluid_valve": "ǝʌןɐΛ pınןℲ ssɐɹᗺ",
"block.tfmg.brass_frame": "ǝɯɐɹℲ ssɐɹᗺ",
"block.tfmg.brass_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ssɐɹᗺ",
"block.tfmg.brass_pipe": "ǝdıԀ ssɐɹᗺ",
@@ -78,6 +80,7 @@
"block.tfmg.cast_iron_block": "uoɹI ʇsɐƆ ɟo ʞɔoןᗺ",
"block.tfmg.cast_iron_chemical_vat": "ʇɐΛ ןɐɔıɯǝɥƆ uoɹI ʇsɐƆ",
"block.tfmg.cast_iron_fluid_tank": "ʞuɐ⟘ pınןℲ uoɹI ʇsɐƆ",
"block.tfmg.cast_iron_fluid_valve": "ǝʌןɐΛ pınןℲ uoɹI ʇsɐƆ",
"block.tfmg.cast_iron_flywheel": "ןǝǝɥʍʎןℲ uoɹI ʇsɐƆ",
"block.tfmg.cast_iron_frame": "ǝɯɐɹℲ uoɹI ʇsɐƆ",
"block.tfmg.cast_iron_ladder": "ɹǝppɐꞀ uoɹI ʇsɐƆ",
@@ -358,6 +361,7 @@
"block.tfmg.pink_rebar_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɹɐqǝᴚ ʞuıԀ",
"block.tfmg.pink_rebar_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɹɐqǝᴚ ʞuıԀ",
"block.tfmg.plastic_block": ıʇsɐןԀ ɟo ʞɔoןᗺ",
"block.tfmg.plastic_fluid_valve": "ǝʌןɐΛ pınןℲ ɔıʇsɐןԀ",
"block.tfmg.plastic_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ɔıʇsɐןԀ",
"block.tfmg.plastic_pipe": "ǝdıԀ ɔıʇsɐןԀ",
"block.tfmg.plastic_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ɔıʇsɐןԀ",
@@ -454,6 +458,7 @@
"block.tfmg.steel_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ןǝǝʇS",
"block.tfmg.steel_encased_steel_cogwheel": "ןǝǝɥʍboƆ ןǝǝʇS pǝsɐɔuƎ ןǝǝʇS",
"block.tfmg.steel_fluid_tank": "ʞuɐ⟘ pınןןǝǝʇS",
"block.tfmg.steel_fluid_valve": "ǝʌןɐΛ pınןןǝǝʇS",
"block.tfmg.steel_flywheel": "ןǝǝɥʍʎןℲ ןǝǝʇS",
"block.tfmg.steel_frame": "ǝɯɐɹℲ ןǝǝʇS",
"block.tfmg.steel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇS",
@@ -1025,7 +1030,8 @@
"tfmg.ponder.pumpjack.text_3": "ʇı puıɥǝq pǝɔɐןd ǝq oʇ spǝǝu ɹǝpןoH ɹǝɯɯɐH ʞɔɐظdɯnԀ",
"tfmg.ponder.pumpjack.text_4": "ǝsɐq ǝɥʇ puɐ ʞuɐɹɔ ǝɥʇ ǝʌoqɐ ʞɔɐظdɯnԀ ǝɥʇ ɟo pɐǝH ǝɥʇ puⱯ ɹoʇɔǝuuoƆ ǝɥʇ buıpןınq sı dǝʇs ʇxǝN",
"tfmg.ponder.pumpjack.text_5": "sʇɹɐԀ ɹǝɯɯɐH ʞɔɐظdɯnԀ ɥʇıʍ pǝʇɔǝuuoɔ ǝq oʇ pǝǝu ʎǝɥʇ ʍoN",
"tfmg.ponder.pumpjack.text_6": "ʇı ǝʌoqɐ ʞuɐɹɔ ʞɔɐظdɯnd ɐ ɥʇıʍ )ʞɔɐظdɯnd ǝɥʇ ɹoɟ ʇnduı ɹǝʍod ǝɥʇ sı ɥɔıɥʍ( ʇnduı ǝuıɥɔɐɯ ɐ buıɔɐןd sı dǝʇs ʇsɐן ǝɥ⟘",
"tfmg.ponder.pumpjack.text_6": "ɹǝɥʇǝboʇ sʇɹɐd ǝɥʇ ǝnן⅁ ɹǝdnS oʇ ǝɹns ǝʞɐW",
"tfmg.ponder.pumpjack.text_7": "ʇı ǝʌoqɐ ʞuɐɹɔ ʞɔɐظdɯnd ɐ ɥʇıʍ )ʞɔɐظdɯnd ǝɥʇ ɹoɟ ʇnduı ɹǝʍod ǝɥʇ sı ɥɔıɥʍ( ʇnduı ǝuıɥɔɐɯ ɐ buıɔɐןd sı dǝʇs ʇsɐן ǝɥ⟘",
"tfmg.ponder.shared.behaviour_modify_value_panel": "ןǝuɐd ǝnןɐʌ ǝɥʇ buısn pǝıɟıpoɯ ǝq uɐɔ ɹnoıʌɐɥǝq sıɥ⟘",
"tfmg.ponder.shared.movement_anchors": "˙pǝʌoɯ ǝq uɐɔ sǝɹnʇɔnɹʇs ɹǝbɹɐן 'ǝnן⅁ ɹǝdnS ɟo dןǝɥ ǝɥʇ ɥʇıM",
"tfmg.ponder.shared.rpm16": "WԀᴚ 9Ɩ",

View File

@@ -9,6 +9,7 @@
"block.tfmg.aluminum_cogwheel": "Aluminum Cogwheel",
"block.tfmg.aluminum_door": "Aluminum Door",
"block.tfmg.aluminum_fluid_tank": "Aluminum Fluid Tank",
"block.tfmg.aluminum_fluid_valve": "Aluminum Fluid Valve",
"block.tfmg.aluminum_flywheel": "Aluminum Flywheel",
"block.tfmg.aluminum_frame": "Aluminum Frame",
"block.tfmg.aluminum_ladder": "Aluminum Ladder",
@@ -54,6 +55,7 @@
"block.tfmg.blue_rebar_concrete_stairs": "Blue Rebar Concrete Stairs",
"block.tfmg.blue_rebar_concrete_wall": "Blue Rebar Concrete Wall",
"block.tfmg.brass_cable_hub": "Brass Cable Hub",
"block.tfmg.brass_fluid_valve": "Brass Fluid Valve",
"block.tfmg.brass_frame": "Brass Frame",
"block.tfmg.brass_mechanical_pump": "Brass Mechanical Pump",
"block.tfmg.brass_pipe": "Brass Pipe",
@@ -78,6 +80,7 @@
"block.tfmg.cast_iron_block": "Block of Cast Iron",
"block.tfmg.cast_iron_chemical_vat": "Cast Iron Chemical Vat",
"block.tfmg.cast_iron_fluid_tank": "Cast Iron Fluid Tank",
"block.tfmg.cast_iron_fluid_valve": "Cast Iron Fluid Valve",
"block.tfmg.cast_iron_flywheel": "Cast Iron Flywheel",
"block.tfmg.cast_iron_frame": "Cast Iron Frame",
"block.tfmg.cast_iron_ladder": "Cast Iron Ladder",
@@ -358,6 +361,7 @@
"block.tfmg.pink_rebar_concrete_stairs": "Pink Rebar Concrete Stairs",
"block.tfmg.pink_rebar_concrete_wall": "Pink Rebar Concrete Wall",
"block.tfmg.plastic_block": "Block of Plastic",
"block.tfmg.plastic_fluid_valve": "Plastic Fluid Valve",
"block.tfmg.plastic_mechanical_pump": "Plastic Mechanical Pump",
"block.tfmg.plastic_pipe": "Plastic Pipe",
"block.tfmg.plastic_smart_fluid_pipe": "Plastic Smart Fluid Pipe",
@@ -454,6 +458,7 @@
"block.tfmg.steel_encased_shaft": "Steel Encased Shaft",
"block.tfmg.steel_encased_steel_cogwheel": "Steel Encased Steel Cogwheel",
"block.tfmg.steel_fluid_tank": "Steel Fluid Tank",
"block.tfmg.steel_fluid_valve": "Steel Fluid Valve",
"block.tfmg.steel_flywheel": "Steel Flywheel",
"block.tfmg.steel_frame": "Steel Frame",
"block.tfmg.steel_gearbox": "Steel Gearbox",
@@ -1025,7 +1030,8 @@
"tfmg.ponder.pumpjack.text_3": "Pumpjack Hammer Holder needs to be placed behind it",
"tfmg.ponder.pumpjack.text_4": "Next step is building the Connector And the Head of the Pumpjack above the crank and the base",
"tfmg.ponder.pumpjack.text_5": "Now they need to be connected with Pumpjack Hammer Parts",
"tfmg.ponder.pumpjack.text_6": "The last step is placing a machine input (which is the power input for the pumpjack) with a pumpjack crank above it",
"tfmg.ponder.pumpjack.text_6": "Make sure to Super Glue the parts together",
"tfmg.ponder.pumpjack.text_7": "The last step is placing a machine input (which is the power input for the pumpjack) with a pumpjack crank above it",
"tfmg.ponder.shared.behaviour_modify_value_panel": "This behaviour can be modified using the value panel",
"tfmg.ponder.shared.movement_anchors": "With the help of Super Glue, larger structures can be moved.",
"tfmg.ponder.shared.rpm16": "16 RPM",

View File

@@ -0,0 +1,3 @@
{
"parent": "tfmg:block/aluminum_fluid_valve/item"
}

View File

@@ -0,0 +1,3 @@
{
"parent": "tfmg:block/brass_fluid_valve/item"
}

View File

@@ -0,0 +1,3 @@
{
"parent": "tfmg:block/cast_iron_fluid_valve/item"
}

View File

@@ -0,0 +1,3 @@
{
"parent": "tfmg:block/plastic_fluid_valve/item"
}

View File

@@ -0,0 +1,3 @@
{
"parent": "tfmg:block/steel_fluid_valve/item"
}

View File

@@ -16,6 +16,11 @@
"tfmg:cast_iron_flywheel",
"tfmg:aluminum_flywheel",
"tfmg:nickel_flywheel",
"tfmg:copper_encased_brass_pipe",
"tfmg:copper_encased_steel_pipe",
"tfmg:copper_encased_aluminum_pipe",
"tfmg:copper_encased_cast_iron_pipe",
"tfmg:copper_encased_plastic_pipe",
"tfmg:steel_encased_shaft",
"tfmg:heavy_casing_encased_shaft",
"tfmg:steel_encased_steel_cogwheel",

View File

@@ -1,312 +1,602 @@
{
"values": [
"tfmg:heavy_machinery_casing",
"tfmg:aluminum_fluid_tank",
"tfmg:industrial_aluminum_casing",
"tfmg:cast_iron_fluid_tank",
"tfmg:steel_block",
"tfmg:steel_fluid_tank",
"tfmg:cast_iron_block",
"tfmg:steel_distillation_output",
"tfmg:aluminum_block",
"tfmg:steel_distillation_controller",
"tfmg:plastic_block",
"tfmg:industrial_pipe",
"tfmg:lead_block",
"tfmg:concrete_encased_industrial_pipe",
"tfmg:constantan_block",
"tfmg:pumpjack_hammer",
"tfmg:pumpjack_crank",
"tfmg:nickel_block",
"tfmg:pumpjack_hammer_part",
"tfmg:lithium_block",
"tfmg:pumpjack_hammer_head",
"tfmg:coal_coke_block",
"tfmg:pumpjack_hammer_connector",
"tfmg:large_pumpjack_hammer_part",
"tfmg:large_pumpjack_hammer_head",
"tfmg:heavy_casing_door",
"tfmg:large_pumpjack_hammer_connector",
"tfmg:pumpjack_base",
"tfmg:steel_door",
"tfmg:oil_deposit",
"tfmg:aluminum_door",
"tfmg:steel_chemical_vat",
"tfmg:cast_iron_chemical_vat",
"tfmg:heavy_plated_door",
"tfmg:fireproof_chemical_vat",
"tfmg:steel_gearbox",
"tfmg:industrial_mixer",
"tfmg:steel_bars",
"tfmg:electrode_holder",
"tfmg:lead_ore",
"tfmg:aluminum_bars",
"tfmg:deepslate_lead_ore",
"tfmg:cast_iron_bars",
"tfmg:nickel_ore",
"tfmg:lead_bars",
"tfmg:deepslate_nickel_ore",
"tfmg:nickel_bars",
"tfmg:lithium_ore",
"tfmg:steel_ladder",
"tfmg:deepslate_lithium_ore",
"tfmg:aluminum_ladder",
"tfmg:sulfur",
"tfmg:cast_iron_ladder",
"tfmg:lignite",
"tfmg:lead_ladder",
"tfmg:nickel_ladder",
"tfmg:fossilstone",
"tfmg:constantan_ladder",
"tfmg:slag_block",
"tfmg:raw_nickel_block",
"tfmg:steel_scaffolding",
"tfmg:raw_lead_block",
"tfmg:aluminum_scaffolding",
"tfmg:raw_lithium_block",
"tfmg:slag_bricks",
"tfmg:air_intake",
"tfmg:cinder_block",
"tfmg:firebox",
"tfmg:cinderflour_block",
"tfmg:winding_machine",
"tfmg:factory_floor",
"tfmg:surface_scanner",
"tfmg:machine_input",
"tfmg:steel_trapdoor",
"tfmg:concrete_hose",
"tfmg:steel_flywheel",
"tfmg:blast_furnace_output",
"tfmg:lead_flywheel",
"tfmg:blast_furnace_hatch",
"tfmg:cast_iron_flywheel",
"tfmg:fireproof_bricks",
"tfmg:aluminum_flywheel",
"tfmg:reinforced_fireproof_bricks",
"tfmg:nickel_flywheel",
"tfmg:blast_furnace_reinforcement",
"tfmg:steel_truss",
"tfmg:blast_furnace_reinforcement_wall",
"tfmg:rusted_blast_furnace_reinforcement",
"tfmg:steel_frame",
"tfmg:rusted_blast_furnace_reinforcement_wall",
"tfmg:aluminum_truss",
"tfmg:fireproof_brick_reinforcement",
"tfmg:aluminum_frame",
"tfmg:coke_oven",
"tfmg:cast_iron_truss",
"tfmg:blast_stove",
"tfmg:cast_iron_frame",
"tfmg:casting_basin",
"tfmg:lead_truss",
"tfmg:napalm_bomb",
"tfmg:generator",
"tfmg:cable_connector",
"tfmg:glass_cable_insulator",
"tfmg:lead_frame",
"tfmg:resistor",
"tfmg:nickel_truss",
"tfmg:copycat_cable_block",
"tfmg:nickel_frame",
"tfmg:copycat_cable_base",
"tfmg:brass_cable_hub",
"tfmg:copper_cable_hub",
"tfmg:steel_cable_hub",
"tfmg:aluminum_cable_hub",
"tfmg:steel_casing_cable_hub",
"tfmg:heavy_cable_hub",
"tfmg:cable_tube",
"tfmg:concrete_encased_cable_tube",
"tfmg:electric_post",
"tfmg:concrete_encased_electric_post",
"tfmg:diagonal_cable_block",
"tfmg:electric_motor",
"tfmg:creative_generator",
"tfmg:accumulator",
"tfmg:light_bulb",
"tfmg:circular_light",
"tfmg:modern_light",
"tfmg:aluminum_lamp",
"tfmg:neon_tube",
"tfmg:electric_diode",
"tfmg:encased_diode",
"tfmg:potentiometer",
"tfmg:electrical_switch",
"tfmg:encased_potentiometer",
"tfmg:electric_pump",
"tfmg:voltage_observer",
"tfmg:voltmeter",
"tfmg:polarizer",
"tfmg:rotor",
"tfmg:stator",
"tfmg:traffic_light",
"tfmg:segmented_display",
"tfmg:transformer",
"tfmg:converter",
"tfmg:brick_smokestack",
"tfmg:metal_smokestack",
"tfmg:concrete_smokestack",
"tfmg:exhaust",
"tfmg:flarestack",
"tfmg:steel_cogwheel",
"tfmg:large_steel_cogwheel",
"tfmg:aluminum_cogwheel",
"tfmg:large_aluminum_cogwheel",
"tfmg:steel_casing",
"tfmg:heavy_machinery_casing",
"tfmg:industrial_aluminum_casing",
"tfmg:steel_block",
"tfmg:cast_iron_block",
"tfmg:aluminum_block",
"tfmg:plastic_block",
"tfmg:lead_block",
"tfmg:constantan_block",
"tfmg:nickel_block",
"tfmg:lithium_block",
"tfmg:coal_coke_block",
"tfmg:heavy_casing_door",
"tfmg:steel_door",
"tfmg:aluminum_door",
"tfmg:heavy_plated_door",
"tfmg:steel_gearbox",
"tfmg:steel_bars",
"tfmg:aluminum_bars",
"tfmg:cast_iron_bars",
"tfmg:lead_bars",
"tfmg:nickel_bars",
"tfmg:steel_ladder",
"tfmg:aluminum_ladder",
"tfmg:cast_iron_ladder",
"tfmg:lead_ladder",
"tfmg:nickel_ladder",
"tfmg:constantan_ladder",
"tfmg:steel_scaffolding",
"tfmg:aluminum_scaffolding",
"tfmg:slag_bricks",
"tfmg:cinder_block",
"tfmg:cinderflour_block",
"tfmg:factory_floor",
"tfmg:steel_trapdoor",
"tfmg:steel_flywheel",
"tfmg:lead_flywheel",
"tfmg:cast_iron_flywheel",
"tfmg:aluminum_flywheel",
"tfmg:nickel_flywheel",
"tfmg:steel_truss",
"tfmg:steel_frame",
"tfmg:aluminum_truss",
"tfmg:aluminum_frame",
"tfmg:cast_iron_truss",
"tfmg:cast_iron_frame",
"tfmg:lead_truss",
"tfmg:lead_frame",
"tfmg:nickel_truss",
"tfmg:nickel_frame",
"tfmg:constantan_truss",
"tfmg:copper_cable_hub",
"tfmg:constantan_frame",
"tfmg:steel_cable_hub",
"tfmg:copper_truss",
"tfmg:aluminum_cable_hub",
"tfmg:copper_frame",
"tfmg:steel_casing_cable_hub",
"tfmg:zinc_truss",
"tfmg:zinc_frame",
"tfmg:heavy_cable_hub",
"tfmg:brass_truss",
"tfmg:cable_tube",
"tfmg:brass_frame",
"tfmg:concrete_encased_cable_tube",
"tfmg:white_caution_block",
"tfmg:electric_post",
"tfmg:blue_caution_block",
"tfmg:concrete_encased_electric_post",
"tfmg:light_blue_caution_block",
"tfmg:diagonal_cable_block",
"tfmg:red_caution_block",
"tfmg:electric_motor",
"tfmg:green_caution_block",
"tfmg:creative_generator",
"tfmg:lime_caution_block",
"tfmg:accumulator",
"tfmg:pink_caution_block",
"tfmg:light_bulb",
"tfmg:magenta_caution_block",
"tfmg:circular_light",
"tfmg:yellow_caution_block",
"tfmg:modern_light",
"tfmg:gray_caution_block",
"tfmg:aluminum_lamp",
"tfmg:light_gray_caution_block",
"tfmg:neon_tube",
"tfmg:brown_caution_block",
"tfmg:electric_diode",
"tfmg:cyan_caution_block",
"tfmg:encased_diode",
"tfmg:potentiometer",
"tfmg:purple_caution_block",
"tfmg:orange_caution_block",
"tfmg:electrical_switch",
"tfmg:concrete_wall",
"tfmg:encased_potentiometer",
"tfmg:concrete",
"tfmg:electric_pump",
"tfmg:concrete_stairs",
"tfmg:voltage_observer",
"tfmg:concrete_slab",
"tfmg:voltmeter",
"tfmg:rebar_concrete_wall",
"tfmg:polarizer",
"tfmg:rebar_concrete",
"tfmg:rotor",
"tfmg:rebar_concrete_stairs",
"tfmg:stator",
"tfmg:rebar_concrete_slab",
"tfmg:traffic_light",
"tfmg:white_concrete",
"tfmg:segmented_display",
"tfmg:white_concrete_wall",
"tfmg:transformer",
"tfmg:white_concrete_stairs",
"tfmg:converter",
"tfmg:white_concrete_slab",
"tfmg:brick_smokestack",
"tfmg:blue_concrete",
"tfmg:metal_smokestack",
"tfmg:blue_concrete_wall",
"tfmg:concrete_smokestack",
"tfmg:blue_concrete_stairs",
"tfmg:exhaust",
"tfmg:blue_concrete_slab",
"tfmg:flarestack",
"tfmg:light_blue_concrete",
"tfmg:steel_cogwheel",
"tfmg:light_blue_concrete_wall",
"tfmg:large_steel_cogwheel",
"tfmg:light_blue_concrete_stairs",
"tfmg:aluminum_cogwheel",
"tfmg:light_blue_concrete_slab",
"tfmg:large_aluminum_cogwheel",
"tfmg:red_concrete",
"tfmg:steel_casing",
"tfmg:red_concrete_wall",
"tfmg:heavy_machinery_casing",
"tfmg:red_concrete_stairs",
"tfmg:industrial_aluminum_casing",
"tfmg:red_concrete_slab",
"tfmg:steel_block",
"tfmg:green_concrete",
"tfmg:cast_iron_block",
"tfmg:green_concrete_wall",
"tfmg:aluminum_block",
"tfmg:green_concrete_stairs",
"tfmg:plastic_block",
"tfmg:green_concrete_slab",
"tfmg:lead_block",
"tfmg:lime_concrete",
"tfmg:constantan_block",
"tfmg:lime_concrete_wall",
"tfmg:nickel_block",
"tfmg:lime_concrete_stairs",
"tfmg:lithium_block",
"tfmg:lime_concrete_slab",
"tfmg:coal_coke_block",
"tfmg:pink_concrete",
"tfmg:pink_concrete_wall",
"tfmg:heavy_casing_door",
"tfmg:pink_concrete_stairs",
"tfmg:steel_door",
"tfmg:pink_concrete_slab",
"tfmg:aluminum_door",
"tfmg:magenta_concrete",
"tfmg:heavy_plated_door",
"tfmg:magenta_concrete_wall",
"tfmg:steel_gearbox",
"tfmg:magenta_concrete_stairs",
"tfmg:steel_bars",
"tfmg:magenta_concrete_slab",
"tfmg:aluminum_bars",
"tfmg:cast_iron_bars",
"tfmg:yellow_concrete",
"tfmg:lead_bars",
"tfmg:yellow_concrete_wall",
"tfmg:nickel_bars",
"tfmg:yellow_concrete_stairs",
"tfmg:steel_ladder",
"tfmg:yellow_concrete_slab",
"tfmg:aluminum_ladder",
"tfmg:gray_concrete",
"tfmg:cast_iron_ladder",
"tfmg:gray_concrete_wall",
"tfmg:lead_ladder",
"tfmg:gray_concrete_stairs",
"tfmg:nickel_ladder",
"tfmg:gray_concrete_slab",
"tfmg:constantan_ladder",
"tfmg:light_gray_concrete",
"tfmg:steel_scaffolding",
"tfmg:light_gray_concrete_wall",
"tfmg:aluminum_scaffolding",
"tfmg:light_gray_concrete_stairs",
"tfmg:slag_bricks",
"tfmg:light_gray_concrete_slab",
"tfmg:cinder_block",
"tfmg:brown_concrete",
"tfmg:cinderflour_block",
"tfmg:brown_concrete_wall",
"tfmg:factory_floor",
"tfmg:brown_concrete_stairs",
"tfmg:steel_trapdoor",
"tfmg:steel_flywheel",
"tfmg:brown_concrete_slab",
"tfmg:lead_flywheel",
"tfmg:cast_iron_flywheel",
"tfmg:cyan_concrete",
"tfmg:aluminum_flywheel",
"tfmg:cyan_concrete_wall",
"tfmg:nickel_flywheel",
"tfmg:cyan_concrete_stairs",
"tfmg:steel_truss",
"tfmg:cyan_concrete_slab",
"tfmg:steel_frame",
"tfmg:purple_concrete",
"tfmg:aluminum_truss",
"tfmg:purple_concrete_wall",
"tfmg:aluminum_frame",
"tfmg:purple_concrete_stairs",
"tfmg:cast_iron_truss",
"tfmg:purple_concrete_slab",
"tfmg:cast_iron_frame",
"tfmg:orange_concrete",
"tfmg:lead_truss",
"tfmg:orange_concrete_wall",
"tfmg:lead_frame",
"tfmg:orange_concrete_stairs",
"tfmg:nickel_truss",
"tfmg:orange_concrete_slab",
"tfmg:nickel_frame",
"tfmg:black_concrete",
"tfmg:constantan_truss",
"tfmg:black_concrete_wall",
"tfmg:constantan_frame",
"tfmg:black_concrete_stairs",
"tfmg:copper_truss",
"tfmg:black_concrete_slab",
"tfmg:copper_frame",
"tfmg:white_rebar_concrete",
"tfmg:zinc_truss",
"tfmg:white_rebar_concrete_wall",
"tfmg:zinc_frame",
"tfmg:white_rebar_concrete_stairs",
"tfmg:brass_truss",
"tfmg:brass_frame",
"tfmg:white_rebar_concrete_slab",
"tfmg:white_caution_block",
"tfmg:blue_rebar_concrete",
"tfmg:blue_caution_block",
"tfmg:blue_rebar_concrete_wall",
"tfmg:light_blue_caution_block",
"tfmg:blue_rebar_concrete_stairs",
"tfmg:red_caution_block",
"tfmg:blue_rebar_concrete_slab",
"tfmg:green_caution_block",
"tfmg:light_blue_rebar_concrete",
"tfmg:lime_caution_block",
"tfmg:light_blue_rebar_concrete_wall",
"tfmg:pink_caution_block",
"tfmg:light_blue_rebar_concrete_stairs",
"tfmg:magenta_caution_block",
"tfmg:light_blue_rebar_concrete_slab",
"tfmg:yellow_caution_block",
"tfmg:red_rebar_concrete",
"tfmg:gray_caution_block",
"tfmg:red_rebar_concrete_wall",
"tfmg:light_gray_caution_block",
"tfmg:red_rebar_concrete_stairs",
"tfmg:brown_caution_block",
"tfmg:red_rebar_concrete_slab",
"tfmg:cyan_caution_block",
"tfmg:green_rebar_concrete",
"tfmg:purple_caution_block",
"tfmg:green_rebar_concrete_wall",
"tfmg:orange_caution_block",
"tfmg:green_rebar_concrete_stairs",
"tfmg:concrete_wall",
"tfmg:green_rebar_concrete_slab",
"tfmg:concrete",
"tfmg:lime_rebar_concrete",
"tfmg:concrete_stairs",
"tfmg:lime_rebar_concrete_wall",
"tfmg:concrete_slab",
"tfmg:lime_rebar_concrete_stairs",
"tfmg:rebar_concrete_wall",
"tfmg:lime_rebar_concrete_slab",
"tfmg:rebar_concrete",
"tfmg:rebar_concrete_stairs",
"tfmg:pink_rebar_concrete",
"tfmg:rebar_concrete_slab",
"tfmg:white_concrete",
"tfmg:pink_rebar_concrete_wall",
"tfmg:white_concrete_wall",
"tfmg:pink_rebar_concrete_stairs",
"tfmg:white_concrete_stairs",
"tfmg:pink_rebar_concrete_slab",
"tfmg:white_concrete_slab",
"tfmg:magenta_rebar_concrete",
"tfmg:blue_concrete",
"tfmg:magenta_rebar_concrete_wall",
"tfmg:blue_concrete_wall",
"tfmg:magenta_rebar_concrete_stairs",
"tfmg:blue_concrete_stairs",
"tfmg:blue_concrete_slab",
"tfmg:magenta_rebar_concrete_slab",
"tfmg:light_blue_concrete",
"tfmg:yellow_rebar_concrete",
"tfmg:light_blue_concrete_wall",
"tfmg:yellow_rebar_concrete_wall",
"tfmg:light_blue_concrete_stairs",
"tfmg:yellow_rebar_concrete_stairs",
"tfmg:light_blue_concrete_slab",
"tfmg:yellow_rebar_concrete_slab",
"tfmg:red_concrete",
"tfmg:gray_rebar_concrete",
"tfmg:red_concrete_wall",
"tfmg:red_concrete_stairs",
"tfmg:gray_rebar_concrete_wall",
"tfmg:red_concrete_slab",
"tfmg:gray_rebar_concrete_stairs",
"tfmg:green_concrete",
"tfmg:gray_rebar_concrete_slab",
"tfmg:green_concrete_wall",
"tfmg:light_gray_rebar_concrete",
"tfmg:green_concrete_stairs",
"tfmg:light_gray_rebar_concrete_wall",
"tfmg:green_concrete_slab",
"tfmg:light_gray_rebar_concrete_stairs",
"tfmg:lime_concrete",
"tfmg:light_gray_rebar_concrete_slab",
"tfmg:lime_concrete_wall",
"tfmg:brown_rebar_concrete",
"tfmg:lime_concrete_stairs",
"tfmg:brown_rebar_concrete_wall",
"tfmg:lime_concrete_slab",
"tfmg:brown_rebar_concrete_stairs",
"tfmg:pink_concrete",
"tfmg:brown_rebar_concrete_slab",
"tfmg:pink_concrete_wall",
"tfmg:cyan_rebar_concrete",
"tfmg:pink_concrete_stairs",
"tfmg:cyan_rebar_concrete_wall",
"tfmg:pink_concrete_slab",
"tfmg:cyan_rebar_concrete_stairs",
"tfmg:magenta_concrete",
"tfmg:cyan_rebar_concrete_slab",
"tfmg:magenta_concrete_wall",
"tfmg:purple_rebar_concrete",
"tfmg:magenta_concrete_stairs",
"tfmg:purple_rebar_concrete_wall",
"tfmg:magenta_concrete_slab",
"tfmg:purple_rebar_concrete_stairs",
"tfmg:yellow_concrete",
"tfmg:purple_rebar_concrete_slab",
"tfmg:yellow_concrete_wall",
"tfmg:orange_rebar_concrete",
"tfmg:yellow_concrete_stairs",
"tfmg:orange_rebar_concrete_wall",
"tfmg:yellow_concrete_slab",
"tfmg:orange_rebar_concrete_stairs",
"tfmg:gray_concrete",
"tfmg:orange_rebar_concrete_slab",
"tfmg:gray_concrete_wall",
"tfmg:black_rebar_concrete",
"tfmg:gray_concrete_stairs",
"tfmg:black_rebar_concrete_wall",
"tfmg:gray_concrete_slab",
"tfmg:black_rebar_concrete_stairs",
"tfmg:light_gray_concrete",
"tfmg:black_rebar_concrete_slab",
"tfmg:light_gray_concrete_wall",
"tfmg:asphalt",
"tfmg:light_gray_concrete_stairs",
"tfmg:asphalt_wall",
"tfmg:light_gray_concrete_slab",
"tfmg:asphalt_slab",
"tfmg:brown_concrete",
"tfmg:asphalt_stairs",
"tfmg:brown_concrete_wall",
"tfmg:brass_pipe",
"tfmg:brown_concrete_stairs",
"tfmg:copper_encased_brass_pipe",
"tfmg:brown_concrete_slab",
"tfmg:glass_brass_pipe",
"tfmg:cyan_concrete",
"tfmg:brass_mechanical_pump",
"tfmg:cyan_concrete_wall",
"tfmg:brass_smart_fluid_pipe",
"tfmg:cyan_concrete_stairs",
"tfmg:brass_fluid_valve",
"tfmg:cyan_concrete_slab",
"tfmg:steel_pipe",
"tfmg:purple_concrete",
"tfmg:copper_encased_steel_pipe",
"tfmg:purple_concrete_wall",
"tfmg:glass_steel_pipe",
"tfmg:purple_concrete_stairs",
"tfmg:steel_mechanical_pump",
"tfmg:purple_concrete_slab",
"tfmg:steel_smart_fluid_pipe",
"tfmg:orange_concrete",
"tfmg:steel_fluid_valve",
"tfmg:orange_concrete_wall",
"tfmg:aluminum_pipe",
"tfmg:orange_concrete_stairs",
"tfmg:copper_encased_aluminum_pipe",
"tfmg:orange_concrete_slab",
"tfmg:glass_aluminum_pipe",
"tfmg:black_concrete",
"tfmg:aluminum_mechanical_pump",
"tfmg:black_concrete_wall",
"tfmg:aluminum_smart_fluid_pipe",
"tfmg:black_concrete_stairs",
"tfmg:aluminum_fluid_valve",
"tfmg:black_concrete_slab",
"tfmg:cast_iron_pipe",
"tfmg:white_rebar_concrete",
"tfmg:copper_encased_cast_iron_pipe",
"tfmg:white_rebar_concrete_wall",
"tfmg:glass_cast_iron_pipe",
"tfmg:white_rebar_concrete_stairs",
"tfmg:cast_iron_mechanical_pump",
"tfmg:white_rebar_concrete_slab",
"tfmg:cast_iron_smart_fluid_pipe",
"tfmg:blue_rebar_concrete",
"tfmg:cast_iron_fluid_valve",
"tfmg:blue_rebar_concrete_wall",
"tfmg:plastic_pipe",
"tfmg:blue_rebar_concrete_stairs",
"tfmg:copper_encased_plastic_pipe",
"tfmg:blue_rebar_concrete_slab",
"tfmg:glass_plastic_pipe",
"tfmg:light_blue_rebar_concrete",
"tfmg:plastic_mechanical_pump",
"tfmg:light_blue_rebar_concrete_wall",
"tfmg:plastic_smart_fluid_pipe",
"tfmg:light_blue_rebar_concrete_stairs",
"tfmg:light_blue_rebar_concrete_slab",
"tfmg:plastic_fluid_valve",
"tfmg:red_rebar_concrete",
"tfmg:steel_encased_shaft",
"tfmg:red_rebar_concrete_wall",
"tfmg:heavy_casing_encased_shaft",
"tfmg:red_rebar_concrete_stairs",
"tfmg:steel_encased_steel_cogwheel",
"tfmg:red_rebar_concrete_slab",
"tfmg:heavy_casing_encased_steel_cogwheel",
"tfmg:green_rebar_concrete",
"tfmg:steel_encased_large_steel_cogwheel",
"tfmg:green_rebar_concrete_wall",
"tfmg:heavy_casing_encased_large_steel_cogwheel",
"tfmg:green_rebar_concrete_stairs",
"tfmg:steel_encased_aluminum_cogwheel",
"tfmg:green_rebar_concrete_slab",
"tfmg:heavy_casing_encased_aluminum_cogwheel",
"tfmg:lime_rebar_concrete",
"tfmg:steel_encased_large_aluminum_cogwheel",
"tfmg:lime_rebar_concrete_wall",
"tfmg:heavy_casing_encased_large_aluminum_cogwheel",
"tfmg:lime_rebar_concrete_stairs",
"tfmg:lime_rebar_concrete_slab",
"tfmg:bauxite",
"tfmg:pink_rebar_concrete",
"tfmg:cut_bauxite",
"tfmg:pink_rebar_concrete_wall",
"tfmg:cut_bauxite_stairs",
"tfmg:pink_rebar_concrete_stairs",
"tfmg:cut_bauxite_slab",
"tfmg:pink_rebar_concrete_slab",
"tfmg:cut_bauxite_wall",
"tfmg:magenta_rebar_concrete",
"tfmg:polished_cut_bauxite",
"tfmg:magenta_rebar_concrete_wall",
"tfmg:polished_cut_bauxite_stairs",
"tfmg:magenta_rebar_concrete_stairs",
"tfmg:polished_cut_bauxite_slab",
"tfmg:magenta_rebar_concrete_slab",
"tfmg:polished_cut_bauxite_wall",
"tfmg:yellow_rebar_concrete",
"tfmg:cut_bauxite_bricks",
"tfmg:yellow_rebar_concrete_wall",
"tfmg:cut_bauxite_brick_stairs",
"tfmg:yellow_rebar_concrete_stairs",
"tfmg:cut_bauxite_brick_slab",
"tfmg:yellow_rebar_concrete_slab",
"tfmg:cut_bauxite_brick_wall",
"tfmg:gray_rebar_concrete",
"tfmg:small_bauxite_bricks",
"tfmg:gray_rebar_concrete_wall",
"tfmg:small_bauxite_brick_stairs",
"tfmg:gray_rebar_concrete_stairs",
"tfmg:small_bauxite_brick_slab",
"tfmg:gray_rebar_concrete_slab",
"tfmg:small_bauxite_brick_wall",
"tfmg:light_gray_rebar_concrete",
"tfmg:layered_bauxite",
"tfmg:light_gray_rebar_concrete_wall",
"tfmg:bauxite_pillar",
"tfmg:light_gray_rebar_concrete_stairs",
"tfmg:galena",
"tfmg:light_gray_rebar_concrete_slab",
"tfmg:cut_galena",
"tfmg:cut_galena_stairs",
"tfmg:brown_rebar_concrete",
"tfmg:cut_galena_slab",
"tfmg:cut_galena_wall",
"tfmg:brown_rebar_concrete_wall",
"tfmg:polished_cut_galena",
"tfmg:brown_rebar_concrete_stairs",
"tfmg:polished_cut_galena_stairs",
"tfmg:brown_rebar_concrete_slab",
"tfmg:polished_cut_galena_slab",
"tfmg:cyan_rebar_concrete",
"tfmg:polished_cut_galena_wall",
"tfmg:cyan_rebar_concrete_wall",
"tfmg:cut_galena_bricks",
"tfmg:cyan_rebar_concrete_stairs",
"tfmg:cut_galena_brick_stairs",
"tfmg:cyan_rebar_concrete_slab",
"tfmg:cut_galena_brick_slab",
"tfmg:purple_rebar_concrete",
"tfmg:cut_galena_brick_wall",
"tfmg:purple_rebar_concrete_wall",
"tfmg:small_galena_bricks",
"tfmg:purple_rebar_concrete_stairs",
"tfmg:small_galena_brick_stairs",
"tfmg:purple_rebar_concrete_slab",
"tfmg:small_galena_brick_slab",
"tfmg:orange_rebar_concrete",
"tfmg:small_galena_brick_wall",
"tfmg:orange_rebar_concrete_wall",
"tfmg:layered_galena",
"tfmg:orange_rebar_concrete_stairs",
"tfmg:galena_pillar",
"tfmg:orange_rebar_concrete_slab",
"tfmg:black_rebar_concrete",
"tfmg:black_rebar_concrete_wall",
@@ -316,6 +606,36 @@
"tfmg:asphalt_wall",
"tfmg:asphalt_slab",
"tfmg:asphalt_stairs",
"tfmg:brass_pipe",
"tfmg:copper_encased_brass_pipe",
"tfmg:glass_brass_pipe",
"tfmg:brass_mechanical_pump",
"tfmg:brass_smart_fluid_pipe",
"tfmg:brass_fluid_valve",
"tfmg:steel_pipe",
"tfmg:copper_encased_steel_pipe",
"tfmg:glass_steel_pipe",
"tfmg:steel_mechanical_pump",
"tfmg:steel_smart_fluid_pipe",
"tfmg:steel_fluid_valve",
"tfmg:aluminum_pipe",
"tfmg:copper_encased_aluminum_pipe",
"tfmg:glass_aluminum_pipe",
"tfmg:aluminum_mechanical_pump",
"tfmg:aluminum_smart_fluid_pipe",
"tfmg:aluminum_fluid_valve",
"tfmg:cast_iron_pipe",
"tfmg:copper_encased_cast_iron_pipe",
"tfmg:glass_cast_iron_pipe",
"tfmg:cast_iron_mechanical_pump",
"tfmg:cast_iron_smart_fluid_pipe",
"tfmg:cast_iron_fluid_valve",
"tfmg:plastic_pipe",
"tfmg:copper_encased_plastic_pipe",
"tfmg:glass_plastic_pipe",
"tfmg:plastic_mechanical_pump",
"tfmg:plastic_smart_fluid_pipe",
"tfmg:plastic_fluid_valve",
"tfmg:steel_encased_shaft",
"tfmg:heavy_casing_encased_shaft",
"tfmg:steel_encased_steel_cogwheel",
@@ -326,31 +646,6 @@
"tfmg:heavy_casing_encased_aluminum_cogwheel",
"tfmg:steel_encased_large_aluminum_cogwheel",
"tfmg:heavy_casing_encased_large_aluminum_cogwheel",
"tfmg:brass_pipe",
"tfmg:copper_encased_brass_pipe",
"tfmg:glass_brass_pipe",
"tfmg:brass_mechanical_pump",
"tfmg:brass_smart_fluid_pipe",
"tfmg:steel_pipe",
"tfmg:copper_encased_steel_pipe",
"tfmg:glass_steel_pipe",
"tfmg:steel_mechanical_pump",
"tfmg:steel_smart_fluid_pipe",
"tfmg:aluminum_pipe",
"tfmg:copper_encased_aluminum_pipe",
"tfmg:glass_aluminum_pipe",
"tfmg:aluminum_mechanical_pump",
"tfmg:aluminum_smart_fluid_pipe",
"tfmg:cast_iron_pipe",
"tfmg:copper_encased_cast_iron_pipe",
"tfmg:glass_cast_iron_pipe",
"tfmg:cast_iron_mechanical_pump",
"tfmg:cast_iron_smart_fluid_pipe",
"tfmg:plastic_pipe",
"tfmg:copper_encased_plastic_pipe",
"tfmg:glass_plastic_pipe",
"tfmg:plastic_mechanical_pump",
"tfmg:plastic_smart_fluid_pipe",
"tfmg:bauxite",
"tfmg:cut_bauxite",
"tfmg:cut_bauxite_stairs",

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:aluminum_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/aluminum_fluid_valve"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/aluminum_fluid_valve"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:aluminum_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/aluminum_mechanical_pump"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/aluminum_mechanical_pump"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:aluminum_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/aluminum_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/aluminum_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:aluminum_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/aluminum_pipe_vertical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/aluminum_pipe_vertical"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:aluminum_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/aluminum_smart_fluid_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/aluminum_smart_fluid_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "create:brass_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/brass_fluid_valve"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/brass_fluid_valve"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "create:brass_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/brass_mechanical_pump"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/brass_mechanical_pump"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "create:brass_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/brass_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/brass_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "create:brass_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/brass_pipe_vertical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/brass_pipe_vertical"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "create:brass_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/brass_smart_fluid_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/brass_smart_fluid_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:cast_iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/cast_iron_fluid_valve"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/cast_iron_fluid_valve"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:cast_iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/cast_iron_mechanical_pump"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/cast_iron_mechanical_pump"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:cast_iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/cast_iron_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/cast_iron_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:cast_iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/cast_iron_pipe_vertical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/cast_iron_pipe_vertical"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:cast_iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/cast_iron_smart_fluid_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/cast_iron_smart_fluid_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:plastic_sheet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/plastic_fluid_valve"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/plastic_fluid_valve"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:plastic_sheet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/plastic_mechanical_pump"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/plastic_mechanical_pump"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:plastic_sheet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/plastic_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/plastic_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:plastic_sheet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/plastic_pipe_vertical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/plastic_pipe_vertical"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:plastic_sheet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/plastic_smart_fluid_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/plastic_smart_fluid_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/steel_fluid_valve"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/steel_fluid_valve"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/steel_mechanical_pump"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/steel_mechanical_pump"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/steel_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/steel_pipe"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/steel_pipe_vertical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/steel_pipe_vertical"
]
}
}

View File

@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "tfmg:steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/materials/steel_smart_fluid_pipe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/materials/steel_smart_fluid_pipe"
]
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "tfmg:aluminum_fluid_valve"
}
],
"rolls": 1.0
}
],
"random_sequence": "tfmg:blocks/aluminum_fluid_valve"
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "tfmg:brass_fluid_valve"
}
],
"rolls": 1.0
}
],
"random_sequence": "tfmg:blocks/brass_fluid_valve"
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "tfmg:cast_iron_fluid_valve"
}
],
"rolls": 1.0
}
],
"random_sequence": "tfmg:blocks/cast_iron_fluid_valve"
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "tfmg:plastic_fluid_valve"
}
],
"rolls": 1.0
}
],
"random_sequence": "tfmg:blocks/plastic_fluid_valve"
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "tfmg:steel_fluid_valve"
}
],
"rolls": 1.0
}
],
"random_sequence": "tfmg:blocks/steel_fluid_valve"
}

View File

@@ -12,11 +12,11 @@
},
{
"amount": 2,
"id": "tfmg:flowing_creosote"
"id": "tfmg:creosote"
},
{
"amount": 20,
"id": "tfmg:flowing_carbon_dioxide"
"id": "tfmg:carbon_dioxide"
}
]
}

View File

@@ -12,11 +12,11 @@
},
{
"amount": 1,
"id": "tfmg:flowing_creosote"
"id": "tfmg:creosote"
},
{
"amount": 30,
"id": "tfmg:flowing_carbon_dioxide"
"id": "tfmg:carbon_dioxide"
}
]
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"tag": "c:plates/iron"
},
{
"item": "tfmg:aluminum_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:aluminum_fluid_valve"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "create:cogwheel"
},
{
"item": "tfmg:aluminum_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:aluminum_mechanical_pump"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/aluminum"
},
"P": {
"tag": "c:plates/aluminum"
}
},
"pattern": [
" ",
"PIP",
" "
],
"result": {
"count": 4,
"id": "tfmg:aluminum_pipe"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/aluminum"
},
"P": {
"tag": "c:plates/aluminum"
}
},
"pattern": [
"P",
"I",
"P"
],
"result": {
"count": 4,
"id": "tfmg:aluminum_pipe"
}
}

View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:plates/brass"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:aluminum_pipe"
}
},
"pattern": [
"I",
"S",
"P"
],
"result": {
"count": 1,
"id": "tfmg:aluminum_smart_fluid_pipe"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"tag": "c:plates/iron"
},
{
"item": "tfmg:brass_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:brass_fluid_valve"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "create:cogwheel"
},
{
"item": "tfmg:brass_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:brass_mechanical_pump"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/brass"
},
"P": {
"tag": "c:plates/brass"
}
},
"pattern": [
" ",
"PIP",
" "
],
"result": {
"count": 4,
"id": "tfmg:brass_pipe"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/brass"
},
"P": {
"tag": "c:plates/brass"
}
},
"pattern": [
"P",
"I",
"P"
],
"result": {
"count": 4,
"id": "tfmg:brass_pipe"
}
}

View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:plates/copper"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:brass_pipe"
}
},
"pattern": [
"I",
"S",
"P"
],
"result": {
"count": 1,
"id": "tfmg:brass_smart_fluid_pipe"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"tag": "c:plates/iron"
},
{
"item": "tfmg:cast_iron_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:cast_iron_fluid_valve"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "create:cogwheel"
},
{
"item": "tfmg:cast_iron_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:cast_iron_mechanical_pump"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/cast_iron"
},
"P": {
"tag": "c:plates/cast_iron"
}
},
"pattern": [
" ",
"PIP",
" "
],
"result": {
"count": 4,
"id": "tfmg:cast_iron_pipe"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/cast_iron"
},
"P": {
"tag": "c:plates/cast_iron"
}
},
"pattern": [
"P",
"I",
"P"
],
"result": {
"count": 4,
"id": "tfmg:cast_iron_pipe"
}
}

View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:plates/cast_iron"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:cast_iron_pipe"
}
},
"pattern": [
"I",
"S",
"P"
],
"result": {
"count": 1,
"id": "tfmg:cast_iron_smart_fluid_pipe"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"tag": "c:plates/iron"
},
{
"item": "tfmg:plastic_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:plastic_fluid_valve"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "create:cogwheel"
},
{
"item": "tfmg:plastic_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:plastic_mechanical_pump"
}
}

View File

@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"item": "tfmg:plastic_sheet"
}
},
"pattern": [
" ",
"III",
" "
],
"result": {
"count": 4,
"id": "tfmg:plastic_pipe"
}
}

View File

@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"item": "tfmg:plastic_sheet"
}
},
"pattern": [
"I",
"I",
"I"
],
"result": {
"count": 4,
"id": "tfmg:plastic_pipe"
}
}

View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:plates/steel"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:plastic_pipe"
}
},
"pattern": [
"I",
"S",
"P"
],
"result": {
"count": 1,
"id": "tfmg:plastic_smart_fluid_pipe"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"tag": "c:plates/iron"
},
{
"item": "tfmg:steel_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:steel_fluid_valve"
}
}

View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "create:cogwheel"
},
{
"item": "tfmg:steel_pipe"
}
],
"result": {
"count": 1,
"id": "tfmg:steel_mechanical_pump"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/steel"
},
"P": {
"tag": "c:plates/steel"
}
},
"pattern": [
" ",
"PIP",
" "
],
"result": {
"count": 4,
"id": "tfmg:steel_pipe"
}
}

View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:ingots/steel"
},
"P": {
"tag": "c:plates/steel"
}
},
"pattern": [
"P",
"I",
"P"
],
"result": {
"count": 4,
"id": "tfmg:steel_pipe"
}
}

View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "c:plates/aluminum"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:steel_pipe"
}
},
"pattern": [
"I",
"S",
"P"
],
"result": {
"count": 1,
"id": "tfmg:steel_smart_fluid_pipe"
}
}

View File

@@ -13,6 +13,7 @@ import com.drmangotea.tfmg.registry.*;
import com.drmangotea.tfmg.worldgen.TFMGFeatures;
import com.mojang.logging.LogUtils;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.item.ItemDescription;
import com.simibubi.create.foundation.item.KineticStats;
import com.simibubi.create.foundation.item.TooltipModifier;
@@ -66,11 +67,11 @@ public class TFMG {
TFMGCableTypes.init();
TFMGCreativeTabs.register(modEventBus);
TFMGBlocks.init();
TFMGPipes.init();
TFMGBlockEntities.init();
TFMGItems.init();
TFMGEntityTypes.init();
TFMGPartialModels.init();
TFMGPipes.init();
TFMGFluids.init();
TFMGMenuTypes.init();
TFMGEncasedBlocks.init();
@@ -129,4 +130,8 @@ public class TFMG {
public static ResourceLocation asResource(String path) {
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
}
public static TFMGRegistrate registrate() {
return REGISTRATE;
}
}

View File

@@ -2,24 +2,20 @@ package com.drmangotea.tfmg.base;
import com.drmangotea.tfmg.TFMG;
import com.drmangotea.tfmg.registry.TFMGTags;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllTags;
import com.simibubi.create.foundation.data.TagGen;
import com.simibubi.create.foundation.data.recipe.Mods;
import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.providers.RegistrateTagsProvider;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import java.util.List;
public class TFMGRegistrateTags {
private static final TFMGRegistrate REGISTRATE = TFMG.registrate();
public static void addGenerators() {
TFMG.REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, TFMGRegistrateTags::genBlockTags);
TFMG.REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, TFMGRegistrateTags::genItemTags);
REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, TFMGRegistrateTags::genBlockTags);
REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, TFMGRegistrateTags::genItemTags);
// TFMG.REGISTRATE.addDataGenerator(ProviderType.FLUID_TAGS, TFMGRegistrateTags::genFluidTags);
// TFMG.REGISTRATE.addDataGenerator(ProviderType.ENTITY_TAGS, TFMGRegistrateTags::genEntityTags);
}

View File

@@ -20,6 +20,13 @@ public class TFMGSpriteShifts {
public static final CTSpriteShiftEntry STEEL_ENCASED_COGWHEEL_SIDE = vertical("steel_encased_cogwheel_side"), STEEL_ENCASED_COGWHEEL_OTHERSIDE = horizontal("steel_encased_cogwheel_side"), HEAVY_CASING_ENCASED_COGWHEEL_SIDE = vertical("heavy_machinery_encased_cogwheel_side"), HEAVY_CASING_ENCASED_COGWHEEL_OTHERSIDE = horizontal("heavy_machinery_encased_cogwheel_side");
public static final CTSpriteShiftEntry COKE_OVEN_TOP = getCT(AllCTTypes.RECTANGLE, "coke_oven/top"), COKE_OVEN_BOTTOM = getCT(AllCTTypes.RECTANGLE, "coke_oven/bottom"), COKE_OVEN_BACK = getCT(AllCTTypes.RECTANGLE, "coke_oven/side"), COKE_OVEN_SIDE = getCT(AllCTTypes.RECTANGLE, "coke_oven/side");
// Fluid Encasing
public static final CTSpriteShiftEntry BRASS_FLUID_CASING = omni("copper_encased_brass_pipe_side");
public static final CTSpriteShiftEntry STEEL_FLUID_CASING = omni("copper_encased_steel_pipe_side");
public static final CTSpriteShiftEntry ALUMINUM_FLUID_CASING = omni("copper_encased_aluminum_pipe_side");
public static final CTSpriteShiftEntry CAST_IRON_FLUID_CASING = omni("copper_encased_cast_iron_pipe_side");
public static final CTSpriteShiftEntry PLASTIC_FLUID_CASING = omni("copper_encased_plastic_pipe_side");
public static final CTSpriteShiftEntry FIREBOX_TOP = getCT(AllCTTypes.RECTANGLE, "firebox_top");
public static final CTSpriteShiftEntry STEEL_FLUID_TANK = getCT(AllCTTypes.RECTANGLE, "steel_fluid_tank"), STEEL_FLUID_TANK_TOP = getCT(AllCTTypes.RECTANGLE, "steel_fluid_tank_top"), STEEL_FLUID_TANK_INNER = getCT(AllCTTypes.RECTANGLE, "steel_fluid_tank_inner");

View File

@@ -1,7 +1,6 @@
package com.drmangotea.tfmg.base;
import com.drmangotea.tfmg.TFMG;
import com.drmangotea.tfmg.TFMGRegistries;
import com.drmangotea.tfmg.base.spark.ElectricSparkParticle;
import com.drmangotea.tfmg.base.spark.Spark;
@@ -11,14 +10,12 @@ import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.electrode.Elec
import com.drmangotea.tfmg.registry.TFMGEntityTypes;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.Create;
import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
import com.simibubi.create.foundation.fluid.SmartFluidTank;
import com.simibubi.create.foundation.utility.CreateLang;
import net.createmod.catnip.lang.LangBuilder;
import net.minecraft.ChatFormatting;
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
@@ -33,7 +30,6 @@ import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LightLayer;
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -43,15 +39,12 @@ import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.capability.IFluidHandler;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.items.IItemHandlerModifiable;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.joml.Matrix4f;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.stream.Collectors;

View File

@@ -42,7 +42,7 @@ public class TFMGEncasedPipeBlock extends EncasedPipeBlock {
context.getLevel()
.levelEvent(2001, context.getClickedPos(), Block.getId(state));
BlockState equivalentPipe = transferSixWayProperties(state, TFMGPipes.TFMG_PIPES.get(material).get(0).getDefaultState());
BlockState equivalentPipe = transferSixWayProperties(state, TFMGPipes.PIPES.get(material).getPipe().getDefaultState());
Direction firstFound = Direction.UP;
for (Direction d : Iterate.directions)
@@ -51,7 +51,7 @@ public class TFMGEncasedPipeBlock extends EncasedPipeBlock {
break;
}
FluidTransportBehaviour.cacheFlows(world, pos);
world.setBlockAndUpdate(pos, ((TFMGPipeBlock)TFMGPipes.TFMG_PIPES.get(material).get(0).get())
world.setBlockAndUpdate(pos, TFMGPipes.PIPES.get(material).getPipe().get()
.updateBlockState(equivalentPipe, firstFound, null, world, pos));
FluidTransportBehaviour.loadFlows(world, pos);
return InteractionResult.SUCCESS;

View File

@@ -10,10 +10,7 @@ import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
public class TFMGFluidValveBlock extends FluidValveBlock
implements IAxisPipe, IBE<FluidValveBlockEntity>, ProperWaterloggedBlock {
public static final BooleanProperty ENABLED = BooleanProperty.create("enabled");
public class TFMGFluidValveBlock extends FluidValveBlock implements IAxisPipe, IBE<FluidValveBlockEntity>, ProperWaterloggedBlock {
public TFMGFluidValveBlock(Properties properties) {
super(properties);

View File

@@ -13,11 +13,9 @@ import net.createmod.catnip.data.Iterate;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -25,7 +23,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult;
import java.util.Map;
@@ -40,7 +37,7 @@ public class TFMGGlassPipeBlock extends GlassFluidPipeBlock {
@Override
public ItemRequirement getRequiredItems(BlockState state, BlockEntity te) {
return ItemRequirement.of(TFMGPipes.TFMG_PIPES.get(material).get(0).getDefaultState(), te);
return ItemRequirement.of(TFMGPipes.PIPES.get(material).getPipe().getDefaultState(), te);
}
// @Override
@@ -53,8 +50,8 @@ public class TFMGGlassPipeBlock extends GlassFluidPipeBlock {
public BlockState toRegularPipe(LevelAccessor world, BlockPos pos, BlockState state) {
Direction side = Direction.get(Direction.AxisDirection.POSITIVE, state.getValue(AXIS));
Map<Direction, BooleanProperty> facingToPropertyMap = FluidPipeBlock.PROPERTY_BY_DIRECTION;
return ((TFMGPipeBlock) TFMGPipes.TFMG_PIPES.get(material).get(0).get())
.updateBlockState(TFMGPipes.TFMG_PIPES.get(material).get(0).getDefaultState()
return TFMGPipes.PIPES.get(material).getPipe().get()
.updateBlockState(TFMGPipes.PIPES.get(material).getPipe().getDefaultState()
.setValue(facingToPropertyMap.get(side), true)
.setValue(facingToPropertyMap.get(side.getOpposite()), true), side, null, world, pos);
}
@@ -65,7 +62,7 @@ public class TFMGGlassPipeBlock extends GlassFluidPipeBlock {
return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
if (level.isClientSide)
return ItemInteractionResult.SUCCESS;
BlockState newState = TFMGPipes.TFMG_PIPES.get(material).get(1).getDefaultState();
BlockState newState = TFMGPipes.PIPES.get(material).getEncased().getDefaultState();
for (Direction d : Iterate.directionsInAxis(getAxis(state)))
newState = newState.setValue(EncasedPipeBlock.FACING_TO_PROPERTY_MAP.get(d), true);
FluidTransportBehaviour.cacheFlows(level, pos);

View File

@@ -26,11 +26,9 @@ import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import javax.annotation.Nullable;
@@ -146,7 +144,7 @@ public class TFMGPipeBlock extends FluidPipeBlock {
.ifPresent($ -> AllAdvancements.GLASS_PIPE.awardTo(context.getPlayer())));
FluidTransportBehaviour.cacheFlows(world, pos);
world.setBlockAndUpdate(pos, TFMGPipes.TFMG_PIPES.get(material).get(2).getDefaultState()
world.setBlockAndUpdate(pos, TFMGPipes.PIPES.get(material).getGlass().getDefaultState()
.setValue(GlassFluidPipeBlock.AXIS, axis)
.setValue(BlockStateProperties.WATERLOGGED, state.getValue(BlockStateProperties.WATERLOGGED)));
FluidTransportBehaviour.loadFlows(world, pos);
@@ -174,7 +172,7 @@ public class TFMGPipeBlock extends FluidPipeBlock {
FluidTransportBehaviour.cacheFlows(world, pos);
world.setBlockAndUpdate(pos,
EncasedPipeBlock.transferSixWayProperties(state, TFMGPipes.TFMG_PIPES.get(material).get(1).getDefaultState()));
EncasedPipeBlock.transferSixWayProperties(state, TFMGPipes.PIPES.get(material).getEncased().getDefaultState()));
FluidTransportBehaviour.loadFlows(world, pos);
return ItemInteractionResult.SUCCESS;
}

View File

@@ -0,0 +1,173 @@
package com.drmangotea.tfmg.content.decoration.pipes;
import com.drmangotea.tfmg.base.TFMGRegistrate;
import com.drmangotea.tfmg.config.TFMGStress;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour;
import com.simibubi.create.content.decoration.encasing.EncasingRegistry;
import com.simibubi.create.content.fluids.PipeAttachmentModel;
import com.simibubi.create.content.fluids.pipes.SmartFluidPipeGenerator;
import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock;
import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.SharedProperties;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.nullness.NonNullFunction;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.material.MapColor;
import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe;
import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
public class TFMGPipeEntry {
private final TFMGPipes.PipeMaterial material;
private final TFMGRegistrate registrate;
private final BlockEntry<? extends TFMGPipeBlock> pipe;
private final BlockEntry<? extends TFMGEncasedPipeBlock> encased;
private final BlockEntry<? extends TFMGGlassPipeBlock> glass;
private final BlockEntry<? extends TFMGPumpBlock> pump;
private final BlockEntry<? extends TFMGSmartFluidPipeBlock> smart;
private final BlockEntry<? extends TFMGFluidValveBlock> valve;
private NonNullFunction<BakedModel, ? extends BakedModel> attachmentModel;
private CTSpriteShiftEntry encasedSpriteShift;
public TFMGPipeEntry(TFMGPipes.PipeMaterial material, TFMGRegistrate registrate) {
this.material = material;
this.registrate = registrate;
this.pipe = registerPipe();
this.encased = registerEncasedPipe();
this.glass = registerGlassPipe();
this.pump = registerPump();
this.smart = registerSmartPipe();
this.valve = registerValve();
}
public TFMGPipeEntry attachmentModel(NonNullFunction<BakedModel, ? extends BakedModel> attachmentModel) {
this.attachmentModel = attachmentModel;
return this;
}
public TFMGPipeEntry encasedSpriteShift(CTSpriteShiftEntry encasedSpriteShift) {
this.encasedSpriteShift = encasedSpriteShift;
return this;
}
public BlockEntry<? extends TFMGPipeBlock> getPipe() {
return pipe;
}
public BlockEntry<? extends TFMGEncasedPipeBlock> getEncased() {
return encased;
}
public BlockEntry<? extends TFMGGlassPipeBlock> getGlass() {
return glass;
}
public BlockEntry<? extends TFMGPumpBlock> getPump() {
return pump;
}
public BlockEntry<? extends TFMGSmartFluidPipeBlock> getSmart() {
return smart;
}
public BlockEntry<? extends TFMGFluidValveBlock> getValve() {
return valve;
}
protected BlockEntry<? extends TFMGPipeBlock> registerPipe() {
return this.registrate.block(this.material.name + "_pipe", p -> new TFMGPipeBlock(p, this.material))
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(BlockStateGen.pipe())
.onRegister(CreateRegistrate.blockModel(()-> this.attachmentModel))
.item()
.transform(customItemModel())
.register();
}
protected BlockEntry<? extends TFMGEncasedPipeBlock> registerEncasedPipe() {
return this.registrate.block("copper_encased_" + this.material.name + "_pipe", p -> new TFMGEncasedPipeBlock(p, AllBlocks.COPPER_CASING::get, this.material))
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.noOcclusion().mapColor(MapColor.TERRACOTTA_LIGHT_GRAY))
.transform(axeOrPickaxe())
.blockstate(BlockStateGen.encasedPipe())
.onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(this.encasedSpriteShift)))
.onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, this.encasedSpriteShift,
(s, f) -> !s.getValue(TFMGEncasedPipeBlock.FACING_TO_PROPERTY_MAP.get(f)))))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.loot((p, b) -> p.dropOther(b, this.pipe.get()))
.transform(EncasingRegistry.addVariantTo(this.pipe))
.register();
}
protected BlockEntry<? extends TFMGGlassPipeBlock> registerGlassPipe() {
return this.registrate.block("glass_" + this.material.name + "_pipe", p -> new TFMGGlassPipeBlock(p, this.material))
.initialProperties(SharedProperties::copperMetal)
.addLayer(() -> RenderType::cutoutMipped)
.transform(pickaxeOnly())
.blockstate((c, p) -> {
p.getVariantBuilder(c.getEntry())
.forAllStatesExcept(state -> {
Direction.Axis axis = state.getValue(BlockStateProperties.AXIS);
return ConfiguredModel.builder()
.modelFile(p.models()
.getExistingFile(p.modLoc("block/" + this.material.name + "_pipe/window")))
.uvLock(false)
.rotationX(axis == Direction.Axis.Y ? 0 : 90)
.rotationY(axis == Direction.Axis.X ? 90 : 0)
.build();
}, BlockStateProperties.WATERLOGGED);
})
.onRegister(CreateRegistrate.blockModel(()-> this.attachmentModel))
.loot((p, b) -> p.dropOther(b, this.pipe.get()))
.register();
}
protected BlockEntry<? extends TFMGPumpBlock> registerPump() {
return this.registrate.block(this.material.name + "_mechanical_pump", TFMGPumpBlock::new)
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true))
.onRegister(CreateRegistrate.blockModel(()-> this.attachmentModel))
.transform(TFMGStress.setImpact(4.0))
.item()
.transform(customItemModel())
.register();
}
protected BlockEntry<? extends TFMGSmartFluidPipeBlock> registerSmartPipe() {
return this.registrate.block(this.material.name + "_smart_fluid_pipe", TFMGSmartFluidPipeBlock::new)
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(new SmartFluidPipeGenerator()::generate)
.onRegister(CreateRegistrate.blockModel(()-> this.attachmentModel))
.item()
.transform(customItemModel())
.register();
}
protected BlockEntry<? extends TFMGFluidValveBlock> registerValve() {
return this.registrate.block(this.material.name + "_fluid_valve", TFMGFluidValveBlock::new)
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.addLayer(() -> RenderType::cutoutMipped)
.blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p,
(state, vertical) -> AssetLookup.partialBaseModel(c, p, vertical ? "vertical" : "horizontal",
state.getValue(FluidValveBlock.ENABLED) ? "open" : "closed")))
.onRegister(CreateRegistrate.blockModel(() -> this.attachmentModel))
.item()
.transform(customItemModel())
.register();
}
}

View File

@@ -2,6 +2,7 @@ package com.drmangotea.tfmg.content.decoration.pipes;
import com.drmangotea.tfmg.base.TFMGCreativeTabs;
import com.drmangotea.tfmg.base.TFMGRegistrate;
import com.drmangotea.tfmg.base.TFMGSpriteShifts;
import com.drmangotea.tfmg.config.TFMGStress;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllSpriteShifts;
@@ -10,12 +11,15 @@ import com.simibubi.create.content.decoration.encasing.EncasingRegistry;
import com.simibubi.create.content.fluids.PipeAttachmentModel;
import com.simibubi.create.content.fluids.pipes.SmartFluidPipeGenerator;
import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock;
import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.SharedProperties;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.nullness.NonNullFunction;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -32,152 +36,22 @@ import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe;
import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
@SuppressWarnings("removal")
public class TFMGPipes {
public static final Map<PipeMaterial, List<BlockEntry<? extends Block>>> TFMG_PIPES = new HashMap<>();
public static final TFMGRegistrate registrate = (TFMGRegistrate) REGISTRATE.setCreativeTab(TFMGCreativeTabs.TFMG_DECORATION);
/*
0: pipe
1: encased
2: glass
3: pump
4: smart pipe
5: valve
*/
public static final Map<PipeMaterial, TFMGPipeEntry> PIPES = new HashMap<>();
static {
PIPES.put(PipeMaterial.BRASS, createEntry(PipeMaterial.BRASS, TFMGPipeAttachmentModel::withAOBrass, TFMGSpriteShifts.BRASS_FLUID_CASING));
PIPES.put(PipeMaterial.STEEL, createEntry(PipeMaterial.STEEL, TFMGPipeAttachmentModel::withAOSteel, TFMGSpriteShifts.STEEL_FLUID_CASING));
PIPES.put(PipeMaterial.ALUMINUM, createEntry(PipeMaterial.ALUMINUM, TFMGPipeAttachmentModel::withAOAluminum, TFMGSpriteShifts.ALUMINUM_FLUID_CASING));
PIPES.put(PipeMaterial.CAST_IRON, createEntry(PipeMaterial.CAST_IRON, TFMGPipeAttachmentModel::withAOCastIron, TFMGSpriteShifts.CAST_IRON_FLUID_CASING));
PIPES.put(PipeMaterial.PLASTIC, createEntry(PipeMaterial.PLASTIC, TFMGPipeAttachmentModel::withAOPlastic, TFMGSpriteShifts.PLASTIC_FLUID_CASING));
}
for (PipeMaterial pipeType : PipeMaterial.values()) {
List<BlockEntry<? extends Block>> pipes = new ArrayList<>();
BlockEntry<TFMGPipeBlock> pipe =
registrate.block(pipeType.name + "_pipe", p -> new TFMGPipeBlock(p, pipeType))
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(BlockStateGen.pipe())
.onRegister(CreateRegistrate.blockModel(()->
switch (pipeType){
case BRASS -> TFMGPipeAttachmentModel::withAOBrass;
case STEEL -> TFMGPipeAttachmentModel::withAOSteel;
case ALUMINUM -> TFMGPipeAttachmentModel::withAOAluminum;
case CAST_IRON -> TFMGPipeAttachmentModel::withAOCastIron;
case PLASTIC -> TFMGPipeAttachmentModel::withAOPlastic;
}))
.item()
.transform(customItemModel())
.register();
pipes.add(pipe);
BlockEntry<TFMGEncasedPipeBlock> copper_encased_pipe =
registrate.block("copper_encased_" + pipeType.name + "_pipe", p -> new TFMGEncasedPipeBlock(p, AllBlocks.COPPER_CASING::get, pipeType))
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.noOcclusion().mapColor(MapColor.TERRACOTTA_LIGHT_GRAY))
.transform(axeOrPickaxe())
.blockstate(BlockStateGen.encasedPipe())
.onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(AllSpriteShifts.COPPER_CASING)))
.onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, AllSpriteShifts.COPPER_CASING,
(s, f) -> !s.getValue(TFMGEncasedPipeBlock.FACING_TO_PROPERTY_MAP.get(f)))))
.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
.loot((p, b) -> p.dropOther(b, pipe.get()))
.transform(EncasingRegistry.addVariantTo(pipe))
.register();
pipes.add(copper_encased_pipe);
BlockEntry<TFMGGlassPipeBlock> glass_pipe =
registrate.block("glass_" + pipeType.name + "_pipe", p -> new TFMGGlassPipeBlock(p, pipeType))
.initialProperties(SharedProperties::copperMetal)
.addLayer(() -> RenderType::cutoutMipped)
.transform(pickaxeOnly())
.blockstate((c, p) -> {
p.getVariantBuilder(c.getEntry())
.forAllStatesExcept(state -> {
Direction.Axis axis = state.getValue(BlockStateProperties.AXIS);
return ConfiguredModel.builder()
.modelFile(p.models()
.getExistingFile(p.modLoc("block/" + pipeType.name + "_pipe/window")))
.uvLock(false)
.rotationX(axis == Direction.Axis.Y ? 0 : 90)
.rotationY(axis == Direction.Axis.X ? 90 : 0)
.build();
}, BlockStateProperties.WATERLOGGED);
})
.onRegister(CreateRegistrate.blockModel(()->
switch (pipeType){
case BRASS -> TFMGPipeAttachmentModel::withAOBrass;
case STEEL -> TFMGPipeAttachmentModel::withAOSteel;
case ALUMINUM -> TFMGPipeAttachmentModel::withAOAluminum;
case CAST_IRON -> TFMGPipeAttachmentModel::withAOCastIron;
case PLASTIC -> TFMGPipeAttachmentModel::withAOPlastic;
}))
.loot((p, b) -> p.dropOther(b, pipe.get()))
.register();
pipes.add(glass_pipe);
BlockEntry<TFMGPumpBlock> fluid_pump =
registrate.block(pipeType.name + "_mechanical_pump", TFMGPumpBlock::new)
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true))
.onRegister(CreateRegistrate.blockModel(()->
switch (pipeType){
case BRASS -> TFMGPipeAttachmentModel::withAOBrass;
case STEEL -> TFMGPipeAttachmentModel::withAOSteel;
case ALUMINUM -> TFMGPipeAttachmentModel::withAOAluminum;
case CAST_IRON -> TFMGPipeAttachmentModel::withAOCastIron;
case PLASTIC -> TFMGPipeAttachmentModel::withAOPlastic;
}))
.transform(TFMGStress.setImpact(4.0))
.item()
.transform(customItemModel())
.register();
pipes.add(fluid_pump);
BlockEntry<TFMGSmartFluidPipeBlock> smart_pipe =
registrate.block(pipeType.name + "_smart_fluid_pipe", TFMGSmartFluidPipeBlock::new)
.initialProperties(SharedProperties::copperMetal)
.transform(pickaxeOnly())
.blockstate(new SmartFluidPipeGenerator()::generate)
.onRegister(CreateRegistrate.blockModel(()->
switch (pipeType){
case BRASS -> TFMGPipeAttachmentModel::withAOBrass;
case STEEL -> TFMGPipeAttachmentModel::withAOSteel;
case ALUMINUM -> TFMGPipeAttachmentModel::withAOAluminum;
case CAST_IRON -> TFMGPipeAttachmentModel::withAOCastIron;
case PLASTIC -> TFMGPipeAttachmentModel::withAOPlastic;
}))
.item()
.transform(customItemModel())
.register();
pipes.add(smart_pipe);
// BlockEntry<TFMGFluidValveBlock> fluid_valve =
// REGISTRATE.block(pipeType.name + "_fluid_valve", TFMGFluidValveBlock::new)
// .initialProperties(SharedProperties::copperMetal)
// .transform(pickaxeOnly())
// .addLayer(() -> RenderType::cutoutMipped)
// .blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p,
// (state, vertical) -> AssetLookup.partialBaseModel(c, p, vertical ? "vertical" : "horizontal",
// state.getValue(FluidValveBlock.ENABLED) ? "open" : "closed")))
// .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
// .item()
// .transform(customItemModel())
// .register();
//
// pipes.add(fluid_valve);
TFMG_PIPES.put(pipeType, pipes);
}
private static TFMGPipeEntry createEntry(PipeMaterial material, NonNullFunction<BakedModel, ? extends BakedModel> attachmentModel, CTSpriteShiftEntry spriteShiftEntry) {
return new TFMGPipeEntry(material, registrate).attachmentModel(attachmentModel).encasedSpriteShift(spriteShiftEntry);
}
public static void init() {

View File

@@ -103,8 +103,8 @@ public class EngineProperties {
components.add(Ingredient.of(TFMGBlocks.STEEL_COGWHEEL.asStack()));
components.add(Ingredient.of(TFMGBlocks.LARGE_STEEL_COGWHEEL.asStack()));
components.add(Ingredient.of(AllItems.BELT_CONNECTOR.asStack()));
components.add(Ingredient.of(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0).asStack()));
components.add(Ingredient.of(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0).asStack()));
components.add(Ingredient.of(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe().asStack()));
components.add(Ingredient.of(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe().asStack()));
components.add(Ingredient.of(TFMGItems.STEEL_MECHANISM.asStack()));
return components;
@@ -115,8 +115,8 @@ public class EngineProperties {
components.add(Ingredient.of(AllBlocks.SHAFT.asStack()));
components.add(Ingredient.of(TFMGBlocks.STEEL_COGWHEEL.asStack()));
components.add(Ingredient.of(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0).asStack()));
components.add(Ingredient.of(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0).asStack()));
components.add(Ingredient.of(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe().asStack()));
components.add(Ingredient.of(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe().asStack()));
components.add(Ingredient.of(TFMGItems.STEEL_MECHANISM.asStack()));
components.add(Ingredient.of(TFMGItems.STEEL_MECHANISM.asStack()));

View File

@@ -5,13 +5,11 @@ import com.drmangotea.tfmg.registry.TFMGBlockEntities;
import com.drmangotea.tfmg.registry.TFMGFluids;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.foundation.fluid.FluidHelper;
import com.simibubi.create.foundation.fluid.SmartFluidTank;
import com.simibubi.create.foundation.utility.CreateLang;
import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.lang.LangBuilder;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
@@ -29,10 +27,8 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler;
import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import static com.drmangotea.tfmg.content.machinery.misc.air_intake.AirIntakeBlock.INVISIBLE;
import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
@@ -83,7 +79,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha
int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 40;
if (tankInventory.getFluidAmount() + production <= tankInventory.getCapacity()) {
//tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(), production), IFluidHandler.FluidAction.EXECUTE);
tankInventory.setFluid(new FluidStack(TFMGFluids.AIR.get(), production + tankInventory.getFluidAmount()));
tankInventory.setFluid(new FluidStack(FluidHelper.convertToStill(TFMGFluids.AIR.get()), production + tankInventory.getFluidAmount()));
// if(controller!=null) {
// ((AirIntakeBlockEntity) level.getBlockEntity(controller)).setChanged();
// ((AirIntakeBlockEntity) level.getBlockEntity(controller)).sendData();

View File

@@ -374,19 +374,19 @@ public class TFMGRecipeProvider extends RecipeProvider {
return TFMGBlocks.INDUSTRIAL_PIPE.get();
}
public static ItemLike steelPipe() {
return TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0);
return TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe();
}
public static ItemLike brassPipe() {
return TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0);
return TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPipe();
}
public static ItemLike castIronPipe() {
return TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0);
return TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPipe();
}
public static ItemLike aluminumPipe() {
return TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0);
return TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPipe();
}
public static ItemLike plasticPipe() {
return TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0);
return TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPipe();
}
public static ItemLike magneticIngot() {
return TFMGItems.MAGNETIC_ALLOY_INGOT.get();

View File

@@ -7,11 +7,8 @@ import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider;
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.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
@@ -19,13 +16,11 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems;
import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks;
import com.simibubi.create.foundation.data.recipe.CompatMetals;
import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider;
import com.simibubi.create.foundation.data.recipe.Mods;
import com.simibubi.create.foundation.mixin.accessor.MappedRegistryAccessor;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.entry.ItemEntry;
import com.tterrag.registrate.util.entry.ItemProviderEntry;
import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.advancements.Advancement;
@@ -169,7 +164,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.unlockedBy(TFMGItems.CIRCUIT_BOARD::get)
.viaShaped(b -> b
.define('C', circuitBoard())
.define('P', TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(3))
.define('P', TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPump())
.define('W', copperWire())
.define('Q', capacitor())
.define('K', TFMGItems.ELECTROMAGNETIC_COIL)
@@ -344,9 +339,9 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("CC ")
.pattern("S ")
.pattern("S ")),
/*
/// ////////////
STEEL_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).returns(4)
STEEL_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe()).returns(4)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('I', steelIngot())
@@ -355,7 +350,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
STEEL_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).withSuffix("_vertical").returns(4)
STEEL_PIPE_VERTICAL = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe()).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('I', steelIngot())
@@ -364,13 +359,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("I")
.pattern("P")),
STEEL_MECHANICAL_PUMP = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(3))
STEEL_MECHANICAL_PUMP = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPump())
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(steelPipe())),
STEEL_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(4))
STEEL_SMART_FLUID_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getSmart())
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
@@ -380,13 +375,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S")
.pattern("P")),
STEEL_FLUID_VALVE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(5))
STEEL_FLUID_VALVE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getValve())
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(steelPipe())),
/// ////////////
ALUMINUM_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).returns(4)
ALUMINUM_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPipe()).returns(4)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('I', aluminumIngot())
@@ -395,7 +390,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
ALUMINUM_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).withSuffix("_vertical").returns(4)
ALUMINUM_PIPE_VERTICAL = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPipe()).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('I', aluminumIngot())
@@ -404,13 +399,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("I")
.pattern("P")),
ALUMINUM_MECHANICAL_PUMP = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(3))
ALUMINUM_MECHANICAL_PUMP = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPump())
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(aluminumPipe())),
ALUMINUM_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(4))
ALUMINUM_SMART_FLUID_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getSmart())
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
@@ -420,13 +415,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S")
.pattern("P")),
ALUMINUM_FLUID_VALVE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(5))
ALUMINUM_FLUID_VALVE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getValve())
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(aluminumPipe())),
/// ////////////
PLASTIC_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).returns(4)
PLASTIC_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPipe()).returns(4)
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('I', plasticSheet())
@@ -434,7 +429,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("III")
.pattern(" ")),
PLASTIC_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).withSuffix("_vertical").returns(4)
PLASTIC_PIPE_VERTICAL = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPipe()).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('I', plasticSheet())
@@ -442,13 +437,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("I")
.pattern("I")),
PLASTIC_MECHANICAL_PUMP = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(3))
PLASTIC_MECHANICAL_PUMP = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPump())
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShapeless(b -> b
.requires(cog())
.requires(plasticPipe())),
PLASTIC_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(4))
PLASTIC_SMART_FLUID_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getSmart())
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('P', electronTube())
@@ -458,13 +453,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S")
.pattern("P")),
PLASTIC_FLUID_VALVE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(5))
PLASTIC_FLUID_VALVE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getValve())
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(plasticPipe())),
/// ////////////
BRASS_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).returns(4)
BRASS_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPipe()).returns(4)
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
@@ -473,7 +468,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
BRASS_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).withSuffix("_vertical").returns(4)
BRASS_PIPE_VERTICAL = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPipe()).withSuffix("_vertical").returns(4)
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
@@ -482,13 +477,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("I")
.pattern("P")),
BRASS_MECHANICAL_PUMP = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(3))
BRASS_MECHANICAL_PUMP = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPump())
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(brassPipe())),
BRASS_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(4))
BRASS_SMART_FLUID_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getSmart())
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
@@ -498,13 +493,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S")
.pattern("P")),
BRASS_FLUID_VALVE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(5))
BRASS_FLUID_VALVE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getValve())
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(brassPipe())),
/// ////////////
CAST_IRON_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).returns(4)
CAST_IRON_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPipe()).returns(4)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', castIronIngot())
@@ -513,7 +508,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).withSuffix("_vertical").returns(4)
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPipe()).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', castIronIngot())
@@ -522,13 +517,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("I")
.pattern("P")),
CAST_IRON_MECHANICAL_PUMP = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(3))
CAST_IRON_MECHANICAL_PUMP = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPump())
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(castIronPipe())),
CAST_IRON_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(4))
CAST_IRON_SMART_FLUID_PIPE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getSmart())
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
@@ -538,13 +533,13 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S")
.pattern("P")),
CAST_IRON_FLUID_VALVE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(5))
CAST_IRON_FLUID_VALVE = create(TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getValve())
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(castIronPipe())),
/// ////////////
*/
STEEL_COGWHEEL = create(TFMGBlocks.STEEL_COGWHEEL).returns(4)
.unlockedBy(() -> TFMGItems.STEEL_INGOT)

View File

@@ -21,15 +21,15 @@ public class TFMGCokingRecipeGen extends CokingRecipeGen {
COAL_COKE = create(TFMG.asResource("coal"), b ->b
.require(Items.COAL)
.output(new FluidStack(TFMGFluids.CREOSOTE.get(), 1))
.output(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), 30))
.output(TFMGFluids.CREOSOTE.get(), 1)
.output(TFMGFluids.CARBON_DIOXIDE.get(), 30)
.output(TFMGItems.COAL_COKE)
.duration(20*60)),
CHARCOAL = create(TFMG.asResource("charcoal"), b ->b
.require(log())
.output(new FluidStack(TFMGFluids.CREOSOTE.get(), 2))
.output(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), 20))
.output(TFMGFluids.CREOSOTE.get(), 2)
.output(TFMGFluids.CARBON_DIOXIDE.get(), 20)
.output(Items.CHARCOAL)
.duration(20*30));
;

View File

@@ -1,5 +1,6 @@
package com.drmangotea.tfmg.mixin;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeEntry;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes;
import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.simibubi.create.AllBlocks;
@@ -85,18 +86,12 @@ public class FluidPropagatorMixin {
if (tileEntity instanceof PumpBlockEntity) {
boolean pipesPredicate = TFMGPipes.PIPES.values().stream().map(TFMGPipeEntry::getPump).noneMatch(pump -> pump.has(targetState));
if (!AllBlocks.MECHANICAL_PUMP.has(targetState)&&
!TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(3).has(targetState)&&
!TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(3).has(targetState)&&
!TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(3).has(targetState)&&
!TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(3).has(targetState)&&
!TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(3).has(targetState)
&&
!TFMGBlocks.ELECTRIC_PUMP.has(targetState)
|| targetState.getValue(PumpBlock.FACING)
.getAxis() != direction.getAxis())
if (!AllBlocks.MECHANICAL_PUMP.has(targetState) &&
pipesPredicate &&
!TFMGBlocks.ELECTRIC_PUMP.has(targetState)||
targetState.getValue(PumpBlock.FACING).getAxis() != direction.getAxis())
continue;
@@ -110,7 +105,7 @@ public class FluidPropagatorMixin {
FluidTransportBehaviour targetPipe = getPipe(world, target);
if (targetPipe == null)
continue;
Integer distance = pair.getFirst();
int distance = pair.getFirst();
if (distance >= getPumpRange() && !targetPipe.hasAnyPressure())
continue;
if (targetPipe.canHaveFlowToward(targetState, direction.getOpposite()))

View File

@@ -7,7 +7,9 @@ import com.drmangotea.tfmg.content.decoration.doors.TFMGSlidingDoorRenderer;
import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlockEntity;
import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelRenderer;
import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelVisual;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeBlock;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeBlockEntity;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeEntry;
import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes;
import com.drmangotea.tfmg.content.decoration.tanks.TFMGFluidTankBlockEntity;
import com.drmangotea.tfmg.content.decoration.tanks.TFMGFluidTankRenderer;
@@ -121,6 +123,13 @@ import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEn
import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
import com.tterrag.registrate.util.entry.BlockEntityEntry;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.nullness.NonNullSupplier;
import net.minecraft.world.level.block.Block;
import java.util.List;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import static com.drmangotea.tfmg.TFMG.REGISTRATE;
@@ -546,22 +555,22 @@ public class TFMGBlockEntities {
public static final BlockEntityEntry<TFMGPipeBlockEntity> TFMG_PIPE = REGISTRATE
.blockEntity("tfmg_pipe", TFMGPipeBlockEntity::new)
.validBlocks(
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPipe(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPipe(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPipe(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPipe(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPipe()
)
.register();
public static final BlockEntityEntry<StraightPipeBlockEntity> GLASS_TFMG_PIPE = REGISTRATE
.blockEntity("glass_tfmg_pipe", StraightPipeBlockEntity::new)
.validBlocks(
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(2),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(2),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(2),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(2),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(2)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getGlass(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getGlass(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getGlass(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getGlass(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getGlass()
)
.renderer(() -> TransparentStraightPipeRenderer::new)
.register();
@@ -570,11 +579,11 @@ public class TFMGBlockEntities {
public static final BlockEntityEntry<FluidPipeBlockEntity> ENCASED_TFMG_PIPE = REGISTRATE
.blockEntity("encased_tfmg_pipe", FluidPipeBlockEntity::new)
.validBlocks(
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(1),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(1),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(1),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(1),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(1)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getEncased(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getEncased(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getEncased(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getEncased(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getEncased()
)
.register();
@@ -583,11 +592,11 @@ public class TFMGBlockEntities {
.blockEntity("mechanical_pump", PumpBlockEntity::new)
.visual(() -> SingleAxisRotatingVisual.ofZ(AllPartialModels.MECHANICAL_PUMP_COG))
.validBlocks(
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(3),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(3),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(3),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(3),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(3)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getPump(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getPump(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getPump(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getPump(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getPump()
)
.renderer(() -> PumpRenderer::new)
.register();
@@ -595,11 +604,11 @@ public class TFMGBlockEntities {
public static final BlockEntityEntry<SmartFluidPipeBlockEntity> TFMG_SMART_FLUID_PIPE = REGISTRATE
.blockEntity("smart_fluid_pipe", SmartFluidPipeBlockEntity::new)
.validBlocks(
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(4),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(4),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(4),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(4),
TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(4)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getSmart(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getSmart(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getSmart(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getSmart(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getSmart()
)
.renderer(() -> SmartBlockEntityRenderer::new)
.register();
@@ -608,11 +617,11 @@ public class TFMGBlockEntities {
.blockEntity("fluid_valve", FluidValveBlockEntity::new)
.visual(() -> FluidValveVisual::new)
.validBlocks(
// TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(5),
// TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(5),
// TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(5),
// TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(5),
// TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(5)
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.BRASS).getValve(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.STEEL).getValve(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).getValve(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).getValve(),
TFMGPipes.PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).getValve()
)
.renderer(() -> FluidValveRenderer::new)
.register();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 792 B

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 810 B

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 258 B

Some files were not shown because too many files have changed in this diff Show More