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

Implement squid colors for rainglow fabric mod (#1141)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0071-Configurable-jockey-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
index 9e7ea6be928fb536c9898a85bb0a9ad40af25bd5..c11c51d2054042f8e12fafff4c4d13bc17b9d176 100644
index 4b58ca48deda0410edf9ad3c9079858d5a31a762..968392e9dd124f997d5d5996893363ac7ef2c740 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -93,6 +93,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -167,10 +167,10 @@ index bc3ffb8867d5f7c2fa548d31256341d388bf8112..6c1dd723373f9b1b920548de85aeb6ce
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061870fc066 100644
index 7d1be131f0fb8631542f429391fed918d36d4534..66fa3990f6a7e6e1623d0e911ee18f3eafebf1c1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -577,6 +577,9 @@ public class PurpurWorldConfig {
@@ -578,6 +578,9 @@ public class PurpurWorldConfig {
public boolean drownedControllable = true;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -588,6 +591,9 @@ public class PurpurWorldConfig {
@@ -589,6 +592,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
}
public boolean elderGuardianRidable = false;
@@ -836,6 +842,9 @@ public class PurpurWorldConfig {
@@ -837,6 +843,9 @@ public class PurpurWorldConfig {
public boolean huskControllable = true;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -847,6 +856,9 @@ public class PurpurWorldConfig {
@@ -848,6 +857,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
}
public boolean illusionerRidable = false;
@@ -1656,6 +1668,9 @@ public class PurpurWorldConfig {
@@ -1657,6 +1669,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1667,6 +1682,9 @@ public class PurpurWorldConfig {
@@ -1668,6 +1683,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
}
public boolean zombieHorseRidableInWater = false;
@@ -1701,6 +1719,9 @@ public class PurpurWorldConfig {
@@ -1702,6 +1720,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1712,6 +1733,9 @@ public class PurpurWorldConfig {
@@ -1713,6 +1734,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
}
public boolean zombifiedPiglinRidable = false;
@@ -1719,6 +1743,9 @@ public class PurpurWorldConfig {
@@ -1720,6 +1744,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1730,5 +1757,8 @@ public class PurpurWorldConfig {
@@ -1731,5 +1758,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);