Emergency commit before my computer explodes

Author: dombomb64

gradle.properties

@@ -2,17 +2,20 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+org.gradle.configuration-cache=false
+
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.16.14
-loom_version=1.10-SNAPSHOT
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
 
 # Mod Properties
 mod_version=0.0.5.1
 maven_group=net.db64.homelawnsecurity
 archives_base_name=homelawnsecurity
 
 # Dependencies
-fabric_version=0.128.0+1.21.6
+fabric_version=0.134.0+1.21.9

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -46,7 +46,7 @@ public static class Projectile {
 		public static final EntityType<PeaEntity> PEA = register(
 			"pea",
 			EntityType.Builder.<PeaEntity>create(PeaEntity::new, SpawnGroup.MISC)
-				.dimensions(0.25f, 0.25f));
+				.dimensions(0.5f, 0.25f));
 	}
 
 

src/main/java/net/db64/homelawnsecurity/entity/ModEntities.java

@@ -28,7 +28,7 @@ public MoveToGoalGoal(PathAwareEntity mob, double speed) {
 
 		this.mob = mob;
 		this.speed = speed;
-		this.world = mob.getWorld();
+		this.world = mob.getEntityWorld();
 		this.setControls(EnumSet.of(Control.MOVE));
 	}
 

src/main/java/net/db64/homelawnsecurity/entity/ai/MoveToGoalGoal.java

@@ -29,7 +29,7 @@ public StayOnPathGoal(PathAwareEntity mob, double speed) {
 
 		this.mob = mob;
 		this.speed = speed;
-		this.world = mob.getWorld();
+		this.world = mob.getEntityWorld();
 		this.setControls(EnumSet.of(Control.MOVE));
 	}
 
@@ -70,7 +70,7 @@ protected boolean targetPathPos() {
 	public boolean shouldContinue() {
 		return !(((IPathBoundEntity) mob).isWalkable(this.mob.getSteppingPos())
 			//|| ((IPathBoundEntity) mob).isStart(this.mob.getSteppingPos()) // If the entity is on a starting block, this goal shouldn't be activated even though this block isn't pathable! This goal randomly chooses a block to path to, remember?
-			|| mob.getWorld().getBlockState(mob.getSteppingPos()).isAir()) // Prevent stopping while over air
+			|| mob.getEntityWorld().getBlockState(mob.getSteppingPos()).isAir()) // Prevent stopping while over air
 			&& checkForExistingPath();
 	}
 
@@ -95,7 +95,7 @@ protected Vec3d locatePathPos(/*int avoidPathId*/) {
 			if (!((IPathBoundEntity) mob).isWalkable(blockPos.down())) continue;
 			Path path = this.mob.getNavigation().findPathTo(blockPos.getX(), blockPos.getY(), blockPos.getZ(), 1);
 			if (path == null || !path.reachesTarget()) continue;
-			//if (avoidPathId != -1 && LawnUtil.isCertainPath(blockPos, mob.getWorld(), avoidPathId)) continue;
+			//if (avoidPathId != -1 && LawnUtil.isCertainPath(blockPos, mob.getEntityWorld(), avoidPathId)) continue;
 
 			this.mob.getNavigation().startMovingTo(blockPos.getX(), blockPos.getY(), blockPos.getZ(), this.speed);
 			return Vec3d.ofBottomCenter(blockPos);

src/main/java/net/db64/homelawnsecurity/entity/ai/StayOnPathGoal.java

@@ -42,8 +42,8 @@ public class PlantTargetGoal<T extends LivingEntity> extends ActiveTargetGoal<T>
 		boolean result = false;
 
 		for (int i = 1; i <= 2; i++) {
-			int mainPathId = LawnUtil.getMainPathId(entity.getBlockPos(), entity.getWorld());
-			int intersectingPathId = LawnUtil.getIntersectingPathId(entity.getBlockPos(), entity.getWorld());
+			int mainPathId = LawnUtil.getMainPathId(entity.getBlockPos(), entity.getEntityWorld());
+			int intersectingPathId = LawnUtil.getIntersectingPathId(entity.getBlockPos(), entity.getEntityWorld());
 			//int pathId = i == 1 ? mainPathId : intersectingPathId;
 			int otherPathId = i == 1 ? intersectingPathId : mainPathId;
 
@@ -90,7 +90,7 @@ public class PlantTargetGoal<T extends LivingEntity> extends ActiveTargetGoal<T>
 			return !(entity instanceof TargetZombieEntity);
 		}
 
-		if (LawnUtil.getIntersectingPathId(entity.getBlockPos().down(), entity.getWorld()) != 0)
+		if (LawnUtil.getIntersectingPathId(entity.getBlockPos().down(), entity.getEntityWorld()) != 0)
 			// This plant needs to target entities on both paths, redirect them to a different predicate
 			return intersectionPredicate.test(entity);
 
@@ -179,7 +179,7 @@ protected void findClosestTarget() {
 		ServerWorld serverWorld = getServerWorld(this.mob);
 		if (this.targetClass != PlayerEntity.class && this.targetClass != ServerPlayerEntity.class) {
 			this.targetEntity = serverWorld.getClosestEntity(
-				this.mob.getWorld().getEntitiesByClass(this.targetClass, this.getSearchBox(this.getFollowRange()),
+				this.mob.getEntityWorld().getEntitiesByClass(this.targetClass, this.getSearchBox(this.getFollowRange()),
 					livingEntity -> rangePredicate.test(livingEntity) && pathPredicate.test(livingEntity)),
 				this.getAndUpdateTargetPredicate(),
 				this.mob,

src/main/java/net/db64/homelawnsecurity/entity/ai/plant/PlantTargetGoal.java

@@ -35,7 +35,7 @@ public ZombieMeleeAttackGoal(PathAwareEntity mob, double speed, boolean pauseWhe
 
 	@Override
 	public boolean canStart() {
-		long l = this.mob.getWorld().getTime();
+		long l = this.mob.getEntityWorld().getTime();
 		if (l - this.lastUpdateTime < MAX_ATTACK_TIME) {
 			return false;
 		}
@@ -130,7 +130,7 @@ protected void attack(LivingEntity target) {
 		if (this.canAttack(target)) {
 			this.resetCooldown();
 			this.mob.swingHand(Hand.MAIN_HAND);
-			this.mob.tryAttack((ServerWorld) target.getWorld(), target);
+			this.mob.tryAttack((ServerWorld) target.getEntityWorld(), target);
 		}
 	}
 

src/main/java/net/db64/homelawnsecurity/entity/ai/zombie/ZombieMeleeAttackGoal.java

@@ -88,7 +88,7 @@ protected void findClosestTarget() {
 		ServerWorld serverWorld = getServerWorld(this.mob);
 		if (this.targetClass != PlayerEntity.class && this.targetClass != ServerPlayerEntity.class) {
 			this.targetEntity = serverWorld.getClosestEntity(
-				this.mob.getWorld().getEntitiesByClass(this.targetClass, this.getSearchBox(this.getFollowRange()),
+				this.mob.getEntityWorld().getEntitiesByClass(this.targetClass, this.getSearchBox(this.getFollowRange()),
 					livingEntity -> rangePredicate.test(livingEntity) && notBehindPredicate.test(livingEntity) && hasHeadPredicate.test(livingEntity)),
 				this.getAndUpdateTargetPredicate(),
 				this.mob,

src/main/java/net/db64/homelawnsecurity/entity/ai/zombie/ZombieTargetGoal.java

@@ -6,8 +6,10 @@
 import net.minecraft.client.item.ItemModelManager;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemDisplayContext;
 import net.minecraft.item.ItemStack;
@@ -39,10 +41,15 @@ protected int getSkyLight(CurrencyEntity entity, BlockPos pos) {
 		return 15;
 	}*/
 
-	public void render(CurrencyRenderState state, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) {
+	public void render(
+		CurrencyRenderState state,
+		MatrixStack matrixStack,
+		OrderedRenderCommandQueue orderedRenderCommandQueue,
+		CameraRenderState cameraRenderState
+	) {
 		matrixStack.push();
 		matrixStack.scale(state.scale, state.scale, state.scale);
-		matrixStack.multiply(this.dispatcher.getRotation());
+		matrixStack.multiply(cameraRenderState.orientation);
 		/*if (state.model != null) {
 			this.itemModelManager
 				.renderItem(
@@ -56,10 +63,10 @@ public void render(CurrencyRenderState state, MatrixStack matrixStack, VertexCon
 					state.model
 				);
 		}*/
-		state.itemRenderState.render(matrixStack, vertexConsumerProvider, i, OverlayTexture.DEFAULT_UV);
+		state.itemRenderState.render(matrixStack, orderedRenderCommandQueue, state.light, OverlayTexture.DEFAULT_UV, state.outlineColor);
 
 		matrixStack.pop();
-		super.render(state, matrixStack, vertexConsumerProvider, i);
+		super.render(state, matrixStack, orderedRenderCommandQueue, cameraRenderState);
 	}
 
 	@Override
@@ -74,7 +81,7 @@ public void updateRenderState(CurrencyEntity entity, CurrencyRenderState state,
 
 		this.itemModelManager.updateForNonLivingEntity(state.itemRenderState, stack, ItemDisplayContext.GROUND, entity);
 
-		/*state.model = !stack.isEmpty() ? this.itemModelManager.getModel(stack, entity.getWorld(), null, entity.getId()) : null;
+		/*state.model = !stack.isEmpty() ? this.itemModelManager.getModel(stack, entity.getEntityWorld(), null, entity.getId()) : null;
 		state.stack = stack.copy();*/
 		CurrencyComponent currency = stack.get(ModDataComponentTypes.CURRENCY);
 		if (currency != null)