Separate ridable and controllable configs

This commit is contained in:
BillyGalbreath
2022-01-18 09:10:04 -06:00
parent 0a9a17044b
commit bd0a85a17c
94 changed files with 2558 additions and 1857 deletions

View File

@@ -25,7 +25,7 @@ index 721971f7618751a2e95f1c49fdc48a9c0c672cab..7b141c495095afcd9c8b04c059d692e8
double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
if (d > 676.0D) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775ba3eb22b 100644
index 98119cf72e7d808d9f3b0ac808c0f286990d2279..f6bd1eff78b3c879ecc439bab3b5aa7674e74044 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -69,6 +69,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -36,7 +36,7 @@ index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775
public Llama(EntityType<? extends Llama> type, Level world) {
super(type, world);
@@ -160,7 +161,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -165,7 +166,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
if (!this.inventory.getItem(1).isEmpty()) {
nbt.put("DecorItem", this.inventory.getItem(1).save(new CompoundTag()));
}
@@ -45,7 +45,7 @@ index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775
}
@Override
@@ -172,6 +173,12 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -177,6 +178,12 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
this.inventory.setItem(1, ItemStack.of(nbt.getCompound("DecorItem")));
}
@@ -58,7 +58,7 @@ index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775
this.updateContainerEquipment();
}
@@ -511,6 +518,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -516,6 +523,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
public void leaveCaravan() {
if (this.caravanHead != null) {
@@ -66,7 +66,7 @@ index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775
this.caravanHead.caravanTail = null;
}
@@ -518,6 +526,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -523,6 +531,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
}
public void joinCaravan(Llama llama) {
@@ -74,7 +74,7 @@ index 6e09dbeb6478fa32d8c46da30e45f8c64f214e30..1195f307ec827c206480fed63deb3775
this.caravanHead = llama;
this.caravanHead.caravanTail = this;
}
@@ -535,6 +544,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -540,6 +549,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
return this.caravanHead;
}