diff --git a/src/main/java/gay/pridecraft/joy/block/ModBlocks.java b/src/main/java/gay/pridecraft/joy/block/ModBlocks.java index 3f27905..327f203 100644 --- a/src/main/java/gay/pridecraft/joy/block/ModBlocks.java +++ b/src/main/java/gay/pridecraft/joy/block/ModBlocks.java @@ -59,6 +59,9 @@ public class ModBlocks { public static final Block PROGRESS_BED = registerBlock("progress_bed", new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.WHITE_BED))); + public static final Block QUEER_CANDLE = registerBlock("queer_candle", + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); + public static final Block GAY_CANDLE = registerBlock("gay_candle", new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); @@ -107,6 +110,9 @@ public class ModBlocks { public static final Block PROGRESS_CANDLE = registerBlock("progress_candle", new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); + public static final Block QUEER_CANDLE_CAKE = registerBlock("queer_candle_cake", + new CandleCakeBlock(QUEER_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); + public static final Block GAY_CANDLE_CAKE = registerBlock("gay_candle_cake", new CandleCakeBlock(GAY_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); diff --git a/src/main/java/gay/pridecraft/joy/datagen/ModBlockTagProvider.java b/src/main/java/gay/pridecraft/joy/datagen/ModBlockTagProvider.java index fe1858e..891f765 100644 --- a/src/main/java/gay/pridecraft/joy/datagen/ModBlockTagProvider.java +++ b/src/main/java/gay/pridecraft/joy/datagen/ModBlockTagProvider.java @@ -16,6 +16,7 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { @Override protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(BlockTags.CANDLES) + .add(ModBlocks.QUEER_CANDLE) .add(ModBlocks.GAY_CANDLE) .add(ModBlocks.ENBY_CANDLE) .add(ModBlocks.INTERSEX_CANDLE) @@ -53,6 +54,7 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { getOrCreateTagBuilder(BlockTags.CANDLE_CAKES) + .add(ModBlocks.QUEER_CANDLE_CAKE) .add(ModBlocks.GAY_CANDLE_CAKE) .add(ModBlocks.ENBY_CANDLE_CAKE) .add(ModBlocks.INTERSEX_CANDLE_CAKE) diff --git a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java b/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java index 3f6cd0a..cbf0811 100644 --- a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java +++ b/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java @@ -15,6 +15,7 @@ public class ModModelProvider extends FabricModelProvider { @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { + blockStateModelGenerator.registerCandle(ModBlocks.QUEER_CANDLE, ModBlocks.QUEER_CANDLE_CAKE); blockStateModelGenerator.registerCandle(ModBlocks.GAY_CANDLE, ModBlocks.GAY_CANDLE_CAKE); blockStateModelGenerator.registerCandle(ModBlocks.ENBY_CANDLE, ModBlocks.ENBY_CANDLE_CAKE); blockStateModelGenerator.registerCandle(ModBlocks.INTERSEX_CANDLE, ModBlocks.INTERSEX_CANDLE_CAKE); diff --git a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java index cb84ac4..744190d 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java @@ -34,6 +34,7 @@ public class ModItemGroups { entries.add(ModBlocks.LESBIAN_BED); entries.add(ModBlocks.PROGRESS_BED); + entries.add(ModBlocks.QUEER_CANDLE); entries.add(ModBlocks.GAY_CANDLE); entries.add(ModBlocks.ENBY_CANDLE); entries.add(ModBlocks.INTERSEX_CANDLE); diff --git a/src/main/resources/assets/joy/textures/block/black_candle.png b/src/main/resources/assets/joy/textures/block/black_candle.png deleted file mode 100644 index 30e12df..0000000 Binary files a/src/main/resources/assets/joy/textures/block/black_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/black_candle_lit.png b/src/main/resources/assets/joy/textures/block/black_candle_lit.png deleted file mode 100644 index 684cc8c..0000000 Binary files a/src/main/resources/assets/joy/textures/block/black_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/blue_candle.png b/src/main/resources/assets/joy/textures/block/blue_candle.png deleted file mode 100644 index ef5ca2f..0000000 Binary files a/src/main/resources/assets/joy/textures/block/blue_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/blue_candle_lit.png b/src/main/resources/assets/joy/textures/block/blue_candle_lit.png deleted file mode 100644 index 7c775cd..0000000 Binary files a/src/main/resources/assets/joy/textures/block/blue_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/brown_candle.png b/src/main/resources/assets/joy/textures/block/brown_candle.png deleted file mode 100644 index a2a40e6..0000000 Binary files a/src/main/resources/assets/joy/textures/block/brown_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/brown_candle_lit.png b/src/main/resources/assets/joy/textures/block/brown_candle_lit.png deleted file mode 100644 index 31dad09..0000000 Binary files a/src/main/resources/assets/joy/textures/block/brown_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/candle.png b/src/main/resources/assets/joy/textures/block/candle.png deleted file mode 100644 index 4af45a5..0000000 Binary files a/src/main/resources/assets/joy/textures/block/candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/candle_lit.png b/src/main/resources/assets/joy/textures/block/candle_lit.png deleted file mode 100644 index 17f3c8d..0000000 Binary files a/src/main/resources/assets/joy/textures/block/candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/cyan_candle.png b/src/main/resources/assets/joy/textures/block/cyan_candle.png deleted file mode 100644 index 2c38b7e..0000000 Binary files a/src/main/resources/assets/joy/textures/block/cyan_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/cyan_candle_lit.png b/src/main/resources/assets/joy/textures/block/cyan_candle_lit.png deleted file mode 100644 index 2c38b7e..0000000 Binary files a/src/main/resources/assets/joy/textures/block/cyan_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/gray_candle.png b/src/main/resources/assets/joy/textures/block/gray_candle.png deleted file mode 100644 index 960796c..0000000 Binary files a/src/main/resources/assets/joy/textures/block/gray_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/gray_candle_lit.png b/src/main/resources/assets/joy/textures/block/gray_candle_lit.png deleted file mode 100644 index 2316953..0000000 Binary files a/src/main/resources/assets/joy/textures/block/gray_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/green_candle.png b/src/main/resources/assets/joy/textures/block/green_candle.png deleted file mode 100644 index 69efe3d..0000000 Binary files a/src/main/resources/assets/joy/textures/block/green_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/green_candle_lit.png b/src/main/resources/assets/joy/textures/block/green_candle_lit.png deleted file mode 100644 index 6709d86..0000000 Binary files a/src/main/resources/assets/joy/textures/block/green_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/light_blue_candle.png b/src/main/resources/assets/joy/textures/block/light_blue_candle.png deleted file mode 100644 index 32cde23..0000000 Binary files a/src/main/resources/assets/joy/textures/block/light_blue_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/light_blue_candle_lit.png b/src/main/resources/assets/joy/textures/block/light_blue_candle_lit.png deleted file mode 100644 index a9e1d13..0000000 Binary files a/src/main/resources/assets/joy/textures/block/light_blue_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/light_gray_candle.png b/src/main/resources/assets/joy/textures/block/light_gray_candle.png deleted file mode 100644 index 97cd8e2..0000000 Binary files a/src/main/resources/assets/joy/textures/block/light_gray_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/light_gray_candle_lit.png b/src/main/resources/assets/joy/textures/block/light_gray_candle_lit.png deleted file mode 100644 index 6a2e714..0000000 Binary files a/src/main/resources/assets/joy/textures/block/light_gray_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/lime_candle.png b/src/main/resources/assets/joy/textures/block/lime_candle.png deleted file mode 100644 index 6fd600b..0000000 Binary files a/src/main/resources/assets/joy/textures/block/lime_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/lime_candle_lit.png b/src/main/resources/assets/joy/textures/block/lime_candle_lit.png deleted file mode 100644 index 91a36ee..0000000 Binary files a/src/main/resources/assets/joy/textures/block/lime_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/magenta_candle.png b/src/main/resources/assets/joy/textures/block/magenta_candle.png deleted file mode 100644 index 0dcb4d0..0000000 Binary files a/src/main/resources/assets/joy/textures/block/magenta_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/magenta_candle_lit.png b/src/main/resources/assets/joy/textures/block/magenta_candle_lit.png deleted file mode 100644 index 0dcb4d0..0000000 Binary files a/src/main/resources/assets/joy/textures/block/magenta_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/orange_candle.png b/src/main/resources/assets/joy/textures/block/orange_candle.png deleted file mode 100644 index 1c598d5..0000000 Binary files a/src/main/resources/assets/joy/textures/block/orange_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/orange_candle_lit.png b/src/main/resources/assets/joy/textures/block/orange_candle_lit.png deleted file mode 100644 index f28baf1..0000000 Binary files a/src/main/resources/assets/joy/textures/block/orange_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/pink_candle.png b/src/main/resources/assets/joy/textures/block/pink_candle.png deleted file mode 100644 index afdea2c..0000000 Binary files a/src/main/resources/assets/joy/textures/block/pink_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/pink_candle_lit.png b/src/main/resources/assets/joy/textures/block/pink_candle_lit.png deleted file mode 100644 index afdea2c..0000000 Binary files a/src/main/resources/assets/joy/textures/block/pink_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/purple_candle.png b/src/main/resources/assets/joy/textures/block/purple_candle.png deleted file mode 100644 index 3bc94d4..0000000 Binary files a/src/main/resources/assets/joy/textures/block/purple_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/purple_candle_lit.png b/src/main/resources/assets/joy/textures/block/purple_candle_lit.png deleted file mode 100644 index 3bc94d4..0000000 Binary files a/src/main/resources/assets/joy/textures/block/purple_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/red_candle.png b/src/main/resources/assets/joy/textures/block/red_candle.png deleted file mode 100644 index c9d99bf..0000000 Binary files a/src/main/resources/assets/joy/textures/block/red_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/red_candle_lit.png b/src/main/resources/assets/joy/textures/block/red_candle_lit.png deleted file mode 100644 index 5efdf7f..0000000 Binary files a/src/main/resources/assets/joy/textures/block/red_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/white_candle.png b/src/main/resources/assets/joy/textures/block/white_candle.png deleted file mode 100644 index d4e4a1e..0000000 Binary files a/src/main/resources/assets/joy/textures/block/white_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/white_candle_lit.png b/src/main/resources/assets/joy/textures/block/white_candle_lit.png deleted file mode 100644 index 8eb33c8..0000000 Binary files a/src/main/resources/assets/joy/textures/block/white_candle_lit.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/yellow_candle.png b/src/main/resources/assets/joy/textures/block/yellow_candle.png deleted file mode 100644 index 8e52a1b..0000000 Binary files a/src/main/resources/assets/joy/textures/block/yellow_candle.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/block/yellow_candle_lit.png b/src/main/resources/assets/joy/textures/block/yellow_candle_lit.png deleted file mode 100644 index ce856bf..0000000 Binary files a/src/main/resources/assets/joy/textures/block/yellow_candle_lit.png and /dev/null differ