Preliminary update to 1.17.1

This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Eating glow berries adds glow effect
diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
index 6322251336a4300649f207efdb4d404d25023c9a..35abd27226d953f42ca52476042c0d417fd35778 100644
index 89d4b7e4cd4222b61b49833fceda56ffa39710fa..1eb50f0bc41db79f091f900861ba71d702a5bd2a 100644
--- a/src/main/java/net/minecraft/world/item/Items.java
+++ b/src/main/java/net/minecraft/world/item/Items.java
@@ -1069,7 +1069,7 @@ public class Items {
@@ -18,10 +18,10 @@ index 6322251336a4300649f207efdb4d404d25023c9a..35abd27226d953f42ca52476042c0d41
public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS);
public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 938a1e41db57ae57a33863a1366213b5ecc18dcc..4aeb8e0944152efe66e8fc74d92104d3359bc0ae 100644
index 68d2feac1cc64e8f4e0e3274a0212d1113475862..fc6f817266a17efaa8c27f3e6bc01099db45be86 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -173,6 +173,7 @@ public class PurpurWorldConfig {
@@ -172,6 +172,7 @@ public class PurpurWorldConfig {
public int enderPearlCooldown = 20;
public int enderPearlCooldownCreative = 20;
public float enderPearlEndermiteChance = 0.05F;
@@ -29,7 +29,7 @@ index 938a1e41db57ae57a33863a1366213b5ecc18dcc..4aeb8e0944152efe66e8fc74d92104d3
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -216,6 +217,7 @@ public class PurpurWorldConfig {
@@ -215,6 +216,7 @@ public class PurpurWorldConfig {
enderPearlCooldown = getInt("gameplay-mechanics.item.ender-pearl.cooldown", enderPearlCooldown);
enderPearlCooldownCreative = getInt("gameplay-mechanics.item.ender-pearl.creative-cooldown", enderPearlCooldownCreative);
enderPearlEndermiteChance = (float) getDouble("gameplay-mechanics.item.ender-pearl.endermite-spawn-chance", enderPearlEndermiteChance);