Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename kelp/vines options to make more sense

Browse Source
This commit is contained in:
BillyGalbreath
2020-11-24 19:55:43 -06:00
parent 8ea89f9433
commit 096971dce8
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-len.patch → patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -1,35 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com> From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Sun, 22 Nov 2020 20:13:27 -0600 Date: Sun, 22 Nov 2020 20:13:27 -0600
Subject: [PATCH] Kelp weeping and twisting vines configurable max length Subject: [PATCH] Kelp weeping and twisting vines configurable max growth age
diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java
index 6c084ad5cd..910dae8054 100644 index 6c084ad5cd..6d49422c33 100644
--- a/src/main/java/net/minecraft/server/BlockGrowingTop.java --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java
+++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java
@@ -15,19 +15,21 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @@ -15,7 +15,7 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB
@Override @Override
public IBlockData a(GeneratorAccess generatoraccess) { public IBlockData a(GeneratorAccess generatoraccess) {
- return (IBlockData) this.getBlockData().set(BlockGrowingTop.d, generatoraccess.getRandom().nextInt(25)); - return (IBlockData) this.getBlockData().set(BlockGrowingTop.d, generatoraccess.getRandom().nextInt(25));
+ return (IBlockData) this.getBlockData().set(BlockGrowingTop.d, generatoraccess.getRandom().nextInt(getMaxLength(generatoraccess.getMinecraftWorld()))); // Purpur + return (IBlockData) this.getBlockData().set(BlockGrowingTop.d, generatoraccess.getRandom().nextInt(getMaxGrowthAge(generatoraccess.getMinecraftWorld()))); // Purpur
} }
@Override @Override
public boolean isTicking(IBlockData iblockdata) { @@ -25,9 +25,11 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB
- return (Integer) iblockdata.get(BlockGrowingTop.d) < 25;
+ return true; // Purpur
}
public abstract double getGrowthModifier(WorldServer worldserver); // Purpur public abstract double getGrowthModifier(WorldServer worldserver); // Purpur
+ public abstract int getMaxLength(WorldServer worldserver); // Purpur + public abstract int getMaxGrowthAge(WorldServer worldserver); // Purpur
+ +
@Override @Override
public void tick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, Random random) { public void tick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, Random random) {
- if ((Integer) iblockdata.get(BlockGrowingTop.d) < 25 && random.nextDouble() < (100.0D / getGrowthModifier(worldserver)) * this.e) { // Spigot // Purpur - if ((Integer) iblockdata.get(BlockGrowingTop.d) < 25 && random.nextDouble() < (100.0D / getGrowthModifier(worldserver)) * this.e) { // Spigot // Purpur
+ if ((Integer) iblockdata.get(BlockGrowingTop.d) < getMaxLength(worldserver) && random.nextDouble() < (100.0D / getGrowthModifier(worldserver)) * this.e) { // Spigot // Purpur + if ((Integer) iblockdata.get(BlockGrowingTop.d) < getMaxGrowthAge(worldserver) && random.nextDouble() < (100.0D / getGrowthModifier(worldserver)) * this.e) { // Spigot // Purpur
BlockPosition blockposition1 = blockposition.shift(this.a); BlockPosition blockposition1 = blockposition.shift(this.a);
if (this.h(worldserver.getType(blockposition1))) { if (this.h(worldserver.getType(blockposition1))) {
@@ -38,19 +35,19 @@ index 6c084ad5cd..910dae8054 100644
public void a(WorldServer worldserver, Random random, BlockPosition blockposition, IBlockData iblockdata) { public void a(WorldServer worldserver, Random random, BlockPosition blockposition, IBlockData iblockdata) {
BlockPosition blockposition1 = blockposition.shift(this.a); BlockPosition blockposition1 = blockposition.shift(this.a);
- int i = Math.min((Integer) iblockdata.get(BlockGrowingTop.d) + 1, 25); - int i = Math.min((Integer) iblockdata.get(BlockGrowingTop.d) + 1, 25);
+ int i = Math.min((Integer) iblockdata.get(BlockGrowingTop.d) + 1, getMaxLength(worldserver)); // Purpur + int i = Math.min((Integer) iblockdata.get(BlockGrowingTop.d) + 1, getMaxGrowthAge(worldserver)); // Purpur
int j = this.a(random); int j = this.a(random);
for (int k = 0; k < j && this.h(worldserver.getType(blockposition1)); ++k) { for (int k = 0; k < j && this.h(worldserver.getType(blockposition1)); ++k) {
worldserver.setTypeUpdate(blockposition1, (IBlockData) iblockdata.set(BlockGrowingTop.d, i)); worldserver.setTypeUpdate(blockposition1, (IBlockData) iblockdata.set(BlockGrowingTop.d, i));
blockposition1 = blockposition1.shift(this.a); blockposition1 = blockposition1.shift(this.a);
- i = Math.min(i + 1, 25); - i = Math.min(i + 1, 25);
+ i = Math.min(i + 1, getMaxLength(worldserver)); // Purpur + i = Math.min(i + 1, getMaxGrowthAge(worldserver)); // Purpur
} }
} }
diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java
index 2a7a6e5943..92412612a5 100644 index 2a7a6e5943..b35c115e34 100644
--- a/src/main/java/net/minecraft/server/BlockKelp.java --- a/src/main/java/net/minecraft/server/BlockKelp.java
+++ b/src/main/java/net/minecraft/server/BlockKelp.java +++ b/src/main/java/net/minecraft/server/BlockKelp.java
@@ -58,5 +58,9 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer { @@ -58,5 +58,9 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer {
@@ -58,13 +55,13 @@ index 2a7a6e5943..92412612a5 100644
return worldserver.spigotConfig.kelpModifier; return worldserver.spigotConfig.kelpModifier;
} }
+ +
+ public int getMaxLength(WorldServer worldserver) { + public int getMaxGrowthAge(WorldServer worldserver) {
+ return worldserver.purpurConfig.kelpMaxLength; + return worldserver.purpurConfig.kelpMaxGrowthAge;
+ } + }
// Purpur end // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java
index 146638111c..a8879e924a 100644 index 146638111c..71b9b7183d 100644
--- a/src/main/java/net/minecraft/server/BlockTwistingVines.java --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java
+++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java
@@ -29,5 +29,9 @@ public class BlockTwistingVines extends BlockGrowingTop { @@ -29,5 +29,9 @@ public class BlockTwistingVines extends BlockGrowingTop {
@@ -72,13 +69,13 @@ index 146638111c..a8879e924a 100644
return worldserver.purpurConfig.twistingVinesGrowthModifier; return worldserver.purpurConfig.twistingVinesGrowthModifier;
} }
+ +
+ public int getMaxLength(WorldServer worldserver) { + public int getMaxGrowthAge(WorldServer worldserver) {
+ return worldserver.purpurConfig.twistingVinesMaxLength; + return worldserver.purpurConfig.twistingVinesMaxGrowthAge;
+ } + }
// Purpur end // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java
index 94ffadb91f..f2168254b9 100644 index 94ffadb91f..067df63ab2 100644
--- a/src/main/java/net/minecraft/server/BlockWeepingVines.java --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java
+++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java
@@ -29,5 +29,9 @@ public class BlockWeepingVines extends BlockGrowingTop { @@ -29,5 +29,9 @@ public class BlockWeepingVines extends BlockGrowingTop {
@@ -86,22 +83,22 @@ index 94ffadb91f..f2168254b9 100644
return worldserver.purpurConfig.weepingVinesGrowthModifier; return worldserver.purpurConfig.weepingVinesGrowthModifier;
} }
+ +
+ public int getMaxLength(WorldServer worldserver) { + public int getMaxGrowthAge(WorldServer worldserver) {
+ return worldserver.purpurConfig.weepingVinesMaxLength; + return worldserver.purpurConfig.weepingVinesMaxGrowthAge;
+ } + }
// Purpur end // Purpur end
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 44b0a45ec5..e7b7a5b48b 100644 index 44b0a45ec5..eec489453d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -359,6 +359,11 @@ public class PurpurWorldConfig { @@ -359,6 +359,11 @@ public class PurpurWorldConfig {
furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel); furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
} }
+ public int kelpMaxLength = 25; + public int kelpMaxGrowthAge = 25;
+ private void kelpSettings() { + private void kelpSettings() {
+ kelpMaxLength = getInt("blocks.kelp.max-length", kelpMaxLength); + kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
+ } + }
+ +
public boolean lavaInfinite = false; public boolean lavaInfinite = false;
@@ -111,17 +108,17 @@ index 44b0a45ec5..e7b7a5b48b 100644
} }
public double twistingVinesGrowthModifier = 0.10D; public double twistingVinesGrowthModifier = 0.10D;
+ public int twistingVinesMaxLength = 25; + public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() { private void twistingVinesSettings() {
twistingVinesGrowthModifier = getDouble("blocks.twisting_vines.growth-modifier", twistingVinesGrowthModifier); twistingVinesGrowthModifier = getDouble("blocks.twisting_vines.growth-modifier", twistingVinesGrowthModifier);
+ twistingVinesMaxLength = getInt("blocks.twisting_vines.max-length", twistingVinesMaxLength); + twistingVinesMaxGrowthAge = getInt("blocks.twisting_vines.max-growth-age", twistingVinesMaxGrowthAge);
} }
public double weepingVinesGrowthModifier = 0.10D; public double weepingVinesGrowthModifier = 0.10D;
+ public int weepingVinesMaxLength = 25; + public int weepingVinesMaxGrowthAge = 25;
private void weepingVinesSettings() { private void weepingVinesSettings() {
weepingVinesGrowthModifier = getDouble("blocks.weeping_vines.growth-modifier", weepingVinesGrowthModifier); weepingVinesGrowthModifier = getDouble("blocks.weeping_vines.growth-modifier", weepingVinesGrowthModifier);
+ weepingVinesMaxLength = getInt("blocks.weeping_vines.max-length", weepingVinesMaxLength); + weepingVinesMaxGrowthAge = getInt("blocks.weeping_vines.max-growth-age", weepingVinesMaxGrowthAge);
} }
public boolean babiesAreRidable = true; public boolean babiesAreRidable = true;