Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flying glow squids

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 22:55:45 -05:00
parent 9e531fe333
commit afabb3c5b6
21 changed files with 157 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patches/server/0119-Make-entity-breeding-times-configurable.patch
View File

@@ -474,7 +474,7 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d401765acd 100644
index e804fdab0637c4a35968246463330eeb2376d7a9..7685cc102d2a5640b61fc50ec9ed3fc053019317 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -462,9 +462,11 @@ public class PurpurWorldConfig {
@@ -585,7 +585,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean ghastRidable = false;
@@ -834,10 +848,12 @@ public class PurpurWorldConfig {
@@ -836,10 +850,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean guardianRidable = false;
@@ -855,6 +871,7 @@ public class PurpurWorldConfig {
@@ -857,6 +873,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -864,6 +881,7 @@ public class PurpurWorldConfig {
@@ -866,6 +883,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean horseRidableInWater = false;
@@ -873,6 +891,7 @@ public class PurpurWorldConfig {
@@ -875,6 +893,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -888,6 +907,7 @@ public class PurpurWorldConfig {
@@ -890,6 +909,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean huskRidable = false;
@@ -958,6 +978,7 @@ public class PurpurWorldConfig {
@@ -960,6 +980,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -974,6 +995,7 @@ public class PurpurWorldConfig {
@@ -976,6 +997,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean magmaCubeRidable = false;
@@ -993,6 +1015,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1017,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1002,6 +1025,7 @@ public class PurpurWorldConfig {
@@ -1004,6 +1027,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean muleRidableInWater = false;
@@ -1011,6 +1035,7 @@ public class PurpurWorldConfig {
@@ -1013,6 +1037,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1026,11 +1051,13 @@ public class PurpurWorldConfig {
@@ -1028,11 +1053,13 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1040,11 +1067,13 @@ public class PurpurWorldConfig {
@@ -1042,11 +1069,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1054,6 +1083,7 @@ public class PurpurWorldConfig {
@@ -1056,6 +1085,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean parrotRidable = false;
@@ -1134,6 +1164,7 @@ public class PurpurWorldConfig {
@@ -1136,6 +1166,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1144,6 +1175,7 @@ public class PurpurWorldConfig {
@@ -1146,6 +1177,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean piglinRidable = false;
@@ -1193,6 +1225,7 @@ public class PurpurWorldConfig {
@@ -1195,6 +1227,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1205,6 +1238,7 @@ public class PurpurWorldConfig {
@@ -1207,6 +1240,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean pufferfishRidable = false;
@@ -1224,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1226,6 +1260,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1235,6 +1270,7 @@ public class PurpurWorldConfig {
@@ -1237,6 +1272,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean ravagerRidable = false;
@@ -1266,6 +1302,7 @@ public class PurpurWorldConfig {
@@ -1268,6 +1304,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1275,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1277,6 +1314,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean shulkerRidable = false;
@@ -1429,6 +1467,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1469,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1438,6 +1477,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1479,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean traderLlamaRidable = false;
@@ -1448,6 +1488,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1490,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1464,6 +1505,7 @@ public class PurpurWorldConfig {
@@ -1466,6 +1507,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -802,7 +802,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean tropicalFishRidable = false;
@@ -1484,6 +1526,7 @@ public class PurpurWorldConfig {
@@ -1486,6 +1528,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1496,6 +1539,7 @@ public class PurpurWorldConfig {
@@ -1498,6 +1541,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean vexRidable = false;
@@ -1524,6 +1568,7 @@ public class PurpurWorldConfig {
@@ -1526,6 +1570,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1540,6 +1585,7 @@ public class PurpurWorldConfig {
@@ -1542,6 +1587,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
}
public boolean vindicatorRidable = false;
@@ -1633,6 +1679,7 @@ public class PurpurWorldConfig {
@@ -1635,6 +1681,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index b54797a5dad26113bcd3a2752378504e62b30b3d..b07147b64ee76cb26b8bbc842c6242d4
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1642,6 +1689,7 @@ public class PurpurWorldConfig {
@@ -1644,6 +1691,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);