ian1337/Ornamentum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ texture update

Browse Source 
+ glow block stairs/slabs
This commit is contained in:
Glitchlabs
2026-07-25 16:58:06 +02:00
parent 934e6b2866
commit 46f96fc180
286 changed files with 7384 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java
+97 -15
View File
@@ -338,49 +338,131 @@ public class ModBlocks {
));
public static final DeferredBlock<Block> WHITE_GLOW_BLOCK = registerBlock("white_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> LIGHT_GRAY_GLOW_BLOCK = registerBlock("light_gray_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> GRAY_GLOW_BLOCK = registerBlock("gray_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> BLACK_GLOW_BLOCK = registerBlock("black_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> BROWN_GLOW_BLOCK = registerBlock("brown_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> RED_GLOW_BLOCK = registerBlock("red_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> ORANGE_GLOW_BLOCK = registerBlock("orange_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> YELLOW_GLOW_BLOCK = registerBlock("yellow_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> GREEN_GLOW_BLOCK = registerBlock("green_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> CYAN_GLOW_BLOCK = registerBlock("cyan_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> LIGHT_BLUE_GLOW_BLOCK = registerBlock("light_blue_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> BLUE_GLOW_BLOCK = registerBlock("blue_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> PURPLE_GLOW_BLOCK = registerBlock("purple_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> MAGENTA_GLOW_BLOCK = registerBlock("magenta_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<Block> PINK_GLOW_BLOCK = registerBlock("pink_glow_block",
() -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
() -> new Block(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
// GlowBlock stairs/slabs
public static final DeferredBlock<StairBlock> LIME_GLOW_BLOCK_STAIRS = registerBlock("lime_glow_block_stairs",
() -> new StairBlock(LIME_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> LIME_GLOW_BLOCK_SLAB = registerBlock("lime_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIME_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> WHITE_GLOW_BLOCK_STAIRS = registerBlock("white_glow_block_stairs",
() -> new StairBlock(WHITE_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(WHITE_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> WHITE_GLOW_BLOCK_SLAB = registerBlock("white_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(WHITE_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> LIGHT_GRAY_GLOW_BLOCK_STAIRS = registerBlock("light_gray_glow_block_stairs",
() -> new StairBlock(LIGHT_GRAY_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIGHT_GRAY_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> LIGHT_GRAY_GLOW_BLOCK_SLAB = registerBlock("light_gray_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_GRAY_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> GRAY_GLOW_BLOCK_STAIRS = registerBlock("gray_glow_block_stairs",
() -> new StairBlock(GRAY_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(GRAY_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> GRAY_GLOW_BLOCK_SLAB = registerBlock("gray_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(GRAY_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> BLACK_GLOW_BLOCK_STAIRS = registerBlock("black_glow_block_stairs",
() -> new StairBlock(BLACK_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLACK_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> BLACK_GLOW_BLOCK_SLAB = registerBlock("black_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BLACK_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> BROWN_GLOW_BLOCK_STAIRS = registerBlock("brown_glow_block_stairs",
() -> new StairBlock(BROWN_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BROWN_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> BROWN_GLOW_BLOCK_SLAB = registerBlock("brown_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BROWN_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> RED_GLOW_BLOCK_STAIRS = registerBlock("red_glow_block_stairs",
() -> new StairBlock(RED_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(RED_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> RED_GLOW_BLOCK_SLAB = registerBlock("red_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(RED_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> ORANGE_GLOW_BLOCK_STAIRS = registerBlock("orange_glow_block_stairs",
() -> new StairBlock(ORANGE_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(ORANGE_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> ORANGE_GLOW_BLOCK_SLAB = registerBlock("orange_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(ORANGE_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> YELLOW_GLOW_BLOCK_STAIRS = registerBlock("yellow_glow_block_stairs",
() -> new StairBlock(YELLOW_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(YELLOW_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> YELLOW_GLOW_BLOCK_SLAB = registerBlock("yellow_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(YELLOW_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> GREEN_GLOW_BLOCK_STAIRS = registerBlock("green_glow_block_stairs",
() -> new StairBlock(GREEN_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(GREEN_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> GREEN_GLOW_BLOCK_SLAB = registerBlock("green_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(GREEN_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> CYAN_GLOW_BLOCK_STAIRS = registerBlock("cyan_glow_block_stairs",
() -> new StairBlock(CYAN_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CYAN_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> CYAN_GLOW_BLOCK_SLAB = registerBlock("cyan_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CYAN_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> LIGHT_BLUE_GLOW_BLOCK_STAIRS = registerBlock("light_blue_glow_block_stairs",
() -> new StairBlock(LIGHT_BLUE_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIGHT_BLUE_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> LIGHT_BLUE_GLOW_BLOCK_SLAB = registerBlock("light_blue_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_BLUE_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> BLUE_GLOW_BLOCK_STAIRS = registerBlock("blue_glow_block_stairs",
() -> new StairBlock(BLUE_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLUE_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> BLUE_GLOW_BLOCK_SLAB = registerBlock("blue_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BLUE_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> PURPLE_GLOW_BLOCK_STAIRS = registerBlock("purple_glow_block_stairs",
() -> new StairBlock(PURPLE_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(PURPLE_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> PURPLE_GLOW_BLOCK_SLAB = registerBlock("purple_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(PURPLE_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> MAGENTA_GLOW_BLOCK_STAIRS = registerBlock("magenta_glow_block_stairs",
() -> new StairBlock(MAGENTA_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MAGENTA_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> MAGENTA_GLOW_BLOCK_SLAB = registerBlock("magenta_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MAGENTA_GLOW_BLOCK.get())));
public static final DeferredBlock<StairBlock> PINK_GLOW_BLOCK_STAIRS = registerBlock("pink_glow_block_stairs",
() -> new StairBlock(PINK_GLOW_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(PINK_GLOW_BLOCK.get())));
public static final DeferredBlock<SlabBlock> PINK_GLOW_BLOCK_SLAB = registerBlock("pink_glow_block_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(PINK_GLOW_BLOCK.get())));
//GlowGlass
public static final DeferredBlock<Block> LIME_GLOW_STAINED_GLASS = registerBlock("lime_glow_stained_glass",
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java
+34
View File
@@ -52,6 +52,40 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider {
dropSelf(ModBlocks.MAGENTA_GLOW_BLOCK.get());
dropSelf(ModBlocks.PINK_GLOW_BLOCK.get());
dropSelf(ModBlocks.LIME_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.RED_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.PINK_GLOW_BLOCK_STAIRS.get());
dropSelf(ModBlocks.LIME_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.WHITE_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.GRAY_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.BLACK_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.BROWN_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.RED_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.GREEN_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.CYAN_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.BLUE_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.PINK_GLOW_BLOCK_SLAB.get());
dropSelf(ModBlocks.WHITE_WOOL_STAIRS.get());
dropSelf(ModBlocks.ORANGE_WOOL_STAIRS.get());
dropSelf(ModBlocks.MAGENTA_WOOL_STAIRS.get());
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java
+18
View File
@@ -47,6 +47,24 @@ public class ModBlockStateProvider extends BlockStateProvider {
blockWithItem(ModBlocks.MAGENTA_GLOW_BLOCK);
blockWithItem(ModBlocks.PINK_GLOW_BLOCK);
// GLOW BLOCK STAIRS/SLABS
createStairsAndSlab(ModBlocks.LIME_GLOW_BLOCK_STAIRS, ModBlocks.LIME_GLOW_BLOCK_SLAB, "lime_glow_block");
createStairsAndSlab(ModBlocks.WHITE_GLOW_BLOCK_STAIRS, ModBlocks.WHITE_GLOW_BLOCK_SLAB, "white_glow_block");
createStairsAndSlab(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS, ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB, "light_gray_glow_block");
createStairsAndSlab(ModBlocks.GRAY_GLOW_BLOCK_STAIRS, ModBlocks.GRAY_GLOW_BLOCK_SLAB, "gray_glow_block");
createStairsAndSlab(ModBlocks.BLACK_GLOW_BLOCK_STAIRS, ModBlocks.BLACK_GLOW_BLOCK_SLAB, "black_glow_block");
createStairsAndSlab(ModBlocks.BROWN_GLOW_BLOCK_STAIRS, ModBlocks.BROWN_GLOW_BLOCK_SLAB, "brown_glow_block");
createStairsAndSlab(ModBlocks.RED_GLOW_BLOCK_STAIRS, ModBlocks.RED_GLOW_BLOCK_SLAB, "red_glow_block");
createStairsAndSlab(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS, ModBlocks.ORANGE_GLOW_BLOCK_SLAB, "orange_glow_block");
createStairsAndSlab(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS, ModBlocks.YELLOW_GLOW_BLOCK_SLAB, "yellow_glow_block");
createStairsAndSlab(ModBlocks.GREEN_GLOW_BLOCK_STAIRS, ModBlocks.GREEN_GLOW_BLOCK_SLAB, "green_glow_block");
createStairsAndSlab(ModBlocks.CYAN_GLOW_BLOCK_STAIRS, ModBlocks.CYAN_GLOW_BLOCK_SLAB, "cyan_glow_block");
createStairsAndSlab(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS, ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB, "light_blue_glow_block");
createStairsAndSlab(ModBlocks.BLUE_GLOW_BLOCK_STAIRS, ModBlocks.BLUE_GLOW_BLOCK_SLAB, "blue_glow_block");
createStairsAndSlab(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS, ModBlocks.PURPLE_GLOW_BLOCK_SLAB, "purple_glow_block");
createStairsAndSlab(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS, ModBlocks.MAGENTA_GLOW_BLOCK_SLAB, "magenta_glow_block");
createStairsAndSlab(ModBlocks.PINK_GLOW_BLOCK_STAIRS, ModBlocks.PINK_GLOW_BLOCK_SLAB, "pink_glow_block");
//GLOW GLASS (use vanilla stained glass textures)
blockWithVanillaTexture(ModBlocks.LIME_GLOW_STAINED_GLASS, "lime_stained_glass");
blockWithVanillaTexture(ModBlocks.WHITE_GLOW_STAINED_GLASS, "white_stained_glass");
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java
+102 -2
View File
@@ -45,6 +45,40 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.MAGENTA_GLOW_BLOCK.get())
.add(ModBlocks.PINK_GLOW_BLOCK.get())
.add(ModBlocks.LIME_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.RED_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PINK_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIME_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.RED_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PINK_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.POOL_TILES.get())
.add(ModBlocks.POOL_TILES1.get())
@@ -147,6 +181,40 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.MAGENTA_GLOW_BLOCK.get())
.add(ModBlocks.PINK_GLOW_BLOCK.get())
.add(ModBlocks.LIME_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.RED_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PINK_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIME_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.RED_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PINK_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GOLD_GRATE.get())
.add(ModBlocks.DIAMOND_GRATE.get())
.add(ModBlocks.AMETHYST_GRATE.get())
@@ -208,8 +276,6 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.MESH_IRON.get())
;
// Stone-tier tools are "incorrect" for anything that needs iron or diamond tool.
// (IRON_GRATE itself needs only stone, so it stays excluded here.)
tag(BlockTags.INCORRECT_FOR_STONE_TOOL)
.add(ModBlocks.GOLD_GRATE.get())
.add(ModBlocks.DIAMOND_GRATE.get())
@@ -781,6 +847,23 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get())
.add(ModBlocks.LIME_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.RED_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get())
.add(ModBlocks.PINK_GLOW_BLOCK_STAIRS.get())
;
tag(BlockTags.SLABS)
@@ -829,6 +912,23 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get())
.add(ModBlocks.LIME_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.WHITE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GRAY_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLACK_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BROWN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.RED_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.GREEN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.CYAN_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.BLUE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get())
.add(ModBlocks.PINK_GLOW_BLOCK_SLAB.get())
;
}
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java
+34
View File
@@ -50,6 +50,40 @@ public class ModLanguageProvider extends LanguageProvider {
add(ModBlocks.MAGENTA_GLOW_BLOCK.get(), "Magenta Glow Block");
add(ModBlocks.PINK_GLOW_BLOCK.get(), "Pink Glow Block");
add(ModBlocks.LIME_GLOW_BLOCK_STAIRS.get(), "Lime Glow Block Stairs");
add(ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get(), "White Glow Block Stairs");
add(ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get(), "Gray Glow Block Stairs");
add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get(), "Light Gray Glow Block Stairs");
add(ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get(), "Black Glow Block Stairs");
add(ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get(), "Brown Glow Block Stairs");
add(ModBlocks.RED_GLOW_BLOCK_STAIRS.get(), "Red Glow Block Stairs");
add(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get(), "Orange Glow Block Stairs");
add(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get(), "Yellow Glow Block Stairs");
add(ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get(), "Green Glow Block Stairs");
add(ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get(), "Cyan Glow Block Stairs");
add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get(), "Light Blue Glow Block Stairs");
add(ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get(), "Blue Glow Block Stairs");
add(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get(), "Purple Glow Block Stairs");
add(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get(), "Magenta Glow Block Stairs");
add(ModBlocks.PINK_GLOW_BLOCK_STAIRS.get(), "Pink Glow Block Stairs");
add(ModBlocks.LIME_GLOW_BLOCK_SLAB.get(), "Lime Glow Block Slab");
add(ModBlocks.WHITE_GLOW_BLOCK_SLAB.get(), "White Glow Block Slab");
add(ModBlocks.GRAY_GLOW_BLOCK_SLAB.get(), "Gray Glow Block Slab");
add(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get(), "Light Gray Glow Block Slab");
add(ModBlocks.BLACK_GLOW_BLOCK_SLAB.get(), "Black Glow Block Slab");
add(ModBlocks.BROWN_GLOW_BLOCK_SLAB.get(), "Brown Glow Block Slab");
add(ModBlocks.RED_GLOW_BLOCK_SLAB.get(), "Red Glow Block Slab");
add(ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get(), "Orange Glow Block Slab");
add(ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get(), "Yellow Glow Block Slab");
add(ModBlocks.GREEN_GLOW_BLOCK_SLAB.get(), "Green Glow Block Slab");
add(ModBlocks.CYAN_GLOW_BLOCK_SLAB.get(), "Cyan Glow Block Slab");
add(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get(), "Light Blue Glow Block Slab");
add(ModBlocks.BLUE_GLOW_BLOCK_SLAB.get(), "Blue Glow Block Slab");
add(ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get(), "Purple Glow Block Slab");
add(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get(), "Magenta Glow Block Slab");
add(ModBlocks.PINK_GLOW_BLOCK_SLAB.get(), "Pink Glow Block Slab");
add(ModBlocks.IRON_GRATE.get(), "Iron Grate");
add(ModBlocks.GOLD_GRATE.get(), "Gold Grate");
add(ModBlocks.DIAMOND_GRATE.get(), "Diamond Grate");
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModRecipeProvider.java
+37
View File
@@ -110,6 +110,24 @@ public class ModRecipeProvider extends RecipeProvider {
stairRecipes.put(ModBlocks.RED_BRICKS.get(), ModBlocks.RED_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.BLACK_BRICKS.get(), ModBlocks.BLACK_BRICKS_STAIRS.get());
// Glow block stairs
stairRecipes.put(ModBlocks.LIME_GLOW_BLOCK.get(), ModBlocks.LIME_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.WHITE_GLOW_BLOCK.get(), ModBlocks.WHITE_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.LIGHT_GRAY_GLOW_BLOCK.get(), ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.GRAY_GLOW_BLOCK.get(), ModBlocks.GRAY_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.BLACK_GLOW_BLOCK.get(), ModBlocks.BLACK_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.BROWN_GLOW_BLOCK.get(), ModBlocks.BROWN_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.RED_GLOW_BLOCK.get(), ModBlocks.RED_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.ORANGE_GLOW_BLOCK.get(), ModBlocks.ORANGE_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.YELLOW_GLOW_BLOCK.get(), ModBlocks.YELLOW_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.GREEN_GLOW_BLOCK.get(), ModBlocks.GREEN_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.CYAN_GLOW_BLOCK.get(), ModBlocks.CYAN_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.LIGHT_BLUE_GLOW_BLOCK.get(), ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.BLUE_GLOW_BLOCK.get(), ModBlocks.BLUE_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.PURPLE_GLOW_BLOCK.get(), ModBlocks.PURPLE_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.MAGENTA_GLOW_BLOCK.get(), ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS.get());
stairRecipes.put(ModBlocks.PINK_GLOW_BLOCK.get(), ModBlocks.PINK_GLOW_BLOCK_STAIRS.get());
slabRecipes.put(Items.WHITE_WOOL, ModBlocks.WHITE_WOOL_SLAB.get());
slabRecipes.put(Items.ORANGE_WOOL, ModBlocks.ORANGE_WOOL_SLAB.get());
slabRecipes.put(Items.MAGENTA_WOOL, ModBlocks.MAGENTA_WOOL_SLAB.get());
@@ -130,6 +148,24 @@ public class ModRecipeProvider extends RecipeProvider {
slabRecipes.put(ModBlocks.POOL_TILES.get(), ModBlocks.POOL_TILES_SLAB.get());
slabRecipes.put(ModBlocks.POOL_TILES1.get(), ModBlocks.POOL_TILES1_SLAB.get());
// Glow block slabs
slabRecipes.put(ModBlocks.LIME_GLOW_BLOCK.get(), ModBlocks.LIME_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.WHITE_GLOW_BLOCK.get(), ModBlocks.WHITE_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.LIGHT_GRAY_GLOW_BLOCK.get(), ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.GRAY_GLOW_BLOCK.get(), ModBlocks.GRAY_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.BLACK_GLOW_BLOCK.get(), ModBlocks.BLACK_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.BROWN_GLOW_BLOCK.get(), ModBlocks.BROWN_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.RED_GLOW_BLOCK.get(), ModBlocks.RED_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.ORANGE_GLOW_BLOCK.get(), ModBlocks.ORANGE_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.YELLOW_GLOW_BLOCK.get(), ModBlocks.YELLOW_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.GREEN_GLOW_BLOCK.get(), ModBlocks.GREEN_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.CYAN_GLOW_BLOCK.get(), ModBlocks.CYAN_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.LIGHT_BLUE_GLOW_BLOCK.get(), ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.BLUE_GLOW_BLOCK.get(), ModBlocks.BLUE_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.PURPLE_GLOW_BLOCK.get(), ModBlocks.PURPLE_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.MAGENTA_GLOW_BLOCK.get(), ModBlocks.MAGENTA_GLOW_BLOCK_SLAB.get());
slabRecipes.put(ModBlocks.PINK_GLOW_BLOCK.get(), ModBlocks.PINK_GLOW_BLOCK_SLAB.get());
// Colored bricks slabs
slabRecipes.put(ModBlocks.WHITE_BRICKS.get(), ModBlocks.WHITE_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.ORANGE_BRICKS.get(), ModBlocks.ORANGE_BRICKS_SLAB.get());
@@ -194,6 +230,7 @@ public class ModRecipeProvider extends RecipeProvider {
slabRecipes.put(ModBlocks.PURPUR_BRICKS.get(), ModBlocks.PURPUR_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.SMOOTH_BASALT_BRICKS.get(), ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get());
grateRecipes.forEach((input, result) ->
createGrateRecipe(output, input, result));
src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java
+34
View File
@@ -67,6 +67,40 @@ public class ModCreativeModeTabs {
output.accept(ModBlocks.MAGENTA_GLOW_BLOCK);
output.accept(ModBlocks.PINK_GLOW_BLOCK);
output.accept(ModBlocks.WHITE_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.GRAY_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.BLACK_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.BROWN_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.RED_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.ORANGE_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.YELLOW_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.LIME_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.GREEN_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.CYAN_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.BLUE_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.PURPLE_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.MAGENTA_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.PINK_GLOW_BLOCK_STAIRS);
output.accept(ModBlocks.WHITE_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.LIGHT_GRAY_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.GRAY_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.BLACK_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.BROWN_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.RED_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.ORANGE_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.YELLOW_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.LIME_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.GREEN_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.CYAN_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.LIGHT_BLUE_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.BLUE_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.PURPLE_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.MAGENTA_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.PINK_GLOW_BLOCK_SLAB);
output.accept(ModBlocks.WHITE_WOOL_STAIRS);
output.accept(ModBlocks.ORANGE_WOOL_STAIRS);
output.accept(ModBlocks.MAGENTA_WOOL_STAIRS);