Skip to content

Commit 053936a

Browse files
committed
Refactor minecart mechanics and changedsign to core module
1 parent 360a368 commit 053936a

File tree

220 files changed

+1162
-908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+1162
-908
lines changed

craftbook-bukkit/doctools/src/main/java/org/enginehub/craftbook/internal/util/MechanicTypesGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static void generateMechanicTypes() {
3131
MechanicType.REGISTRY.keySet().stream().sorted().forEach(mech -> {
3232
MechanicType<?> type = MechanicType.REGISTRY.get(mech);
3333
try {
34-
writer.write("public static final @Nullable Supplier<MechanicType<" + type.getMechanicClass().getSimpleName() + ">> " + mech.toUpperCase(Locale.ENGLISH) + " = get(\"" + mech + "\");\n");
34+
writer.write("public static final Supplier<@Nullable MechanicType<" + type.getMechanicClass().getSimpleName() + ">> " + mech.toUpperCase(Locale.ENGLISH) + " = get(\"" + mech + "\");\n");
3535
} catch (Throwable e) {
3636
System.err.println("Failed to generate mechanic type for " + mech);
3737
e.printStackTrace();

craftbook-bukkit/src/main/java/org/enginehub/craftbook/ChangedSign.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/BukkitChangedSign.java

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
/**
3838
* A ChangedSign represents a single side of a sign block.
3939
*/
40-
public class ChangedSign {
40+
public class BukkitChangedSign extends ChangedSign {
4141
private final Block block;
4242
private final Side side;
4343

4444
private @Nullable Sign sign;
4545
private Component @Nullable [] lines;
4646
private Component @Nullable [] oldLines;
4747

48-
private ChangedSign(Block block, Side side, Component @Nullable [] lines, @Nullable CraftBookPlayer player) {
48+
private BukkitChangedSign(Block block, Side side, Component @Nullable [] lines, @Nullable CraftBookPlayer player) {
4949
this.block = block;
5050
this.side = side;
5151

@@ -62,6 +62,7 @@ private ChangedSign(Block block, Side side, Component @Nullable [] lines, @Nulla
6262
}
6363
}
6464

65+
@Override
6566
public void checkPlayerVariablePermissions(CraftBookPlayer player) {
6667
if (this.lines != null && VariableManager.instance != null) {
6768
for (int i = 0; i < 4; i++) {
@@ -101,34 +102,42 @@ public Material getType() {
101102
return block.getType();
102103
}
103104

105+
@Override
104106
public int getX() {
105107
return this.block.getX();
106108
}
107109

110+
@Override
108111
public int getY() {
109112
return this.block.getY();
110113
}
111114

115+
@Override
112116
public int getZ() {
113117
return this.block.getZ();
114118
}
115119

120+
@Override
116121
public Component @Nullable [] getLines() {
117122
return this.lines;
118123
}
119124

125+
@Override
120126
public Component getLine(int index) throws IndexOutOfBoundsException {
121127
return this.getLine(index, null);
122128
}
123129

130+
@Override
124131
public Component getLine(int index, @Nullable Player player) throws IndexOutOfBoundsException {
125132
return ParsingUtil.parseLine(this.lines[index], player);
126133
}
127134

135+
@Override
128136
public Component getRawLine(int index) throws IndexOutOfBoundsException {
129137
return this.lines[index];
130138
}
131139

140+
@Override
132141
public void setLine(int index, Component line) throws IndexOutOfBoundsException {
133142
this.lines[index] = line;
134143
}
@@ -137,6 +146,7 @@ public void setType(Material type) {
137146
block.setType(type);
138147
}
139148

149+
@Override
140150
public boolean update(boolean force) {
141151
if (!hasChanged() && !force) {
142152
return false;
@@ -150,14 +160,17 @@ public boolean update(boolean force) {
150160
return getSign().update(force, false);
151161
}
152162

163+
@Override
153164
public void setLines(Component[] lines) {
154165
this.lines = lines;
155166
}
156167

168+
@Override
157169
public void setOldLines(Component[] oldLines) {
158170
this.oldLines = oldLines;
159171
}
160172

173+
@Override
161174
public boolean hasChanged() {
162175
for (int i = 0; i < 4; i++) {
163176
if (!Objects.equals(this.oldLines[i], this.lines[i])) {
@@ -168,6 +181,7 @@ public boolean hasChanged() {
168181
return false;
169182
}
170183

184+
@Override
171185
public void flushLines() {
172186
this.sign = null;
173187
this.lines = this.getSignSide().lines().toArray(new Component[0]);
@@ -179,18 +193,9 @@ public void flushLines() {
179193
System.arraycopy(this.lines, 0, this.oldLines, 0, this.lines.length);
180194
}
181195

182-
public boolean updateSign(ChangedSign sign) {
183-
if (!equals(sign)) {
184-
flushLines();
185-
return true;
186-
}
187-
188-
return false;
189-
}
190-
191196
@Override
192197
public boolean equals(Object o) {
193-
if (o instanceof ChangedSign other) {
198+
if (o instanceof BukkitChangedSign other) {
194199
return Objects.equals(other.getType(), getType())
195200
&& other.getSide() == getSide()
196201
&& other.getX() == getX()
@@ -213,22 +218,22 @@ public String toString() {
213218
return Arrays.stream(this.lines).map(PlainTextComponentSerializer.plainText()::serialize).collect(Collectors.joining("|"));
214219
}
215220

216-
public static ChangedSign create(Sign sign, Side side) {
221+
public static BukkitChangedSign create(Sign sign, Side side) {
217222
return create(sign.getBlock(), side, sign.getSide(side).lines().toArray(new Component[0]), null);
218223
}
219224

220-
public static ChangedSign create(Sign sign, Side side, @Nullable CraftBookPlayer player) {
225+
public static BukkitChangedSign create(Sign sign, Side side, @Nullable CraftBookPlayer player) {
221226
return create(sign.getBlock(), side, sign.getSide(side).lines().toArray(new Component[0]), player);
222227
}
223228

224-
public static ChangedSign create(Block block, Side side) {
229+
public static BukkitChangedSign create(Block block, Side side) {
225230
return create(block, side, null, null);
226231
}
227232

228-
public static ChangedSign create(Block block, Side side, Component @Nullable [] lines, @Nullable CraftBookPlayer player) {
233+
public static BukkitChangedSign create(Block block, Side side, Component @Nullable [] lines, @Nullable CraftBookPlayer player) {
229234
Preconditions.checkNotNull(block, "block");
230235
Preconditions.checkNotNull(side, "side");
231236

232-
return new ChangedSign(block, side, lines, player);
237+
return new BukkitChangedSign(block, side, lines, player);
233238
}
234239
}

craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/MechanicListenerAdapter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
import org.bukkit.util.RayTraceResult;
4545
import org.bukkit.util.Vector;
4646
import org.enginehub.craftbook.CraftBook;
47+
import org.enginehub.craftbook.bukkit.events.CartBlockEnterEvent;
48+
import org.enginehub.craftbook.bukkit.events.CartBlockImpactEvent;
49+
import org.enginehub.craftbook.bukkit.events.CartBlockRedstoneEvent;
50+
import org.enginehub.craftbook.bukkit.events.SignClickEvent;
51+
import org.enginehub.craftbook.bukkit.events.SourcedBlockRedstoneEvent;
4752
import org.enginehub.craftbook.mechanics.minecart.blocks.CartMechanismBlocks;
48-
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockEnterEvent;
49-
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
50-
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockRedstoneEvent;
5153
import org.enginehub.craftbook.util.EventUtil;
5254
import org.enginehub.craftbook.util.HistoryHashMap;
5355
import org.enginehub.craftbook.util.LocationUtil;
5456
import org.enginehub.craftbook.util.SignUtil;
55-
import org.enginehub.craftbook.util.events.SignClickEvent;
56-
import org.enginehub.craftbook.util.events.SourcedBlockRedstoneEvent;
5757

5858
import java.util.Map;
5959
import java.util.UUID;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/events/CartBlockEnterEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/CartBlockEnterEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.mechanics.minecart.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.entity.Entity;
1919
import org.bukkit.entity.Minecart;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/events/CartBlockImpactEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/CartBlockImpactEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.mechanics.minecart.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.Location;
1919
import org.bukkit.entity.Minecart;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/events/CartBlockRedstoneEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/CartBlockRedstoneEvent.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.mechanics.minecart.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.block.Block;
1919
import org.bukkit.entity.Minecart;
2020
import org.bukkit.event.HandlerList;
2121
import org.enginehub.craftbook.mechanics.minecart.blocks.CartMechanismBlocks;
22-
import org.enginehub.craftbook.util.events.SourcedBlockRedstoneEvent;
2322
import org.jspecify.annotations.Nullable;
2423

2524
public class CartBlockRedstoneEvent extends SourcedBlockRedstoneEvent {

craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/events/RangedCollectEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/RangedCollectEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.util.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.block.Block;
1919
import org.bukkit.entity.Item;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/events/SelfTriggerPingEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/SelfTriggerPingEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.util.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.block.Block;
1919
import org.bukkit.event.HandlerList;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/events/SelfTriggerThinkEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/SelfTriggerThinkEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.util.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.block.Block;
1919
import org.bukkit.event.HandlerList;

craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/events/SelfTriggerUnregisterEvent.java renamed to craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/events/SelfTriggerUnregisterEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* see <http://www.gnu.org/licenses/>.
1414
*/
1515

16-
package org.enginehub.craftbook.util.events;
16+
package org.enginehub.craftbook.bukkit.events;
1717

1818
import org.bukkit.block.Block;
1919
import org.bukkit.event.Cancellable;

0 commit comments

Comments
 (0)