diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index ac78cbe5d0..c54ec67927 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -1170,7 +1170,11 @@ private static FabricBlockSettings copyWithMapColor(Block baseBlock, MapColor co public static final Block POTTED_AMARANTH_BUSHEL = new PottedAmaranthBushelBlock(AMARANTH_BUSHEL, pottedPlant()); public static final Block POTTED_BLOOD_ORCHID = new PottedBloodOrchidBlock(BLOOD_ORCHID, pottedPlant()); public static final Block POTTED_RESONANT_LILY = new PottedResonantLilyBlock(RESONANT_LILY, pottedPlant()); - + public static final Block POTTED_SWEET_PEA = new FlowerPotBlock(SWEET_PEA, pottedPlant().luminance(s -> 11).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)); + public static final Block POTTED_APRICOTTI = new FlowerPotBlock(APRICOTTI, pottedPlant().luminance(s -> 11).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)); + public static final Block POTTED_VARIA_SPROUT = new FlowerPotBlock(VARIA_SPROUT, pottedPlant().luminance(s -> 11).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)); + public static final Block POTTED_HUMMING_BELL = new FlowerPotBlock(HUMMING_BELL, pottedPlant().luminance(s -> 9).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always)); + private static Settings glowBlock(MapColor color) { return settings(color, BlockSoundGroup.BASALT, 2.5F).requiresTool().luminance(state -> 1).postProcess(SpectrumBlocks::always).emissiveLighting(SpectrumBlocks::always); } @@ -1616,6 +1620,10 @@ public static void register() { registerBlockWithItem("blood_orchid", BLOOD_ORCHID, IS.of(), DyeColor.RED); registerBlock("potted_blood_orchid", POTTED_BLOOD_ORCHID); registerBlock("potted_resonant_lily", POTTED_RESONANT_LILY); + registerBlock("potted_sweet_pea", POTTED_SWEET_PEA); + registerBlock("potted_apricotti", POTTED_APRICOTTI); + registerBlock("potted_varia_sprout", POTTED_VARIA_SPROUT); + registerBlock("potted_humming_bell", POTTED_HUMMING_BELL); // Worldgen registerBlockWithItem("quitoxic_reeds", QUITOXIC_REEDS, IS.of(), DyeColor.PURPLE); @@ -3057,6 +3065,10 @@ public static void registerClient() { BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.BLOOD_ORCHID, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_BLOOD_ORCHID, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_RESONANT_LILY, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_SWEET_PEA, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_APRICOTTI, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_VARIA_SPROUT, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.POTTED_HUMMING_BELL, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(VARIA_SPROUT, RenderLayer.getCutout()); diff --git a/src/main/resources/assets/spectrum/blockstates/potted_apricotti.json b/src/main/resources/assets/spectrum/blockstates/potted_apricotti.json new file mode 100644 index 0000000000..31603cc7e1 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/potted_apricotti.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/potted_apricotti" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/potted_humming_bell.json b/src/main/resources/assets/spectrum/blockstates/potted_humming_bell.json new file mode 100644 index 0000000000..dfd7832714 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/potted_humming_bell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/potted_humming_bell" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/potted_sweet_pea.json b/src/main/resources/assets/spectrum/blockstates/potted_sweet_pea.json new file mode 100644 index 0000000000..3baa972482 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/potted_sweet_pea.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/potted_sweet_pea" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/potted_varia_sprout.json b/src/main/resources/assets/spectrum/blockstates/potted_varia_sprout.json new file mode 100644 index 0000000000..66ce31de41 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/potted_varia_sprout.json @@ -0,0 +1,24 @@ +{ + "variants": { + "": [ + { + "model": "spectrum:block/potted_varia_sprout" + }, + { + "model": "spectrum:block/potted_varia_sprout_2" + }, + { + "model": "spectrum:block/potted_varia_sprout_3" + }, + { + "model": "spectrum:block/potted_varia_sprout_4" + }, + { + "model": "spectrum:block/potted_varia_sprout_5" + }, + { + "model": "spectrum:block/potted_varia_sprout_6" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 491457c54f..a1ec42a15d 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -1673,6 +1673,10 @@ "block.spectrum.potted_purple_sapling": "Potted Purple Sapling", "block.spectrum.potted_red_sapling": "Potted Red Sapling", "block.spectrum.potted_resonant_lily": "Potted Resonant Lily", + "block.spectrum.potted_sweet_pea": "Potted Sweet Pea", + "block.spectrum.potted_apricotti": "Potted Apricotti", + "block.spectrum.potted_varia_sprout": "Potted Varia Sprout", + "block.spectrum.potted_humming_bell": "Potted Humming Bell", "block.spectrum.potted_slate_noxshroom": "Potted Slate Noxshroom", "block.spectrum.potted_weeping_gala_sprig": "Potted Weeping Gala Sprig", "block.spectrum.potted_white_sapling": "Potted White Sapling", diff --git a/src/main/resources/assets/spectrum/models/block/potted_apricotti.json b/src/main/resources/assets/spectrum/models/block/potted_apricotti.json new file mode 100644 index 0000000000..0a497f652f --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_apricotti.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/potted_apricotti" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_humming_bell.json b/src/main/resources/assets/spectrum/models/block/potted_humming_bell.json new file mode 100644 index 0000000000..e90a4cf035 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_humming_bell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/potted_humming_bell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_sweet_pea.json b/src/main/resources/assets/spectrum/models/block/potted_sweet_pea.json new file mode 100644 index 0000000000..7a341bd588 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_sweet_pea.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/potted_sweet_pea" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout.json new file mode 100644 index 0000000000..802552bf24 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_2.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_2.json new file mode 100644 index 0000000000..0e785c848c --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_3.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_3.json new file mode 100644 index 0000000000..b96b40fa53 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_4.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_4.json new file mode 100644 index 0000000000..d0d712d17c --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_5.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_5.json new file mode 100644 index 0000000000..d75462089f --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_6.json b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_6.json new file mode 100644 index 0000000000..1b0beff2a3 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/potted_varia_sprout_6.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "spectrum:block/varia_sprout_6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/potted_apricotti.png b/src/main/resources/assets/spectrum/textures/block/potted_apricotti.png new file mode 100644 index 0000000000..46958dd33a Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/potted_apricotti.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/potted_humming_bell.png b/src/main/resources/assets/spectrum/textures/block/potted_humming_bell.png new file mode 100644 index 0000000000..a0bec1c2f4 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/potted_humming_bell.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/potted_sweet_pea.png b/src/main/resources/assets/spectrum/textures/block/potted_sweet_pea.png new file mode 100644 index 0000000000..250183954d Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/potted_sweet_pea.png differ diff --git a/src/main/resources/data/spectrum/loot_tables/blocks/potted_apricotti.json b/src/main/resources/data/spectrum/loot_tables/blocks/potted_apricotti.json new file mode 100644 index 0000000000..692ab13ebb --- /dev/null +++ b/src/main/resources/data/spectrum/loot_tables/blocks/potted_apricotti.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:apricotti" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_tables/blocks/potted_humming_bell.json b/src/main/resources/data/spectrum/loot_tables/blocks/potted_humming_bell.json new file mode 100644 index 0000000000..fb051023cd --- /dev/null +++ b/src/main/resources/data/spectrum/loot_tables/blocks/potted_humming_bell.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:humming_bell" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_tables/blocks/potted_sweet_pea.json b/src/main/resources/data/spectrum/loot_tables/blocks/potted_sweet_pea.json new file mode 100644 index 0000000000..4c75d544f1 --- /dev/null +++ b/src/main/resources/data/spectrum/loot_tables/blocks/potted_sweet_pea.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:sweet_pea" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_tables/blocks/potted_varia_sprout.json b/src/main/resources/data/spectrum/loot_tables/blocks/potted_varia_sprout.json new file mode 100644 index 0000000000..06c83837d4 --- /dev/null +++ b/src/main/resources/data/spectrum/loot_tables/blocks/potted_varia_sprout.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:varia_sprout" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file