diff --git a/src/main/java/com/finderfeed/solarcraft/content/items/solar_lexicon/screen/InfusingCraftingRecipeScreen.java b/src/main/java/com/finderfeed/solarcraft/content/items/solar_lexicon/screen/InfusingCraftingRecipeScreen.java index a9e9e7cf7..c5b73dce2 100644 --- a/src/main/java/com/finderfeed/solarcraft/content/items/solar_lexicon/screen/InfusingCraftingRecipeScreen.java +++ b/src/main/java/com/finderfeed/solarcraft/content/items/solar_lexicon/screen/InfusingCraftingRecipeScreen.java @@ -202,7 +202,8 @@ public void tick() { if (itemRators != null){ for (ItemRator[] itemRators : itemRators){ for (ItemRator itemRator : itemRators){ - if (i % 30 == 0) { + if (i % 30 == 0 && itemRator != null) { + //2nd null check to prevent crashes on certain infusion crafting recipes itemRator.next(); } } diff --git a/src/main/java/com/finderfeed/solarcraft/helpers/multiblock/Multiblocks.java b/src/main/java/com/finderfeed/solarcraft/helpers/multiblock/Multiblocks.java index adc298051..ef3e33494 100644 --- a/src/main/java/com/finderfeed/solarcraft/helpers/multiblock/Multiblocks.java +++ b/src/main/java/com/finderfeed/solarcraft/helpers/multiblock/Multiblocks.java @@ -14,14 +14,14 @@ public class Multiblocks { .setPattern(new String[][]{{"qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq", "qqqqqqqqqqqqq"}, {"weeweeweeweew", "eeeeeeeeeeeee", "eereeereeeree", "weeeeeeeeeeew", "eeeereeereeee", "eeeeeeeeeeeee", "wereeeteeerew", "eeeeeeeeeeeee", "eeeereeereeee", "weeeeeeeeeeew", "eereeereeeree", "eeeeeeeeeeeee", "weeweeweeweew"}, {"weeMeeMeeMeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "MeeeeeeeeeeeM", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "MeeeeeeeeeeeM", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "MeeeeeeeeeeeM", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeMeeMeeMeew"}, {"weeweeweeweew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeweeweeweew"}, {"weeweeweeweew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeeeeeeeeeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeweeweeweew"}, {"weeyuuiuuyeew", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "yeeeeeeeeeeey", "oeeeeeeeeeeep", "oeeeeeeeeeeep", "ieeeeeeeeeeei", "oeeeeeeeeeeep", "oeeeeeeeeeeep", "yeeeeeeeeeeey", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "weeyaaiaayeew"}, {"iuuieeeeeiuui", "oeeeeeeeeeeep", "oeeeeeeeeeeep", "ieeeeeeeeeeei", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "eeeeeeeeeeeee", "ieeeeeeeeeeei", "oeeeeeeeeeeep", "oeeeeeeeeeeep", "iaaieeeeeiaai"}}) .setMainChar('t') .put('q',"solarcraft:magistone_bricks") - .put('u',"solarcraft:magistone_ray[facing=north]") - .put('o',"solarcraft:magistone_ray[facing=west]") + .put('u',"solarcraft:magistone_ray[axis=x]") + .put('o',"solarcraft:magistone_ray[axis=z]") .put('i',"solarcraft:chiseled_magistone") .put('r',"solarcraft:solar_forge_infusion_pool") .put('y',"minecraft:gold_block") .put('w',"solarcraft:magistone_column") - .put('p',"solarcraft:magistone_ray[facing=east]") - .put('a',"solarcraft:magistone_ray[facing=south]") + .put('p',"solarcraft:magistone_ray[axis=z]") + .put('a',"solarcraft:magistone_ray[axis=x]") .put('e',"minecraft:air") .put('t',"solarcraft:solar_infuser") .put('M',"solarcraft:magistone_column") @@ -55,14 +55,14 @@ public class Multiblocks { .put('k',"solarcraft:kelda_rune_block") .put('t',"solarcraft:magistone_column") .put('l',"solarcraft:repeater") - .put('v',"solarcraft:magistone_ray[facing=east]") + .put('v',"solarcraft:magistone_ray[axis=z]") .put('o',"solarcraft:solar_infuser") .put('p',"solarcraft:magistone_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]") .put('r',"solarcraft:magistone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('j',"solarcraft:ardo_rune_block") - .put('x',"solarcraft:magistone_ray[facing=north]") + .put('x',"solarcraft:magistone_ray[axis=x]") .put('h',"solarcraft:zeta_rune_block") - .put('c',"solarcraft:magistone_ray[facing=west]") + .put('c',"solarcraft:magistone_ray[axis=z]") .put('n',"minecraft:diamond_block") .put('a',"solarcraft:tera_rune_block") .put('y',"solarcraft:solar_forge_infusion_pool") @@ -74,7 +74,7 @@ public class Multiblocks { .put('i',"solarcraft:magistone_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]") .put('e',"solarcraft:chiseled_magistone") .put('z',"minecraft:gold_block") - .put('b',"solarcraft:magistone_ray[facing=south]") + .put('b',"solarcraft:magistone_ray[axis=x]") .put('u',"solarcraft:magistone_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]") .put('M',"solarcraft:magistone_column") .checkTag('M',Tags.CATALYST) @@ -109,15 +109,15 @@ public class Multiblocks { .put('y',"solarcraft:magistone_column") .put('t',"minecraft:obsidian") .put('z',"solarcraft:repeater") - .put('b',"solarcraft:magistone_ray[facing=east]") + .put('b',"solarcraft:magistone_ray[axis=z]") .put('p',"solarcraft:solar_infuser") .put('a',"solarcraft:magistone_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]") .put('r',"solarcraft:magistone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('k',"solarcraft:ardo_rune_block") - .put('c',"solarcraft:magistone_ray[facing=north]") + .put('c',"solarcraft:magistone_ray[axis=x]") .put('E',"solarcraft:magistone_stairs[facing=west,half=top,shape=straight,waterlogged=false]") .put('j',"solarcraft:zeta_rune_block") - .put('v',"solarcraft:magistone_ray[facing=west]") + .put('v',"solarcraft:magistone_ray[axis=z]") .put('m',"minecraft:diamond_block") .put('s',"solarcraft:tera_rune_block") .put('u',"solarcraft:solar_forge_infusion_pool") @@ -132,7 +132,7 @@ public class Multiblocks { .put('W',"solarcraft:magistone_stairs[facing=east,half=top,shape=straight,waterlogged=false]") .put('e',"solarcraft:chiseled_magistone") .put('x',"minecraft:gold_block") - .put('n',"solarcraft:magistone_ray[facing=south]") + .put('n',"solarcraft:magistone_ray[axis=x]") .put('R',"solarcraft:magistone_stairs[facing=north,half=top,shape=straight,waterlogged=false]") .put('i',"solarcraft:magistone_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]") .put('M',"solarcraft:magistone_column") @@ -146,9 +146,9 @@ public class Multiblocks { .put('i',"solarcraft:magistone_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]") .put('h',"solarcraft:magistone_stairs[facing=north,half=top,shape=straight,waterlogged=false]") .put('r',"solarcraft:magistone_bricks") - .put('t',"solarcraft:magistone_ray[facing=east]") - .put('w',"solarcraft:magistone_ray[facing=north]") - .put('y',"solarcraft:magistone_ray[facing=south]") + .put('t',"solarcraft:magistone_ray[axis=z]") + .put('w',"solarcraft:magistone_ray[axis=x]") + .put('y',"solarcraft:magistone_ray[axis=x]") .put('a',"solarcraft:magistone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('d',"solarcraft:solar_energy_generator") .put('f',"solarcraft:magistone_stairs[facing=west,half=top,shape=straight,waterlogged=false]") @@ -157,7 +157,7 @@ public class Multiblocks { .put('s',"solarcraft:magistone_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]") .put('q',"solarcraft:chiseled_magistone") .put('g',"solarcraft:magistone_stairs[facing=east,half=top,shape=straight,waterlogged=false]") - .put('e',"solarcraft:magistone_ray[facing=west]") + .put('e',"solarcraft:magistone_ray[axis=z]") .put('k',"solarcraft:magistone_stairs[facing=south,half=top,shape=straight,waterlogged=false]") .put('u',"solarcraft:magistone_column") .put('j',"solarcraft:magistone_slab[type=top,waterlogged=false]") @@ -180,13 +180,13 @@ public class Multiblocks { .setId("mortar") .setPattern(new String[][]{{"qqqqq", "qqqqq", "qqqqq", "qqqqq", "qqqqq"}, {"weeew", "rttty", "rttty", "rttty", "wuuuw"}, {"iqtti", "ttttq", "ttttt", "qtttt", "ittqi"}, {"itqti", "ttttt", "qtttq", "ttttt", "itqti"}, {"ittqi", "qtttt", "ttttt", "ttttq", "iqtti"}, {"weeew", "rttty", "rttty", "rttty", "wuuuw"}, {"iqtti", "ttttq", "ttttt", "qtttt", "ittqi"}, {"itqti", "ttttt", "qtttq", "ttttt", "itqti"}, {"ittqi", "qtttt", "ttttt", "ttttq", "iqtti"}, {"weeew", "rttty", "rttty", "rttty", "wuuuw"}, {"tqqqt", "qqqqq", "qqtqq", "qqqqq", "tqqqt"}, {"ttqtt", "tqqqt", "qqtqq", "tqqqt", "ttqtt"}, {"ttttt", "ttitt", "tioit", "ttitt", "ttttt"}, {"ttttt", "ttwtt", "twtwt", "ttwtt", "ttttt"}}) .setMainChar('o') - .put('r',"solarcraft:magistone_ray[facing=west]") + .put('r',"solarcraft:magistone_ray[axis=z]") .put('w',"solarcraft:chiseled_magistone") - .put('e',"solarcraft:magistone_ray[facing=north]") + .put('e',"solarcraft:magistone_ray[axis=x]") .put('i',"solarcraft:magistone_column") .put('q',"solarcraft:magistone_bricks") - .put('y',"solarcraft:magistone_ray[facing=east]") - .put('u',"solarcraft:magistone_ray[facing=south]") + .put('y',"solarcraft:magistone_ray[axis=z]") + .put('u',"solarcraft:magistone_ray[axis=x]") .put('t',"minecraft:air") .put('o',"solarcraft:solar_mortar_block") .build()); @@ -291,10 +291,10 @@ public class Multiblocks { .put('k',"solarcraft:rune_energy_pylon") .put('j',"solarcraft:solar_stone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('r',"solarcraft:solar_stone_collumn") - .put('f',"solarcraft:solar_stone_collumn_horizontal[facing=north]") + .put('f',"solarcraft:solar_stone_collumn_horizontal[axis=x]") .put('w',"solarcraft:solar_stone_bricks") .put('o',"solarcraft:solar_stone_stairs[facing=south,half=top,shape=straight,waterlogged=false]") - .put('s',"solarcraft:solar_stone_collumn_horizontal[facing=east]") + .put('s',"solarcraft:solar_stone_collumn_horizontal[axis=z]") .put('u',"solarcraft:ardo_rune_block") .put('q',"minecraft:air") .put('t',"solarcraft:inscription_stone[type=none]") @@ -303,7 +303,7 @@ public class Multiblocks { .put('y',"solarcraft:solar_stone_stairs[facing=east,half=top,shape=straight,waterlogged=false]") .put('i',"solarcraft:solar_stone_stairs[facing=west,half=top,shape=straight,waterlogged=false]") .put('p',"solarcraft:solar_stone_stairs[facing=north,half=top,shape=straight,waterlogged=false]") - .put('g',"solarcraft:solar_stone_collumn_horizontal[facing=south]") + .put('g',"solarcraft:solar_stone_collumn_horizontal[axis=x]") .checkTag('u',Tags.CATALYST) .checkTag('t',Tags.INSCRIPTION_STONE) .build()); @@ -323,10 +323,10 @@ public class Multiblocks { .put('a',"solarcraft:solar_stone_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]") .put('j',"solarcraft:solar_stone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('r',"solarcraft:solar_stone_collumn") - .put('f',"solarcraft:solar_stone_collumn_horizontal[facing=north]") + .put('f',"solarcraft:solar_stone_collumn_horizontal[axis=x]") .put('w',"solarcraft:solar_stone_bricks") .put('o',"solarcraft:solar_stone_stairs[facing=south,half=top,shape=straight,waterlogged=false]") - .put('s',"solarcraft:solar_stone_collumn_horizontal[facing=east]") + .put('s',"solarcraft:solar_stone_collumn_horizontal[axis=z]") .put('u',"solarcraft:ardo_rune_block") .put('q',"minecraft:air") .put('t',"solarcraft:inscription_stone[type=none]") @@ -335,7 +335,7 @@ public class Multiblocks { .put('y',"solarcraft:solar_stone_stairs[facing=east,half=top,shape=straight,waterlogged=false]") .put('i',"solarcraft:solar_stone_stairs[facing=west,half=top,shape=straight,waterlogged=false]") .put('p',"solarcraft:solar_stone_stairs[facing=north,half=top,shape=straight,waterlogged=false]") - .put('g',"solarcraft:solar_stone_collumn_horizontal[facing=south]") + .put('g',"solarcraft:solar_stone_collumn_horizontal[axis=x]") .checkTag('u',Tags.CATALYST) .checkTag('t',Tags.INSCRIPTION_STONE) .build()); @@ -364,14 +364,14 @@ public class Multiblocks { .setId("runic_energy_core") .setPattern(new String[][]{{"qwwwwwq", "errrrrt", "errrrrt", "errrrrt", "errrrrt", "errrrrt", "qyyyyyq"}, {"uiooopu", "aoooooa", "ooooooo", "ooooooo", "ooooooo", "sooooos", "uiooopu"}, {"uooooou", "ooooooo", "ooooooo", "ooooooo", "ooooooo", "ooooooo", "uooooou"}, {"qoooooq", "ooooooo", "ooooooo", "ooodooo", "ooooooo", "ooooooo", "qoooooq"}}) .setMainChar('d') - .put('e',"solarcraft:magistone_ray[facing=west]") + .put('e',"solarcraft:magistone_ray[axis=z]") .put('a',"solarcraft:magistone_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]") .put('u',"solarcraft:magistone_column") .put('i',"solarcraft:magistone_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]") - .put('w',"solarcraft:magistone_ray[facing=north]") + .put('w',"solarcraft:magistone_ray[axis=x]") .put('r',"solarcraft:magistone_bricks") - .put('t',"solarcraft:magistone_ray[facing=east]") - .put('y',"solarcraft:magistone_ray[facing=south]") + .put('t',"solarcraft:magistone_ray[axis=z]") + .put('y',"solarcraft:magistone_ray[axis=x]") .put('p',"solarcraft:magistone_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]") .put('q',"solarcraft:chiseled_magistone") .put('s',"solarcraft:magistone_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]") diff --git a/src/main/java/com/finderfeed/solarcraft/registries/blocks/SCBlocks.java b/src/main/java/com/finderfeed/solarcraft/registries/blocks/SCBlocks.java index 160c8a5e2..954806bd6 100644 --- a/src/main/java/com/finderfeed/solarcraft/registries/blocks/SCBlocks.java +++ b/src/main/java/com/finderfeed/solarcraft/registries/blocks/SCBlocks.java @@ -67,7 +67,7 @@ public class SCBlocks { public static final DeferredHolder CATALYST_BASE = BLOCKS.register("catalyst_base",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder SOLAR_STONE_BRICKS = BLOCKS.register("solar_stone_bricks",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder SOLAR_STONE_STAIRS = BLOCKS.register("solar_stone_stairs",()-> new StairBlock(()-> SOLAR_STONE_BRICKS.get().defaultBlockState(),BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); - public static final DeferredHolder SOLAR_STONE_COLLUMN_HORIZONTAL = BLOCKS.register("solar_stone_collumn_horizontal",()-> new GlazedTerracottaBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); + public static final DeferredHolder SOLAR_STONE_COLLUMN_HORIZONTAL = BLOCKS.register("solar_stone_collumn_horizontal",()-> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder SOLAR_STONE_SLAB = BLOCKS.register("solar_stone_slab",()-> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder ENERGIZED_STONE = BLOCKS.register("energized_stone",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder KEY_LOCK_BLOCK = BLOCKS.register("key_lock_block",()-> new KeyLockBlock()); @@ -212,7 +212,7 @@ public void animateTick(BlockState p_220827_, Level world, BlockPos pos, RandomS public static final DeferredHolder MAGISTONE_BRICKS = BLOCKS.register("magistone_bricks",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder MAGISTONE_STAIRS = BLOCKS.register("magistone_stairs",()-> new StairBlock(()-> MAGISTONE_BRICKS.get().defaultBlockState(),BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); - public static final DeferredHolder MAGISTONE_RAY = BLOCKS.register("magistone_ray",()-> new GlazedTerracottaBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); + public static final DeferredHolder MAGISTONE_RAY = BLOCKS.register("magistone_ray",()-> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder MAGISTONE_SLAB = BLOCKS.register("magistone_slab",()-> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder MAGISTONE_COLUMN = BLOCKS.register("magistone_column",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); public static final DeferredHolder CHISELED_MAGISTONE = BLOCKS.register("chiseled_magistone",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); diff --git a/src/main/resources/assets/solarcraft/blockstates/magistone_ray.json b/src/main/resources/assets/solarcraft/blockstates/magistone_ray.json index 391cb1c46..a61f10ff3 100644 --- a/src/main/resources/assets/solarcraft/blockstates/magistone_ray.json +++ b/src/main/resources/assets/solarcraft/blockstates/magistone_ray.json @@ -1,8 +1,14 @@ { "variants": { - "facing=south": { "model": "solarcraft:block/magistone_ray" }, - "facing=west": { "model": "solarcraft:block/magistone_ray", "y": 90 }, - "facing=north": { "model": "solarcraft:block/magistone_ray", "y": 180 }, - "facing=east": { "model": "solarcraft:block/magistone_ray", "y": 270 } + "axis=x": { + "model": "solarcraft:block/magistone_ray" + }, + "axis=y": { + "model": "solarcraft:block/magistone_ray_y" + }, + "axis=z": { + "model": "solarcraft:block/magistone_ray", + "y": 90 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/solarcraft/blockstates/solar_stone_collumn_horizontal.json b/src/main/resources/assets/solarcraft/blockstates/solar_stone_collumn_horizontal.json index 9fd096d19..4dd40dd99 100644 --- a/src/main/resources/assets/solarcraft/blockstates/solar_stone_collumn_horizontal.json +++ b/src/main/resources/assets/solarcraft/blockstates/solar_stone_collumn_horizontal.json @@ -1,8 +1,14 @@ { "variants": { - "facing=south": { "model": "solarcraft:block/solar_stone_collumn_horizontal" }, - "facing=west": { "model": "solarcraft:block/solar_stone_collumn_horizontal", "y": 90 }, - "facing=north": { "model": "solarcraft:block/solar_stone_collumn_horizontal", "y": 180 }, - "facing=east": { "model": "solarcraft:block/solar_stone_collumn_horizontal", "y": 270 } + "axis=x": { + "model": "solarcraft:block/solar_stone_collumn_horizontal" + }, + "axis=y": { + "model": "solarcraft:block/solar_stone_collumn_horizontal_y" + }, + "axis=z": { + "model": "solarcraft:block/solar_stone_collumn_horizontal", + "y": 90 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/solarcraft/models/block/magistone_ray.json b/src/main/resources/assets/solarcraft/models/block/magistone_ray.json index e5a5a4d34..86ef540f5 100644 --- a/src/main/resources/assets/solarcraft/models/block/magistone_ray.json +++ b/src/main/resources/assets/solarcraft/models/block/magistone_ray.json @@ -1,8 +1,7 @@ { - "parent": "block/orientable", + "parent": "minecraft:block/cube_column_horizontal", "textures": { - "top": "solarcraft:block/magistone_ray_top", - "side": "solarcraft:block/magistone_ray", - "front": "solarcraft:block/magistone_ray" + "end": "solarcraft:block/magistone_ray_top", + "side": "solarcraft:block/magistone_ray" } } diff --git a/src/main/resources/assets/solarcraft/models/block/magistone_ray_y.json b/src/main/resources/assets/solarcraft/models/block/magistone_ray_y.json new file mode 100644 index 000000000..eeb8d25af --- /dev/null +++ b/src/main/resources/assets/solarcraft/models/block/magistone_ray_y.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "solarcraft:block/chiseled_magistone", + "side": "solarcraft:block/magistone_ray" + } +} diff --git a/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal.json b/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal.json index fdedebcfb..8cbb9fcc8 100644 --- a/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal.json +++ b/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal.json @@ -1,8 +1,7 @@ { - "parent": "block/orientable", + "parent": "minecraft:block/cube_column_horizontal", "textures": { - "top": "solarcraft:block/solar_stone_vertical_collumn_top", - "side": "solarcraft:block/solar_stone_vertical_collumn", - "front": "solarcraft:block/solar_stone_vertical_collumn" + "end": "solarcraft:block/solar_stone_vertical_collumn_top", + "side": "solarcraft:block/solar_stone_vertical_collumn" } } diff --git a/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal_y.json b/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal_y.json new file mode 100644 index 000000000..e1e5be65d --- /dev/null +++ b/src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal_y.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "solarcraft:block/stone_collumn_top", + "side": "solarcraft:block/solar_stone_vertical_collumn" + } +} diff --git a/src/main/resources/data/solarcraft/structures/cold_star_charging_station.nbt b/src/main/resources/data/solarcraft/structures/cold_star_charging_station.nbt index e193d5b99..68d53ead2 100644 Binary files a/src/main/resources/data/solarcraft/structures/cold_star_charging_station.nbt and b/src/main/resources/data/solarcraft/structures/cold_star_charging_station.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/crystal_boss_room.nbt b/src/main/resources/data/solarcraft/structures/crystal_boss_room.nbt index 056d4d6fa..9bf50d42b 100644 Binary files a/src/main/resources/data/solarcraft/structures/crystal_boss_room.nbt and b/src/main/resources/data/solarcraft/structures/crystal_boss_room.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/dimensional_shard_structure.nbt b/src/main/resources/data/solarcraft/structures/dimensional_shard_structure.nbt index 3a5cf0964..8cbb807e7 100644 Binary files a/src/main/resources/data/solarcraft/structures/dimensional_shard_structure.nbt and b/src/main/resources/data/solarcraft/structures/dimensional_shard_structure.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/jungle_dungeon.nbt b/src/main/resources/data/solarcraft/structures/jungle_dungeon.nbt index ce9104090..07c4724f7 100644 Binary files a/src/main/resources/data/solarcraft/structures/jungle_dungeon.nbt and b/src/main/resources/data/solarcraft/structures/jungle_dungeon.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/runic_elemental_arena.nbt b/src/main/resources/data/solarcraft/structures/runic_elemental_arena.nbt index c0cf6fa68..bae42fe75 100644 Binary files a/src/main/resources/data/solarcraft/structures/runic_elemental_arena.nbt and b/src/main/resources/data/solarcraft/structures/runic_elemental_arena.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/savanna_dungeon.nbt b/src/main/resources/data/solarcraft/structures/savanna_dungeon.nbt index 48a66be29..69b00aa05 100644 Binary files a/src/main/resources/data/solarcraft/structures/savanna_dungeon.nbt and b/src/main/resources/data/solarcraft/structures/savanna_dungeon.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/solarcraft_dungeon_one.nbt b/src/main/resources/data/solarcraft/structures/solarcraft_dungeon_one.nbt index 70173b155..842f6bb6b 100644 Binary files a/src/main/resources/data/solarcraft/structures/solarcraft_dungeon_one.nbt and b/src/main/resources/data/solarcraft/structures/solarcraft_dungeon_one.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/sun_shard_dungeon.nbt b/src/main/resources/data/solarcraft/structures/sun_shard_dungeon.nbt index 849e0f314..c4166819d 100644 Binary files a/src/main/resources/data/solarcraft/structures/sun_shard_dungeon.nbt and b/src/main/resources/data/solarcraft/structures/sun_shard_dungeon.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon.nbt index 8f29c4793..f15c2def4 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ardo.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ardo.nbt index 8a22a6489..0afc0b55f 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ardo.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ardo.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_fira.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_fira.nbt index 73809508a..a4b9267bf 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_fira.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_fira.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_giro.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_giro.nbt index 30c388bfa..476491e22 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_giro.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_giro.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_kelda.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_kelda.nbt index c18903a3e..8a437d6a6 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_kelda.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_kelda.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_tera.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_tera.nbt index ba2ed673c..779226fc9 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_tera.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_tera.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ultima.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ultima.nbt index a6e0ed970..dd55c1ac4 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ultima.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ultima.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_urba.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_urba.nbt index 16204dd23..5a60a1b50 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_urba.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_urba.nbt differ diff --git a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_zeta.nbt b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_zeta.nbt index 671742f06..0b2a6c96e 100644 Binary files a/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_zeta.nbt and b/src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_zeta.nbt differ