a few puter fixes

This commit is contained in:
craisinlord committed 2026-09-14 19:02:18 -05:00
1 parent 0c400ef404
commit 3300fa8f2a
86 files changed
+4480 -200

No files matched your search

@@ -76,11 +76,9 @@ public class OctopusBombEntity extends Monster implements GeoEntity {
private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this);
// Squid-style wander
private float wanderDx, wanderDy, wanderDz;
private int wanderRetargetTicks;
// Combat
private int attackCooldown;
private int actionTicks;
private int lastAttackState;
@@ -89,7 +87,6 @@ public class OctopusBombEntity extends Monster implements GeoEntity {
private float orbitDirection = 1.0F;
private int inkSprayCooldown;
// Kraken spawn flag
private boolean spawnedByKraken;
// Explosive impact (fired from the R.P.O. Launcher)
@@ -366,10 +363,6 @@ public class OctopusBombEntity extends Monster implements GeoEntity {
this.hasImpulse = true;
}
// -------------------------------------------------------------------------
// Squid-style wander
// -------------------------------------------------------------------------
private void tickWanderMovement() {
if (--this.wanderRetargetTicks <= 0) {
this.wanderRetargetTicks = 40 + this.random.nextInt(40);
@@ -388,10 +381,6 @@ public class OctopusBombEntity extends Monster implements GeoEntity {
this.setDeltaMovement(this.getDeltaMovement().add(this.wanderDx, dy, this.wanderDz));
}
// -------------------------------------------------------------------------
// Ink spray
// -------------------------------------------------------------------------
private boolean hasHitExplosiveTarget() {
AABB box = this.getBoundingBox();
return !this.level().getEntitiesOfClass(LivingEntity.class, box,
@@ -447,10 +436,6 @@ public class OctopusBombEntity extends Monster implements GeoEntity {
serverLevel.sendParticles(OCTOPUS_BOMB_INK_PARTICLE, cx, cy, cz, 30, 3.5D, 1.8D, 3.5D, 0.02D);
}
// -------------------------------------------------------------------------
// Combat
// -------------------------------------------------------------------------
private void tickPursuitMovement(LivingEntity target) {
if (this.strafeRetargetTicks-- <= 0) {
this.strafeRetargetTicks = 10 + this.random.nextInt(12);
@@ -157,7 +157,6 @@ public class BigBerthaItem extends SwordItem implements GeoItem, com.craisinlord
return;
}
// Toreterror jump tracking
if (isToreterrorJumping(stack) && player.getMainHandItem() == stack) {
player.fallDistance = 0.0F; // prevent fall damage during the crash-down
boolean launched = readInt(stack, TORETERROR_LAUNCHED_TAG) == 1;
@@ -178,7 +177,6 @@ public class BigBerthaItem extends SwordItem implements GeoItem, com.craisinlord
}
}
// Tick client shake counter
if (level.isClientSide && clientShakeTicks > 0) {
clientShakeTicks--;
}