Skip to content

Convert "ray" blocks to RotatedPillarBlocks #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zero-ui9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert "ray" blocks to RotatedPillarBlocks #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...inderfeed/solarcraft/content/items/solar_lexicon/screen/InfusingCraftingRecipeScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
60 changes: 30 additions & 30 deletions src/main/java/com/finderfeed/solarcraft/helpers/multiblock/Multiblocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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]")
Expand All @@ -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]")
Expand All @@ -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());
Expand Down Expand Up @@ -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]")
Expand All @@ -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());
Expand All @@ -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]")
Expand All @@ -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());
Expand Down Expand Up @@ -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]")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/finderfeed/solarcraft/registries/blocks/SCBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class SCBlocks {
public static final DeferredHolder<Block,Block> CATALYST_BASE = BLOCKS.register("catalyst_base",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> SOLAR_STONE_BRICKS = BLOCKS.register("solar_stone_bricks",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> SOLAR_STONE_STAIRS = BLOCKS.register("solar_stone_stairs",()-> new StairBlock(()-> SOLAR_STONE_BRICKS.get().defaultBlockState(),BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> SOLAR_STONE_COLLUMN_HORIZONTAL = BLOCKS.register("solar_stone_collumn_horizontal",()-> new GlazedTerracottaBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> SOLAR_STONE_COLLUMN_HORIZONTAL = BLOCKS.register("solar_stone_collumn_horizontal",()-> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> SOLAR_STONE_SLAB = BLOCKS.register("solar_stone_slab",()-> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> ENERGIZED_STONE = BLOCKS.register("energized_stone",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> KEY_LOCK_BLOCK = BLOCKS.register("key_lock_block",()-> new KeyLockBlock());
Expand Down Expand Up @@ -212,7 +212,7 @@ public void animateTick(BlockState p_220827_, Level world, BlockPos pos, RandomS

public static final DeferredHolder<Block,Block> MAGISTONE_BRICKS = BLOCKS.register("magistone_bricks",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> MAGISTONE_STAIRS = BLOCKS.register("magistone_stairs",()-> new StairBlock(()-> MAGISTONE_BRICKS.get().defaultBlockState(),BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> MAGISTONE_RAY = BLOCKS.register("magistone_ray",()-> new GlazedTerracottaBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> MAGISTONE_RAY = BLOCKS.register("magistone_ray",()-> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> MAGISTONE_SLAB = BLOCKS.register("magistone_slab",()-> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> MAGISTONE_COLUMN = BLOCKS.register("magistone_column",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
public static final DeferredHolder<Block,Block> CHISELED_MAGISTONE = BLOCKS.register("chiseled_magistone",()-> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
Expand Down
14 changes: 10 additions & 4 deletions src/main/resources/assets/solarcraft/blockstates/magistone_ray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
14 changes: 10 additions & 4 deletions src/main/resources/assets/solarcraft/blockstates/solar_stone_collumn_horizontal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
7 changes: 3 additions & 4 deletions src/main/resources/assets/solarcraft/models/block/magistone_ray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/solarcraft/models/block/magistone_ray_y.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "solarcraft:block/chiseled_magistone",
"side": "solarcraft:block/magistone_ray"
}
}
7 changes: 3 additions & 4 deletions src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/solarcraft/models/block/solar_stone_collumn_horizontal_y.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "solarcraft:block/stone_collumn_top",
"side": "solarcraft:block/solar_stone_vertical_collumn"
}
}
Binary file modified src/main/resources/data/solarcraft/structures/cold_star_charging_station.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/crystal_boss_room.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/dimensional_shard_structure.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/jungle_dungeon.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/runic_elemental_arena.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/savanna_dungeon.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/solarcraft_dungeon_one.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/sun_shard_dungeon.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ardo.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_fira.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_giro.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_kelda.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_tera.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_ultima.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_urba.nbt
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/data/solarcraft/structures/worldgen_features/energy_pylon_zeta.nbt
View file
Open in desktop
Binary file not shown.