Initial 1.20 support #145

Arnuh · Jun 8, 2023 · 4c54a40 · 4c54a40
1 parent 507c3cd
commit 4c54a40
Show file tree

Hide file tree

Showing 47 changed files with 229 additions and 514 deletions.
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
 	implementation(project(path = ":nms:v1_19_2", configuration = "reobf"))
 	implementation(project(path = ":nms:v1_19_3", configuration = "reobf"))
 	implementation(project(path = ":nms:v1_19_4", configuration = "reobf"))
+	implementation(project(path = ":nms:v1_20", configuration = "reobf"))
 }
 
 tasks {

diff --git a/nms/build.gradle.kts b/nms/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	id("echopet-conventions")
-	id("io.papermc.paperweight.userdev") version "1.5.3"
+	id("io.papermc.paperweight.userdev") version "1.5.5"
 }
 
 subprojects {
@@ -9,5 +9,5 @@ subprojects {
 
 dependencies {
 	api(project(":api"))
-	paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT")
+	paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
 }
diff --git a/nms/src/main/java/com/dsh105/echopet/nms/CraftBukkitUtil.java b/nms/src/main/java/com/dsh105/echopet/nms/CraftBukkitUtil.java
@@ -18,7 +18,7 @@
 package com.dsh105.echopet.nms;
 
 import com.dsh105.echopet.compat.api.util.ICraftBukkitUtil;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 
 public class CraftBukkitUtil implements ICraftBukkitUtil{

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/NMSEntityUtil.java b/nms/src/main/java/com/dsh105/echopet/nms/NMSEntityUtil.java
@@ -34,7 +34,7 @@
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.ItemStack;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.jetbrains.annotations.Nullable;
 
 /*

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/SpawnUtil.java b/nms/src/main/java/com/dsh105/echopet/nms/SpawnUtil.java
@@ -44,9 +44,9 @@
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Particle;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.meta.SkullMeta;

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/VersionBreaking.java b/nms/src/main/java/com/dsh105/echopet/nms/VersionBreaking.java
@@ -133,4 +133,11 @@ public static DamageSource getDamageSource(Entity entity, DamageSourceType damag
 			case FLY_INTO_WALL -> entity.damageSources().flyIntoWall();
 		};
 	}
+
+	public static boolean onGround(Entity entity){
+		// 1.19.4 and below
+		// return entity.isOnGround();
+		// 1.20
+		return entity.onGround;
+	}
 }
diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/EntityPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/EntityPet.java
@@ -44,9 +44,9 @@
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 @Deprecated

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/INMSEntityPetHandle.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/INMSEntityPetHandle.java
@@ -21,7 +21,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.phys.Vec3;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public interface INMSEntityPetHandle extends IEntityPetHandle{
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/PetGoalFollowOwner.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/PetGoalFollowOwner.java
@@ -25,11 +25,12 @@
 import com.dsh105.echopet.compat.api.entity.pet.IPet;
 import com.dsh105.echopet.compat.api.event.PetMoveEvent;
 import com.dsh105.echopet.compat.api.plugin.EchoPet;
+import com.dsh105.echopet.nms.VersionBreaking;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public class PetGoalFollowOwner extends APetGoalFollowOwner{
 
@@ -101,7 +102,7 @@ public void tick(){
 		mob.getLookControl().setLookAt(owner, 10.0F, (float) mob.getMaxHeadXRot());
 		if(--this.timeToRecalcPath <= 0){
 			this.timeToRecalcPath = 10;
-			if(mob.distanceToSqr(owner) > this.teleportDistanceSqr && ((CraftPlayer) this.pet.getPetOwner()).getHandle().isOnGround() || this.pet.getPetOwner()
+			if(mob.distanceToSqr(owner) > this.teleportDistanceSqr && VersionBreaking.onGround(((CraftPlayer) this.pet.getPetOwner()).getHandle()) || this.pet.getPetOwner()
 				.isInsideVehicle()){
 				this.pet.getPet().teleportToOwner();
 				return;

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/PetCamelAi.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/PetCamelAi.java
@@ -19,6 +19,7 @@
 
 
 import java.util.function.Predicate;
+import com.dsh105.echopet.nms.VersionBreaking;
 import com.dsh105.echopet.nms.entity.type.EntityCamelPet;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -139,7 +140,7 @@ public CamelPanic(float speed){
 		@Override
 		protected void start(ServerLevel serverLevel, PathfinderMob pathfinderMob, long l){
 			if(pathfinderMob instanceof EntityCamelPet camel){
-				camel.standUpPanic();
+				camel.standUpInstantly();
 			}
 
 			super.start(serverLevel, pathfinderMob, l);
@@ -157,7 +158,7 @@ public RandomSitting(int lastPoseSecondsDelta){
 
 		@Override
 		protected boolean checkExtraStartConditions(ServerLevel world, EntityCamelPet entity){
-			return !entity.isInWater() && entity.getPoseTime() >= (long) this.minimalPoseTicks && !entity.isLeashed() && entity.isOnGround() && !entity.hasControllingPassenger();
+			return !entity.isInWater() && entity.getPoseTime() >= (long) this.minimalPoseTicks && !entity.isLeashed() && VersionBreaking.onGround(entity) && !entity.hasControllingPassenger();
 		}
 
 		@Override

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/PetFrogAi.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/PetFrogAi.java
@@ -18,6 +18,7 @@
 package com.dsh105.echopet.nms.entity.ai.brain;
 
 
+import com.dsh105.echopet.nms.VersionBreaking;
 import com.dsh105.echopet.nms.entity.ai.brain.behavior.BrainFollowOwner;
 import com.dsh105.echopet.nms.entity.ai.brain.behavior.RandomStrollAroundOwner;
 import com.dsh105.echopet.nms.entity.ai.brain.behavior.ShootTongueOwner;
@@ -124,7 +125,7 @@ private static void initIdleActivity(Brain<EntityFrogPet> frogBrain){
 						Pair.of(new RandomStrollAroundOwner(SPEED_MULTIPLIER_ON_LAND), 1),
 						Pair.of(SetWalkTargetFromLookTarget.create(SPEED_MULTIPLIER_ON_LAND, 3), 1),
 						Pair.of(new Croak(), 3),
-						Pair.of(BehaviorBuilder.triggerIf(Entity::isOnGround), 2)
+						Pair.of(BehaviorBuilder.triggerIf(VersionBreaking::onGround), 2)
 					)
 				))
 			), ImmutableSet.of(Pair.of(MemoryModuleType.LONG_JUMP_MID_JUMP, MemoryStatus.VALUE_ABSENT),

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/BrainFollowOwner.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/BrainFollowOwner.java
@@ -33,7 +33,7 @@
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.entity.player.Player;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public class BrainFollowOwner extends Behavior<PathfinderMob>{
 

diff --git a/...rc/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/RandomStrollAroundOwner.java b/...rc/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/RandomStrollAroundOwner.java
@@ -26,7 +26,7 @@
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public class RandomStrollAroundOwner extends Behavior<PathfinderMob>{
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/SetOwnerLookTarget.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/SetOwnerLookTarget.java
@@ -25,7 +25,7 @@
 import net.minecraft.world.entity.ai.behavior.Behavior;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public class SetOwnerLookTarget extends Behavior<LivingEntity>{
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/ShootTongueOwner.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/ai/brain/behavior/ShootTongueOwner.java
@@ -33,7 +33,7 @@
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.entity.animal.frog.Frog;
 import net.minecraft.world.level.pathfinder.Path;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 public class ShootTongueOwner extends Behavior<Frog>{
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/handle/EntityPetHandle.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/handle/EntityPetHandle.java
@@ -38,8 +38,8 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.phys.Vec3;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Pose;
 import org.bukkit.util.Vector;
@@ -215,7 +215,7 @@ public float getSpeed(){
 		float speed = rideSpeed;
 		if(NMSEntityUtil.getJumpingField() != null && !entity.getPassengers().isEmpty()){
 			if(canFly){
-				if(!entity.isOnGround()){
+				if(!VersionBreaking.onGround(entity)){
 					speed = rideFlySpeed;
 				}
 			}
@@ -275,7 +275,7 @@ public Vec3 travel(Vec3 vec3d){
 				}catch(IllegalArgumentException | IllegalStateException | IllegalAccessException e){
 					EchoPet.LOG.log(java.util.logging.Level.WARNING, "Failed to initiate Pet Flying Motion for " + player.getName() + "'s Pet.", e);
 				}
-			}else if(entity.isOnGround()){
+			}else if(VersionBreaking.onGround(entity)){
 				try{
 					if(NMSEntityUtil.getJumpingField().getBoolean(passenger)){
 						PetRideJumpEvent rideEvent = new PetRideJumpEvent(this.getPet(), this.jumpHeight);

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/handle/LivingEntityPetHandle.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/handle/LivingEntityPetHandle.java
@@ -38,7 +38,7 @@
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.Vec3;
-import org.bukkit.craftbukkit.v1_19_R3.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory;
 
 public class LivingEntityPetHandle extends EntityPetHandle implements INMSLivingEntityPetHandle{
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityAllayPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityAllayPet.java
@@ -54,7 +54,7 @@
 import net.minecraft.world.level.gameevent.GameEventListener;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityAxolotlPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityAxolotlPet.java
@@ -43,7 +43,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 
 @EntityPetType(petType = PetType.AXOLOTL)

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityBatPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityBatPet.java
@@ -36,7 +36,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 
 @EntityPetType(petType = PetType.BAT)
 public class EntityBatPet extends EntityPet implements IEntityBatPet{

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityBeePet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityBeePet.java
@@ -41,7 +41,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 
 @EntityPetType(petType = PetType.BEE)
 public class EntityBeePet extends Bee implements IEntityAgeablePet, EntityPetGiveMeAccess{

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityCamelPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityCamelPet.java
@@ -21,7 +21,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 
 @EntityPetType(petType = PetType.CAMEL)

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityCatPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityCatPet.java
@@ -34,7 +34,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 
 @EntityPetType(petType = PetType.CAT)
 public class EntityCatPet extends Cat implements IEntityTameablePet, EntityPetGiveMeAccess{

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityDonkeyPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityDonkeyPet.java
@@ -34,7 +34,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 
 @EntityPetType(petType = PetType.DONKEY)
 public class EntityDonkeyPet extends Donkey implements IEntityAnimalPet, EntityPetGiveMeAccess{

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityFrogPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityFrogPet.java
@@ -41,7 +41,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 
 @EntityPetType(petType = PetType.FROG)

diff --git a/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityGoatPet.java b/nms/src/main/java/com/dsh105/echopet/nms/entity/type/EntityGoatPet.java
@@ -44,7 +44,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;