From e308b64f7ada5de6b96d92b61ea602a4ea83ce46 Mon Sep 17 00:00:00 2001 From: Glitchlabs Date: Fri, 26 Jun 2026 20:58:38 +0200 Subject: [PATCH] glass glow --- .../ovh/glitchlabs/ornamentum/Ornamentum.java | 18 ------- .../ornamentum/blocks/GlowGlassPaneBlock.java | 18 ------- .../ornamentum/blocks/ModBlocks.java | 54 ------------------- .../datagen/ModBlockLootTableProvider.java | 18 ------- .../datagen/ModBlockStateProvider.java | 18 ------- 5 files changed, 126 deletions(-) delete mode 100644 src/main/java/ovh/glitchlabs/ornamentum/blocks/GlowGlassPaneBlock.java diff --git a/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java b/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java index f684a9d..0af7c12 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java @@ -113,24 +113,6 @@ public class Ornamentum { net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PURPLE_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.MAGENTA_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PINK_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); - - // Panes - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.LIME_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.WHITE_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.GRAY_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.LIGHT_GRAY_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.BLACK_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.BROWN_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.RED_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.ORANGE_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.YELLOW_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.GREEN_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.CYAN_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.LIGHT_BLUE_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.BLUE_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PURPLE_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.MAGENTA_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); - net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PINK_GLOW_STAINED_GLASS_PANE.get(), net.minecraft.client.renderer.RenderType.translucent()); } } } diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/GlowGlassPaneBlock.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/GlowGlassPaneBlock.java deleted file mode 100644 index 3c6bbdd..0000000 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/GlowGlassPaneBlock.java +++ /dev/null @@ -1,18 +0,0 @@ -package ovh.glitchlabs.ornamentum.blocks; - -import net.minecraft.world.level.block.IronBarsBlock; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.core.Direction; - -public class GlowGlassPaneBlock extends IronBarsBlock { - public GlowGlassPaneBlock(BlockBehaviour.Properties properties) { - super(properties); - } - - @Override - public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Direction side) { - return adjacentBlockState.getBlock() instanceof GlowGlassPaneBlock || super.skipRendering(state, adjacentBlockState, side); - } -} - diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java index 99f386f..f24e015 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java @@ -78,60 +78,6 @@ public class ModBlocks { public static final DeferredBlock PINK_GLOW_STAINED_GLASS = registerBlock("pink_glow_stained_glass", () -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS.get()))); - //GlowGlassPane - public static final DeferredBlock LIME_GLOW_STAINED_GLASS_PANE = registerBlock("lime_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.GLASS_PANE) - .emissiveRendering(((blockState, blockGetter, blockPos) -> true)) - .lightLevel(blockstate -> 10) - .noOcclusion() - .hasPostProcess((bs, br, bp) -> true)) - ); - - public static final DeferredBlock WHITE_GLOW_STAINED_GLASS_PANE = registerBlock("white_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock LIGHT_GRAY_GLOW_STAINED_GLASS_PANE = registerBlock("light_gray_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock GRAY_GLOW_STAINED_GLASS_PANE = registerBlock("gray_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock BLACK_GLOW_STAINED_GLASS_PANE = registerBlock("black_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock BROWN_GLOW_STAINED_GLASS_PANE = registerBlock("brown_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock RED_GLOW_STAINED_GLASS_PANE = registerBlock("red_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock ORANGE_GLOW_STAINED_GLASS_PANE = registerBlock("orange_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock YELLOW_GLOW_STAINED_GLASS_PANE = registerBlock("yellow_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock GREEN_GLOW_STAINED_GLASS_PANE = registerBlock("green_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock CYAN_GLOW_STAINED_GLASS_PANE = registerBlock("cyan_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock LIGHT_BLUE_GLOW_STAINED_GLASS_PANE = registerBlock("light_blue_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock BLUE_GLOW_STAINED_GLASS_PANE = registerBlock("blue_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock PURPLE_GLOW_STAINED_GLASS_PANE = registerBlock("purple_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock MAGENTA_GLOW_STAINED_GLASS_PANE = registerBlock("magenta_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - - public static final DeferredBlock PINK_GLOW_STAINED_GLASS_PANE = registerBlock("pink_glow_stained_glass_pane", - () -> new GlowGlassPaneBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_STAINED_GLASS_PANE.get()))); - private static DeferredBlock registerBlock(String name, Supplier block) { DeferredBlock toReturn = BLOCKS.register(name, block); registerBlockItem(name, toReturn); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java index 218bd72..bc7dd8a 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java @@ -34,24 +34,6 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { dropWhenSilkTouch(ModBlocks.MAGENTA_GLOW_STAINED_GLASS.get()); dropWhenSilkTouch(ModBlocks.PINK_GLOW_STAINED_GLASS.get()); - //Panes - dropWhenSilkTouch(ModBlocks.LIME_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.WHITE_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.GRAY_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.LIGHT_GRAY_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.BLACK_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.BROWN_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.RED_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.ORANGE_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.YELLOW_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.GREEN_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.CYAN_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.LIGHT_BLUE_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.BLUE_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.PURPLE_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.MAGENTA_GLOW_STAINED_GLASS_PANE.get()); - dropWhenSilkTouch(ModBlocks.PINK_GLOW_STAINED_GLASS_PANE.get()); - } @Override diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java index cc29c75..2f855eb 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java @@ -32,24 +32,6 @@ public class ModBlockStateProvider extends BlockStateProvider { blockWithItem(ModBlocks.PURPLE_GLOW_STAINED_GLASS); blockWithItem(ModBlocks.MAGENTA_GLOW_STAINED_GLASS); blockWithItem(ModBlocks.PINK_GLOW_STAINED_GLASS); - - //GLOW GLASS PANE - paneModelWithItem(ModBlocks.LIME_GLOW_STAINED_GLASS_PANE, "lime_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.WHITE_GLOW_STAINED_GLASS_PANE, "white_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.GRAY_GLOW_STAINED_GLASS_PANE, "gray_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.LIGHT_GRAY_GLOW_STAINED_GLASS_PANE, "light_gray_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.BLACK_GLOW_STAINED_GLASS_PANE, "black_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.BROWN_GLOW_STAINED_GLASS_PANE, "brown_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.RED_GLOW_STAINED_GLASS_PANE, "red_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.ORANGE_GLOW_STAINED_GLASS_PANE, "orange_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.YELLOW_GLOW_STAINED_GLASS_PANE, "yellow_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.GREEN_GLOW_STAINED_GLASS_PANE, "green_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.CYAN_GLOW_STAINED_GLASS_PANE, "cyan_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.LIGHT_BLUE_GLOW_STAINED_GLASS_PANE, "light_blue_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.BLUE_GLOW_STAINED_GLASS_PANE, "blue_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.PURPLE_GLOW_STAINED_GLASS_PANE, "purple_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.MAGENTA_GLOW_STAINED_GLASS_PANE, "magenta_glow_stained_glass_pane_top"); - paneModelWithItem(ModBlocks.PINK_GLOW_STAINED_GLASS_PANE, "pink_glow_stained_glass_pane_top"); } private void blockWithItem(DeferredBlock deferredBlock) {