making motion possible to be independent of eureka, although right now you still need eureka for the new ai. also made the shot entity use its stored data properly

JSJBDEV · JSJBDEV · commit c3a628911778 · 2024-12-30T22:44:09.000Z
diff --git a/src/main/java/ace/actually/pirates/blocks/DispenserCannonBlock.java b/src/main/java/ace/actually/pirates/blocks/DispenserCannonBlock.java
@@ -32,7 +32,7 @@ protected DispenserBehavior getBehaviorForItem(ItemStack stack) {
             return new CannonDispenserBehavior() {
                 @Override
                 protected ProjectileEntity createProjectile(World world, Position position, ItemStack stack) {
-                    ShotEntity qentity = Util.make(new ShotEntity(Pirates.SHOT_ENTITY_TYPE,world,null,Pirates.CANNONBALL_ENT,2,""), (entity) -> {});
+                    ShotEntity qentity = Util.make(new ShotEntity(Pirates.SHOT_ENTITY_TYPE,world,null,Pirates.CANNONBALL_ENT,6,""), (entity) -> {});
                     qentity.setPosition(new Vec3d(position.getX(),position.getY(),position.getZ()));
                     return qentity;
                 }
diff --git a/src/main/java/ace/actually/pirates/blocks/MotionInvokingBlock.java b/src/main/java/ace/actually/pirates/blocks/MotionInvokingBlock.java
@@ -6,10 +6,16 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
@@ -27,6 +33,15 @@ public MotionInvokingBlock(Settings settings) {
 
     }
 
+    @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        if(world instanceof  ServerWorld serverWorld && player.getStackInHand(hand).isOf(Items.DEBUG_STICK))
+        {
+            MotionInvokingBlockEntity be = (MotionInvokingBlockEntity) serverWorld.getBlockEntity(pos);
+            be.setCompat("None");
+        }
+        return super.onUse(state, world, pos, player, hand, hit);
+    }
 
     @Nullable
     @Override
diff --git a/src/main/java/ace/actually/pirates/blocks/entity/MotionInvokingBlockEntity.java b/src/main/java/ace/actually/pirates/blocks/entity/MotionInvokingBlockEntity.java
@@ -1,41 +1,25 @@
 package ace.actually.pirates.blocks.entity;
 
-import ace.actually.pirates.blocks.MotionInvokingBlock;
 import ace.actually.pirates.util.ConfigUtils;
+import ace.actually.pirates.util.EurekaCompat;
 import ace.actually.pirates.util.PatternProcessor;
 import ace.actually.pirates.Pirates;
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
-import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import org.joml.Quaterniondc;
 import org.joml.Vector3d;
 import org.joml.Vector3dc;
-import org.joml.Vector3i;
 import org.valkyrienskies.core.api.ships.LoadedServerShip;
-import org.valkyrienskies.core.api.ships.ServerShip;
 import org.valkyrienskies.core.api.ships.Ship;
-import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet;
 import org.valkyrienskies.eureka.block.ShipHelmBlock;
-import org.valkyrienskies.eureka.ship.EurekaShipControl;
-import org.valkyrienskies.eureka.util.ShipAssembler;
 import org.valkyrienskies.mod.api.SeatedControllingPlayer;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
-import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
-import org.valkyrienskies.mod.common.assembly.ShipAssemblyKt;
-import org.valkyrienskies.mod.common.util.DimensionIdProvider;
 import org.valkyrienskies.mod.common.util.GameTickForceApplier;
-import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
-import org.valkyrienskies.mod.util.RelocationUtilKt;
 
 import java.util.List;
 
@@ -44,6 +28,12 @@
 public class MotionInvokingBlockEntity extends BlockEntity {
     NbtList instructions = new NbtList();
     long nextInstruction = 0;
+    String compat = "Eureka";
+
+    //variables below this line aren't serialised because they don't need to be.
+    int[] target = new int[3]; //x,y,z of a point in space that the ship is "trying" to get to.
+    double ldx = -1; //last distance tracked along the x axis, from the target
+    double ldz = -1; //last distance tracked along the z axis, from the target
 
     public NbtList getInstructions() {return instructions;}
     public void setNextInstruction(long nextInstruction) {this.nextInstruction = nextInstruction;}
@@ -55,7 +45,10 @@ public MotionInvokingBlockEntity(BlockPos pos, BlockState state) {
         super(Pirates.MOTION_INVOKING_BLOCK_ENTITY, pos, state);
     }
 
-
+    public void setCompat(String compat) {
+        this.compat = compat;
+        markDirty();
+    }
 
     public static void tick(World world, BlockPos pos, BlockState state, MotionInvokingBlockEntity be) {
 
@@ -87,8 +80,6 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
                 ChunkPos chunkPos = world.getChunk(pos).getPos();
                 LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos((ServerWorld) world, chunkPos);
 
-                //Pirates.LOGGER.info("scaling of ship: "+s.x()+" "+s.y()+" "+s.z());
-
                 if (ship != null) {
                     SeatedControllingPlayer seatedControllingPlayer = ship.getAttachment(SeatedControllingPlayer.class);
                     if (seatedControllingPlayer == null) {
@@ -100,10 +91,6 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
                         ship.setAttachment(SeatedControllingPlayer.class, seatedControllingPlayer);
                     }
 
-
-                    //Pirates.LOGGER.info(be.instructions.getString(0));
-                    //be.utiliseInternalPattern(seatedControllingPlayer, be);
-                    //be.moveShipForward(ship);
                     if(world.getTimeOfDay()%updateTicks==0)
                     {
                         List<Ship> ships = VSGameUtilsKt.getAllShips(world).stream().filter(a->
@@ -120,7 +107,12 @@ public static void tick(World world, BlockPos pos, BlockState state, MotionInvok
                         }
                     }
 
-                    be.moveTowards(seatedControllingPlayer,ship);
+                    switch (be.compat)
+                    {
+                        case "Eureka" -> EurekaCompat.moveTowards(be,seatedControllingPlayer,ship);
+                        default -> be.moveShipForward(ship);
+                    }
+
 
                 }
             }
@@ -133,6 +125,7 @@ protected void writeNbt(NbtCompound nbt) {
         nbt.putLong("nextInstruction", nextInstruction);
         nbt.put("instructions", instructions);
         nbt.putIntArray("target",target);
+        nbt.putString("compat",compat);
         super.writeNbt(nbt);
     }
 
@@ -141,6 +134,10 @@ public void readNbt(NbtCompound nbt) {
         super.readNbt(nbt);
         instructions = (NbtList) nbt.get("instructions");
         nextInstruction = nbt.getLong("nextInstruction");
+        if(nbt.contains("compat"))
+        {
+            compat = nbt.getString("compat");
+        }
         if(nbt.contains("target"))
         {
             target = nbt.getIntArray("target");
@@ -160,61 +157,44 @@ public void setTarget(int[] target) {
         markDirty();
     }
 
-    int[] target = new int[3];
-    double ldx = -1;
-    double ldz = -1;
-    int flipflop = 1;
 
-    private void moveTowards(SeatedControllingPlayer power, LoadedServerShip ship)
-    {
-        if(target.length!=3) return;
 
-        power.setForwardImpulse(1);
-        Vector3dc v3d = ship.getTransform().getPositionInWorld();
-        if(ldx==-1)
-        {
-            //lastDistance = v3d.distanceSquared(target[0],target[1],target[2]);
-            ldx = vdis(target[0],v3d.x());
-            ldz = vdis(target[2],v3d.z());
-        }
-        else
-        {
-            //double currentDistance = v3d.distanceSquared(target[0],target[1],target[2]);
-            double cdx = vdis(target[0],v3d.x());
-            double cdz = vdis(target[2],v3d.z());
-            //System.out.println(lastDistance+" -> "+currentDistance);
-            if(cdx>=ldx || cdz>=ldz)
-            {
-                power.setLeftImpulse(flipflop);
+    public int[] getTarget() {
+        return target;
+    }
 
-            }
-            else
-            {
-                power.setLeftImpulse(0);
-                flipflop = -flipflop;
-            }
-            ldx=cdx;
-            ldz=cdz;
-        }
+    public double getLdx() {
+        return ldx;
+    }
 
+    public double getLdz() {
+        return ldz;
     }
 
-    private double vdis(double x, double xto) {
-        return Math.abs(x-xto);
+    public void setLdx(double ldx) {
+        this.ldx = ldx;
     }
 
+    public void setLdz(double ldz) {
+        this.ldz = ldz;
+    }
+
+
+    /**
+     * This method uses bases VS things to effectively create circles.
+     * the circles arent very good. TODO: Make the circles good
+     * @param ship
+     */
     private void moveShipForward(LoadedServerShip ship)
     {
         double mass = ship.getInertiaData().getMass();
-        Vector3d qdc = ship.getTransform().getShipToWorldRotation().getEulerAnglesZXY(new Vector3d()).mul(mass*100);
+        Vector3d qdc = ship.getTransform().getShipToWorldRotation().getEulerAnglesZXY(new Vector3d()).normalize().mul(mass*500);
         qdc = new Vector3d(qdc.x,0,qdc.z);
-        //qdc = qdc.rotateY(-Math.PI);
         GameTickForceApplier gtfa = ship.getAttachment(GameTickForceApplier.class);
         if(gtfa!=null)
         {
-            Vector3d loc = new Vector3d(pos.getX()-1,pos.getY()+0.3,pos.getZ()-1).sub(ship.getTransform().getPositionInShip());
+            Vector3d loc = new Vector3d(pos.getX(),pos.getY(),pos.getZ()).sub(ship.getTransform().getPositionInShip());
             gtfa.applyInvariantForceToPos(qdc,loc);
-            //gtfa.applyInvariantForce(qdc);
         }
     }
 }
diff --git a/src/main/java/ace/actually/pirates/entities/shot/ShotEntity.java b/src/main/java/ace/actually/pirates/entities/shot/ShotEntity.java
@@ -19,7 +19,7 @@
 
 public class ShotEntity extends ThrownItemEntity implements FlyingItemEntity {
     private LivingEntity in;
-    private float damage=1;
+    private float damage=6;
     private String extra="";
 
 
@@ -49,7 +49,7 @@ public void tick () {
     protected void onCollision(HitResult hitResult) {
         super.onCollision(hitResult);
         if (!this.getWorld().isClient) {
-            this.getWorld().createExplosion(this, this.getX(), this.getY(), this.getZ(), 2.2f, false, World.ExplosionSourceType.BLOCK);
+            this.getWorld().createExplosion(this, this.getX(), this.getY(), this.getZ(), 2.2f, extra.contains("fire"), World.ExplosionSourceType.TNT);
             this.discard();
         }
     }
@@ -58,7 +58,11 @@ protected void onCollision(HitResult hitResult) {
     protected void onEntityHit(EntityHitResult entityHitResult) {
         super.onEntityHit(entityHitResult);
         Entity entity = entityHitResult.getEntity();
-        entity.damage(this.getDamageSources().explosion(null), 6.0f);
+        entity.damage(this.getDamageSources().explosion(null), damage);
+        if (!this.getWorld().isClient) {
+            this.getWorld().createExplosion(this, this.getX(), this.getY(), this.getZ(), 2.2f, extra.contains("fire"), World.ExplosionSourceType.TNT);
+            this.discard();
+        }
     }
 
     @Override
diff --git a/src/main/java/ace/actually/pirates/util/EurekaCompat.java b/src/main/java/ace/actually/pirates/util/EurekaCompat.java
@@ -0,0 +1,47 @@
+package ace.actually.pirates.util;
+
+import ace.actually.pirates.blocks.entity.MotionInvokingBlockEntity;
+import org.joml.Vector3dc;
+import org.valkyrienskies.core.api.ships.LoadedServerShip;
+import org.valkyrienskies.mod.api.SeatedControllingPlayer;
+
+public class EurekaCompat {
+    private static int flipflop = 1;
+    public static void moveTowards(MotionInvokingBlockEntity be, SeatedControllingPlayer power, LoadedServerShip ship)
+    {
+        if(be.getTarget().length!=3) return;
+
+        power.setForwardImpulse(1);
+        Vector3dc v3d = ship.getTransform().getPositionInWorld();
+        if(be.getLdx()==-1)
+        {
+            //lastDistance = v3d.distanceSquared(target[0],target[1],target[2]);
+            be.setLdx(vdis(be.getTarget()[0],v3d.x()));
+            be.setLdz(vdis(be.getTarget()[2],v3d.z()));
+        }
+        else
+        {
+            //double currentDistance = v3d.distanceSquared(target[0],target[1],target[2]);
+            double cdx = vdis(be.getTarget()[0],v3d.x());
+            double cdz = vdis(be.getTarget()[2],v3d.z());
+            //System.out.println(lastDistance+" -> "+currentDistance);
+            if(cdx>=be.getLdx() || cdz>= be.getLdz())
+            {
+                power.setLeftImpulse(flipflop);
+
+            }
+            else
+            {
+                power.setLeftImpulse(0);
+                flipflop = -flipflop;
+            }
+            be.setLdx(cdx);
+            be.setLdz(cdz);
+        }
+
+    }
+
+    private static double vdis(double x, double xto) {
+        return Math.abs(x-xto);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected DispenserBehavior getBehaviorForItem(ItemStack stack) {`
`32`	`32`	`return new CannonDispenserBehavior() {`
`33`	`33`	`@Override`
`34`	`34`	`protected ProjectileEntity createProjectile(World world, Position position, ItemStack stack) {`
`35`		`- ShotEntity qentity = Util.make(new ShotEntity(Pirates.SHOT_ENTITY_TYPE,world,null,Pirates.CANNONBALL_ENT,2,""), (entity) -> {});`
	`35`	`+ ShotEntity qentity = Util.make(new ShotEntity(Pirates.SHOT_ENTITY_TYPE,world,null,Pirates.CANNONBALL_ENT,6,""), (entity) -> {});`
`36`	`36`	`qentity.setPosition(new Vec3d(position.getX(),position.getY(),position.getZ()));`
`37`	`37`	`return qentity;`
`38`	`38`	`}`