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

@@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man!
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2838c9ae7d598e9e53f4e5d59c2bf5927e0d9bbe..c318a83363048e052333e98705f94217039662c4 100644
index 2e8ac4ba143c12c2da5487ff817baa7fe3bd5926..ebed5983846bb4cfde5ecb06f99b3df8f514b6f3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2223,6 +2223,20 @@ public abstract class LivingEntity extends Entity {
@@ -30,10 +30,10 @@ index 2838c9ae7d598e9e53f4e5d59c2bf5927e0d9bbe..c318a83363048e052333e98705f94217
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 46fbf50268f8531c11efccba0f971b19bdfd4a0e..b2bcd43db51bad65f2dc7e01333b504ea3a751f0 100644
index 895c988fa77059783527d7f73274694ca5e96fd8..ec9c6cea5cdd4931ff75f8ceee1cd9592f04e9b3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {
@@ -345,6 +345,7 @@ public class PurpurWorldConfig {
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
@@ -41,7 +41,7 @@ index 46fbf50268f8531c11efccba0f971b19bdfd4a0e..b2bcd43db51bad65f2dc7e01333b504e
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -362,6 +363,7 @@ public class PurpurWorldConfig {
@@ -363,6 +364,7 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);