drop two config options in favor of PurpurExtras impl

dropped options:
- `mobs.snow_golem.drop-pumpkin-when-sheared`
- `mobs.sheep.jeb-shear-random-color`
This commit is contained in:
granny
2024-01-07 16:50:35 -08:00
parent 3727300bd0
commit d05e78bdb1
108 changed files with 302 additions and 357 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 05eecaf3147051c44f9c4abce178c3126385c825..c77da33c38ddb9a383cb39e8a8837e67cf545bda 100644
index f17b7e83a04a2cd738f7d708891fec2e341f3f96..a36994947d3a4f06f102bb143e44d0d7510f8338 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1317,6 +1317,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -49,10 +49,10 @@ index 64dd35573db3feae6507fc05086ed08c60f5ea01..ad7a32169b0decad1d3a2bd98e25b077
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5a952358f 100644
index 431fa9e522662b506c82fbe7e0266e5662ad91cc..40a0cd68b1e35894360f0edc45bc30a5bd47622f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1449,6 +1450,7 @@ public class PurpurWorldConfig {
@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
}
public boolean vindicatorRidable = false;
@@ -1472,6 +1474,7 @@ public class PurpurWorldConfig {
@@ -1470,6 +1472,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderControllable = true;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1483,6 +1486,7 @@ public class PurpurWorldConfig {
@@ -1481,6 +1484,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);