Update 20240712 - Refactor and Clean Up

Refactored some packages from having plural names into singular. Furthermore, unused directories and files are removed.

[CHANGELOG]
🟡 Renamed `com.virus5600.defensive_measures.entities` package into `.entity`.
🟡 Renamed `com.virus5600.defensive_measures.items` package into `.item`.
🟡 Updated some values in Gradle properties.
🔴 Removed mixins in fabric mod JSON file.
🔴 Removed the entire `src.client` package.
🔴 Removed unused Loom configurations in Gradle build.

build.gradle

@@ -46,7 +46,7 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	// GeckoLib
 	modImplementation "software.bernie.geckolib:geckolib-fabric-${minecraft_version}:${geckolib_version}"
-	
+
 }
 
 processResources {
@@ -94,18 +94,3 @@ publishing {
 		// retrieving dependencies.
 	}
 }
-
-// loom configurations
-loom {
-	runs {
-		client {
-			client()
-            vmArg "-Dgeckolib.disable_examples=true"
-		}
-
-		server {
-			server()
-			vmArg "-Dgeckolib.disable_examples=true"
-		}
-	}
-}

gradle.properties

@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 # Fabric Properties
@@ -15,4 +15,4 @@ archives_base_name = defensive-measures
 
 # Dependencies
 fabric_version=0.100.6+1.21
-geckolib_version=4.5.5
+geckolib_version=4.5.5

src/main/java/com/virus5600/defensive_measures/DefensiveMeasures.java

@@ -1,8 +1,8 @@
 package com.virus5600.defensive_measures;
 
-import com.virus5600.defensive_measures.entities.ModEntities;
-import com.virus5600.defensive_measures.items.ModItemGroups;
-import com.virus5600.defensive_measures.items.ModItems;
+import com.virus5600.defensive_measures.entity.ModEntities;
+import com.virus5600.defensive_measures.item.ModItemGroups;
+import com.virus5600.defensive_measures.item.ModItems;
 import net.fabricmc.api.ModInitializer;
 
 import org.slf4j.Logger;

src/main/java/com/virus5600/defensive_measures/entities/ModEntities.java → src/main/java/com/virus5600/defensive_measures/entity/ModEntities.java

@@ -1,8 +1,8 @@
-package com.virus5600.defensive_measures.entities;
+package com.virus5600.defensive_measures.entity;
 
 import com.virus5600.defensive_measures.DefensiveMeasures;
 
-import com.virus5600.defensive_measures.entities.turrets.CannonTurretEntity;
+import com.virus5600.defensive_measures.entity.turrets.CannonTurretEntity;
 
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 

src/main/java/com/virus5600/defensive_measures/entity/TurretMaterial.java

@@ -0,0 +1,6 @@
+package com.virus5600.defensive_measures.entity;
+
+public enum TurretMaterial {
+	METAL,
+	WOOD
+}

src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetOtherTeamGoal.java → src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java

@@ -1,6 +1,6 @@
-package com.virus5600.defensive_measures.entities.ai.goal;
+package com.virus5600.defensive_measures.entity.ai.goal;
 
-import com.virus5600.defensive_measures.entities.turrets.TurretEntity;
+import com.virus5600.defensive_measures.entity.turrets.TurretEntity;
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.goal.ActiveTargetGoal;

src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetPlayerGoal.java → src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java

@@ -1,9 +1,9 @@
-package com.virus5600.defensive_measures.entities.ai.goal;
+package com.virus5600.defensive_measures.entity.ai.goal;
 
 import net.minecraft.entity.ai.goal.ActiveTargetGoal;
 import net.minecraft.entity.player.PlayerEntity;
 
-import com.virus5600.defensive_measures.entities.turrets.TurretEntity;
+import com.virus5600.defensive_measures.entity.turrets.TurretEntity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 

src/main/java/com/virus5600/defensive_measures/entities/turrets/CannonTurretEntity.java → src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java

@@ -1,11 +1,11 @@
-package com.virus5600.defensive_measures.entities.turrets;
+package com.virus5600.defensive_measures.entity.turrets;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.virus5600.defensive_measures.DefensiveMeasures;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.RangedAttackMob;
@@ -30,14 +30,25 @@
 import net.minecraft.item.Items;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.virus5600.defensive_measures.entities.ai.goal.TargetOtherTeamGoal;
-import com.virus5600.defensive_measures.entities.TurretMaterial;
+import com.virus5600.defensive_measures.DefensiveMeasures;
+import com.virus5600.defensive_measures.entity.TurretMaterial;
+import com.virus5600.defensive_measures.entity.ai.goal.TargetOtherTeamGoal;
+
+import software.bernie.geckolib.animatable.GeoEntity;
+import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
+import software.bernie.geckolib.animation.AnimatableManager.ControllerRegistrar;
+import software.bernie.geckolib.animation.AnimationState;
+import software.bernie.geckolib.animation.PlayState;
+import software.bernie.geckolib.animation.RawAnimation;
+import software.bernie.geckolib.util.GeckoLibUtil;
 
-public class CannonTurretEntity extends TurretEntity implements RangedAttackMob, Itemable {
+public class CannonTurretEntity extends TurretEntity implements GeoEntity, RangedAttackMob, Itemable {
 	private static final int totalAttCooldown = 20 * 5;
 	private static final TrackedData<Boolean> FUSE_LIT;
 	/**
@@ -48,12 +59,15 @@ public class CannonTurretEntity extends TurretEntity implements RangedAttackMob,
 	 * Contains all the items that can give effect to this entity
 	 */
 	private static Map<Item, List<Object[]>> effectSource;
+
+	private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this);
 	/**
 	 * Defines the current target of this Cannon.
 	 */
 	@Nullable
 	private LivingEntity currentTarget = null;
 	private double attCooldown = totalAttCooldown;
+	private boolean animPlayed = false;
 
 	//////////////////
 	// CONSTRUCTORS //
@@ -174,10 +188,84 @@ public ItemStack getEntityItem() {
 		return new ItemStack(Items.IRON_BLOCK);
 	}
 
+	///////////////////////////
+	// ANIMATION CONTROLLERS //
+	///////////////////////////
+
+	private <E extends CannonTurretEntity>PlayState deathController(final AnimationState<E> event) {
+		if (!this.isAlive() && !animPlayed) {
+			animPlayed = true;
+			event.setAnimation(
+				RawAnimation
+					.begin()
+					.thenLoop("animation.cannon_turret.death")
+			);
+			return PlayState.STOP;
+		}
+		return PlayState.CONTINUE;
+	}
+
+	private <E extends CannonTurretEntity>PlayState idleController(final AnimationState<E> event) {
+		return event
+			.setAndContinue(
+				RawAnimation
+					.begin()
+					.thenLoop("animation.cannon_turret.setup")
+			);
+	}
+
+	private <E extends CannonTurretEntity>PlayState lookAtTargetController(final AnimationState<E> event) {
+		return event
+			.setAndContinue(
+				RawAnimation
+					.begin()
+					.thenLoop("animation.cannon_turret.look_at_target")
+			);
+	}
+
+	private <E extends CannonTurretEntity>PlayState firingSequenceController(final AnimationState<E> event) {
+		Vec3d fusePos = this.getRelativePos(0, 0, 0),
+			barrelPos = this.getRelativePos(0, 0, 0);
+
+		if (this.hasTarget() && this.isShooting()) {
+			event.getController()
+				.setParticleKeyframeHandler((state) -> {
+					String fuse = state.getKeyframeData().getLocator(),
+						effectName = state.getKeyframeData().getEffect();
+				})
+				.setAnimation(
+					RawAnimation
+						.begin()
+						.thenPlay("animation.cannon_turret.shoot")
+				);
+
+			if (!this.getShootingFXDone()) {
+				int count = MathHelper.nextInt(this.random, 10, 25);
+				double vx = (this.getPos(TARGET_POS_X) - this.getPos(X))/10;
+				double vy = (this.getPos(TARGET_POS_Y) - this.getPos(Y));
+				double vz = (this.getPos(TARGET_POS_Z) - this.getPos(Z))/10;
+				double variance = Math.sqrt(vx * vx + vz * vz) * 0.5;
+			}
+		}
+
+		return PlayState.CONTINUE;
+	}
+
 	///////////////////////////////
 	// INTERFACE IMPLEMENTATIONS //
 	///////////////////////////////
 
+	// GeoEntity //
+	@Override
+	public void registerControllers(ControllerRegistrar controllers) {
+
+	}
+
+	@Override
+	public AnimatableInstanceCache getAnimatableInstanceCache() {
+		return this.geoCache;
+	}
+
 	///////////////////
 	// LOCAL CLASSES //
 	///////////////////

src/main/java/com/virus5600/defensive_measures/entities/turrets/Itemable.java → src/main/java/com/virus5600/defensive_measures/entity/turrets/Itemable.java

@@ -1,6 +1,5 @@
-package com.virus5600.defensive_measures.entities.turrets;
+package com.virus5600.defensive_measures.entity.turrets;
 
-import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.NbtComponent;
 import net.minecraft.entity.mob.MobEntity;

src/main/java/com/virus5600/defensive_measures/entities/turrets/TurretEntity.java → src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.entities.turrets;
+package com.virus5600.defensive_measures.entity.turrets;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -33,9 +33,9 @@
 import net.minecraft.world.World;
 
 import com.virus5600.defensive_measures.DefensiveMeasures;
-import com.virus5600.defensive_measures.entities.TurretMaterial;
-import com.virus5600.defensive_measures.items.ModItems;
-import com.virus5600.defensive_measures.items.turrets.TurretItem;
+import com.virus5600.defensive_measures.entity.TurretMaterial;
+import com.virus5600.defensive_measures.item.ModItems;
+import com.virus5600.defensive_measures.item.turrets.TurretItem;
 
 import org.jetbrains.annotations.Nullable;
 

src/main/java/com/virus5600/defensive_measures/items/ModItemGroups.java → src/main/java/com/virus5600/defensive_measures/item/ModItemGroups.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items;
+package com.virus5600.defensive_measures.item;
 
 import com.virus5600.defensive_measures.DefensiveMeasures;
 

src/main/java/com/virus5600/defensive_measures/items/ModItems.java → src/main/java/com/virus5600/defensive_measures/item/ModItems.java

@@ -1,10 +1,10 @@
-package com.virus5600.defensive_measures.items;
+package com.virus5600.defensive_measures.item;
 
 import com.virus5600.defensive_measures.DefensiveMeasures;
 
-import com.virus5600.defensive_measures.entities.ModEntities;
-import com.virus5600.defensive_measures.items.equipments.TurretRemoverItem;
-import com.virus5600.defensive_measures.items.turrets.cannon.*;
+import com.virus5600.defensive_measures.entity.ModEntities;
+import com.virus5600.defensive_measures.item.equipments.TurretRemoverItem;
+import com.virus5600.defensive_measures.item.turrets.cannon.*;
 
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.Item;

src/main/java/com/virus5600/defensive_measures/items/ModToolMaterials.java → src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items;
+package com.virus5600.defensive_measures.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;

src/main/java/com/virus5600/defensive_measures/items/equipments/TurretRemoverItem.java → src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.equipments;
+package com.virus5600.defensive_measures.item.equipments;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/com/virus5600/defensive_measures/items/turrets/TurretItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.turrets;
+package com.virus5600.defensive_measures.item.turrets;
 
 import java.util.Map;
 import java.util.Objects;
@@ -9,7 +9,7 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
-import com.virus5600.defensive_measures.entities.turrets.TurretEntity;
+import com.virus5600.defensive_measures.entity.turrets.TurretEntity;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
@@ -97,7 +97,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
         if (!(world instanceof ServerWorld)) {
             return TypedActionResult.success(itemStack);
         }
-		
+
         BlockPos blockPos = hitResult.getBlockPos();
 
         if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) {

src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonBaseItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.turrets.cannon;
+package com.virus5600.defensive_measures.item.turrets.cannon;
 
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.item.Item;

src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonHeadItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.turrets.cannon;
+package com.virus5600.defensive_measures.item.turrets.cannon;
 
 import net.minecraft.item.Item;
 import net.minecraft.util.Rarity;

src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonStandItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.turrets.cannon;
+package com.virus5600.defensive_measures.item.turrets.cannon;
 
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.item.Item;

src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonTurretItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java

@@ -1,6 +1,6 @@
-package com.virus5600.defensive_measures.items.turrets.cannon;
+package com.virus5600.defensive_measures.item.turrets.cannon;
 
-import com.virus5600.defensive_measures.items.turrets.TurretItem;
+import com.virus5600.defensive_measures.item.turrets.TurretItem;
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.mob.MobEntity;

src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/UnfinishedCannonHeadItem.java → src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java

@@ -1,4 +1,4 @@
-package com.virus5600.defensive_measures.items.turrets.cannon;
+package com.virus5600.defensive_measures.item.turrets.cannon;
 
 import net.minecraft.item.Item;
 import net.minecraft.util.Rarity;