Added config for shot power and pursuit distance, removed skeleton pirates temporarily

Author: JSJBDEV

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.15.10
 fabric_kotlin_version=1.10.19+kotlin.1.9.23
 
 # Mod Properties
-mod_version=1.4.4
+mod_version=1.4.5
 maven_group=ace.actually.pirates
 archives_base_name=ValkyrienPirates
 

src/main/java/ace/actually/pirates/ClientPirates.java

@@ -19,12 +19,12 @@ public class ClientPirates implements ClientModInitializer {
     public void onInitializeClient() {
 
         EntityRendererRegistry.register(Pirates.PIRATE_ENTITY_TYPE, PirateEntityRenderer::new);
-        EntityRendererRegistry.register(Pirates.SKELETON_PIRATE_ENTITY_TYPE, SkeletonPirateEntityRenderer::new);
+        //EntityRendererRegistry.register(Pirates.SKELETON_PIRATE_ENTITY_TYPE, SkeletonPirateEntityRenderer::new);
         EntityRendererRegistry.register(Pirates.SHOT_ENTITY_TYPE, (context) -> new ShotEntityRenderer(context, 1,false));
 
         BlockEntityRendererFactories.register(Pirates.CANNON_PRIMING_BLOCK_ENTITY, CannonPrimingBlockEntityRenderer::new);
 
-        EntityModelLayerRegistry.registerModelLayer(SKELETON_PIRATE, SkeletonPirateModel::getTexturedModelData);
+        //EntityModelLayerRegistry.registerModelLayer(SKELETON_PIRATE, SkeletonPirateModel::getTexturedModelData);
 
     }
 

src/main/java/ace/actually/pirates/Pirates.java

@@ -58,12 +58,14 @@ public class Pirates implements ModInitializer {
 			.build();
 
 	public static float baseShotPower;
+	public static int pursuitDistance;
 
 	@Override
 	public void onInitialize() {
 
 		ConfigUtils.checkConfigs();
 		baseShotPower = Float.parseFloat(ConfigUtils.config.getOrDefault("base-shot-power","2.2"));
+		pursuitDistance = Integer.parseInt(ConfigUtils.config.getOrDefault("pursuit-distance","10000"));
 		registerEntityThings();
 		//entity types do it themselves
 		registerBlocks();
@@ -97,7 +99,7 @@ private void registerEntityThings()
 	{
 
 		FabricDefaultAttributeRegistry.register(PIRATE_ENTITY_TYPE, PirateEntity.attributes());
-		FabricDefaultAttributeRegistry.register(SKELETON_PIRATE_ENTITY_TYPE, SkeletonPirateEntity.attributes());
+		//FabricDefaultAttributeRegistry.register(SKELETON_PIRATE_ENTITY_TYPE, SkeletonPirateEntity.attributes());
 
 	}
 
@@ -166,7 +168,7 @@ private void registerItems()
 
 	public static final EntityType<PirateEntity> PIRATE_ENTITY_TYPE =registerEntity("pirate",SpawnGroup.MISC,EntityDimensions.changing(0.6f,1.9f),((type, world) -> new PirateEntity(world)));
 
-	public static final EntityType<SkeletonPirateEntity> SKELETON_PIRATE_ENTITY_TYPE =registerEntity("skeleton_pirate",SpawnGroup.MISC,EntityDimensions.changing(0.6f,1.9f),((type, world) -> new SkeletonPirateEntity(world)));
+	public static final EntityType<SkeletonPirateEntity> SKELETON_PIRATE_ENTITY_TYPE = null; //=registerEntity("skeleton_pirate",SpawnGroup.MISC,EntityDimensions.changing(0.6f,1.9f),((type, world) -> new SkeletonPirateEntity(world)));
 
 
 

src/main/java/ace/actually/pirates/blocks/entity/CrewSpawnerBlockEntity.java

@@ -110,7 +110,7 @@ private static Entity getEntityFromState(World world, BlockEntity be) {
             crew = new VillagerEntity(EntityType.VILLAGER, world, VillagerType.forBiome(world.getBiome(be.getPos())));
         } else if (be.getCachedState().get(CrewTypes.CREW_SPAWN_TYPE) == CrewSpawnType.SKELETON_PIRATE) {
             BlockPos blockToCrew = checkForBlocksToCrew(world, be.getPos());
-            crew = new SkeletonPirateEntity(world, blockToCrew);
+            crew = new PirateEntity(world, blockToCrew);
             ItemStack itemStack = new ItemStack(Items.BOW);
             if (world.getBlockState(blockToCrew).isOf(Pirates.MOTION_INVOKING_BLOCK)) {
                 itemStack.addEnchantment(Enchantments.POWER, 2);

src/main/java/ace/actually/pirates/blocks/entity/MotionInvokingBlockEntity.java

@@ -101,7 +101,7 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
                             if(a.getId()==ship.getId()) return false;
                             Vector3dc f1 = ship.getTransform().getPositionInWorld();
                             Vector3dc f2 = a.getTransform().getPositionInWorld();
-                            return f1.distanceSquared(f2)<10000;
+                            return f1.distanceSquared(f2)<Pirates.pursuitDistance;
                         }).toList();
                         if(!ships.isEmpty())
                         {

src/main/java/ace/actually/pirates/entities/pirate_abstract/AbstractPirateEntity.java

@@ -102,5 +102,4 @@ public void readCustomDataFromNbt(NbtCompound nbt) {
             this.blockToDisable = new BlockPos(x, y, z);
         }
     }
-
 }

src/main/java/ace/actually/pirates/util/ConfigUtils.java

@@ -68,6 +68,8 @@ private static List<String> makeDefaults()
         defaults.add("controlled-ship-updates=100");
         defaults.add("#Base power for cannonball shot entity, default=2.2");
         defaults.add("base-shot-power=2.2");
+        defaults.add("#Based squared distance to trigger NPC ship pursuit default=10000");
+        defaults.add("pursuit-distance=10000");
 
         return defaults;
     }