Add Suspicious Blocks

src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java

@@ -132,6 +132,8 @@ public static void addBlockEntityTypeBlocks(BlockEntityTypeAddBlocksEvent event)
 		skullBlocksList.addAll(SpectrumWallSkullBlock.getMobWallHeads());
 
 		event.modify(SpectrumBlockEntities.SKULL.get(), skullBlocksList.toArray(new Block[0]));
+
+		event.modify(BlockEntityType.BRUSHABLE_BLOCK, SpectrumBlocks.SUSPICIOUS_ASH.get(), SpectrumBlocks.SUSPICIOUS_SLUDGE.get(), SpectrumBlocks.SUSPICIOUS_SLUSH.get(), SpectrumBlocks.SUSPICIOUS_ROT.get());
 	}
 
 	public static void registerClient(FMLClientSetupEvent event) {

src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java

@@ -1905,6 +1905,18 @@ private static BlockBehaviour.Properties fluid(MapColor mapColor) {
 	public static final DeferredBlock<Block> BLOODSTONE_BRICKS = register(simple(blockWithItem("bloodstone_bricks", () -> new Block(BlockBehaviour.Properties.ofFullCopy(PURE_BLOODSTONE_BLOCK.get())))));
 	public static final DeferredBlock<Block> MIXED_REFINED_CRYSTAL_BRICKS = register(simple(blockWithItem("mixed_refined_crystal_bricks", () -> new Block(BlockBehaviour.Properties.ofFullCopy(PURE_AZURITE_BLOCK.get())))));
 
+	private static Supplier<BrushableBlock> suspiciousBlock(Supplier<? extends Block> original) {
+		return () -> new BrushableBlock(original.get(),
+				SoundEvents.BRUSH_SAND, SoundEvents.BRUSH_SAND_COMPLETED,
+				BlockBehaviour.Properties.ofFullCopy(original.get()).strength(0.25F).sound(SoundType.SUSPICIOUS_SAND).pushReaction(PushReaction.DESTROY)
+		);
+	}
+
+	public static final DeferredBlock<BrushableBlock> SUSPICIOUS_SLUSH = register(simple(blockWithItem("suspicious_slush", suspiciousBlock(SLUSH))));
+	public static final DeferredBlock<BrushableBlock> SUSPICIOUS_SLUDGE = register(simple(blockWithItem("suspicious_sludge", suspiciousBlock(BLACK_SLUDGE))));
+	public static final DeferredBlock<BrushableBlock> SUSPICIOUS_ASH = register(simple(blockWithItem("suspicious_ash", suspiciousBlock(ASH))));
+	public static final DeferredBlock<BrushableBlock> SUSPICIOUS_ROT = register(simple(blockWithItem("suspicious_rot", suspiciousBlock(ROTTEN_GROUND))));
+
 	static boolean never(BlockState state, BlockGetter world, BlockPos pos, EntityType<?> type) {
 		return false;
 	}

src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java

@@ -1068,6 +1068,11 @@ public static void registerSubTabs() {
 					entries.accept(SpectrumBlocks.VARIA_SPROUT);
 					entries.accept(SpectrumBlocks.JADEITE_LOTUS_STEM);
 					entries.accept(SpectrumBlocks.JADEITE_LOTUS_FLOWER);
+
+					entries.accept(SpectrumBlocks.SUSPICIOUS_SLUSH);
+					entries.accept(SpectrumBlocks.SUSPICIOUS_SLUDGE);
+					entries.accept(SpectrumBlocks.SUSPICIOUS_ASH);
+					entries.accept(SpectrumBlocks.SUSPICIOUS_ROT);
 				}).build();
 
 		new CreativeSubTab.Builder(MAIN.get(), ItemGroupIDs.SUBTAB_DECORATION, Component.translatable("itemGroup.spectrum.decoration"))

src/main/resources/assets/spectrum/blockstates/suspicious_ash.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "dusted=0": {
+      "model": "spectrum:block/suspicious_ash_0"
+    },
+    "dusted=1": {
+      "model": "spectrum:block/suspicious_ash_1"
+    },
+    "dusted=2": {
+      "model": "spectrum:block/suspicious_ash_2"
+    },
+    "dusted=3": {
+      "model": "spectrum:block/suspicious_ash_3"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/suspicious_rot.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "dusted=0": {
+      "model": "spectrum:block/suspicious_rot_0"
+    },
+    "dusted=1": {
+      "model": "spectrum:block/suspicious_rot_1"
+    },
+    "dusted=2": {
+      "model": "spectrum:block/suspicious_rot_2"
+    },
+    "dusted=3": {
+      "model": "spectrum:block/suspicious_rot_3"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/suspicious_sludge.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "dusted=0": {
+      "model": "spectrum:block/suspicious_sludge_0"
+    },
+    "dusted=1": {
+      "model": "spectrum:block/suspicious_sludge_1"
+    },
+    "dusted=2": {
+      "model": "spectrum:block/suspicious_sludge_2"
+    },
+    "dusted=3": {
+      "model": "spectrum:block/suspicious_sludge_3"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/suspicious_slush.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "dusted=0": {
+      "model": "spectrum:block/suspicious_slush_0"
+    },
+    "dusted=1": {
+      "model": "spectrum:block/suspicious_slush_1"
+    },
+    "dusted=2": {
+      "model": "spectrum:block/suspicious_slush_2"
+    },
+    "dusted=3": {
+      "model": "spectrum:block/suspicious_slush_3"
+    }
+  }
+}

src/main/resources/assets/spectrum/lang/en_us.json

@@ -2011,6 +2011,10 @@
   "block.spectrum.stripped_yellow_log": "Stripped Yellow Log",
   "block.spectrum.stripped_yellow_wood": "Stripped Yellow Wood",
   "block.spectrum.stuck_storm_stone": "Storm Stone",
+  "block.spectrum.suspicious_ash": "Suspicious Ash",
+  "block.spectrum.suspicious_rot": "Suspicious Rot",
+  "block.spectrum.suspicious_sludge": "Suspicious Sludge",
+  "block.spectrum.suspicious_slush": "Suspicious Slush",
   "block.spectrum.sweet_pea": "Sweet Pea",
   "block.spectrum.tadpole_head": "Tadpole Head",
   "block.spectrum.tall_black_dragonjag": "Tall Black Dragonjag",

src/main/resources/assets/spectrum/models/block/suspicious_ash_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_ash_0"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_ash_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_ash_1"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_ash_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_ash_2"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_ash_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_ash_3"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_rot_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_rot_0"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_rot_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_rot_1"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_rot_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_rot_2"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_rot_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_rot_3"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_sludge_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_sludge_0"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_sludge_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_sludge_1"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_sludge_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_sludge_2"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_sludge_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_sludge_3"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_slush_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_slush_0"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_slush_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_slush_1"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_slush_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_slush_2"
+  }
+}

src/main/resources/assets/spectrum/models/block/suspicious_slush_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "spectrum:block/suspicious_slush_3"
+  }
+}

src/main/resources/assets/spectrum/models/item/suspicious_ash.json

@@ -0,0 +1,3 @@
+{
+  "parent": "spectrum:block/suspicious_ash_0"
+}

src/main/resources/assets/spectrum/models/item/suspicious_rot.json

@@ -0,0 +1,3 @@
+{
+  "parent": "spectrum:block/suspicious_rot_0"
+}

src/main/resources/assets/spectrum/models/item/suspicious_sludge.json

@@ -0,0 +1,3 @@
+{
+  "parent": "spectrum:block/suspicious_sludge_0"
+}

src/main/resources/assets/spectrum/models/item/suspicious_slush.json

@@ -0,0 +1,3 @@
+{
+  "parent": "spectrum:block/suspicious_slush_0"
+}

src/main/resources/data/c/tags/block/brushable_blocks.json

@@ -2,9 +2,13 @@
   "values": [
     "minecraft:suspicious_sand",
     "minecraft:suspicious_gravel",
+    "spectrum:suspicious_ash",
+    "spectrum:suspicious_rot",
+    "spectrum:suspicious_sludge",
+    "spectrum:suspicious_slush",
     {
       "id": "the_bumblezone:pile_of_pollen_suspicious",
       "required": false
     }
   ]
-}
+}

src/main/resources/data/minecraft/tags/block/mineable/shovel.json

@@ -6,6 +6,10 @@
     "spectrum:redstone_sand",
     "spectrum:sacred_soil",
     "spectrum:rotten_ground",
-    "spectrum:stardust_block"
+    "spectrum:stardust_block",
+    "spectrum:suspicious_ash",
+    "spectrum:suspicious_rot",
+    "spectrum:suspicious_sludge",
+    "spectrum:suspicious_slush"
   ]
 }

src/main/resources/data/spectrum/loot_table/blocks/suspicious_ash.json

@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:block",
+  "random_sequence": "spectrum:blocks/suspicious_ash"
+}

src/main/resources/data/spectrum/loot_table/blocks/suspicious_rot.json

@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:block",
+  "random_sequence": "spectrum:blocks/suspicious_rot"
+}

src/main/resources/data/spectrum/loot_table/blocks/suspicious_sludge.json

@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:block",
+  "random_sequence": "spectrum:blocks/suspicious_sludge"
+}

src/main/resources/data/spectrum/loot_table/blocks/suspicious_slush.json

@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:block",
+  "random_sequence": "spectrum:blocks/suspicious_slush"
+}

src/main/resources/data/spectrum/tags/block/aloe_plantable.json

@@ -6,6 +6,7 @@
     "#spectrum:base_stone_deeper_down",
 
     "spectrum:rotten_ground",
+    "spectrum:suspicious_rot",
     "spectrum:shimmel",
     "spectrum:shale_clay",
     "spectrum:sawblade_grass",

src/main/resources/data/spectrum/tags/block/ash.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "spectrum:ash",
-    "spectrum:ash_pile"
+    "spectrum:ash_pile",
+    "spectrum:suspicious_ash"
   ]
 }

src/main/resources/data/spectrum/tags/block/deep_soils.json

@@ -1,9 +1,11 @@
 {
   "values": [
+    "#spectrum:slushes",
+    "#spectrum:ash",
+
     "spectrum:black_materia",
     "spectrum:shale_clay",
     "spectrum:black_sludge",
-    "#spectrum:slushes",
-    "#spectrum:ash"
+    "spectrum:suspicious_sludge"
   ]
 }

src/main/resources/data/spectrum/tags/block/mermaids_brush_plantable.json

@@ -5,6 +5,7 @@
     "minecraft:gravel",
     "minecraft:sand",
     "minecraft:clay",
-    "spectrum:slush"
+    "spectrum:slush",
+    "spectrum:suspicious_slush"
   ]
 }

src/main/resources/data/spectrum/tags/block/quitoxic_reeds_plantable.json

@@ -3,6 +3,8 @@
     "#spectrum:quitoxic_reeds_consumable",
     "minecraft:coarse_dirt",
     "spectrum:slush",
-    "spectrum:rotten_ground"
+    "spectrum:suspicious_slush",
+    "spectrum:rotten_ground",
+    "spectrum:suspicious_rot"
   ]
 }

src/main/resources/data/spectrum/tags/block/slush.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "spectrum:slush",
-    "spectrum:tilled_slush"
+    "spectrum:tilled_slush",
+    "spectrum:suspicious_slush"
   ]
 }

src/main/resources/data/spectrum/tags/block/slushes.json

@@ -2,6 +2,7 @@
   "values": [
     "spectrum:slush",
     "spectrum:tilled_slush",
-    "spectrum:overgrown_slush"
+    "spectrum:overgrown_slush",
+    "spectrum:suspicious_slush"
   ]
 }

src/main/resources/data/spectrum/tags/block/snapping_ivy_plantable.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "#minecraft:dirt",
-    "spectrum:rotten_ground"
+    "spectrum:rotten_ground",
+    "spectrum:suspicious_rot"
   ]
 }

src/main/resources/data/spectrum/tags/block/structure/dirt_blocks.json

@@ -1,7 +1,9 @@
 {
   "values": [
     "spectrum:rotten_ground",
+    "spectrum:suspicious_rot",
     "spectrum:slush",
+    "spectrum:suspicious_slush",
     "#spectrum:groundcover"
   ]
 }