diff --git a/src/main/java/gregtech/api/unification/material/properties/ModeratorProperty.java b/src/main/java/gregtech/api/unification/material/properties/ModeratorProperty.java deleted file mode 100644 index 81e3504fdc2..00000000000 --- a/src/main/java/gregtech/api/unification/material/properties/ModeratorProperty.java +++ /dev/null @@ -1,26 +0,0 @@ -package gregtech.api.unification.material.properties; - -public class ModeratorProperty implements IMaterialProperty { - - private double moderatorFactor = 0.D; - private double absorption = 0.D; - - @Override - public void verifyProperty(MaterialProperties properties) {} - - public void setModeratorFactor(double moderatorFactor) { - this.moderatorFactor = moderatorFactor; - } - - public double getModeratorFactor() { - return this.moderatorFactor; - } - - public void setAbsorption(double absorption) { - this.absorption = absorption; - } - - public double getAbsorption() { - return this.absorption; - } -} diff --git a/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java b/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java index 7e5443728d6..6b8eb9bde89 100644 --- a/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java +++ b/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java @@ -12,8 +12,6 @@ public class PropertyKey { public static final PropertyKey FLUID = new PropertyKey<>("fluid", FluidProperty.class); public static final PropertyKey GEM = new PropertyKey<>("gem", GemProperty.class); public static final PropertyKey INGOT = new PropertyKey<>("ingot", IngotProperty.class); - public static final PropertyKey MODERATOR = new PropertyKey<>("moderator", - ModeratorProperty.class); public static final PropertyKey POLYMER = new PropertyKey<>("polymer", PolymerProperty.class); public static final PropertyKey ITEM_PIPE = new PropertyKey<>("item_pipe", ItemPipeProperties.class); diff --git a/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json b/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json index 11036a5d892..67f4dd5d3b1 100644 --- a/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json +++ b/src/main/resources/assets/gregtech/blockstates/gas_centrifuge_casing.json @@ -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" } } } diff --git a/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json b/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json index 6468689e724..3cf3a57c1db 100644 --- a/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json +++ b/src/main/resources/assets/gregtech/models/block/gas_centrifuge.json @@ -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] + } + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge.png deleted file mode 100644 index f324f28a94c..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png new file mode 100644 index 00000000000..abbd8bfbcd5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_end.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_side.png new file mode 100644 index 00000000000..e0e687c0a94 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/nuclear/gas_centrifuge_side.png differ