Implement squid colors for rainglow fabric mod (#1141)

This commit is contained in:
BillyGalbreath
2022-10-01 18:18:16 -05:00
committed by GitHub
parent 69c104dc6e
commit f093c6481e
202 changed files with 1064 additions and 935 deletions

View File

@@ -29,10 +29,10 @@ index 89a0878d77548d1e0e414903b04d5868c0b8c0b1..f04ce887e314110a136b4bff91d55d2e
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793d2ba1b1c 100644
index de0652cec9f8a6b1f4bec03f9f8ce41ff45a3a23..0be973281d0b81736208f8a4dac1e93f5241ae0f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
@@ -1235,6 +1235,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1251,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1252,6 +1253,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793
}
public boolean dolphinRidable = false;
@@ -2326,6 +2328,7 @@ public class PurpurWorldConfig {
@@ -2327,6 +2329,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2338,6 +2341,7 @@ public class PurpurWorldConfig {
@@ -2339,6 +2342,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793
}
public boolean skeletonHorseRidableInWater = true;
@@ -2865,6 +2869,7 @@ public class PurpurWorldConfig {
@@ -2866,6 +2870,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index 24ac9a497f690fadf26e4b20560d35ec0e79d886..bb7e4e505b8389a8be4973ab6abce793
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2883,6 +2888,7 @@ public class PurpurWorldConfig {
@@ -2884,6 +2889,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);