diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 4eaeafc6f..9a6aa8ca7 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -59,7 +59,6 @@ import java.util.Random; */ public abstract class BlockTransformer extends BaseTileBlock { public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL); - protected final String prefix = "techreborn:blocks/machines/energy/"; public String name; public BlockTransformer(String name) { diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 7e59baa0c..857e796d2 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -255,7 +255,7 @@ public class ModBlocks { GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR"); INTERDIMENSIONAL_SU = new BlockInterdimensionalSU(); - registerBlock(INTERDIMENSIONAL_SU, "inderdimensional_su"); + registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su"); GameRegistry.registerTileEntity(TileInterdimensionalSU.class, "TileInterdimensionalSUTR"); ADJUSTABLE_SU = new BlockAdjustableSU(); diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/adjustable_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/adjustable_su.json new file mode 100644 index 000000000..12a3e9150 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/adjustable_su.json @@ -0,0 +1,40 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/energy/adjustable_su_side", + "bottom": "techreborn:blocks/machines/energy/adjustable_su_side", + "top": "techreborn:blocks/machines/energy/adjustable_su_side", + "front": "techreborn:blocks/machines/energy/adjustable_su_front", + "side": "techreborn:blocks/machines/energy/adjustable_su_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage.json index 730d5febd..078e8f068 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_storage.json @@ -12,5 +12,31 @@ "east": "techreborn:blocks/machines/energy/ev_storage_side", "south": "techreborn:blocks/machines/energy/ev_storage_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_transformer.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_transformer.json index 768278d36..d85a73b96 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_transformer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/ev_transformer.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/ev_transformer_front", "side": "techreborn:blocks/machines/energy/ev_transformer_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json index cf356889a..b51c55051 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/hv_storage_front", "side": "techreborn:blocks/machines/energy/hv_storage_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/hv_transformer.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/hv_transformer.json index 6b246ec39..870334aaa 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/hv_transformer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/hv_transformer.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/hv_transformer_front", "side": "techreborn:blocks/machines/energy/hv_transformer_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json index 51b52f457..4cf3d9a9d 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/interdimensional_su.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/ev_storage_transmitter_front", "side": "techreborn:blocks/machines/energy/ev_storage_transmitter_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json index 81ea4f138..0744c1749 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/lapotronic_su.json @@ -2,24 +2,38 @@ "forge_marker": 1, "defaults": { "transform": "forge:default-block", - "model": "cube_all", + "model": "orientable", "textures": { - "all": "techreborn:blocks/machines/energy/ev_multi_side" + "particle": "techreborn:blocks/machines/energy/lapotronic_su_side", + "bottom": "techreborn:blocks/machines/energy/lapotronic_su_side", + "top": "techreborn:blocks/machines/energy/lapotronic_su_side", + "front": "techreborn:blocks/machines/energy/lapotronic_su_front", + "side": "techreborn:blocks/machines/energy/lapotronic_su_side" } }, "variants": { "inventory": { "transform": "forge:default-block", - "model": "cube_all", "textures": { - "all": "techreborn:blocks/machines/energy/ev_multi_side" } }, - "normal": { - "transform": "forge:default-block", - "model": "cube_all", - "textures": { - "all": "techreborn:blocks/machines/energy/ev_multi_side" + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 } } } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json index 4e2254291..da9b6e328 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json @@ -1,12 +1,42 @@ { - "parent": "block/cube_directional", - "textures": { - "particle": "techreborn:blocks/machines/energy/lv_storage_front", - "down": "techreborn:blocks/machines/energy/lv_storage_side", - "up": "techreborn:blocks/machines/energy/lv_storage_side", - "north": "techreborn:blocks/machines/energy/lv_storage_front", - "east": "techreborn:blocks/machines/energy/lv_storage_side", - "south": "techreborn:blocks/machines/energy/lv_storage_side", - "west": "techreborn:blocks/machines/energy/lv_storage_side" + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/energy/lv_storage_front", + "down": "techreborn:blocks/machines/energy/lv_storage_side", + "up": "techreborn:blocks/machines/energy/lv_storage_side", + "north": "techreborn:blocks/machines/energy/lv_storage_front", + "east": "techreborn:blocks/machines/energy/lv_storage_side", + "south": "techreborn:blocks/machines/energy/lv_storage_side", + "west": "techreborn:blocks/machines/energy/lv_storage_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/lsu_storage.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/lsu_storage.json new file mode 100644 index 000000000..49755511f --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/lsu_storage.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_all", + "textures": { + "all": "techreborn:blocks/machines/energy/lapotronic_su_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "normal": { + "textures": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_transformer.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_transformer.json index 4fa8445f1..8285cb25c 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_transformer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/lv_transformer.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/lv_transformer_front", "side": "techreborn:blocks/machines/energy/lv_transformer_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json index cdf749568..fb6eee35c 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/mv_storage_front", "side": "techreborn:blocks/machines/energy/mv_storage_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/mv_transformer.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/mv_transformer.json index 40f1cc29b..d0de7c461 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/mv_transformer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/energy/mv_transformer.json @@ -10,5 +10,31 @@ "front": "techreborn:blocks/machines/energy/mv_transformer_front", "side": "techreborn:blocks/machines/energy/mv_transformer_side" } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "textures": { + } + }, + "facing": { + "north": { + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_front.png b/src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_side.png b/src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_front.png b/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side.png b/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png