Candle Cake support

PanSzelescik · Oct 23, 2022 · 7efd9dd · 7efd9dd
1 parent 1564442
commit 7efd9dd
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/common/src/main/java/pl/panszelescik/colorize/common/api/BaseBlockHandler.java b/common/src/main/java/pl/panszelescik/colorize/common/api/BaseBlockHandler.java
@@ -73,7 +73,7 @@ public boolean handle(Level level, BlockPos pos, BlockState state, ItemStack sta
             return false;
         }
 
-        var result = this.replace(level, pos, state, stack, newBlock.get().defaultBlockState(), player);
+        var result = this.replace(level, pos, state, stack, newBlock.get().withPropertiesOf(state), player);
         if (result) {
             if (this.consumeItem()) {
                 stack.shrink(1);

diff --git a/common/src/main/java/pl/panszelescik/colorize/common/api/ColorizeEventHandler.java b/common/src/main/java/pl/panszelescik/colorize/common/api/ColorizeEventHandler.java
@@ -29,6 +29,7 @@ public ColorizeEventHandler(ColorizeConfig config) {
         this.handlers.add(new BannerBlockHandler());
         this.handlers.add(new BedBlockHandler());
         this.handlers.add(new CandleBlockHandler());
+        this.handlers.add(new CandleCakeBlockHandler());
         this.handlers.add(new CarpetBlockHandler());
         this.handlers.add(new ConcreteBlockHandler());
         this.handlers.add(new ConcretePowderBlockHandler());

diff --git a/common/src/main/java/pl/panszelescik/colorize/common/handler/CandleCakeBlockHandler.java b/common/src/main/java/pl/panszelescik/colorize/common/handler/CandleCakeBlockHandler.java
@@ -0,0 +1,50 @@
+package pl.panszelescik.colorize.common.handler;
+
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.Blocks;
+import pl.panszelescik.colorize.common.api.BaseBlockHandler;
+import pl.panszelescik.colorize.common.api.Colors;
+import pl.panszelescik.colorize.common.api.RightClicker2BlockMap;
+import pl.panszelescik.colorize.common.recipes.ColorizeRecipe;
+
+import java.util.stream.Stream;
+
+public class CandleCakeBlockHandler extends BaseBlockHandler {
+
+    public CandleCakeBlockHandler() {
+        super("candle", CANDLE_CAKES);
+    }
+
+    @Override
+    protected SoundEvent getSound() {
+        return SoundEvents.CANDLE_HIT;
+    }
+
+    @Override
+    public Stream<ColorizeRecipe> getRecipes() {
+        return Stream.empty(); // Don't duplicate recipes
+    }
+
+    private static final RightClicker2BlockMap CANDLE_CAKES = new RightClicker2BlockMap(17);
+
+    static {
+        CANDLE_CAKES.put(Colors.CLEAR, Blocks.CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.WHITE, Blocks.WHITE_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.ORANGE, Blocks.ORANGE_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.MAGENTA, Blocks.MAGENTA_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.LIGHT_BLUE, Blocks.LIGHT_BLUE_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.YELLOW, Blocks.YELLOW_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.LIME, Blocks.LIME_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.PINK, Blocks.PINK_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.GRAY, Blocks.GRAY_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.LIGHT_GRAY, Blocks.LIGHT_GRAY_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.CYAN, Blocks.CYAN_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.PURPLE, Blocks.PURPLE_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.BLUE, Blocks.BLUE_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.BROWN, Blocks.BROWN_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.GREEN, Blocks.GREEN_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.RED, Blocks.RED_CANDLE_CAKE);
+        CANDLE_CAKES.put(Colors.BLACK, Blocks.BLACK_CANDLE_CAKE);
+    }
+}