merge

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
 	}
 }

src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java

@@ -123,6 +123,13 @@ public static TagKey<Block> 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)

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);

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<Vec2i> 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<Vec2i, Door.Instance> 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()));

src/main/java/net/limit/cubliminal/world/maze/LevelOneMazeRegion.java

@@ -272,13 +272,13 @@ private List<Vec2i> addConnections(BlockPos mazePos, int width, int height, int
         Random randomRight = Random.create(LimlibHelper.blockSeed(mazePos.add(0, 0, width * thicknessX)));
         List<Vec2i> 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;
     }
 }

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"
+    }
+  }
+}

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
+    }
+  }
+}

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",

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",

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

src/main/resources/assets/cubliminal/models/item/damp_carpet_slab.json

@@ -0,0 +1,3 @@
+{
+  "parent": "cubliminal:block/damp_carpet_slab"
+}

src/main/resources/assets/cubliminal/models/item/damp_carpet_stairs.json

@@ -0,0 +1,3 @@
+{
+  "parent": "cubliminal:block/damp_carpet_stairs"
+}