remove rainglow patch in favor of paper plugin impl

https://modrinth.com/plugin/rainglow-paper

supersedes #1351
This commit is contained in:
granny
2023-06-20 17:25:29 -07:00
parent d22455b2a3
commit 625e4adbd8
217 changed files with 919 additions and 1048 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 777853b5afc7b170fe6caffa21f55468b4321a1d..e2e470892ced1e350a841707f0c3266550e015f2 100644
index 558f56e7e559b5fcb712bdf3515704ad77dfe665..03ddc48436567fd3449bc8f489f8b7751eaa42c6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1041,9 +1041,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -32,10 +32,10 @@ index 777853b5afc7b170fe6caffa21f55468b4321a1d..e2e470892ced1e350a841707f0c32665
// 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 f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49adbf62e748 100644
index a7f66b8328f41a4c73aa4f9a68d92b1588983e1d..9c843a9e1448595f01a1240e58289c757fd28122 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1285,6 +1285,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1284,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1302,6 +1303,7 @@ public class PurpurWorldConfig {
@@ -1301,6 +1302,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);
@@ -51,7 +51,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
}
public boolean dolphinRidable = false;
@@ -2088,6 +2090,7 @@ public class PurpurWorldConfig {
@@ -2087,6 +2089,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2102,6 +2105,7 @@ public class PurpurWorldConfig {
@@ -2101,6 +2104,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
}
public boolean piglinBruteRidable = false;
@@ -2363,6 +2367,7 @@ public class PurpurWorldConfig {
@@ -2362,6 +2366,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2375,6 +2380,7 @@ public class PurpurWorldConfig {
@@ -2374,6 +2379,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);
@@ -83,7 +83,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
}
public boolean skeletonHorseRidableInWater = true;
@@ -2909,6 +2915,7 @@ public class PurpurWorldConfig {
@@ -2908,6 +2914,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49ad
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2927,6 +2934,7 @@ public class PurpurWorldConfig {
@@ -2926,6 +2933,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);