Skip to content

Commit f093c64

Browse files
BillyGalbreathBillyGalbreath
authored
Implement squid colors for rainglow fabric mod (#1141)
1 parent 69c104d commit f093c64

202 files changed

Lines changed: 1064 additions & 935 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎patches/server/0004-Purpur-config-files.patch‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ index 061716934ba0a1f01e4d85d664034f72b3c7a765..acd95cf1dc7f009b63e44e4404e17362
2929
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
3030
Map<String, Map<String, Integer>> map = new HashMap<>();
3131
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
32-
index dd0143f319d4adef8834c513af34b1cce7a94a84..40f6d9845d2405c6e54c5213618e1b21016e3d3f 100644
32+
index 0d140dd7d55407b57fc3394ceb2eba5136e4fcaf..ed64b78bc8510fbe8fda9a10b779e91d99313676 100644
3333
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
3434
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
3535
@@ -318,6 +318,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
@@ -351,10 +351,10 @@ index 0000000000000000000000000000000000000000..5907e78bb059bca4a63ea8043d0be730
351351
+}
352352
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
353353
new file mode 100644
354-
index 0000000000000000000000000000000000000000..98784ef305393ba90ca54efde363b2fea5757b3d
354+
index 0000000000000000000000000000000000000000..b1628149a2f3effebbf86fd5615f1c8c1d0fbe73
355355
--- /dev/null
356356
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
357-
@@ -0,0 +1,94 @@
357+
@@ -0,0 +1,95 @@
358358
+package org.purpurmc.purpur;
359359
+
360360
+import gg.pufferfish.pufferfish.PufferfishConfig;
@@ -370,6 +370,7 @@ index 0000000000000000000000000000000000000000..98784ef305393ba90ca54efde363b2fe
370370
+import net.minecraft.world.level.block.Block;
371371
+import net.minecraft.world.level.block.Blocks;
372372
+import net.minecraft.world.level.block.state.properties.Tilt;
373+
+import org.purpurmc.purpur.entity.GlowSquidColor;
373374
+import org.purpurmc.purpur.tool.Strippable;
374375
+import org.purpurmc.purpur.tool.Tillable;
375376
+import org.purpurmc.purpur.tool.Waxable;

‎patches/server/0008-Ridables.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5236,10 +5236,10 @@ index 5907e78bb059bca4a63ea8043d0be730412d9c13..b5d8d9475e563a77c9a7923fc4e780e0
52365236
+ }
52375237
}
52385238
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5239-
index 98784ef305393ba90ca54efde363b2fea5757b3d..3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7 100644
5239+
index b1628149a2f3effebbf86fd5615f1c8c1d0fbe73..c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2 100644
52405240
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
52415241
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5242-
@@ -91,4 +91,706 @@ public class PurpurWorldConfig {
5242+
@@ -92,4 +92,706 @@ public class PurpurWorldConfig {
52435243
final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
52445244
return value.isEmpty() ? fallback : value;
52455245
}

‎patches/server/0009-Configurable-entity-base-attributes.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,10 +1464,10 @@ index 2ae9a5da91ad20f1b566a686dcc8d4f14c62ecc5..8bfa041297db79e8f1452ce7059d1536
14641464

14651465
@Override
14661466
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
1467-
index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bcb54df073 100644
1467+
index c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2..b411ba7283b8d6abf7cf53c3c82b612c801ebbee 100644
14681468
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
14691469
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
1470-
@@ -112,94 +112,166 @@ public class PurpurWorldConfig {
1470+
@@ -113,94 +113,166 @@ public class PurpurWorldConfig {
14711471

14721472
public boolean axolotlRidable = false;
14731473
public boolean axolotlControllable = true;
@@ -1634,7 +1634,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
16341634
}
16351635

16361636
public boolean dolphinRidable = false;
1637-
@@ -207,80 +279,161 @@ public class PurpurWorldConfig {
1637+
@@ -208,80 +280,161 @@ public class PurpurWorldConfig {
16381638
public int dolphinSpitCooldown = 20;
16391639
public float dolphinSpitSpeed = 1.0F;
16401640
public float dolphinSpitDamage = 2.0F;
@@ -1796,7 +1796,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
17961796
}
17971797

17981798
public boolean frogRidable = false;
1799-
@@ -298,147 +451,316 @@ public class PurpurWorldConfig {
1799+
@@ -299,147 +452,316 @@ public class PurpurWorldConfig {
18001800
public boolean ghastRidableInWater = false;
18011801
public boolean ghastControllable = true;
18021802
public double ghastMaxY = 320D;
@@ -2113,7 +2113,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
21132113
}
21142114

21152115
public boolean phantomRidable = false;
2116-
@@ -448,6 +770,10 @@ public class PurpurWorldConfig {
2116+
@@ -449,6 +771,10 @@ public class PurpurWorldConfig {
21172117
public float phantomFlameDamage = 1.0F;
21182118
public int phantomFlameFireTime = 8;
21192119
public boolean phantomAllowGriefing = false;
@@ -2124,7 +2124,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
21242124
private void phantomSettings() {
21252125
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
21262126
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
2127-
@@ -456,180 +782,350 @@ public class PurpurWorldConfig {
2127+
@@ -457,180 +783,350 @@ public class PurpurWorldConfig {
21282128
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
21292129
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
21302130
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2475,7 +2475,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
24752475
}
24762476

24772477
public boolean tadpoleRidable = false;
2478-
@@ -644,64 +1140,125 @@ public class PurpurWorldConfig {
2478+
@@ -645,64 +1141,125 @@ public class PurpurWorldConfig {
24792479
public boolean traderLlamaRidable = false;
24802480
public boolean traderLlamaRidableInWater = false;
24812481
public boolean traderLlamaControllable = true;
@@ -2601,7 +2601,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
26012601
}
26022602

26032603
public boolean wardenRidable = false;
2604-
@@ -716,81 +1273,165 @@ public class PurpurWorldConfig {
2604+
@@ -717,81 +1274,165 @@ public class PurpurWorldConfig {
26052605
public boolean witchRidable = false;
26062606
public boolean witchRidableInWater = false;
26072607
public boolean witchControllable = true;

‎patches/server/0012-AFK-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
213213
if (range < 0.0D || d < range * range) {
214214
return true;
215215
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
216-
index ea2c76116d8328d2ba6e5e7cc2ed1464f43a8c82..c272fc856113ca2399832b4af7f1e94af9ebb3e2 100644
216+
index b158f3add91becadd8faad67e20791f16b58583d..a5bedcf16df7665e428bbfabfac31403bbb759e1 100644
217217
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
218218
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
219219
@@ -522,10 +522,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -276,10 +276,10 @@ index 492fb7fc8452bb214566e1ca1ebfd0f3ee5fde9e..88b76a75623d306da3bb3d935e7598a9
276276

277277
public static int barrelRows = 3;
278278
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
279-
index 6255b208de609d4e0331d611c2f0c7bcb54df073..b9580396b99af75ae4895b09fd8f10a56d0f6046 100644
279+
index b411ba7283b8d6abf7cf53c3c82b612c801ebbee..657dfaa9cf2990fcade8739d3e1c3f9e71e2d38d 100644
280280
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
281281
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
282-
@@ -92,6 +92,24 @@ public class PurpurWorldConfig {
282+
@@ -93,6 +93,24 @@ public class PurpurWorldConfig {
283283
return value.isEmpty() ? fallback : value;
284284
}
285285

‎patches/server/0019-Player-invulnerabilities.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ index 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b04505024
121121
return entityplayer1;
122122
}
123123
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
124-
index c272fc856113ca2399832b4af7f1e94af9ebb3e2..dee07e6f1d85f37f4dbb9cd0956d48f91bd39ca2 100644
124+
index a5bedcf16df7665e428bbfabfac31403bbb759e1..e98b9b3c549b077a220b108f668e6ab8df966c2c 100644
125125
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
126126
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
127127
@@ -2963,5 +2963,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -146,10 +146,10 @@ index c272fc856113ca2399832b4af7f1e94af9ebb3e2..dee07e6f1d85f37f4dbb9cd0956d48f9
146146
// Purpur end
147147
}
148148
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
149-
index b9580396b99af75ae4895b09fd8f10a56d0f6046..1aea97e220b088c145a2cfdcd44530649389ce86 100644
149+
index 657dfaa9cf2990fcade8739d3e1c3f9e71e2d38d..8eaac4b3b7e999ec99785fa41463d8e18d25a277 100644
150150
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
151151
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
152-
@@ -97,6 +97,8 @@ public class PurpurWorldConfig {
152+
@@ -98,6 +98,8 @@ public class PurpurWorldConfig {
153153
public boolean idleTimeoutCountAsSleeping = false;
154154
public boolean idleTimeoutUpdateTabList = false;
155155
public boolean idleTimeoutTargetPlayer = true;
@@ -158,7 +158,7 @@ index b9580396b99af75ae4895b09fd8f10a56d0f6046..1aea97e220b088c145a2cfdcd4453064
158158
private void playerSettings() {
159159
if (PurpurConfig.version < 19) {
160160
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
161-
@@ -108,6 +110,8 @@ public class PurpurWorldConfig {
161+
@@ -109,6 +111,8 @@ public class PurpurWorldConfig {
162162
idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
163163
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
164164
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);

‎patches/server/0021-Configurable-villager-brain-ticks.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ index ef08ec3eb88ee1ab624e2bd38aaff5e8f97720f2..4cb1cf2b51f1c58e2600996f1d67dcef
3636
this.getBrain().tick((ServerLevel) this.level, this); // Paper
3737
}
3838
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
39-
index 6bb51d0ec5d110c8a6690c1df25a730d50df0f72..707ebaa9568d2875ead797feccd80da1cb9fc6a2 100644
39+
index 8eaac4b3b7e999ec99785fa41463d8e18d25a277..f6bbe6326b60de83ee79c749705edca4ce293a11 100644
4040
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
4141
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
42-
@@ -1239,6 +1239,8 @@ public class PurpurWorldConfig {
42+
@@ -1240,6 +1240,8 @@ public class PurpurWorldConfig {
4343
public boolean villagerRidableInWater = false;
4444
public boolean villagerControllable = true;
4545
public double villagerMaxHealth = 20.0D;
@@ -48,7 +48,7 @@ index 6bb51d0ec5d110c8a6690c1df25a730d50df0f72..707ebaa9568d2875ead797feccd80da1
4848
private void villagerSettings() {
4949
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
5050
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
51-
@@ -1249,6 +1251,8 @@ public class PurpurWorldConfig {
51+
@@ -1250,6 +1252,8 @@ public class PurpurWorldConfig {
5252
set("mobs.villager.attributes.max_health", oldValue);
5353
}
5454
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);

‎patches/server/0023-Silk-touch-spawners.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ index 39bc91423c830d69eff1996881373296f322f06a..e0d8bd28576f16822a584f3514dbcb8f
127127
int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
128128

129129
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
130-
index 707ebaa9568d2875ead797feccd80da1cb9fc6a2..cc194b3560229101fcf2836cbb950082d3d35397 100644
130+
index f6bbe6326b60de83ee79c749705edca4ce293a11..a4d4ef2e390df3b1f4d88413bd67fa78e847f35b 100644
131131
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
132132
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
133-
@@ -114,6 +114,38 @@ public class PurpurWorldConfig {
133+
@@ -115,6 +115,38 @@ public class PurpurWorldConfig {
134134
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
135135
}
136136

‎patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ index 7d25fb0fc64a4f559fe206198fde900afa06f258..1a12fee99a8b69fc6c01e1e217575c7c
5050
}
5151
}
5252
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
53-
index cc194b3560229101fcf2836cbb950082d3d35397..b22e855393e5f3d3099db3bba60ad62c1163ca2b 100644
53+
index a4d4ef2e390df3b1f4d88413bd67fa78e847f35b..8214b85d372c2cb16aa56791f158fc6a88e5a988 100644
5454
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5555
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
56-
@@ -146,6 +146,15 @@ public class PurpurWorldConfig {
56+
@@ -147,6 +147,15 @@ public class PurpurWorldConfig {
5757
});
5858
}
5959

‎patches/server/0028-Giants-AI-settings.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ index c1c5e884f00398032196ee71b55b348fcfce21ce..ed032918fb33d60c2d60d4db9275dddf
120120
}
121121
}
122122
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
123-
index b22e855393e5f3d3099db3bba60ad62c1163ca2b..2cf4bab37d7789f9d22ae1d9edbdabbe8fa79ab5 100644
123+
index 8214b85d372c2cb16aa56791f158fc6a88e5a988..ebea7fe95f5722eb526aa94787e899f9bbfe6e72 100644
124124
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
125125
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
126-
@@ -534,6 +534,10 @@ public class PurpurWorldConfig {
126+
@@ -535,6 +535,10 @@ public class PurpurWorldConfig {
127127
public double giantMovementSpeed = 0.5D;
128128
public double giantAttackDamage = 50.0D;
129129
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index b22e855393e5f3d3099db3bba60ad62c1163ca2b..2cf4bab37d7789f9d22ae1d9edbdabbe
134134
private void giantSettings() {
135135
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
136136
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
137-
@@ -550,6 +554,10 @@ public class PurpurWorldConfig {
137+
@@ -551,6 +555,10 @@ public class PurpurWorldConfig {
138138
set("mobs.giant.attributes.max_health", oldValue);
139139
}
140140
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

‎patches/server/0029-Zombie-horse-naturally-spawn.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ index eab96c9b53cd608ff99cdad06721cd19e490ad14..6e6559b7edbabc000ac47617ab064e43
2828
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
2929
this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
3030
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
31-
index 3e86f0fa382a80250c9b9a0e97eb6544b597760d..3657c311c2be4c8f9f6c8816c885bce7ed621f0f 100644
31+
index ebea7fe95f5722eb526aa94787e899f9bbfe6e72..c48312f89859787cdecf667becee866a10c88e3b 100644
3232
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
3333
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
34-
@@ -1457,6 +1457,7 @@ public class PurpurWorldConfig {
34+
@@ -1458,6 +1458,7 @@ public class PurpurWorldConfig {
3535
public double zombieHorseJumpStrengthMax = 1.0D;
3636
public double zombieHorseMovementSpeedMin = 0.2D;
3737
public double zombieHorseMovementSpeedMax = 0.2D;
3838
+ public double zombieHorseSpawnChance = 0.0D;
3939
private void zombieHorseSettings() {
4040
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
4141
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
42-
@@ -1472,6 +1473,7 @@ public class PurpurWorldConfig {
42+
@@ -1473,6 +1474,7 @@ public class PurpurWorldConfig {
4343
zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
4444
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
4545
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);

0 commit comments

Comments
 (0)