Skip to content

Commit

Permalink
feat: gas centrifuge columns now look OK
Browse files Browse the repository at this point in the history
  • Loading branch information
bruberu committed Jul 21, 2024
1 parent 52a55db commit 43767a6
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 42 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public class PropertyKey<T extends IMaterialProperty> {
public static final PropertyKey<FluidProperty> FLUID = new PropertyKey<>("fluid", FluidProperty.class);
public static final PropertyKey<GemProperty> GEM = new PropertyKey<>("gem", GemProperty.class);
public static final PropertyKey<IngotProperty> INGOT = new PropertyKey<>("ingot", IngotProperty.class);
public static final PropertyKey<ModeratorProperty> MODERATOR = new PropertyKey<>("moderator",
ModeratorProperty.class);
public static final PropertyKey<PolymerProperty> POLYMER = new PropertyKey<>("polymer", PolymerProperty.class);
public static final PropertyKey<ItemPipeProperties> ITEM_PIPE = new PropertyKey<>("item_pipe",
ItemPipeProperties.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
"gas_centrifuge_column" : {
"model" : "gregtech:gas_centrifuge",
"textures" : {
"0" : "gregtech:blocks/casings/nuclear/gas_centrifuge",
"particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge"
"0" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side",
"1" : "gregtech:blocks/casings/nuclear/gas_centrifuge_end",
"particle" : "gregtech:blocks/casings/nuclear/gas_centrifuge_side"
}
}
}
Expand Down
35 changes: 23 additions & 12 deletions src/main/resources/assets/gregtech/models/block/gas_centrifuge.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "gregtech:gas_centrifuge",
"particle": "gregtech:gas_centrifuge"
},
"elements": [
{
"from": [3, 0, 3],
"to": [13, 16, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [0, 0, 5, 8], "texture": "#0"},
"east": {"uv": [0, 0, 5, 8], "texture": "#0"},
"south": {"uv": [0, 0, 5, 8], "texture": "#0"},
"west": {"uv": [0, 0, 5, 8], "texture": "#0"},
"up": {"uv": [10, 5, 5, 0], "texture": "#0"},
"down": {"uv": [10, 0, 5, 5], "texture": "#0"}
"north": {"uv": [0, 0, 10, 16], "texture": "#0"},
"east": {"uv": [0, 0, 10, 16], "texture": "#0"},
"south": {"uv": [0, 0, 10, 16], "texture": "#0"},
"west": {"uv": [0, 0, 10, 16], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
}
}
]
],
"display": {
"firstperson_righthand": {
"rotation": [0, 7, 0],
"translation": [0, -1.5, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [0, 7, 0],
"translation": [0, -1.5, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [34, 45, 0],
"scale": [0.7, 0.7, 0.7]
}
}
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 43767a6

Please sign in to comment.