Tweaks from 1.21

Mechalopa · Jan 19, 2025 · 651a023 · 651a023
1 parent 2ae51f4
commit 651a023
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java
@@ -144,9 +144,9 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.CRIMSON_CLOVER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MAGENTA_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.JADE_VINE.get(), 2), 5, 1, 0.05F));
 		}
 	}

diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/JadeVineBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/JadeVineBlock.java
@@ -127,7 +127,7 @@ public boolean isValidBonemealTarget(LevelReader levelReader, BlockPos pos, Bloc
 		}
 		else
 		{
-			Optional<BlockPos> optional = this.getHeadPos(levelReader, pos, state.getBlock());
+			Optional<BlockPos> optional = this.getHeadPos(levelReader, pos);
 			return optional.isPresent() && this.canGrowInto(levelReader.getBlockState(optional.get().relative(Direction.DOWN)));
 		}
 	}
@@ -149,7 +149,7 @@ public void performBonemeal(ServerLevel serverLevel, RandomSource random, BlockP
 		}
 		else
 		{
-			Optional<BlockPos> optional = this.getHeadPos(serverLevel, pos, state.getBlock());
+			Optional<BlockPos> optional = this.getHeadPos(serverLevel, pos);
 
 			if (optional.isPresent())
 			{
@@ -164,7 +164,7 @@ protected boolean canGrowInto(BlockState state)
 		return state.isAir();
 	}
 
-	private Optional<BlockPos> getHeadPos(BlockGetter getter, BlockPos pos, Block p_153325_)
+	private Optional<BlockPos> getHeadPos(BlockGetter getter, BlockPos pos)
 	{
 		BlockPos.MutableBlockPos blockpos$mutableblockpos = pos.mutable();
 		BlockState blockstate;

diff --git a/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json b/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json
@@ -1,7 +1,6 @@
 {
-  "parent": "jafohana:block/medium_flower_height_20",
+  "parent": "jafohana:block/cross_height_20",
   "textures": {
-    "particle": "jafohana:block/bells_of_ireland",
     "cross": "jafohana:block/bells_of_ireland",
     "stem": "jafohana:block/bells_of_ireland_stem"
   }

diff --git a/...models/block/medium_flower_height_18.json → ...afohana/models/block/cross_height_18.json b/...models/block/medium_flower_height_18.json → ...afohana/models/block/cross_height_18.json
@@ -1,6 +1,9 @@
 {
   "ambientocclusion": false,
   "render_type": "cutout",
+  "textures": {
+    "particle": "#cross"
+  },
   "elements": [
     {
       "from": [ 0.8, 0, 8 ],

diff --git a/...models/block/medium_flower_height_20.json → ...afohana/models/block/cross_height_20.json b/...models/block/medium_flower_height_20.json → ...afohana/models/block/cross_height_20.json
@@ -1,6 +1,9 @@
 {
   "ambientocclusion": false,
   "render_type": "cutout",
+  "textures": {
+    "particle": "#cross"
+  },
   "elements": [
     {
       "from": [ 0.8, 0, 8 ],

diff --git a/src/main/resources/assets/jafohana/models/block/wheel_lily.json b/src/main/resources/assets/jafohana/models/block/wheel_lily.json
@@ -1,7 +1,6 @@
 {
-  "parent": "jafohana:block/medium_flower_height_18",
+  "parent": "jafohana:block/cross_height_18",
   "textures": {
-    "particle": "jafohana:block/wheel_lily",
     "cross": "jafohana:block/wheel_lily",
     "stem": "jafohana:block/wheel_lily_stem"
   }