fix some compile errors

This commit is contained in:
granny
2023-03-15 18:03:35 -07:00
parent 6314bddba2
commit 3c0d4f1d84
16 changed files with 593 additions and 616 deletions

View File

@@ -1002,7 +1002,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6bb9b0b84367e6b670aeb2de51f94714821db53d..f68b42f80bb8d76d08589f2d3047da1e07984092 100644
index b7f1dad5ffe5a0f5d337fbe39345242940b82e4b..ffe329e624b4d7db6c2b6f49f31093ab02116214 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -789,7 +789,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1128,7 +1128,7 @@ index 6bb9b0b84367e6b670aeb2de51f94714821db53d..f68b42f80bb8d76d08589f2d3047da1e
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f1c4ee3416592b91a255a482c272d3df8114e8c8..a0500cab65501a7a0ac2e8aa0efacc3105731c6b 100644
index 9ff8a54f48d0f3c8a4b434f5dae7bf31c7a334e5..64ddf35722640fa764b6b508196f0303676193cb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -394,7 +394,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1428,7 +1428,7 @@ index 288c6627906d07c0d223eacd84ae4eb31a349998..9babe636176da3c40598eb5bdac0919a
this.seen.add(i);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 0d4fb258c53468ddd15413f7a802c9f89677972e..4c4b27a762d4faf0467136ee92a3bbba5ab7322d 100644
index 4e9f4bddaf9221c02e5dc127aa796a24c83ed8f7..afbce4fdece213e456ef4e993f07bfb448bb2dd1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -260,12 +260,12 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@@ -1449,10 +1449,10 @@ index 0d4fb258c53468ddd15413f7a802c9f89677972e..4c4b27a762d4faf0467136ee92a3bbba
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index f931b6fde9e40473bacbe04bc72e00288f00e4eb..16a4c5abb702378e73000d3c2d4090a390453975 100644
index d61d9a7e7fa4d360dc740fdcb31efd028452fe61..e46105d1d15b4f8d24f726cc75be3020a5770c5c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -329,12 +329,12 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -324,12 +324,12 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@Override
protected void customServerAiStep() {
@@ -1492,7 +1492,7 @@ index 14386280e7ab006787054ca17503ec8ef0ab9621..ed07b29820ba7032bab439a7f5db0e2d
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index c544db9508c39a062480e42a98ab0b5ba6fb9e59..0b64fa0639dfbb7dc06d9a32f755938095968300 100644
index 61c604a05eedb1928bdac8c8544b0cad074f29ee..695b4fa27fc989ead95e4c46d9305a62f17487fa 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -222,12 +222,12 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -1513,7 +1513,7 @@ index c544db9508c39a062480e42a98ab0b5ba6fb9e59..0b64fa0639dfbb7dc06d9a32f7559380
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 9e499aecc623ba10301899ab9a64b76464a5e203..2854b9311686e3b62820e545c9b2819d75c18b0b 100644
index f12bd0227af77bec164f2938957c0c8100be9d03..16cc27ad7c152c5ea0854ba095a72ea3de64eb7e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -116,12 +116,12 @@ public class Tadpole extends AbstractFish {
@@ -1534,7 +1534,7 @@ index 9e499aecc623ba10301899ab9a64b76464a5e203..2854b9311686e3b62820e545c9b2819d
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 9e1e1a7d0fc58d70e3566acc78e27b825ddd8ab8..cc319c0d2d34d72709c7bd60282c474d2698dc25 100644
index 9d813827c27823c2e01341330cda1a64c4cdd315..ac91fe2c9b0c293789c4e0273823ddf5601b666d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -230,10 +230,10 @@ public class Goat extends Animal {
@@ -1552,7 +1552,7 @@ index 9e1e1a7d0fc58d70e3566acc78e27b825ddd8ab8..cc319c0d2d34d72709c7bd60282c474d
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 8b522186395d570bb14db94df8df2c4fa3705a7e..70d891d85748039b517a87b2438b04a9010d8af4 100644
index af31d334485139ef06bc534484a69f720ed1b5cf..d5cc573bd73a241594bd6c0505821ec10acf9b3d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
@@ -230,10 +230,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -1569,7 +1569,7 @@ index 8b522186395d570bb14db94df8df2c4fa3705a7e..70d891d85748039b517a87b2438b04a9
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 4a6adf17ecc95c19b5f9e36e7cd1161e8a9a22c2..a2c46c6b7adf43212ca081f08cc0abbfe75748d4 100644
index 92685decf4ed1c9f673cf607458788c2f807d626..d3524004f447fff9b091f03b8fe18f6656b98313 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -165,10 +165,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1586,7 +1586,7 @@ index 4a6adf17ecc95c19b5f9e36e7cd1161e8a9a22c2..a2c46c6b7adf43212ca081f08cc0abbf
if (this.isConverting()) {
++this.timeInOverworld;
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 8e670ac3e4f60174b593c477dcc476f468668ee4..89669eafa7fdb6e9377d64de0203dbf78acf1b78 100644
index ff2c7610d39e50ffb548aa9a687d7973a1f17a35..e7528b55713c0719c1510856fd029bcf5c2b75c2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -342,10 +342,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1603,7 +1603,7 @@ index 8e670ac3e4f60174b593c477dcc476f468668ee4..89669eafa7fdb6e9377d64de0203dbf7
super.customServerAiStep();
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
index 760015f7a98e70b735707c77472c084d8bd052bb..bc6572b1025d74a7590d7e1cc49132f95af0560a 100644
index b6165a1d513bea0d441289eb0df05ea866941bb3..061868ea8d7bb9825a2f097949e1430cf59dbf81 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
@@ -117,10 +117,10 @@ public class PiglinBrute extends AbstractPiglin {
@@ -1620,7 +1620,7 @@ index 760015f7a98e70b735707c77472c084d8bd052bb..bc6572b1025d74a7590d7e1cc49132f9
PiglinBruteAi.maybePlayActivitySound(this);
super.customServerAiStep();
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
index 4aa043ef7756b456b02049d22998444b2213dcdd..e803e04f00ef8418e7599f36efeda3cd12e7f62b 100644
index a268f6a39b972f91ca04d6b0004efda4cf086e10..d72221ab3e6d92a1bb5b8303ce3152f8f15449d8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
@@ -298,9 +298,9 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
@@ -1636,7 +1636,7 @@ index 4aa043ef7756b456b02049d22998444b2213dcdd..e803e04f00ef8418e7599f36efeda3cd
if ((this.tickCount + this.getId()) % 120 == 0) {
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 59aca9a0ec9696f4461b6331abfe1314f239e64f..b2e3a749a3f0aa663f2381f2d36ca57426d5c5eb 100644
index 87e1782baf0f5d083c23dd848952e8eac51e40f0..9c5d1426c19309048bd33e7a44818b7edbe6a431 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -332,7 +332,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler