Skip to content

Allow putting the Sweet Pea, Apricotti, Humming Bell and Varia Sprout in flower pots #711

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

Merged
DaFuqs merged 1 commit into from
May 13, 2025
Merged

Allow putting the Sweet Pea, Apricotti, Humming Bell and Varia Sprout in flower pots #711

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
14 changes: 13 additions & 1 deletion src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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());

Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/assets/spectrum/blockstates/potted_apricotti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/potted_apricotti"
}
}
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/spectrum/blockstates/potted_humming_bell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/potted_humming_bell"
}
}
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/spectrum/blockstates/potted_sweet_pea.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "spectrum:block/potted_sweet_pea"
}
}
}
24 changes: 24 additions & 0 deletions src/main/resources/assets/spectrum/blockstates/potted_varia_sprout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
}
4 changes: 4 additions & 0 deletions src/main/resources/assets/spectrum/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_apricotti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/potted_apricotti"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_humming_bell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/potted_humming_bell"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_sweet_pea.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/potted_sweet_pea"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout_2"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout_3"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout_4"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout_5"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/spectrum/models/block/potted_varia_sprout_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/flower_pot_cross",
"textures": {
"plant": "spectrum:block/varia_sprout_6"
}
}
Binary file added src/main/resources/assets/spectrum/textures/block/potted_apricotti.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/spectrum/textures/block/potted_humming_bell.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/spectrum/textures/block/potted_sweet_pea.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions src/main/resources/data/spectrum/loot_tables/blocks/potted_apricotti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
]
}
35 changes: 35 additions & 0 deletions src/main/resources/data/spectrum/loot_tables/blocks/potted_humming_bell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
]
}
35 changes: 35 additions & 0 deletions src/main/resources/data/spectrum/loot_tables/blocks/potted_sweet_pea.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
]
}
35 changes: 35 additions & 0 deletions src/main/resources/data/spectrum/loot_tables/blocks/potted_varia_sprout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
]
}