Fix the last compilation issues that I was able to

PurpurMC · Apr 28, 2024 · e381ed7 · e381ed7
1 parent 9a2102a
commit e381ed7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch
@@ -18,7 +18,7 @@ index a207a31d80a302dbdfe80f8727222542d3a78da2..7ca70e9ddda24e2fe661c7b13fa439a6
          if (entry != null) {
              ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..f47575bb8cc5e31ef3583cf6ed94604c1da60932 100644
+index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..9df30e61d97d7c403adede631df2a6825b986496 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -636,6 +636,16 @@ public final class ItemStack implements DataComponentHolder {
@@ -28,7 +28,7 @@ index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..f47575bb8cc5e31ef3583cf6ed94604c
 +    // Purpur start
 +    public float getDamagePercent() {
 +        if (isDamaged()) {
-+            return (float) getDamageValue() / (float) getItem().getMaxDamage();
++            return (float) getDamageValue() / (float) getMaxDamage();
 +        } else {
 +            return 0F;
 +        }

diff --git a/patches/server/0058-Implement-elytra-settings.patch b/patches/server/0058-Implement-elytra-settings.patch
@@ -46,7 +46,7 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6
                          itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f47575bb8cc5e31ef3583cf6ed94604c1da60932..206f6409a17eb0db1ced8c7a90127ed375329a44 100644
+index 9df30e61d97d7c403adede631df2a6825b986496..a1bf3368450386015c64b711c01471dad8dc5ccd 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -663,7 +663,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -64,7 +64,7 @@ index f47575bb8cc5e31ef3583cf6ed94604c1da60932..206f6409a17eb0db1ced8c7a90127ed3
                  Item item = this.getItem();
 +                // Purpur start
 +                if (item == Items.ELYTRA) {
-+                    setDamageValue(item.getMaxDamage() - 1);
++                    setDamageValue(getMaxDamage() - 1);
 +                    return;
 +                }
 +                // Purpur end

diff --git a/patches/server/0099-Make-entity-breeding-times-configurable.patch b/patches/server/0099-Make-entity-breeding-times-configurable.patch
@@ -299,6 +299,22 @@ index 8aaac4e86ec6d9c40999f6198cda7d367ece54e3..4212c3921a4059c539ca37f9609ef505
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index b38281f963377cc82b360e8457da7cad033b8c36..29412208e329e9fc211b844822a2fc3328a5bc89 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -469,4 +469,11 @@ public class Armadillo extends Animal {
+             return this.animationDuration;
+         }
+     }
++
++    // Purpur start
++    @Override
++    public int getPurpurBreedTime() {
++        return 6000;
++    }
++    // Purpur end
+ }
 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 414ff28670c3d36dc78e3df4d39b6d4eb3ec1e77..97ba327398d84db09c81cee860b40642b428ea48 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java

diff --git a/patches/server/0286-Shears-can-defuse-TNT.patch b/patches/server/0286-Shears-can-defuse-TNT.patch
@@ -8,7 +8,7 @@ Shears can now defuse TNT. Each world can have a configured chance for the TNT t
 By default the option is disabled to avoid breaking any possible vanilla mechanics.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index f1f352ec0e51f5db59254841a06c176c5a876fc9..ea989493494984eefc362db3603b248eb4f70060 100644
+index f1f352ec0e51f5db59254841a06c176c5a876fc9..dff0e7b08b973a1b29f916e63d3e4778d6c56cdc 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -193,4 +193,29 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -28,7 +28,7 @@ index f1f352ec0e51f5db59254841a06c176c5a876fc9..ea989493494984eefc362db3603b248e
 +                    new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.TNT));
 +            tntItem.setPickUpDelay(10);
 +
-+            inHand.hurtAndBreak(1, player, hand == net.minecraft.world.InteractionHand.MAIN_HAND ? net.minecraft.world.entity.EquipmentSlot.MAINHAND : net.minecraft.world.entity.EquipmentSlot.OFFHAND);
++            inHand.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
 +            level().addFreshEntity(tntItem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CUSTOM);
 +
 +            this.playSound(net.minecraft.sounds.SoundEvents.SHEEP_SHEAR);