Skip to content

Commit

Permalink
Actually add the storage block models
Browse files Browse the repository at this point in the history
  • Loading branch information
Electro593 committed Feb 21, 2025
1 parent 21ee045 commit 0fbd236
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 85 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/bedrock_storage_block"
}
}
}
30 changes: 30 additions & 0 deletions src/main/generated/assets/spectrum/blockstates/neolith_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"variants": {
"facing=down": {
"model": "spectrum:block/neolith_block",
"x": 180
},
"facing=east": {
"model": "spectrum:block/neolith_block",
"x": 90,
"y": 90
},
"facing=north": {
"model": "spectrum:block/neolith_block",
"x": 90
},
"facing=south": {
"model": "spectrum:block/neolith_block",
"x": 90,
"y": 180
},
"facing=up": {
"model": "spectrum:block/neolith_block"
},
"facing=west": {
"model": "spectrum:block/neolith_block",
"x": 90,
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "spectrum:block/neolith_block_bottom",
"side": "spectrum:block/neolith_block_side",
"top": "spectrum:block/neolith_block_top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "spectrum:templates/translucent_outer1",
"textures": {
"texture": "spectrum:block/vegetal_block"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ private static Settings gemstoneBlock(MapColor mapColor, BlockSoundGroup blockSo
public static final Block ONYX_POWDER_BLOCK = registerSimple("onyx_powder_block", new ColoredFallingBlock(new ColorCode(DyeColor.BLACK.getFireworkColor()), AbstractBlock.Settings.copy(Blocks.SAND).mapColor(MapColor.BLACK)), DyeColor.BLACK);
public static final Block MOONSTONE_POWDER_BLOCK = registerSimple("moonstone_powder_block", new ColoredFallingBlock(new ColorCode(DyeColor.WHITE.getFireworkColor()), AbstractBlock.Settings.copy(Blocks.SAND).mapColor(MapColor.WHITE)), DyeColor.WHITE);

public static final Block VEGETAL_BLOCK = registerWithoutModel("vegetal_block", new Block(settings(MapColor.PALE_GREEN, BlockSoundGroup.FUNGUS, 2.0F).nonOpaque()), DyeColor.GREEN);
public static final Block NEOLITH_BLOCK = registerWithoutModel("neolith_block", new SpectrumFacingBlock(settings(MapColor.PURPLE, BlockSoundGroup.COPPER, 6.0F).requiresTool().instrument(NoteBlockInstrument.BASEDRUM).luminance(state -> 13).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)), DyeColor.PINK);
public static final Block BEDROCK_STORAGE_BLOCK = registerWithoutModel("bedrock_storage_block", new BlockWithTooltip(settings(MapColor.STONE_GRAY, BlockSoundGroup.STONE, 100.0F, 3600.0F).pistonBehavior(PistonBehavior.BLOCK).requiresTool().instrument(NoteBlockInstrument.BASEDRUM), Text.translatable("spectrum.tooltip.dragon_and_wither_immune")), IS.of(Rarity.UNCOMMON), DyeColor.BLACK);
public static final Block VEGETAL_BLOCK = registerSingleton("vegetal_block", new Block(settings(MapColor.PALE_GREEN, BlockSoundGroup.FUNGUS, 2.0F).nonOpaque()), DyeColor.GREEN, TexturedModel.makeFactory(TextureMap::texture, SpectrumModels.TRANSLUCENT_OUTER1));
public static final Block NEOLITH_BLOCK = registerCustom("neolith_block", new SpectrumFacingBlock(settings(MapColor.PURPLE, BlockSoundGroup.COPPER, 6.0F).requiresTool().instrument(NoteBlockInstrument.BASEDRUM).luminance(state -> 13).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)), DyeColor.PINK, block -> registerDefaultFacingUpBlockModel(block, TexturedModel.CUBE_BOTTOM_TOP));
public static final Block BEDROCK_STORAGE_BLOCK = registerCustom("bedrock_storage_block", new BlockWithTooltip(settings(MapColor.STONE_GRAY, BlockSoundGroup.STONE, 100.0F, 3600.0F).pistonBehavior(PistonBehavior.BLOCK).requiresTool().instrument(NoteBlockInstrument.BASEDRUM), Text.translatable("spectrum.tooltip.dragon_and_wither_immune")), IS.of(Rarity.UNCOMMON), DyeColor.BLACK, SpectrumModelProvider::registerSimpleBlockModel);

public static final SpectrumClusterBlock BISMUTH_CLUSTER = registerClusterBlock("bismuth_cluster", new SpectrumClusterBlock(gemstone(MapColor.DARK_AQUA, BlockSoundGroup.CHAIN, 8), SpectrumClusterBlock.GrowthStage.CLUSTER), IS.of(Rarity.UNCOMMON), SpectrumModels.CRYSTALLARIEUM_FARMABLE, DyeColor.CYAN);
public static final SpectrumClusterBlock LARGE_BISMUTH_BUD = registerClusterBlock("large_bismuth_bud", new BismuthBudBlock(gemstone(MapColor.DARK_AQUA, BlockSoundGroup.CHAIN, 6).ticksRandomly(), SpectrumClusterBlock.GrowthStage.LARGE, BISMUTH_CLUSTER), IS.of(Rarity.UNCOMMON), SpectrumModels.CRYSTALLARIEUM_FARMABLE, DyeColor.CYAN);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class SpectrumModels {
public static final Model LARGE_BUD_ITEM = new Model(Optional.of(SpectrumCommon.locate("templates_item/large_bud")), Optional.empty(), TextureKey.LAYER0);
public static final Model CLUSTER_ITEM = new Model(Optional.of(SpectrumCommon.locate("templates_item/cluster")), Optional.empty(), TextureKey.LAYER0);

public static final Model TRANSLUCENT_OUTER1 = new Model(Optional.of(SpectrumCommon.locate("templates/translucent_outer1")), Optional.empty(), TextureKey.TEXTURE);
public static final Model MULTILAYER_LIGHT = new Model(Optional.of(SpectrumCommon.locate("templates/multilayer_light")), Optional.empty(), TextureKey.TOP, TextureKey.SIDE, TextureKey.INSIDE);
public static final Model MOONSTONE_CHISELED = new Model(Optional.of(SpectrumCommon.locate("templates/moonstone_chiseled")), Optional.empty(), TextureKey.SIDE, SpectrumTextureKeys.LINE);
public static final Model MOONSTONE_CHISELED_DOWN = new Model(Optional.of(SpectrumCommon.locate("templates/moonstone_chiseled_down")), Optional.empty(), TextureKey.SIDE, SpectrumTextureKeys.LINE);
Expand Down

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/resources/assets/spectrum/blockstates/neolith_block.json

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/resources/assets/spectrum/models/block/neolith_block.json

This file was deleted.

33 changes: 0 additions & 33 deletions src/main/resources/assets/spectrum/models/block/vegetal_block.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "block/block",
"textures": {
"particle": "#texture",
"texture": "#texture"
},
"elements": [
{
"from": [ 1, 1, 1 ],
"to": [ 15, 15, 15 ],
"faces": {
"down": { "texture": "#texture" },
"up": { "texture": "#texture" },
"north": { "texture": "#texture" },
"south": { "texture": "#texture" },
"west": { "texture": "#texture" },
"east": { "texture": "#texture" }
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "texture": "#texture", "cullface": "down" },
"up": { "texture": "#texture", "cullface": "up" },
"north": { "texture": "#texture", "cullface": "north" },
"south": { "texture": "#texture", "cullface": "south" },
"west": { "texture": "#texture", "cullface": "west" },
"east": { "texture": "#texture", "cullface": "east" }
}
}
]
}

0 comments on commit 0fbd236

Please sign in to comment.