Merge branch '1.20.4' into 1.20.2

# Conflicts: # src/main/java/net/frozenblock/wilderwild/block/BaobabNutBlock.java # src/main/java/net/frozenblock/wilderwild/block/CoconutBlock.java # src/main/java/net/frozenblock/wilderwild/block/DisplayLanternBlock.java # src/main/java/net/frozenblock/wilderwild/block/FlowerLichenBlock.java # src/main/java/net/frozenblock/wilderwild/block/GloryOfTheSnowBlock.java # src/main/java/net/frozenblock/wilderwild/block/HangingTendrilBlock.java
FrozenBlock · Dec 28, 2023 · 55ea35a · 55ea35a
2 parents 803bf33 + 2e5a822
commit 55ea35a
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,17 +2,5 @@ Please clear changelog after each release.
 Thank you!
 
 -----------------
-- Fixed Crabs not dropping cooked crab claws when killed whilst on fire
-- Updated the Crab's digging and emerging sounds to sound slightly more Minecrafty
-- Stopped Crabs from moving when they aren't supposed to
-- Renamed the `wilderwild:crab_tempt_items` tag to `wilderwild:crab_food`
-- Fixed the Looting enchantment not affecting the Crab claw loot table
-- Fixed Display Lanterns not properly saving Fireflies to the item when broken with Silk Touch, and not spawning Fireflies upon breaking without Silk Touch
-- Fixed log spam of the Enderman anger sound predicate
-- Fixed tags on 1.20.4
-- Fixed potted grass loot table on 1.20.4
-- Fixed compat with Simple Copper Pipes to now work 100% of the time
-    - Requires Simple Copper Pipes 1.16+ (compat id 3)
-- Removed embedded Reach Entity Attributes on 1.20.5
-- Updated embedded FrozenLib to 1.5.4
-- Bumped the protocol version to 2
+- Fixed some tags replacing Vanilla's entries
+- Fixed a possible compatibility issue regarding Baobab Nut block states
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@
 
 # Mod Properties
 	mod_id = wilderwild
-	mod_version = 2.2.2
+	mod_version = 2.2.3
     # protocol version must be changed after each update with dual env changes
     protocol_version = 2
 	mod_loader = Fabric

diff --git a/src/main/java/net/frozenblock/wilderwild/block/BaobabNutBlock.java b/src/main/java/net/frozenblock/wilderwild/block/BaobabNutBlock.java
@@ -59,7 +59,7 @@ public class BaobabNutBlock extends SaplingBlock {
 
 	public BaobabNutBlock(@NotNull BlockBehaviour.Properties settings) {
 		super(new BaobabSaplingGenerator(), settings);
-		this.registerDefaultState(this.stateDefinition.any().setValue(STAGE, 0).setValue(AGE, 0).setValue(HANGING, false));
+		this.registerDefaultState(this.defaultBlockState().setValue(AGE, 0).setValue(HANGING, false));
 	}
 
 	private static boolean isHanging(@NotNull BlockState state) {

diff --git a/src/main/java/net/frozenblock/wilderwild/block/CoconutBlock.java b/src/main/java/net/frozenblock/wilderwild/block/CoconutBlock.java
@@ -57,6 +57,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("deprecation")
 public class CoconutBlock extends FallingBlock implements BonemealableBlock {
 	public static final int VALID_FROND_DISTANCE = 2;
 	public static final IntegerProperty STAGE = BlockStateProperties.STAGE;

diff --git a/src/main/java/net/frozenblock/wilderwild/block/EchoGlassBlock.java b/src/main/java/net/frozenblock/wilderwild/block/EchoGlassBlock.java
@@ -20,7 +20,6 @@
 
 import net.frozenblock.lib.item.api.ItemBlockStateTagUtils;
 import net.frozenblock.wilderwild.entity.AncientHornProjectile;
-import net.frozenblock.wilderwild.misc.WilderSharedConstants;
 import net.frozenblock.wilderwild.registry.RegisterProperties;
 import net.frozenblock.wilderwild.registry.RegisterSounds;
 import net.minecraft.core.BlockPos;
@@ -49,6 +48,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("deprecation")
 public class EchoGlassBlock extends TintedGlassBlock {
 	public static final IntegerProperty DAMAGE = RegisterProperties.DAMAGE;
 

diff --git a/src/main/java/net/frozenblock/wilderwild/block/GloryOfTheSnowBlock.java b/src/main/java/net/frozenblock/wilderwild/block/GloryOfTheSnowBlock.java
@@ -51,6 +51,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("deprecation")
 public class GloryOfTheSnowBlock extends BushBlock implements BonemealableBlock {
 	public static final EnumProperty<FlowerColor> COLORS = RegisterProperties.FLOWER_COLOR;
 	private static final VoxelShape SHAPE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 4.0D, 13.0D);

diff --git a/src/main/java/net/frozenblock/wilderwild/block/HangingTendrilBlock.java b/src/main/java/net/frozenblock/wilderwild/block/HangingTendrilBlock.java
@@ -67,6 +67,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("deprecation")
 public class HangingTendrilBlock extends BaseEntityBlock implements SimpleWaterloggedBlock, SculkBehaviour {
 	public static final int ACTIVE_TICKS = 60;
 	public static final EnumProperty<SculkSensorPhase> PHASE = BlockStateProperties.SCULK_SENSOR_PHASE;
@@ -209,14 +210,13 @@ public int getActiveTicks() {
 		return ACTIVE_TICKS;
 	}
 
-	public void activate(@Nullable Entity entity, @NotNull Level world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull GameEvent gameEvent, int power, int j) {
+	public void activate(@Nullable Entity entity, @NotNull Level world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull GameEvent gameEvent, int power, int frequency) {
 		world.setBlock(pos, state.setValue(PHASE, SculkSensorPhase.ACTIVE).setValue(POWER, power), 3);
 		world.scheduleTick(pos, state.getBlock(), this.getActiveTicks());
-		SculkSensorBlock.updateNeighbours(world, pos, state);
-		SculkSensorBlock.tryResonateVibration(entity, world, pos, j);
 		boolean tendrilsCarryEvents = BlockConfig.get().tendrilsCarryEvents;
-		world.gameEvent(tendrilsCarryEvents ? entity : null, VibrationSystem.getResonanceEventByFrequency(j), pos);
-		world.gameEvent(tendrilsCarryEvents ? entity : null, tendrilsCarryEvents && gameEvent != null ? gameEvent : GameEvent.SCULK_SENSOR_TENDRILS_CLICKING, pos);
+		SculkSensorBlock.updateNeighbours(world, pos, state);
+		SculkSensorBlock.tryResonateVibration(tendrilsCarryEvents ? entity : null, world, pos, frequency);
+		world.gameEvent(tendrilsCarryEvents ? entity : null, tendrilsCarryEvents ? gameEvent : GameEvent.SCULK_SENSOR_TENDRILS_CLICKING, pos);
 		if (!state.getValue(WATERLOGGED)) {
 			world.playSound(
 				null,
@@ -268,6 +268,7 @@ public void spawnAfterBreak(@NotNull BlockState state, @NotNull ServerLevel leve
 	}
 
 	@Override
+	@NotNull
 	public InteractionResult use(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull Player player, @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
 		if (SculkSensorBlock.canActivate(state) && !state.getValue(WRINGING_OUT)) {
 			if (level.isClientSide) {

diff --git a/src/main/java/net/frozenblock/wilderwild/block/MilkweedBlock.java b/src/main/java/net/frozenblock/wilderwild/block/MilkweedBlock.java
@@ -45,6 +45,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("deprecation")
 public class MilkweedBlock extends TallFlowerBlock {
 	private static final int MAX_AGE = 3;
 

diff --git a/src/main/resources/data/minecraft/tags/blocks/mangrove_roots_can_grow_through.json b/src/main/resources/data/minecraft/tags/blocks/mangrove_roots_can_grow_through.json
@@ -1,4 +1,5 @@
 {
+  "replace": false,
   "values": [
     "wilderwild:algae"
   ]

diff --git a/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json b/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json
@@ -1,4 +1,5 @@
 {
+  "replace": false,
   "values": [
     "wilderwild:baobab_log",
     "wilderwild:cypress_log",

diff --git a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json
@@ -1,4 +1,5 @@
 {
+  "replace": false,
   "values": [
     "#wilderwild:baobab_logs",
     "#wilderwild:cypress_logs",

diff --git a/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json b/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json
@@ -1,4 +1,5 @@
 {
+  "replace": false,
   "values": [
     "wilderwild:baobab_log",
     "wilderwild:cypress_log",