Skip to content

Commit b757019

Browse files
Machine-MakerMachine-Maker
authored
Add missing block data mins and maxes (#6790)
1 parent 392acfd commit b757019

File tree

2 files changed

+222
-0
lines changed

2 files changed

+222
-0
lines changed

‎patches/api/0370-Add-missing-block-data-mins-and-maxes.patch‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Sat, 16 Oct 2021 22:57:10 -0700
4+
Subject: [PATCH] Add missing block data mins and maxes
5+
6+
7+
diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java
8+
index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644
9+
--- a/src/main/java/org/bukkit/block/data/Levelled.java
10+
+++ b/src/main/java/org/bukkit/block/data/Levelled.java
11+
@@ -36,4 +36,13 @@ public interface Levelled extends BlockData {
12+
* @return the maximum 'level' value
13+
*/
14+
int getMaximumLevel();
15+
+
16+
+ // Paper start
17+
+ /**
18+
+ * Gets the minimum allowed value of the 'level' property.
19+
+ *
20+
+ * @return the minimum 'level' value
21+
+ */
22+
+ int getMinimumLevel();
23+
+ // Paper end
24+
}
25+
diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java
26+
index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644
27+
--- a/src/main/java/org/bukkit/block/data/type/Candle.java
28+
+++ b/src/main/java/org/bukkit/block/data/type/Candle.java
29+
@@ -28,4 +28,13 @@ public interface Candle extends Lightable, Waterlogged {
30+
* @return the maximum 'candles' value
31+
*/
32+
int getMaximumCandles();
33+
+
34+
+ // Paper start
35+
+ /**
36+
+ * Gets the minimum allowed value of the 'candles' property.
37+
+ *
38+
+ * @return the minimum 'candles' value
39+
+ */
40+
+ int getMinimumCandles();
41+
+ // Paper end
42+
}
43+
diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java
44+
index 3874d5d9647107c409651d20470a57197b4f3a3d..1050f5d9d2e75d221ce26eca0ef14add07221f19 100644
45+
--- a/src/main/java/org/bukkit/block/data/type/Leaves.java
46+
+++ b/src/main/java/org/bukkit/block/data/type/Leaves.java
47+
@@ -39,4 +39,20 @@ public interface Leaves extends BlockData {
48+
* @param distance the new 'distance' value
49+
*/
50+
void setDistance(int distance);
51+
+
52+
+ // Paper start
53+
+ /**
54+
+ * Gets the maximum allowed value of the 'distance' property.
55+
+ *
56+
+ * @return the maximum 'distance' value
57+
+ */
58+
+ int getMaximumDistance();
59+
+
60+
+ /**
61+
+ * Gets the minimum allowed value of the 'distance' property.
62+
+ *
63+
+ * @return the minimum 'distance' value
64+
+ */
65+
+ int getMinimumDistance();
66+
+ // Paper end
67+
}

‎patches/server/0873-Add-missing-block-data-mins-and-maxes.patch‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Sat, 16 Oct 2021 22:57:31 -0700
4+
Subject: [PATCH] Add missing block data mins and maxes
5+
6+
7+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftLeaves.java b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftLeaves.java
8+
index 5b0da54982fc0879005fd1db104284eb3318bee8..3c5a2de56724bc784f619f3087140c72a42dc57b 100644
9+
--- a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftLeaves.java
10+
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftLeaves.java
11+
@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.block.data.type;
12+
import org.bukkit.block.data.type.Leaves;
13+
import org.bukkit.craftbukkit.block.data.CraftBlockData;
14+
15+
-public class CraftLeaves extends CraftBlockData implements Leaves {
16+
+public abstract class CraftLeaves extends CraftBlockData implements Leaves { // Paper - make abstract (not used anyways)
17+
18+
private static final net.minecraft.world.level.block.state.properties.IntegerProperty DISTANCE = getInteger("distance");
19+
private static final net.minecraft.world.level.block.state.properties.BooleanProperty PERSISTENT = getBoolean("persistent");
20+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
21+
index 83f86725c00f0e175cb46c7e27705ca777f413ba..24d16825c10edfed6d22e8e37ddb9fd804b716c4 100644
22+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
23+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
24+
@@ -31,6 +31,12 @@ public final class CraftCandle extends org.bukkit.craftbukkit.block.data.CraftBl
25+
public int getMaximumCandles() {
26+
return getMax(CraftCandle.CANDLES);
27+
}
28+
+ // Paper start
29+
+ @Override
30+
+ public int getMinimumCandles() {
31+
+ return getMin(CraftCandle.CANDLES);
32+
+ }
33+
+ // Paper end
34+
35+
// org.bukkit.craftbukkit.block.data.CraftLightable
36+
37+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java
38+
index e17a85182555b7b50b4b1e42af871462699dba06..ef90de836888caa0a56c9c34c15bcd0d6c2d16a8 100644
39+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java
40+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java
41+
@@ -31,4 +31,11 @@ public final class CraftCauldron extends org.bukkit.craftbukkit.block.data.Craft
42+
public int getMaximumLevel() {
43+
return getMax(CraftCauldron.LEVEL);
44+
}
45+
+
46+
+ // Paper start
47+
+ @Override
48+
+ public int getMinimumLevel() {
49+
+ return getMin(CraftCauldron.LEVEL);
50+
+ }
51+
+ // Paper end
52+
}
53+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
54+
index 780b6a29592571f4a730a858734256f69519cca7..ef97e77b25562a8aed35d68d42ced4825d43a29d 100644
55+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
56+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
57+
@@ -31,4 +31,11 @@ public final class CraftComposter extends org.bukkit.craftbukkit.block.data.Craf
58+
public int getMaximumLevel() {
59+
return getMax(CraftComposter.LEVEL);
60+
}
61+
+
62+
+ // Paper start
63+
+ @Override
64+
+ public int getMinimumLevel() {
65+
+ return getMin(CraftComposter.LEVEL);
66+
+ }
67+
+ // Paper end
68+
}
69+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
70+
index f083cf727e7fd55f0749e85e3d034b5606121110..e40cda2f23d63e9d2029a8c8818103b6eeb6a925 100644
71+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
72+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
73+
@@ -31,4 +31,11 @@ public final class CraftFluids extends org.bukkit.craftbukkit.block.data.CraftBl
74+
public int getMaximumLevel() {
75+
return getMax(CraftFluids.LEVEL);
76+
}
77+
+
78+
+ // Paper start
79+
+ @Override
80+
+ public int getMinimumLevel() {
81+
+ return getMin(CraftFluids.LEVEL);
82+
+ }
83+
+ // Paper end
84+
}
85+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
86+
index 0d08c81dd8582ef4f259f0e0db88e1b85d79f2a1..5b96ec73bf7bd4d90ce77cfe8ffec82580b20d2b 100644
87+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
88+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
89+
@@ -31,4 +31,11 @@ public final class CraftLayeredCauldron extends org.bukkit.craftbukkit.block.dat
90+
public int getMaximumLevel() {
91+
return getMax(CraftLayeredCauldron.LEVEL);
92+
}
93+
+
94+
+ // Paper start
95+
+ @Override
96+
+ public int getMinimumLevel() {
97+
+ return getMin(CraftLayeredCauldron.LEVEL);
98+
+ }
99+
+ // Paper end
100+
}
101+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
102+
index c4ac30e38bf786c491e0e1d47a9003f2b8e1d985..709812fd312f9eddfada21d3836eca6a696183fd 100644
103+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
104+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
105+
@@ -37,4 +37,16 @@ public final class CraftLeaves extends org.bukkit.craftbukkit.block.data.CraftBl
106+
public void setDistance(int distance) {
107+
set(CraftLeaves.DISTANCE, distance);
108+
}
109+
+
110+
+ // Paper start
111+
+ @Override
112+
+ public int getMaximumDistance() {
113+
+ return getMax(CraftLeaves.DISTANCE);
114+
+ }
115+
+
116+
+ @Override
117+
+ public int getMinimumDistance() {
118+
+ return getMin(CraftLeaves.DISTANCE);
119+
+ }
120+
+ // Paper end
121+
}
122+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
123+
index de882af105fae1166aced908cfe45b826a07f418..0d430382a05dfc0802a2569816c5ec876a053f16 100644
124+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
125+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
126+
@@ -32,6 +32,13 @@ public final class CraftLight extends org.bukkit.craftbukkit.block.data.CraftBlo
127+
return getMax(CraftLight.LEVEL);
128+
}
129+
130+
+ // Paper start
131+
+ @Override
132+
+ public int getMinimumLevel() {
133+
+ return getMin(CraftLight.LEVEL);
134+
+ }
135+
+ // Paper end
136+
+
137+
// org.bukkit.craftbukkit.block.data.CraftWaterlogged
138+
139+
private static final net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED = getBoolean(net.minecraft.world.level.block.LightBlock.class, "waterlogged");
140+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPowderSnowCauldron.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPowderSnowCauldron.java
141+
index c6bd91bdf6bf64701ffc69619174cc3b43b72d88..c6289306f0f933b67ff1f6db63ef976df7aa5438 100644
142+
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPowderSnowCauldron.java
143+
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPowderSnowCauldron.java
144+
@@ -31,4 +31,11 @@ public final class CraftPowderSnowCauldron extends org.bukkit.craftbukkit.block.
145+
public int getMaximumLevel() {
146+
return getMax(CraftPowderSnowCauldron.LEVEL);
147+
}
148+
+
149+
+ // Paper start
150+
+ @Override
151+
+ public int getMinimumLevel() {
152+
+ return getMin(CraftPowderSnowCauldron.LEVEL);
153+
+ }
154+
+ // Paper end
155+
}

0 commit comments

Comments
 (0)