remove mixin extras

build.gradle.kts

@@ -254,14 +254,11 @@ dependencies {
     // TerraBlender
     modCompileOnlyApi("com.github.glitchfiend:TerraBlender-fabric:${terrablender_version}")
 
-    // CaffeineConfig
-    //modImplementation("net.caffeinemc:mixin-config:1.0.0+1.17")?.let { include(it) }
-
     // Particle Rain
     modCompileOnly("maven.modrinth:particle-rain:v2.0.5")
 
     // MixinExtras
-    implementation("io.github.llamalad7.mixinextras:mixinextras-fabric:$mixin_extras_version")?.let { annotationProcessor(it); }
+    modApi("io.github.llamalad7:mixinextras-fabric:$mixin_extras_version")?.let { annotationProcessor(it) }
 
     // Sodium
     modCompileOnly("maven.modrinth:sodium:${sodium_version}")

gradle.properties

@@ -13,7 +13,7 @@
 	minecraft_version=1.20.2
 	quilt_mappings=1.20.2+build.2
 	parchment_mappings=1.20.2:2023.10.22
-	loader_version=0.14.24
+	loader_version=0.15.0
 
 # Mod Properties
 	mod_id = wilderwild
@@ -23,8 +23,8 @@
 	archives_base_name = WilderWild
 
 # Dependencies
-	fabric_api_version=0.91.0+1.20.2
-    mixin_extras_version=0.2.1
+	fabric_api_version=0.91.1+1.20.2
+    mixin_extras_version=0.3.1
 	fabric_asm_version=v2.3
 	frozenlib_version=1.4.5-mc1.20.2
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/frozenblock/wilderwild/block/BaobabLeavesBlock.java

@@ -48,6 +48,6 @@ public boolean isBonemealSuccess(@NotNull Level level, @NotNull RandomSource ran
 
 	@Override
 	public void performBonemeal(@NotNull ServerLevel level, @NotNull RandomSource random, @NotNull BlockPos pos, @NotNull BlockState state) {
-		level.setBlock(pos.below(), RegisterBlocks.BAOBAB_NUT.getDefaultHangingState(), 2);
+		level.setBlock(pos.below(), RegisterBlocks.BAOBAB_NUT.getDefaultHangingState(), UPDATE_CLIENTS);
 	}
 }

src/main/java/net/frozenblock/wilderwild/block/BaobabNutBlock.java

@@ -108,7 +108,7 @@ public void randomTick(@NotNull BlockState state, @NotNull ServerLevel level, @N
 				}
 			} else {
 				if (random.nextDouble() < 0.4 && !isFullyGrown(state)) {
-					level.setBlock(pos, state.cycle(AGE), 2);
+					level.setBlock(pos, state.cycle(AGE), UPDATE_CLIENTS);
 				}
 			}
 		}
@@ -127,7 +127,7 @@ public boolean isBonemealSuccess(@NotNull Level level, @NotNull RandomSource ran
 	@Override
 	public void performBonemeal(@NotNull ServerLevel level, @NotNull RandomSource random, @NotNull BlockPos pos, @NotNull BlockState state) {
 		if (state.is(this) && isHanging(state) && !isFullyGrown(state)) {
-			level.setBlock(pos, state.cycle(AGE), 2);
+			level.setBlock(pos, state.cycle(AGE), UPDATE_CLIENTS);
 		} else {
 			super.performBonemeal(level, random, pos, state);
 		}

src/main/java/net/frozenblock/wilderwild/block/CoconutBlock.java

@@ -96,7 +96,7 @@ public static BlockState getHangingState(int age) {
 
 	public void advanceTree(@NotNull ServerLevel level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull RandomSource random) {
 		if (state.getValue(STAGE) == 0) {
-			level.setBlock(pos, state.cycle(STAGE), 4);
+			level.setBlock(pos, state.cycle(STAGE), UPDATE_INVISIBLE);
 		} else {
 			this.treeGrower.growTree(level, level.getChunkSource().getGenerator(), pos, state, random);
 		}
@@ -165,7 +165,7 @@ public void randomTick(@NotNull BlockState state, @NotNull ServerLevel level, @N
 				}
 			} else {
 				if (random.nextDouble() < 0.4 && !isFullyGrown(state)) {
-					level.setBlock(pos, state.cycle(AGE), 2);
+					level.setBlock(pos, state.cycle(AGE), UPDATE_CLIENTS);
 				}
 			}
 		}
@@ -184,7 +184,7 @@ public boolean isBonemealSuccess(@NotNull Level level, @NotNull RandomSource ran
 	@Override
 	public void performBonemeal(@NotNull ServerLevel level, @NotNull RandomSource random, @NotNull BlockPos pos, @NotNull BlockState state) {
 		if (isHanging(state) && !isFullyGrown(state)) {
-			level.setBlock(pos, state.cycle(AGE), 2);
+			level.setBlock(pos, state.cycle(AGE), UPDATE_CLIENTS);
 		} else {
 			this.advanceTree(level, pos, state, random);
 		}
@@ -238,7 +238,7 @@ public void tick(@NotNull BlockState state, @NotNull ServerLevel level, @NotNull
 	@Override
 	public void onLand(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull BlockState replaceableState, @NotNull FallingBlockEntity fallingBlock) {
 		if (!level.isClientSide) {
-			level.setBlock(pos, replaceableState, 3);
+			level.setBlock(pos, replaceableState, UPDATE_ALL);
 		}
 	}
 

src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java

@@ -44,7 +44,7 @@ public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNul
 				mutable.set(i + Mth.nextInt(random, -10, 10), j - random.nextInt(10), k + Mth.nextInt(random, -10, 10));
 				BlockState blockState = level.getBlockState(mutable);
 				if (!blockState.isCollisionShapeFullBlock(level, mutable) && !level.isRainingAt(mutable)) {
-					level.addParticle(RegisterParticles.POLLEN, (double) mutable.getX() + random.nextDouble(), (double) mutable.getY() + random.nextDouble(), (double) mutable.getZ() + random.nextDouble(), 0.0D, 0.0D, 0.0D);
+					level.addParticle(RegisterParticles.POLLEN, mutable.getX() + random.nextDouble(), mutable.getY() + random.nextDouble(), mutable.getZ() + random.nextDouble(), 0.0D, 0.0D, 0.0D);
 				}
 			}
 		}

src/main/java/net/frozenblock/wilderwild/block/PricklyPearCactusBlock.java

@@ -71,10 +71,8 @@ public boolean isValidBonemealTarget(@NotNull LevelReader level, @NotNull BlockP
 
 	@Override
 	public void randomTick(@NotNull BlockState state, @NotNull ServerLevel level, @NotNull BlockPos pos, @NotNull RandomSource random) {
-		if (!isFullyGrown(state)) {
-			if (random.nextInt(0, 3) == 0) {
-				level.setBlockAndUpdate(pos, state.setValue(AGE, state.getValue(AGE) + 1));
-			}
+		if (!isFullyGrown(state) && random.nextInt(0, 3) == 0) {
+			level.setBlockAndUpdate(pos, state.setValue(AGE, state.getValue(AGE) + 1));
 		}
 	}
 
@@ -86,7 +84,7 @@ public VoxelShape getShape(@NotNull BlockState state, @NotNull BlockGetter level
 
 	@Override
 	public void entityInside(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull Entity entity) {
-		entity.makeStuckInBlock(state, new Vec3(0.800000011920929, 0.75, 0.800000011920929));
+		entity.makeStuckInBlock(state, new Vec3(0.8, 0.75, 0.8));
 		if (!(entity instanceof ItemEntity)) {
 			entity.hurt(level.damageSources().cactus(), 0.5F);
 		}

src/main/java/net/frozenblock/wilderwild/block/TermiteMoundBlock.java

@@ -44,7 +44,12 @@ public class TermiteMoundBlock extends BaseEntityBlock {
 
 	public TermiteMoundBlock(@NotNull Properties settings) {
 		super(settings);
-		this.registerDefaultState(this.stateDefinition.any().setValue(RegisterProperties.NATURAL, false).setValue(RegisterProperties.TERMITES_AWAKE, false).setValue(RegisterProperties.CAN_SPAWN_TERMITE, false));
+		this.registerDefaultState(
+			this.stateDefinition.any()
+				.setValue(RegisterProperties.NATURAL, false)
+				.setValue(RegisterProperties.TERMITES_AWAKE, false)
+				.setValue(RegisterProperties.CAN_SPAWN_TERMITE, false)
+		);
 	}
 
 	public static boolean canTermitesWaken(@NotNull Level level, @NotNull BlockPos pos) {

src/main/java/net/frozenblock/wilderwild/registry/RegisterProperties.java

@@ -20,6 +20,7 @@
 
 import net.frozenblock.wilderwild.block.property.BubbleDirection;
 import net.frozenblock.wilderwild.block.property.FlowerColor;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;