2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sat, 29 Sep 2018 16:08:23 -0500
|
|
|
|
Subject: [PATCH] Turtle API
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.world.entity.animal.Turtle getHomePos()Lnet/minecraft/core/BlockPos;
|
|
|
|
public net.minecraft.world.entity.animal.Turtle setHasEgg(Z)V
|
|
|
|
public net.minecraft.world.entity.animal.Turtle isGoingHome()Z
|
|
|
|
public net.minecraft.world.entity.animal.Turtle setGoingHome(Z)V
|
|
|
|
public net.minecraft.world.entity.animal.Turtle isTravelling()Z
|
|
|
|
public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
2023-06-07 22:41:26 +02:00
|
|
|
index 60e291abb3ebdf8676c13a2138d8eb436d033fa2..d27e5f9dac4703b839ab8444f6b54bf54d58af86 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
|
|
|
@@ -14,7 +14,7 @@ public abstract class MoveToBlockGoal extends Goal {
|
|
|
|
protected int nextStartTick;
|
|
|
|
protected int tryTicks;
|
|
|
|
private int maxStayTicks;
|
2021-06-13 08:48:25 +02:00
|
|
|
- protected BlockPos blockPos = BlockPos.ZERO;
|
2021-06-17 21:52:26 +02:00
|
|
|
+ protected BlockPos blockPos = BlockPos.ZERO; @Deprecated public final BlockPos getTargetPosition() { return this.blockPos; } // Paper - OBFHELPER
|
2021-06-11 14:02:28 +02:00
|
|
|
private boolean reachedTarget;
|
|
|
|
private final int searchRange;
|
|
|
|
private final int verticalSearchRange;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
2023-06-07 23:35:19 +02:00
|
|
|
index fcd760cb88f84ff79811631612956fde79905132..99fc97051c61ac8d08afdc0ea4845e96705e243b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
|
2023-03-14 20:24:52 +01:00
|
|
|
@@ -487,15 +487,18 @@ public class Turtle extends Animal {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (!this.turtle.isInWater() && this.isReachedTarget()) {
|
|
|
|
if (this.turtle.layEggCounter < 1) {
|
|
|
|
- this.turtle.setLayingEgg(true);
|
2023-06-07 23:35:19 +02:00
|
|
|
+ this.turtle.setLayingEgg(new com.destroystokyo.paper.event.entity.TurtleStartDiggingEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity(), io.papermc.paper.util.MCUtil.toLocation(this.turtle.level(), this.getTargetPosition())).callEvent()); // Paper
|
2021-11-24 00:06:05 +01:00
|
|
|
} else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
|
2023-06-07 22:41:26 +02:00
|
|
|
Level world = this.turtle.level();
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
- if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1)).isCancelled()) {
|
|
|
|
+ // Paper start
|
|
|
|
+ int eggCount = this.turtle.random.nextInt(4) + 1;
|
2023-06-07 23:35:19 +02:00
|
|
|
+ com.destroystokyo.paper.event.entity.TurtleLayEggEvent layEggEvent = new com.destroystokyo.paper.event.entity.TurtleLayEggEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity(), io.papermc.paper.util.MCUtil.toLocation(this.turtle.level(), this.blockPos.above()), eggCount);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (layEggEvent.callEvent() && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount())).isCancelled()) {
|
|
|
|
world.playSound((Player) null, blockposition, SoundEvents.TURTLE_LAY_EGG, SoundSource.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
|
2023-03-14 20:24:52 +01:00
|
|
|
BlockPos blockposition1 = this.blockPos.above();
|
|
|
|
- BlockState iblockdata = (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, this.turtle.random.nextInt(4) + 1);
|
|
|
|
+ BlockState iblockdata = (BlockState) Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount()); // Paper
|
|
|
|
|
|
|
|
world.setBlock(blockposition1, iblockdata, 3);
|
|
|
|
world.gameEvent(GameEvent.BLOCK_PLACE, blockposition1, GameEvent.Context.of(this.turtle, iblockdata));
|
|
|
|
@@ -566,7 +569,7 @@ public class Turtle extends Animal {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean canUse() {
|
2022-03-01 06:43:03 +01:00
|
|
|
- return this.turtle.isBaby() ? false : (this.turtle.hasEgg() ? true : (this.turtle.getRandom().nextInt(reducedTickDelay(700)) != 0 ? false : !this.turtle.getHomePos().closerToCenterThan(this.turtle.position(), 64.0D)));
|
|
|
|
+ return this.turtle.isBaby() ? false : (this.turtle.hasEgg() ? true : (this.turtle.getRandom().nextInt(reducedTickDelay(700)) != 0 ? false : !this.turtle.getHomePos().closerToCenterThan(this.turtle.position(), 64.0D))) && new com.destroystokyo.paper.event.entity.TurtleGoHomeEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity()).callEvent(); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
2023-06-08 22:56:13 +02:00
|
|
|
index 96462a29551c301d3c80029cab2bec3839914237..d3546fb082a56b4ce077ded5d25909e15f7eb593 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
2022-07-22 20:18:00 +02:00
|
|
|
@@ -34,4 +34,31 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
|
|
|
|
public boolean isLayingEgg() {
|
|
|
|
return this.getHandle().isLayingEgg();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.Location getHome() {
|
2023-06-08 22:56:13 +02:00
|
|
|
+ return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), this.getHandle().getHomePos());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setHome(org.bukkit.Location location) {
|
2023-06-08 22:56:13 +02:00
|
|
|
+ this.getHandle().setHomePos(io.papermc.paper.util.MCUtil.toBlockPosition(location));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isGoingHome() {
|
2023-06-08 22:56:13 +02:00
|
|
|
+ return this.getHandle().isGoingHome();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isDigging() {
|
2023-06-08 22:56:13 +02:00
|
|
|
+ return this.getHandle().isLayingEgg();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setHasEgg(boolean hasEgg) {
|
2023-06-08 22:56:13 +02:00
|
|
|
+ this.getHandle().setHasEgg(hasEgg);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|