Updates

Mechalopa · Jul 21, 2024 · eeeca75 · eeeca75
1 parent 22f5e43
commit eeeca75
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 8 deletions.
diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java
@@ -14,14 +14,14 @@
 
 public class ModFlowerBlock extends FlowerBlock
 {
-	public ModFlowerBlock(Holder<MobEffect> effect, int effectDuration, BlockBehaviour.Properties properties)
+	public ModFlowerBlock(Holder<MobEffect> effect, int effectDuration)
 	{
-		super(effect, effectDuration, properties);
+		this(effect, effectDuration, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY));
 	}
 
-	public ModFlowerBlock(Holder<MobEffect> effect, int effectDuration)
+	public ModFlowerBlock(Holder<MobEffect> effect, int effectDuration, BlockBehaviour.Properties properties)
 	{
-		this(effect, effectDuration, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY));
+		super(effect, effectDuration, properties);
 	}
 
 	public boolean isReallyFlammable(BlockState state, BlockGetter getter, BlockPos pos, Direction direction)

diff --git a/src/main/resources/data/jafohana/loot_table/blocks/water_hyacinth.json b/src/main/resources/data/jafohana/loot_table/blocks/water_hyacinth.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "jafohana:water_hyacinth"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "jafohana:blocks/water_hyacinth"
+}
diff --git a/src/main/resources/data/jafohana/tags/block/beach_spider_lily_plantable_on.json b/src/main/resources/data/jafohana/tags/block/beach_spider_lily_plantable_on.json
@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "#c:sands",
+    "#minecraft:sand",
     "#minecraft:dirt",
     "#neoforge:villager_farmlands"
   ]

diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_coniferous.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_coniferous.json
@@ -5,6 +5,10 @@
       "id": "#c:is_tree/coniferous",
       "required": false
     },
+    {
+      "id": "#c:is_coniferous",
+      "required": false
+    },
     {
       "id": "spookybats:christmas_forest",
       "required": false

diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json
@@ -11,7 +11,7 @@
     },
     {
       "type": "minecraft:rarity_filter",
-      "chance": 48
+      "chance": 64
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/water_hyacinth.json b/src/main/resources/data/jafohana/worldgen/placed_feature/water_hyacinth.json
@@ -9,7 +9,7 @@
     },
     {
       "type": "minecraft:rarity_filter",
-      "chance": 80
+      "chance": 112
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/water_hyacinth_river.json b/src/main/resources/data/jafohana/worldgen/placed_feature/water_hyacinth_river.json
@@ -3,13 +3,13 @@
   "placement": [
     {
       "type": "minecraft:noise_threshold_count",
-      "above_noise": 5,
+      "above_noise": 7,
       "below_noise": 0,
       "noise_level": -0.85
     },
     {
       "type": "minecraft:rarity_filter",
-      "chance": 128
+      "chance": 160
     },
     {
       "type": "minecraft:in_square"