Merge remote-tracking branch 'origin/latest' into latest

src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt

@@ -115,17 +115,19 @@ object HybridAquaticClient : ClientModInitializer {
         )
         registry.putBlocks(
             RenderLayer.getCutout(),
-            HybridAquaticBlocks.RED_SEAWEED,
-            HybridAquaticBlocks.TALL_RED_SEAWEED,
+            HybridAquaticBlocks.RED_ALGAE,
+            HybridAquaticBlocks.TALL_RED_ALGAE,
 
             HybridAquaticBlocks.SARGASSUM,
             HybridAquaticBlocks.SARGASSUM_PLANT,
             HybridAquaticBlocks.FLOATING_SARGASSUM,
 
+            HybridAquaticBlocks.WATER_LETTUCE,
+
             HybridAquaticBlocks.GLOWING_PLANKTON,
 
-            HybridAquaticBlocks.GREEN_SEAWEED,
-            HybridAquaticBlocks.TALL_GREEN_SEAWEED,
+            HybridAquaticBlocks.SEA_LETTUCE,
+            HybridAquaticBlocks.TALL_SEA_LETTUCE,
 
             HybridAquaticBlocks.CRAB_POT,
             HybridAquaticBlocks.GIANT_CLAM,

src/generated/resources/assets/hybrid-aquatic/blockstates/sea_lettuce.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "hybrid-aquatic:block/sea_lettuce"
+    }
+  }
+}

src/generated/resources/assets/hybrid-aquatic/lang/en_us.json

@@ -75,7 +75,6 @@
   "block.hybrid-aquatic.glowing_plankton": "Glowing Plankton",
   "block.hybrid-aquatic.glowstick": "Glowstick",
   "block.hybrid-aquatic.great_white_shark_plushie": "Great White Shark Plushie",
-  "block.hybrid-aquatic.green_seaweed": "Green Seaweed",
   "block.hybrid-aquatic.hammerhead_shark_plushie": "Hammerhead Shark Plushie",
   "block.hybrid-aquatic.hybrid_crate": "Hybrid Crate",
   "block.hybrid-aquatic.hybrid_crate.description": "Break with an axe to open",
@@ -92,9 +91,10 @@
   "block.hybrid-aquatic.message_in_a_bottle.longneck": "Message in a Longneck Bottle",
   "block.hybrid-aquatic.oak_crate": "Oak Crate",
   "block.hybrid-aquatic.oak_crate.description": "Break with an axe to open",
-  "block.hybrid-aquatic.red_seaweed": "Red Seaweed",
+  "block.hybrid-aquatic.red_algae": "Red Algae",
   "block.hybrid-aquatic.sargassum": "Sargassum",
   "block.hybrid-aquatic.sargassum_plant": "Sargassum Plant",
+  "block.hybrid-aquatic.sea_lettuce": "Sea Lettuce",
   "block.hybrid-aquatic.spruce_crate": "Spruce Crate",
   "block.hybrid-aquatic.spruce_crate.description": "Break with an axe to open",
   "block.hybrid-aquatic.strawberry_anemone": "Strawberry Anemone",
@@ -103,15 +103,16 @@
   "block.hybrid-aquatic.sun_coral": "Sun Coral",
   "block.hybrid-aquatic.sun_coral_block": "Sun Coral Block",
   "block.hybrid-aquatic.sun_coral_fan": "Sun Coral Fan",
-  "block.hybrid-aquatic.tall_green_seaweed": "Tall Green Seaweed",
-  "block.hybrid-aquatic.tall_red_seaweed": "Tall Red Seaweed",
+  "block.hybrid-aquatic.tall_red_algae": "Tall Red Algae",
+  "block.hybrid-aquatic.tall_sea_lettuce": "Tall Sea Lettuce",
   "block.hybrid-aquatic.thorn_coral": "Thorn Coral",
   "block.hybrid-aquatic.thorn_coral_block": "Thorn Coral Block",
   "block.hybrid-aquatic.thorn_coral_fan": "Thorn Coral Fan",
   "block.hybrid-aquatic.thresher_shark_plushie": "Thresher Shark Plushie",
   "block.hybrid-aquatic.tiger_shark_plushie": "Tiger Shark Plushie",
   "block.hybrid-aquatic.tube_sponge": "Tube Sponge",
   "block.hybrid-aquatic.tube_worm": "Tube Worm",
+  "block.hybrid-aquatic.water_lettuce": "Water Lettuce",
   "block.hybrid-aquatic.whale_shark_plushie": "Whale Shark Plushie",
   "effect.hybrid-aquatic.bleeding": "Bleeding",
   "effect.hybrid-aquatic.buoyancy": "Buoyancy",

src/generated/resources/assets/hybrid-aquatic/models/block/red_seaweed.json → src/generated/resources/assets/hybrid-aquatic/models/block/sea_lettuce.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cross",
   "textures": {
-    "cross": "hybrid-aquatic:block/red_seaweed"
+    "cross": "hybrid-aquatic:block/sea_lettuce"
   }
 }

src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/water_lettuce.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "hybrid-aquatic:water_lettuce"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/red_algae_patch.json

@@ -0,0 +1,6 @@
+{
+  "type": "hybrid-aquatic:red_algae_patch",
+  "config": {
+    "probability": 0.33
+  }
+}

src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/sea_lettuce_patch.json

@@ -0,0 +1,6 @@
+{
+  "type": "hybrid-aquatic:sea_lettuce_patch",
+  "config": {
+    "probability": 0.33
+  }
+}

src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/thermal_vent_patch.json

@@ -14,7 +14,7 @@
         "min_inclusive": 2
       }
     },
-    "spread_radius": 2,
+    "spread_radius": 3,
     "vent_block": {
       "type": "minecraft:simple_state_provider",
       "state": {
@@ -49,6 +49,6 @@
         "min_inclusive": 1
       }
     },
-    "worm_spread_radius": 8
+    "worm_spread_radius": 4
   }
 }

src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/green_seaweed_patch.json → src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/water_lettuce.json

@@ -1,5 +1,5 @@
 {
-  "type": "minecraft:flower",
+  "type": "minecraft:random_patch",
   "config": {
     "feature": {
       "feature": {
@@ -8,7 +8,10 @@
           "to_place": {
             "type": "minecraft:simple_state_provider",
             "state": {
-              "Name": "hybrid-aquatic:green_seaweed"
+              "Name": "hybrid-aquatic:water_lettuce",
+              "Properties": {
+                "waterlogged": "true"
+              }
             }
           }
         }
@@ -23,8 +26,8 @@
         }
       ]
     },
-    "tries": 10,
-    "xz_spread": 5,
-    "y_spread": 2
+    "tries": 5,
+    "xz_spread": 3,
+    "y_spread": 3
   }
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/anemone_patch.json

@@ -11,6 +11,9 @@
     {
       "type": "minecraft:count",
       "count": 2
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/floating_sargassum.json

@@ -10,9 +10,12 @@
     },
     {
       "type": "minecraft:noise_based_count",
-      "noise_factor": 100.0,
+      "noise_factor": 80.0,
       "noise_offset": 0.0,
-      "noise_to_count_ratio": 20
+      "noise_to_count_ratio": 30
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/giant_clam_patch.json

@@ -11,6 +11,9 @@
     {
       "type": "minecraft:count",
       "count": 1
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/glowing_plankton.json

@@ -12,7 +12,10 @@
       "type": "minecraft:noise_based_count",
       "noise_factor": 100.0,
       "noise_offset": 0.0,
-      "noise_to_count_ratio": 40
+      "noise_to_count_ratio": 80
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_seaweed_patch.json → src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_algae_meadow.json

@@ -1,22 +1,21 @@
 {
-  "feature": "hybrid-aquatic:red_seaweed_patch",
+  "feature": "hybrid-aquatic:red_algae_patch",
   "placement": [
-    {
-      "type": "minecraft:in_square"
-    },
     {
       "type": "minecraft:noise_based_count",
-      "noise_factor": 300.0,
+      "noise_factor": 100.0,
       "noise_offset": 0.0,
-      "noise_to_count_ratio": 20
+      "noise_to_count_ratio": 400
+    },
+    {
+      "type": "minecraft:in_square"
     },
     {
       "type": "minecraft:heightmap",
       "heightmap": "OCEAN_FLOOR_WG"
     },
     {
-      "type": "minecraft:count",
-      "count": 1
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_seaweed_meadow.json → src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_algae_patch.json

@@ -1,18 +1,21 @@
 {
-  "feature": "hybrid-aquatic:red_seaweed_meadow",
+  "feature": "hybrid-aquatic:red_algae_patch",
   "placement": [
-    {
-      "type": "minecraft:in_square"
-    },
     {
       "type": "minecraft:noise_based_count",
-      "noise_factor": 100.0,
+      "noise_factor": 80.0,
       "noise_offset": 0.0,
       "noise_to_count_ratio": 10
     },
+    {
+      "type": "minecraft:in_square"
+    },
     {
       "type": "minecraft:heightmap",
       "heightmap": "OCEAN_FLOOR_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }

src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/sargassum.json

@@ -1,6 +1,12 @@
 {
   "feature": "hybrid-aquatic:sargassum",
   "placement": [
+    {
+      "type": "minecraft:noise_based_count",
+      "noise_factor": 80.0,
+      "noise_offset": 0.0,
+      "noise_to_count_ratio": 10
+    },
     {
       "type": "minecraft:in_square"
     },
@@ -10,10 +16,6 @@
     },
     {
       "type": "minecraft:biome"
-    },
-    {
-      "type": "minecraft:count",
-      "count": 10
     }
   ]
 }