New Baby-System for 1.17 -> No more axolotlcide - Fixed Follow-Telepo…

…rtation Fixed: - The actual teleportation works now (in addition to respawn) - Axolotls don't kill other axolotls anymore Internal: - New Baby-System for 1.17 (using AgeableMob)
Jakllp · Aug 27, 2021 · 2b46858 · 2b46858
1 parent 60e183c
commit 2b46858
Show file tree

Hide file tree

Showing 35 changed files with 178 additions and 151 deletions.
diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/EntityMyPet.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/EntityMyPet.java
@@ -25,6 +25,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
@@ -100,6 +102,7 @@
 import net.minecraft.network.protocol.game.ClientboundSoundPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
@@ -108,6 +111,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.AgeableMob;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
@@ -127,7 +131,7 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
-public abstract class EntityMyPet extends Mob implements MyPetMinecraftEntity {
+public abstract class EntityMyPet extends AgeableMob implements MyPetMinecraftEntity {
 
 	protected static final EntityDataAccessor<Byte> POTION_PARTICLE_WATCHER = Mob.DATA_SHARED_FLAGS_ID;
 
@@ -161,6 +165,7 @@ public EntityMyPet(Level world, MyPet myPet) {
 
 		try {
 			this.replaceCraftAttributes();
+			ageLocked = true;
 
 			this.myPet = myPet;
 			this.isMyPet = true;
@@ -1420,4 +1425,9 @@ public DamageSource getLastDamageSource() {
 	public UUID getUniqueID() {
 		return this.uuid;
 	}
+
+	@Override
+	public @Nullable AgeableMob getBreedOffspring(ServerLevel arg0, AgeableMob arg1) {
+		return null;
+	}
 }
diff --git a/...v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/ai/movement/FollowOwner.java b/...v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/ai/movement/FollowOwner.java
@@ -20,6 +20,7 @@
 
 package de.Keyle.MyPet.compat.v1_17_R1.entity.ai.movement;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
 
@@ -114,12 +115,12 @@ public void tick() {
 		if (this.petEntity.canMove()) {
 			if (!owner.getAbilities().flying) {
 				if (!waitForGround) {
-					if (owner.flyDist <= 4) {
+					if (owner.fallDistance <= 4) {
 						if (this.petEntity.distanceToSqr(owner) >= this.teleportDistance) {
 							if (controlPathfinderGoal.moveTo == null) {
 								if (!petEntity.hasTarget()) {
 									if (MyPetApi.getPlatformHelper().canSpawn(ownerLocation, this.petEntity)) {
-										this.petEntity.flyDist = 0;
+										this.petEntity.fallDistance = 0;
 										this.petEntity.moveTo(ownerLocation.getX(), ownerLocation.getY(), ownerLocation.getZ(), this.petEntity.getYRot(), this.petEntity.getXRot());
 										this.setPathTimer = 0;
 										return;

diff --git a/...s/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyAxolotl.java b/...s/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyAxolotl.java
@@ -34,7 +34,6 @@
 @EntitySize(width = 0.7F, height = 1.3F)
 public class EntityMyAxolotl extends EntityMyPet {
 
-    private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyAxolotl.class, EntityDataSerializers.BOOLEAN);
     private static final EntityDataAccessor<Integer> VARIANT_WATCHER = SynchedEntityData.defineId(EntityMyAxolotl.class, EntityDataSerializers.INT);
 
     public EntityMyAxolotl(Level world, MyPet myPet) {
@@ -59,13 +58,16 @@ protected String getLivingSound() {
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
-        getEntityData().define(AGE_WATCHER, false);
         getEntityData().define(VARIANT_WATCHER, 0);
     }
 
     @Override
     public void updateVisuals() {
-        this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+    	if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
         this.getEntityData().set(VARIANT_WATCHER, getMyPet().getVariant());
     }
 

diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyBee.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyBee.java
@@ -37,7 +37,6 @@
 @EntitySize(width = 0.6F, height = 0.6f)
 public class EntityMyBee extends EntityMyPet {
 
-	private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyBee.class, EntityDataSerializers.BOOLEAN);
 	private static final EntityDataAccessor<Byte> BEE_STATUS_WATCHER = SynchedEntityData.defineId(EntityMyBee.class, EntityDataSerializers.BYTE);
 	private static final EntityDataAccessor<Integer> ANGER_WATCHER = SynchedEntityData.defineId(EntityMyBee.class, EntityDataSerializers.INT);
 
@@ -76,14 +75,17 @@ public float getSoundSpeed() {
 	@Override
 	protected void defineSynchedData() {
 		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
 		getEntityData().define(BEE_STATUS_WATCHER, (byte) 0);
 		getEntityData().define(ANGER_WATCHER, 0);
 	}
 
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 		this.getEntityData().set(ANGER_WATCHER, (getMyPet().isAngry() || isAngry) ? 1 : 0);
 		this.setBeeStatus(8, getMyPet().hasNectar());
 		this.setBeeStatus(4, getMyPet().hasStung());

diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyCat.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyCat.java
@@ -43,7 +43,6 @@
 @EntitySize(width = 0.6F, height = 0.8F)
 public class EntityMyCat extends EntityMyPet {
 
-	protected static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyCat.class, EntityDataSerializers.BOOLEAN);
 	protected static final EntityDataAccessor<Byte> SIT_WATCHER = SynchedEntityData.defineId(EntityMyCat.class, EntityDataSerializers.BYTE);
 	protected static final EntityDataAccessor<Optional<UUID>> OWNER_WATCHER = SynchedEntityData.defineId(EntityMyCat.class, EntityDataSerializers.OPTIONAL_UUID);
 	protected static final EntityDataAccessor<Integer> TYPE_WATCHER = SynchedEntityData.defineId(EntityMyCat.class, EntityDataSerializers.INT);
@@ -116,7 +115,6 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
 	@Override
 	protected void defineSynchedData() {
 		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
 		getEntityData().define(SIT_WATCHER, (byte) 0);
 		getEntityData().define(OWNER_WATCHER, Optional.empty());
 		getEntityData().define(TYPE_WATCHER, 1);
@@ -127,7 +125,11 @@ protected void defineSynchedData() {
 
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 		this.getEntityData().set(TYPE_WATCHER, getMyPet().getCatType().ordinal());
 		this.getEntityData().set(COLLAR_COLOR_WATCHER, getMyPet().getCollarColor().ordinal());
 

diff --git a/...s/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyChicken.java b/...s/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyChicken.java
@@ -40,8 +40,6 @@
 @EntitySize(width = 0.4F, height = 0.7F)
 public class EntityMyChicken extends EntityMyPet {
 
-	private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyChicken.class, EntityDataSerializers.BOOLEAN);
-
 	private int nextEggTimer;
 
 	public EntityMyChicken(Level world, MyPet myPet) {
@@ -85,15 +83,13 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
 		return InteractionResult.PASS;
 	}
 
-	@Override
-	protected void defineSynchedData() {
-		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
-	}
-
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 	}
 
 	@Override

diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyCow.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyCow.java
@@ -40,8 +40,6 @@
 @EntitySize(width = 0.7F, height = 1.3F)
 public class EntityMyCow extends EntityMyPet {
 
-	private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyCow.class, EntityDataSerializers.BOOLEAN);
-
 	public EntityMyCow(Level world, MyPet myPet) {
 		super(world, myPet);
 	}
@@ -87,15 +85,13 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
 		return InteractionResult.PASS;
 	}
 
-	@Override
-	protected void defineSynchedData() {
-		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
-	}
-
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 	}
 
 	@Override

diff --git a/...es/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyDonkey.java b/...es/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyDonkey.java
@@ -53,8 +53,7 @@
 
 @EntitySize(width = 1.4F, height = 1.6F)
 public class EntityMyDonkey extends EntityMyPet implements PlayerRideableJumping {
-
-	protected static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyDonkey.class, EntityDataSerializers.BOOLEAN);
+
 	protected static final EntityDataAccessor<Byte> SADDLE_WATCHER = SynchedEntityData.defineId(EntityMyDonkey.class, EntityDataSerializers.BYTE);
 	protected static final EntityDataAccessor<Optional<UUID>> OWNER_WATCHER = SynchedEntityData.defineId(EntityMyDonkey.class, EntityDataSerializers.OPTIONAL_UUID);
 	private static final EntityDataAccessor<Boolean> CHEST_WATCHER = SynchedEntityData.defineId(EntityMyDonkey.class, EntityDataSerializers.BOOLEAN);
@@ -174,15 +173,18 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
 	@Override
 	protected void defineSynchedData() {
 		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
 		getEntityData().define(SADDLE_WATCHER, (byte) 0);
 		getEntityData().define(OWNER_WATCHER, Optional.empty());
 		getEntityData().define(CHEST_WATCHER, false);
 	}
 
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 		this.getEntityData().set(CHEST_WATCHER, getMyPet().hasChest());
 		applyVisual(4, getMyPet().hasSaddle());
 	}

diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyFox.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyFox.java
@@ -55,7 +55,6 @@
 @EntitySize(width = 0.6F, height = 0.8F)
 public class EntityMyFox extends EntityMyPet {
 
-	private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyFox.class, EntityDataSerializers.BOOLEAN);
 	private static final EntityDataAccessor<Integer> FOX_TYPE_WATCHER = SynchedEntityData.defineId(EntityMyFox.class, EntityDataSerializers.INT);
 	private static final EntityDataAccessor<Byte> ACTIONS_WATCHER = SynchedEntityData.defineId(EntityMyFox.class, EntityDataSerializers.BYTE);
 	private static final EntityDataAccessor<Optional<UUID>> FRIEND_A_WATCHER = SynchedEntityData.defineId(EntityMyFox.class, EntityDataSerializers.OPTIONAL_UUID);
@@ -153,7 +152,6 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
 	@Override
 	protected void defineSynchedData() {
 		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
 		getEntityData().define(FRIEND_A_WATCHER, Optional.empty());
 		getEntityData().define(FRIEND_B_WATCHER, Optional.empty());
 		getEntityData().define(FOX_TYPE_WATCHER, 0);
@@ -162,7 +160,11 @@ protected void defineSynchedData() {
 
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 		this.getEntityData().set(FOX_TYPE_WATCHER, getMyPet().getType().ordinal());
 
 		Bukkit.getScheduler().runTaskLater(MyPetApi.getPlugin(), () -> {

diff --git a/...les/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyGhast.java b/...les/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyGhast.java
@@ -20,11 +20,15 @@
 
 package de.Keyle.MyPet.compat.v1_17_R1.entity.types;
 
+import javax.annotation.Nullable;
+
 import de.Keyle.MyPet.api.Configuration;
 import de.Keyle.MyPet.api.entity.EntitySize;
 import de.Keyle.MyPet.api.entity.MyPet;
 import de.Keyle.MyPet.compat.v1_17_R1.entity.EntityMyPet;
 import de.Keyle.MyPet.compat.v1_17_R1.entity.ai.attack.MeleeAttack;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.AgeableMob;
 import net.minecraft.world.level.Level;
 
 @EntitySize(width = 4.F, height = 4.F)

diff --git a/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyGoat.java b/modules/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyGoat.java
@@ -38,8 +38,6 @@
 @EntitySize(width = 0.7F, height = 1.3F)
 public class EntityMyGoat extends EntityMyPet {
 
-    private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyGoat.class, EntityDataSerializers.BOOLEAN);
-
     public EntityMyGoat(Level world, MyPet myPet) {
         super(world, myPet);
     }
@@ -84,15 +82,14 @@ public InteractionResult handlePlayerInteraction(Player entityhuman, Interaction
         }
         return InteractionResult.PASS;
     }
-    @Override
-    protected void defineSynchedData() {
-        super.defineSynchedData();
-        getEntityData().define(AGE_WATCHER, false);
-    }
 
     @Override
     public void updateVisuals() {
-        this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+    	if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
     }
 
     @Override

diff --git a/...es/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyHoglin.java b/...es/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyHoglin.java
@@ -37,8 +37,6 @@
 @EntitySize(width = 1.3965F, height = 1.4F)
 public class EntityMyHoglin extends EntityMyPet {
 
-	private static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyHoglin.class, EntityDataSerializers.BOOLEAN);
-
 	public EntityMyHoglin(Level world, MyPet myPet) {
 		super(world, myPet);
 	}
@@ -79,15 +77,13 @@ public InteractionResult handlePlayerInteraction(final Player entityhuman, Inter
 		return InteractionResult.PASS;
 	}
 
-	@Override
-	protected void defineSynchedData() {
-		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
-	}
-
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 	}
 
 	@Override

diff --git a/...les/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyHorse.java b/...les/v1_17_R1/src/main/java/de/Keyle/MyPet/compat/v1_17_R1/entity/types/EntityMyHorse.java
@@ -61,8 +61,7 @@
 
 @EntitySize(width = 1.3965F, height = 1.6F)
 public class EntityMyHorse extends EntityMyPet implements PlayerRideableJumping {
-
-	protected static final EntityDataAccessor<Boolean> AGE_WATCHER = SynchedEntityData.defineId(EntityMyHorse.class, EntityDataSerializers.BOOLEAN);
+
 	protected static final EntityDataAccessor<Byte> SADDLE_CHEST_WATCHER = SynchedEntityData.defineId(EntityMyHorse.class, EntityDataSerializers.BYTE);
 	protected static final EntityDataAccessor<Optional<UUID>> OWNER_WATCHER = SynchedEntityData.defineId(EntityMyHorse.class, EntityDataSerializers.OPTIONAL_UUID);
 	private static final EntityDataAccessor<Integer> VARIANT_WATCHER = SynchedEntityData.defineId(EntityMyHorse.class, EntityDataSerializers.INT);
@@ -217,15 +216,18 @@ protected boolean isArmor(org.bukkit.inventory.ItemStack item) {
 	@Override
 	protected void defineSynchedData() {
 		super.defineSynchedData();
-		getEntityData().define(AGE_WATCHER, false);
 		getEntityData().define(SADDLE_CHEST_WATCHER, (byte) 0);
 		getEntityData().define(OWNER_WATCHER, Optional.empty());
 		getEntityData().define(VARIANT_WATCHER, 0);
 	}
 
 	@Override
 	public void updateVisuals() {
-		this.getEntityData().set(AGE_WATCHER, getMyPet().isBaby());
+		if(getMyPet().isBaby()) {
+			this.setAge(-1);
+		} else {
+			this.setAge(1);
+		}
 		this.getEntityData().set(VARIANT_WATCHER, getMyPet().getVariant());
 		applyVisual(4, getMyPet().hasSaddle());
 		Bukkit.getScheduler().runTaskLater(MyPetApi.getPlugin(), () -> {