Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,40 @@ public static <T extends Block> BlockRegistrar<T> moonstoneChiseled(BlockRegistr
public static final DeferredBlock<Block> ONYX_CHISELED_CALCITE = register(simple(blockWithItem("onyx_chiseled_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3)))));
public static final DeferredBlock<Block> MOONSTONE_CHISELED_CALCITE = register(moonstoneChiseled(blockWithItem("moonstone_chiseled_calcite", () -> new SpectrumCounterDirectionalPlacedBlock(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 12))), SpectrumTextures.CALCITE_CAP));

public static final DeferredBlock<Block> WHITE_SYMBOLIC_CALCITE = register(simple(blockWithItem("white_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIGHT_GRAY_SYMBOLIC_CALCITE = register(simple(blockWithItem("light_gray_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> GRAY_SYMBOLIC_CALCITE = register(simple(blockWithItem("gray_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BLACK_SYMBOLIC_CALCITE = register(simple(blockWithItem("black_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BROWN_SYMBOLIC_CALCITE = register(simple(blockWithItem("brown_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> RED_SYMBOLIC_CALCITE = register(simple(blockWithItem("red_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> ORANGE_SYMBOLIC_CALCITE = register(simple(blockWithItem("orange_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> YELLOW_SYMBOLIC_CALCITE = register(simple(blockWithItem("yellow_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIME_SYMBOLIC_CALCITE = register(simple(blockWithItem("lime_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> GREEN_SYMBOLIC_CALCITE = register(simple(blockWithItem("green_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> CYAN_SYMBOLIC_CALCITE = register(simple(blockWithItem("cyan_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIGHT_BLUE_SYMBOLIC_CALCITE = register(simple(blockWithItem("light_blue_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BLUE_SYMBOLIC_CALCITE = register(simple(blockWithItem("blue_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> PURPLE_SYMBOLIC_CALCITE = register(simple(blockWithItem("purple_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> MAGENTA_SYMBOLIC_CALCITE = register(simple(blockWithItem("magenta_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> PINK_SYMBOLIC_CALCITE = register(simple(blockWithItem("pink_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7)))));

public static final DeferredBlock<Block> WHITE_SYMBOLIC_BASALT = register(simple(blockWithItem("white_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIGHT_GRAY_SYMBOLIC_BASALT = register(simple(blockWithItem("light_gray_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> GRAY_SYMBOLIC_BASALT = register(simple(blockWithItem("gray_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BLACK_SYMBOLIC_BASALT = register(simple(blockWithItem("black_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BROWN_SYMBOLIC_BASALT = register(simple(blockWithItem("brown_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> RED_SYMBOLIC_BASALT = register(simple(blockWithItem("red_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> ORANGE_SYMBOLIC_BASALT = register(simple(blockWithItem("orange_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> YELLOW_SYMBOLIC_BASALT = register(simple(blockWithItem("yellow_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIME_SYMBOLIC_BASALT = register(simple(blockWithItem("lime_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> GREEN_SYMBOLIC_BASALT = register(simple(blockWithItem("green_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> CYAN_SYMBOLIC_BASALT = register(simple(blockWithItem("cyan_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> LIGHT_BLUE_SYMBOLIC_BASALT = register(simple(blockWithItem("light_blue_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> BLUE_SYMBOLIC_BASALT = register(simple(blockWithItem("blue_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> PURPLE_SYMBOLIC_BASALT = register(simple(blockWithItem("purple_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> MAGENTA_SYMBOLIC_BASALT = register(simple(blockWithItem("magenta_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));
public static final DeferredBlock<Block> PINK_SYMBOLIC_BASALT = register(simple(blockWithItem("pink_symbolic_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7)))));

public static DeferredBlock<Block> registerGemstoneLight(String name, DeferredBlock<Block> gemBlock, DeferredBlock<Block> baseBlock, ResourceLocation capTexture, InkColor color) {
return register(axisRotated(blockWithItem(name, () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(baseBlock.get()).lightLevel(s -> 15).noOcclusion().forceSolidOn())), TexturedModel.createDefault(block -> SpectrumTextureMaps.sideTopInside(TextureMapping.getBlockTexture(block), capTexture, TextureMapping.getBlockTexture(gemBlock.get())), SpectrumModelTemplates.MULTILAYER_LIGHT)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,40 @@ public static void registerSubTabs() {
entries.accept(SpectrumBlocks.RESPLENDENT_CARPET);
entries.accept(SpectrumBlocks.RESPLENDENT_BED);

entries.accept(SpectrumBlocks.WHITE_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.ORANGE_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.MAGENTA_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.LIGHT_BLUE_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.YELLOW_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.LIME_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.PINK_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.GRAY_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.LIGHT_GRAY_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.CYAN_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.PURPLE_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.BLUE_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.BROWN_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.GREEN_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.RED_SYMBOLIC_BASALT);
entries.accept(SpectrumBlocks.BLACK_SYMBOLIC_BASALT);

entries.accept(SpectrumBlocks.WHITE_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.ORANGE_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.MAGENTA_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.LIGHT_BLUE_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.YELLOW_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.LIME_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.PINK_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.GRAY_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.LIGHT_GRAY_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.CYAN_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.PURPLE_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.BLUE_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.BROWN_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.GREEN_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.RED_SYMBOLIC_CALCITE);
entries.accept(SpectrumBlocks.BLACK_SYMBOLIC_CALCITE);

entries.accept(SpectrumBlocks.WHITE_BLOCK);
entries.accept(SpectrumBlocks.ORANGE_BLOCK);
entries.accept(SpectrumBlocks.MAGENTA_BLOCK);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/black_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/black_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/blue_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/blue_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/brown_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/brown_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/cyan_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/cyan_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/gray_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/gray_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/green_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/green_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/light_blue_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/light_blue_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/light_gray_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/light_gray_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/lime_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/lime_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/magenta_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/magenta_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/orange_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/orange_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/pink_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/pink_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variants": {
"cardinal_facing=false": {
"model": "spectrum:block/polished_basalt_crest",
"model": "spectrum:block/polished_basalt_crest_alt",
"y": 90
},
"cardinal_facing=true": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variants": {
"cardinal_facing=false": {
"model": "spectrum:block/polished_calcite_crest",
"model": "spectrum:block/polished_calcite_crest_alt",
"y": 90
},
"cardinal_facing=true": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/purple_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/purple_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/red_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/red_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/white_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/white_symbolic_calcite"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/yellow_symbolic_basalt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/yellow_symbolic_calcite"
}
}
}
Loading