first 50 patches done!

2026-02-17 16:37:43 +01:00 · 2024-10-25 20:37:48 -07:00
parent 66cd75fdaf
commit d8c53a380d
42 changed files with 454 additions and 456 deletions
--- a/patches/unapplied-server/0031-Breedable-Polar-Bears.patch
+++ b/patches/unapplied-server/0031-Breedable-Polar-Bears.patch
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 12 Apr 2024 15:40:12 -0700
-Subject: [PATCH] Breedable Polar Bears
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 232f392cf1a1c278acdbbe537c76097ae9610027..cd5856d3c5fdefb22f1ae146e5b64d9d4a64e07c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -99,6 +99,27 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.polarBearScale);
-     }
- 
-+    public boolean canMate(Animal other) {
-+        if (other == this) {
-+            return false;
-+        } else if (this.isStanding()) {
-+            return false;
-+        } else if (this.getTarget() != null) {
-+            return false;
-+        } else if (!(other instanceof PolarBear)) {
-+            return false;
-+        } else {
-+            PolarBear bear = (PolarBear) other;
-+            if (bear.isStanding()) {
-+                return false;
-+            }
-+            if (bear.getTarget() != null) {
-+                return false;
-+            }
-+            return this.isInLove() && bear.isInLove();
-+        }
-+    }
-+
-     @Nullable
-     @Override
-     public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-@@ -107,7 +128,7 @@ public class PolarBear extends Animal implements NeutralMob {
- 
-     @Override
-     public boolean isFood(ItemStack stack) {
-        return false;
-+        return level().purpurConfig.polarBearBreedableItem != null && stack.getItem() == level().purpurConfig.polarBearBreedableItem; // Purpur
-     }
- 
-     @Override
-@@ -118,6 +139,12 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
-         this.goalSelector
-             .addGoal(1, new PanicGoal(this, 2.0, polarBear -> polarBear.isBaby() ? DamageTypeTags.PANIC_CAUSES : DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES));
-+        // Purpur start
-+        if (level().purpurConfig.polarBearBreedableItem != null) {
-+            this.goalSelector.addGoal(2, new net.minecraft.world.entity.ai.goal.BreedGoal(this, 1.0D));
-+            this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, net.minecraft.world.item.crafting.Ingredient.of(level().purpurConfig.polarBearBreedableItem), false));
-+        }
-+        // Purpur end
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25));
-         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0));
-         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d6e3ab58756bd8e0c3d2a7aa651a22545db6749e..fe9b0ff2a73dc0f49b46738f07a7c58b622399d6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1060,6 +1060,8 @@ public class PurpurWorldConfig {
-     public boolean polarBearControllable = true;
-     public double polarBearMaxHealth = 30.0D;
-     public double polarBearScale = 1.0D;
-+    public String polarBearBreedableItemString = "";
-+    public Item polarBearBreedableItem = null;
-     private void polarBearSettings() {
-         polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
-         polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -1071,6 +1073,9 @@ public class PurpurWorldConfig {
-         }
-         polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);
-         polarBearScale = Mth.clamp(getDouble("mobs.polar_bear.attributes.scale", polarBearScale), 0.0625D, 16.0D);
-+        polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
-+        Item item = BuiltInRegistries.ITEM.get(ResourceLocation.parse(polarBearBreedableItemString));
-+        if (item != Items.AIR) polarBearBreedableItem = item;
-     }
- 
-     public boolean pufferfishRidable = false;