diff --git a/src/main/java/net/limit/cubliminal/Initer.java b/src/main/java/net/limit/cubliminal/Initer.java index 68dc3fa..93ba7c3 100644 --- a/src/main/java/net/limit/cubliminal/Initer.java +++ b/src/main/java/net/limit/cubliminal/Initer.java @@ -2,9 +2,20 @@ import net.fabricmc.loader.api.FabricLoader; +import java.util.Comparator; + public interface Initer { default void init() {} + + default int order() { + return 0; + } + static void initialise() { - FabricLoader.getInstance().getEntrypoints("initer", Initer.class).forEach(Initer::init); + FabricLoader.getInstance() + .getEntrypoints("initer", Initer.class) + .stream() + .sorted(Comparator.comparingInt(Initer::order)) // sort by order + .forEach(Initer::init); // initialize } } diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java b/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java index 4e3f811..ebf7d8f 100644 --- a/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java +++ b/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java @@ -123,6 +123,13 @@ public static TagKey of(String id) { .sounds(BlockSoundGroup.WOOL) .strength(1, 3)); + public static final Block DAMP_CARPET_STAIRS = register("damp_carpet_stairs", StairsBlock::new, + AbstractBlock.Settings.copy(DAMP_CARPET), + DAMP_CARPET.getDefaultState(), BlockItem::new, new Item.Settings()); + + public static final Block DAMP_CARPET_SLAB = register("damp_carpet_slab", SlabBlock::new, + AbstractBlock.Settings.copy(DAMP_CARPET)); + public static final Block DIRTY_DAMP_CARPET = register("dirty_damp_carpet", Block::new, AbstractBlock.Settings.create() .mapColor(MapColor.OAK_TAN) diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java b/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java index d1505fa..c20be81 100644 --- a/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java +++ b/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java @@ -27,6 +27,8 @@ public class CubliminalItemGroups implements Initer { entries.add(CubliminalBlocks.FALSE_CEILING); entries.add(CubliminalBlocks.DAMP_CARPET); entries.add(CubliminalBlocks.DIRTY_DAMP_CARPET); + entries.add(CubliminalBlocks.DAMP_CARPET_SLAB); + entries.add(CubliminalBlocks.DAMP_CARPET_STAIRS); entries.add(CubliminalBlocks.RED_DAMP_CARPET); entries.add(CubliminalBlocks.RED_WALLPAPERS); entries.add(CubliminalBlocks.FLICKERING_FLUORESCENT_LIGHT); diff --git a/src/main/java/net/limit/cubliminal/world/maze/LevelOneMaze.java b/src/main/java/net/limit/cubliminal/world/maze/LevelOneMaze.java index b55ba7d..1995fe2 100644 --- a/src/main/java/net/limit/cubliminal/world/maze/LevelOneMaze.java +++ b/src/main/java/net/limit/cubliminal/world/maze/LevelOneMaze.java @@ -77,7 +77,6 @@ private void generateHalls() { Vec2i end = new Vec2i((int) edge.b.x, (int) edge.b.y); visitedCells++; this.visit(cell); - //this.connectDoors(cell); Stack corridor = new Stack<>(); stack.push(cell); corridor.push(cell); @@ -86,7 +85,6 @@ private void generateHalls() { cell = corridor.peek(); // If it is the desired end, reassign and remove the new one if (cell.equals(end)) { - //this.connectDoors(end); for (CellState cellState : maze) { this.visit(cellState.getPosition(), false); } @@ -160,10 +158,6 @@ public void setDoors(SetMultimap doors) { this.doors = HashMultimap.create(doors); } - public void connectDoors(Vec2i doorPos) { - this.doors.get(doorPos).forEach(door -> this.cellState(doorPos).go(door.facing().mirror())); - } - public void connectDoors() { if (this.doors != null) { this.doors.forEach((doorPos, door) -> this.cellState(doorPos).go(door.facing().mirror())); diff --git a/src/main/java/net/limit/cubliminal/world/maze/LevelOneMazeRegion.java b/src/main/java/net/limit/cubliminal/world/maze/LevelOneMazeRegion.java index 34c4b2e..3e5bacc 100644 --- a/src/main/java/net/limit/cubliminal/world/maze/LevelOneMazeRegion.java +++ b/src/main/java/net/limit/cubliminal/world/maze/LevelOneMazeRegion.java @@ -272,13 +272,13 @@ private List addConnections(BlockPos mazePos, int width, int height, int Random randomRight = Random.create(LimlibHelper.blockSeed(mazePos.add(0, 0, width * thicknessX))); List connections = new ArrayList<>(); // East - connections.add(new Vec2i(width - 1, randomUp.nextBetween(-a, height + a))); + connections.add(new Vec2i(width - 1, randomUp.nextBetween(-a, height + a - 1))); // West - connections.add(new Vec2i(0, randomDown.nextBetween(-a, height + a))); + connections.add(new Vec2i(0, randomDown.nextBetween(-a, height + a - 1))); // North - connections.add(new Vec2i(randomLeft.nextBetween(-a, width + a), 0)); + connections.add(new Vec2i(randomLeft.nextBetween(-a, width + a - 1), 0)); // South - connections.add(new Vec2i(randomRight.nextBetween(-a, width + a), height - 1)); + connections.add(new Vec2i(randomRight.nextBetween(-a, width + a - 1), height - 1)); return connections; } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/blockstates/damp_carpet_slab.json b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_slab.json new file mode 100644 index 0000000..f9fd453 --- /dev/null +++ b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cubliminal:block/damp_carpet_slab" + }, + "type=double": { + "model": "cubliminal:block/damp_carpet" + }, + "type=top": { + "model": "cubliminal:block/damp_carpet_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json new file mode 100644 index 0000000..73bde96 --- /dev/null +++ b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cubliminal:block/damp_carpet_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cubliminal:block/damp_carpet_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cubliminal:block/damp_carpet_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/lang/en_us.json b/src/main/resources/assets/cubliminal/lang/en_us.json index b573f17..6f6dcbf 100644 --- a/src/main/resources/assets/cubliminal/lang/en_us.json +++ b/src/main/resources/assets/cubliminal/lang/en_us.json @@ -12,6 +12,8 @@ "item.cubliminal.damaged_yellow_wallpapers": "Damaged Yellow Wallpapers", "item.cubliminal.false_ceiling": "False Ceiling", "item.cubliminal.damp_carpet": "Damp Carpet", + "item.cubliminal.damp_carpet_slab": "Damp Carpet Slab", + "item.cubliminal.damp_carpet_stairs": "Damp Carpet Stairs", "item.cubliminal.red_damp_carpet": "Red Damp Carpet", "item.cubliminal.red_wallpapers": "Crimson Wallpapers", "item.cubliminal.dirty_damp_carpet": "Dirty Damp Carpet", diff --git a/src/main/resources/assets/cubliminal/lang/es_es.json b/src/main/resources/assets/cubliminal/lang/es_es.json index ac6e49e..7eb3c4a 100644 --- a/src/main/resources/assets/cubliminal/lang/es_es.json +++ b/src/main/resources/assets/cubliminal/lang/es_es.json @@ -11,6 +11,8 @@ "item.cubliminal.damaged_yellow_wallpapers": "Tapices amarillos dañados", "item.cubliminal.false_ceiling": "Techo falso", "item.cubliminal.damp_carpet": "Moqueta húmeda", + "item.cubliminal.damp_carpet_slab": "Losa de moqueta húmeda", + "item.cubliminal.damp_carpet_stairs": "Escaleras de moqueta húmeda", "item.cubliminal.red_damp_carpet": "Moqueta roja húmeda", "item.cubliminal.red_wallpapers": "Tapices carmesíes", "item.cubliminal.dirty_damp_carpet": "Moqueta húmeda sucia", diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab.json new file mode 100644 index 0000000..a254829 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cubliminal:block/damp_carpet", + "side": "cubliminal:block/damp_carpet", + "top": "cubliminal:block/damp_carpet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab_top.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab_top.json new file mode 100644 index 0000000..b72d287 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cubliminal:block/damp_carpet", + "side": "cubliminal:block/damp_carpet", + "top": "cubliminal:block/damp_carpet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json new file mode 100644 index 0000000..c9b2e64 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cubliminal:block/damp_carpet", + "side": "cubliminal:block/damp_carpet", + "top": "cubliminal:block/damp_carpet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json new file mode 100644 index 0000000..27fca36 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cubliminal:block/damp_carpet", + "side": "cubliminal:block/damp_carpet", + "top": "cubliminal:block/damp_carpet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json new file mode 100644 index 0000000..1844636 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cubliminal:block/damp_carpet", + "side": "cubliminal:block/damp_carpet", + "top": "cubliminal:block/damp_carpet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/item/damp_carpet_slab.json b/src/main/resources/assets/cubliminal/models/item/damp_carpet_slab.json new file mode 100644 index 0000000..97ebb1e --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/item/damp_carpet_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cubliminal:block/damp_carpet_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/item/damp_carpet_stairs.json b/src/main/resources/assets/cubliminal/models/item/damp_carpet_stairs.json new file mode 100644 index 0000000..febbe88 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/item/damp_carpet_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cubliminal:block/damp_carpet_stairs" +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_slab.json b/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_slab.json new file mode 100644 index 0000000..81e6a93 --- /dev/null +++ b/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_slab.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_damp_carpet": { + "conditions": { + "items": [ + { + "items": "cubliminal:damp_carpet" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "cubliminal:damp_carpet_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_damp_carpet" + ] + ], + "rewards": { + "recipes": [ + "cubliminal:damp_carpet_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_stairs.json b/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_stairs.json new file mode 100644 index 0000000..bde0ef3 --- /dev/null +++ b/src/main/resources/data/cubliminal/advancement/recipes/building_blocks/damp_carpet_stairs.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_damp_carpet": { + "conditions": { + "items": [ + { + "items": "cubliminal:damp_carpet" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "cubliminal:damp_carpet_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_damp_carpet" + ] + ], + "rewards": { + "recipes": [ + "cubliminal:damp_carpet_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_slab.json b/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_slab.json new file mode 100644 index 0000000..92205dd --- /dev/null +++ b/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_slab.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "cubliminal:damp_carpet_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "cubliminal:blocks/damp_carpet_slab" +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_stairs.json b/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_stairs.json new file mode 100644 index 0000000..fdc94a7 --- /dev/null +++ b/src/main/resources/data/cubliminal/loot_table/blocks/damp_carpet_stairs.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "cubliminal:damp_carpet_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "cubliminal:blocks/damp_carpet_stairs" +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/recipe/damp_carpet_slab.json b/src/main/resources/data/cubliminal/recipe/damp_carpet_slab.json new file mode 100644 index 0000000..a03830b --- /dev/null +++ b/src/main/resources/data/cubliminal/recipe/damp_carpet_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "cubliminal:damp_carpet" + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "id": "cubliminal:damp_carpet_slab" + } +} \ No newline at end of file diff --git a/src/main/resources/data/cubliminal/recipe/damp_carpet_stairs.json b/src/main/resources/data/cubliminal/recipe/damp_carpet_stairs.json new file mode 100644 index 0000000..bced54f --- /dev/null +++ b/src/main/resources/data/cubliminal/recipe/damp_carpet_stairs.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "cubliminal:damp_carpet" + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "id": "cubliminal:damp_carpet_stairs" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/shears.json b/src/main/resources/data/minecraft/tags/block/mineable/shears.json index 85762f4..198cbc2 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/shears.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/shears.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "cubliminal:damp_carpet", + "cubliminal:damp_carpet_slab", + "cubliminal:damp_carpet_stairs", "cubliminal:dirty_damp_carpet", "cubliminal:red_damp_carpet" ] diff --git a/src/main/resources/data/minecraft/tags/block/slabs.json b/src/main/resources/data/minecraft/tags/block/slabs.json index 6943ad2..538b519 100644 --- a/src/main/resources/data/minecraft/tags/block/slabs.json +++ b/src/main/resources/data/minecraft/tags/block/slabs.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "cubliminal:damp_carpet_slab", "cubliminal:pool_tile_slab", "cubliminal:yellow_wallpapers_vertical_slab" ] diff --git a/src/main/resources/data/minecraft/tags/block/stairs.json b/src/main/resources/data/minecraft/tags/block/stairs.json index f1ff69b..fcace4e 100644 --- a/src/main/resources/data/minecraft/tags/block/stairs.json +++ b/src/main/resources/data/minecraft/tags/block/stairs.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "cubliminal:damp_carpet_stairs", "cubliminal:pool_tile_stairs" ] } \ No newline at end of file