Skip to content

Commit e7bf712

Browse files
Merge pull request #841 from eccentricdevotion/console
Add integrated console and update to 1.20.6
2 parents 3827d46 + 131380b commit e7bf712

File tree

357 files changed

+6724
-1833
lines changed

Some content is hidden

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

357 files changed

+6724
-1833
lines changed

pom.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@
144144
<plugin>
145145
<groupId>org.apache.maven.plugins</groupId>
146146
<artifactId>maven-compiler-plugin</artifactId>
147-
<version>3.11.0</version>
147+
<version>3.13.0</version>
148148
<configuration>
149-
<release>17</release>
149+
<release>21</release>
150150
<encoding>${project.build.sourceEncoding}</encoding>
151151
</configuration>
152152
</plugin>
153153
<plugin>
154154
<groupId>net.md-5</groupId>
155155
<artifactId>specialsource-maven-plugin</artifactId>
156-
<version>2.0.2</version>
156+
<version>2.0.3</version>
157157
<executions>
158158
<execution>
159159
<phase>package</phase>
@@ -162,9 +162,9 @@
162162
</goals>
163163
<id>remap-obf</id>
164164
<configuration>
165-
<srgIn>org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
165+
<srgIn>org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
166166
<reverse>true</reverse>
167-
<remappedDependencies>org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-mojang
167+
<remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-mojang
168168
</remappedDependencies>
169169
<remappedArtifactAttached>true</remappedArtifactAttached>
170170
<remappedClassifierName>remapped-obf</remappedClassifierName>
@@ -180,8 +180,8 @@
180180
<inputFile>
181181
${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar
182182
</inputFile>
183-
<srgIn>org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
184-
<remappedDependencies>org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-obf
183+
<srgIn>org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
184+
<remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-obf
185185
</remappedDependencies>
186186
</configuration>
187187
</execution>
@@ -191,7 +191,7 @@
191191
<plugin>
192192
<groupId>org.apache.maven.plugins</groupId>
193193
<artifactId>maven-jar-plugin</artifactId>
194-
<version>3.3.1-SNAPSHOT</version>
194+
<version>3.4.0</version>
195195
<configuration>
196196
<archive>
197197
<manifest>
@@ -206,7 +206,7 @@
206206
<plugin>
207207
<groupId>org.apache.maven.plugins</groupId>
208208
<artifactId>maven-shade-plugin</artifactId>
209-
<version>3.5.1</version>
209+
<version>3.5.2</version>
210210
<configuration>
211211
<transformers>
212212
<transformer
@@ -248,7 +248,7 @@
248248
<dependency>
249249
<groupId>io.papermc.paper</groupId>
250250
<artifactId>paper-api</artifactId>
251-
<version>1.20.4-R0.1-SNAPSHOT</version>
251+
<version>1.20.6-R0.1-SNAPSHOT</version>
252252
<scope>provided</scope>
253253
<exclusions>
254254
<exclusion>
@@ -272,7 +272,7 @@
272272
<dependency>
273273
<groupId>org.spigotmc</groupId>
274274
<artifactId>spigot</artifactId>
275-
<version>1.20.4-R0.1-SNAPSHOT</version>
275+
<version>1.20.6-R0.1-SNAPSHOT</version>
276276
<classifier>remapped-mojang</classifier>
277277
<scope>provided</scope>
278278
</dependency>
@@ -341,7 +341,7 @@
341341
<dependency>
342342
<groupId>com.palmergames.bukkit.towny</groupId>
343343
<artifactId>towny</artifactId>
344-
<version>0.100.1.0</version>
344+
<version>0.100.2.0</version>
345345
<scope>provided</scope>
346346
</dependency>
347347
<dependency>
@@ -412,7 +412,7 @@
412412
<dependency>
413413
<groupId>nl.rutgerkok</groupId>
414414
<artifactId>blocklocker</artifactId>
415-
<version>1.10.5-SNAPSHOT</version>
415+
<version>1.12.2</version>
416416
<type>jar</type>
417417
<scope>provided</scope>
418418
<exclusions>
@@ -452,7 +452,7 @@
452452
<dependency>
453453
<groupId>LibsDisguises</groupId>
454454
<artifactId>LibsDisguises</artifactId>
455-
<version>10.0.42-SNAPSHOT</version>
455+
<version>10.0.44</version>
456456
<type>jar</type>
457457
<scope>provided</scope>
458458
<exclusions>
@@ -517,7 +517,7 @@
517517
<dependency>
518518
<groupId>net.coreprotect</groupId>
519519
<artifactId>coreprotect</artifactId>
520-
<version>22.2</version>
520+
<version>22.3</version>
521521
<type>jar</type>
522522
<scope>provided</scope>
523523
<exclusions>

src/main/java/me/eccentric_nz/TARDIS/ARS/TARDISARSRunnable.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ public void run() {
6767
ResultSetTardis rs = new ResultSetTardis(plugin, where, "", false, 0);
6868
if (rs.resultSet()) {
6969
Tardis tardis = rs.getTardis();
70-
plugin.getTrackerKeeper().getIsGrowingRooms().add(tardis.getTardis_id());
70+
plugin.getTrackerKeeper().getIsGrowingRooms().add(tardis.getTardisId());
7171
World w = TARDISStaticLocationGetters.getWorldFromSplitString(tardis.getChunk());
7272
ResultSetPlayerPrefs rsp = new ResultSetPlayerPrefs(plugin, p.getUniqueId().toString());
7373
TARDISRoomData roomData = new TARDISRoomData();
74-
roomData.setTardis_id(tardis.getTardis_id());
74+
roomData.setTardis_id(tardis.getTardisId());
7575
// get middle data, default to orange wool if not set
7676
Material wall_type, floor_type;
7777
if (rsp.resultSet()) {

src/main/java/me/eccentric_nz/TARDIS/TARDIS.java

+35-5
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public class TARDIS extends JavaPlugin {
140140
private final HashMap<String, String> versions = new HashMap<>();
141141
private final String versionRegex = "(\\d+[.])+\\d+";
142142
private final Pattern versionPattern = Pattern.compile(versionRegex);
143-
private final String serverStr = "1.20.4";
143+
private final String serverStr = "1.20.6";
144144
private TARDISChatGUI jsonKeeper;
145145
private TARDISUpdateChatGUI updateChatGUI;
146146
// public TARDISFurnaceRecipe fornacis;
@@ -202,6 +202,9 @@ public class TARDIS extends JavaPlugin {
202202
private NamespacedKey tardisIdKey;
203203
private NamespacedKey timeLordUuidKey;
204204
private NamespacedKey standUuidKey;
205+
private NamespacedKey interactionUuidKey;
206+
private NamespacedKey modelUuidKey;
207+
private NamespacedKey unaryKey;
205208
private NamespacedKey blueprintKey;
206209
private NamespacedKey sonicUuidKey;
207210
private NamespacedKey sonicChargeKey;
@@ -306,6 +309,9 @@ public void onEnable() {
306309
tardisIdKey = new NamespacedKey(this, "tardis_id");
307310
timeLordUuidKey = new NamespacedKey(this, "timelord_uuid");
308311
standUuidKey = new NamespacedKey(this, "stand_uuid");
312+
interactionUuidKey = new NamespacedKey(this, "interaction_uuid");
313+
modelUuidKey = new NamespacedKey(this, "model_uuid");
314+
unaryKey = new NamespacedKey(this, "unary");
309315
blueprintKey = new NamespacedKey(this, "blueprint");
310316
sonicUuidKey = new NamespacedKey(this, "sonic_uuid");
311317
sonicChargeKey = new NamespacedKey(this, "sonic_charge");
@@ -452,7 +458,6 @@ public void onEnable() {
452458
tardisMapper.enable();
453459
}
454460
if (getConfig().getBoolean("modules.weeping_angels")) {
455-
if (PaperLib.isPaper()) {
456461
getMessenger().message(console, TardisModule.TARDIS, "Loading Weeping Angels Module");
457462
new TARDISWeepingAngels(this).enable();
458463
if (!getConfig().getBoolean("conversions.all_in_one.weeping_angels")) {
@@ -461,9 +466,6 @@ public void onEnable() {
461466
conversions++;
462467
}
463468
}
464-
} else {
465-
getLogger().log(Level.WARNING, "The Weeping Angels Module requires Paper server or a suitable variant!");
466-
}
467469
}
468470
if (getConfig().getBoolean("modules.vortex_manipulator")) {
469471
getMessenger().message(console, TardisModule.TARDIS, "Loading Vortex Manipulator Module");
@@ -1323,6 +1325,34 @@ public NamespacedKey getTimeLordUuidKey() {
13231325
public NamespacedKey getStandUuidKey() {
13241326
return standUuidKey;
13251327
}
1328+
1329+
/**
1330+
* Gets the console interaction UUID NamespacedKey
1331+
*
1332+
* @return the console interaction UUID NamespacedKey
1333+
*/
1334+
public NamespacedKey getInteractionUuidKey() {
1335+
return interactionUuidKey;
1336+
}
1337+
1338+
/**
1339+
* Gets the console model UUID NamespacedKey
1340+
*
1341+
* @return the console model UUID NamespacedKey
1342+
*/
1343+
public NamespacedKey getModelUuidKey() {
1344+
return modelUuidKey;
1345+
}
1346+
1347+
/**
1348+
* Gets the console interaction unary NamespacedKey
1349+
*
1350+
* @return the console interaction unary NamespacedKey
1351+
*/
1352+
public NamespacedKey getUnaryKey() {
1353+
return unaryKey;
1354+
}
1355+
13261356
/**
13271357
* Gets the TARDIS Blueprint NamespacedKey
13281358
*

src/main/java/me/eccentric_nz/TARDIS/TARDISConstants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ public class TARDISConstants {
124124
EntityType.DROWNED, EntityType.ELDER_GUARDIAN, EntityType.ENDERMAN, EntityType.ENDERMITE, EntityType.EVOKER, EntityType.FOX, EntityType.FROG,
125125
EntityType.GHAST, EntityType.GIANT, EntityType.GLOW_SQUID, EntityType.GOAT, EntityType.GUARDIAN, EntityType.HOGLIN, EntityType.HORSE,
126126
EntityType.HUSK, EntityType.ILLUSIONER, EntityType.IRON_GOLEM, EntityType.LLAMA, EntityType.MAGMA_CUBE, EntityType.MULE,
127-
EntityType.MUSHROOM_COW, EntityType.OCELOT, EntityType.PANDA, EntityType.PARROT, EntityType.PHANTOM, EntityType.PIG, EntityType.PIGLIN,
127+
EntityType.MOOSHROOM, EntityType.OCELOT, EntityType.PANDA, EntityType.PARROT, EntityType.PHANTOM, EntityType.PIG, EntityType.PIGLIN,
128128
EntityType.PIGLIN_BRUTE, EntityType.PILLAGER, EntityType.PLAYER, EntityType.POLAR_BEAR, EntityType.PUFFERFISH, EntityType.RABBIT,
129129
EntityType.RAVAGER, EntityType.SALMON, EntityType.SHEEP, EntityType.SHULKER, EntityType.SILVERFISH, EntityType.SKELETON,
130-
EntityType.SKELETON_HORSE, EntityType.SLIME, EntityType.SNIFFER, EntityType.SNOWMAN, EntityType.SPIDER, EntityType.SQUID, EntityType.STRAY,
130+
EntityType.SKELETON_HORSE, EntityType.SLIME, EntityType.SNIFFER, EntityType.SNOW_GOLEM, EntityType.SPIDER, EntityType.SQUID, EntityType.STRAY,
131131
EntityType.STRIDER, EntityType.TADPOLE, EntityType.TRADER_LLAMA, EntityType.TROPICAL_FISH, EntityType.TURTLE, EntityType.VEX, EntityType.VILLAGER,
132132
EntityType.VINDICATOR, EntityType.WANDERING_TRADER, EntityType.WARDEN, EntityType.WITCH, EntityType.WITHER, EntityType.WITHER_SKELETON,
133133
EntityType.WOLF, EntityType.ZOGLIN, EntityType.ZOMBIE, EntityType.ZOMBIE_HORSE, EntityType.ZOMBIE_VILLAGER, EntityType.ZOMBIFIED_PIGLIN

src/main/java/me/eccentric_nz/TARDIS/TARDISListenerRegisterer.java

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
import me.eccentric_nz.TARDIS.commands.utils.TARDISWeatherListener;
3939
import me.eccentric_nz.TARDIS.companionGUI.TARDISCompanionAddGUIListener;
4040
import me.eccentric_nz.TARDIS.companionGUI.TARDISCompanionGUIListener;
41+
import me.eccentric_nz.TARDIS.console.ConsoleInteractionListener;
42+
import me.eccentric_nz.TARDIS.console.telepathic.TelepathicBiomeListener;
43+
import me.eccentric_nz.TARDIS.console.telepathic.TelepathicGUIListener;
44+
import me.eccentric_nz.TARDIS.console.telepathic.TelepathicStructureListener;
4145
import me.eccentric_nz.TARDIS.control.TARDISControlListener;
4246
import me.eccentric_nz.TARDIS.control.TARDISControlMenuListener;
4347
import me.eccentric_nz.TARDIS.customblocks.TARDISDisplayBlockListener;
@@ -193,6 +197,7 @@ TARDISInformationSystemListener registerListeners() {
193197
plugin.getPM().registerEvents(new TARDISDismountListener(plugin), plugin);
194198
plugin.getPM().registerEvents(new TARDISDisplayBlockListener(plugin), plugin);
195199
plugin.getPM().registerEvents(new TARDISDisplayListener(plugin), plugin);
200+
plugin.getPM().registerEvents(new ConsoleInteractionListener(plugin), plugin);
196201
plugin.getPM().registerEvents(new TARDISEjectListener(plugin), plugin);
197202
plugin.getPM().registerEvents(new TARDISEntityGriefListener(plugin), plugin);
198203
plugin.getPM().registerEvents(new TARDISExplosionAndDamageListener(plugin), plugin);
@@ -319,6 +324,10 @@ TARDISInformationSystemListener registerListeners() {
319324
plugin.getPM().registerEvents(new TARDISAntiBuildListener(plugin), plugin);
320325
}
321326
plugin.getPM().registerEvents(new TARDISPlayerKickListener(plugin), plugin);
327+
// telepathic listeners
328+
plugin.getPM().registerEvents(new TelepathicGUIListener(plugin), plugin);
329+
plugin.getPM().registerEvents(new TelepathicBiomeListener(plugin), plugin);
330+
plugin.getPM().registerEvents(new TelepathicStructureListener(plugin), plugin);
322331
if (plugin.getPlanetsConfig().getBoolean("planets.skaro.enabled")) {
323332
plugin.debug("Skaro enabled, registering planet event listeners");
324333
if (plugin.getPlanetsConfig().getBoolean("planets.skaro.acid")) {

src/main/java/me/eccentric_nz/TARDIS/TARDISTrackerInstanceKeeper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class TARDISTrackerInstanceKeeper {
8484
private final HashMap<UUID, Integer> secondaryRemovers = new HashMap<>();
8585
private final HashMap<UUID, Integer> siegeCarrying = new HashMap<>();
8686
private final HashMap<UUID, JsonObject> pastes = new HashMap<>();
87-
private final HashMap<UUID, List<Location>> repeaters = new HashMap<>();
87+
private final HashMap<UUID, List<Location>> manualFlightLocations = new HashMap<>();
8888
private final HashMap<UUID, List<UUID>> renderedNPCs = new HashMap<>();
8989
private final HashMap<UUID, Location> activeForceFields = new HashMap<>();
9090
private final HashMap<UUID, Location> dispersed = new HashMap<>();
@@ -464,10 +464,10 @@ public HashMap<UUID, JsonObject> getPastes() {
464464
/**
465465
* Another tracker for TARDIS Manual flight mode
466466
*
467-
* @return a Map of player UUIDs and their TARDIS repeater control locations
467+
* @return a Map of player UUIDs and their TARDIS control locations
468468
*/
469-
public HashMap<UUID, List<Location>> getRepeaters() {
470-
return repeaters;
469+
public HashMap<UUID, List<Location>> getManualFlightLocations() {
470+
return manualFlightLocations;
471471
}
472472

473473
/**

src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISConsoleSwitchListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ public void onConsoleInventoryClick(InventoryClickEvent event) {
116116
} // Memory circuit (saves/areas)
117117
case 10001975, 20001975 -> {
118118
new_inv = plugin.getServer().createInventory(p, 54, ChatColor.DARK_RED + "TARDIS Dimension Map");
119-
stack = new TARDISSavesPlanetInventory(plugin, tardis.getTardis_id()).getPlanets();
119+
stack = new TARDISSavesPlanetInventory(plugin, tardis.getTardisId()).getPlanets();
120120
} // Input circuit (terminal)
121121
case 10001976, 20001976 -> {
122122
new_inv = plugin.getServer().createInventory(p, 54, ChatColor.DARK_RED + "Destination Terminal");
123123
stack = new TARDISTerminalInventory(plugin).getTerminal();
124124
}
125125
// scanner circuit
126-
default -> new TARDISScanner(plugin).scan(tardis.getTardis_id(), p, tardis.getRenderer(), tardis.getArtron_level());
126+
default -> new TARDISScanner(plugin).scan(tardis.getTardisId(), p, tardis.getRenderer(), tardis.getArtronLevel());
127127
}
128128
// close inventory
129129
p.closeInventory();

src/main/java/me/eccentric_nz/TARDIS/advanced/TARDISDiskWriterCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public boolean writeSave(Player player, String[] args) {
8383
return false;
8484
} else {
8585
Tardis tardis = rs.getTardis();
86-
int id = tardis.getTardis_id();
86+
int id = tardis.getTardisId();
8787
ChameleonPreset preset = tardis.getPreset();
8888
// check has unique name - this will always return false in HARD & MEDIUM difficulty
8989
// TODO check for disk lore if MEDIUM difficulty

src/main/java/me/eccentric_nz/TARDIS/api/TARDII.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import me.eccentric_nz.tardisweepingangels.utils.Monster;
5757
import org.bukkit.*;
5858
import org.bukkit.World.Environment;
59-
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
59+
import org.bukkit.craftbukkit.v1_20_R4.entity.CraftEntity;
6060
import org.bukkit.entity.Entity;
6161
import org.bukkit.entity.LivingEntity;
6262
import org.bukkit.entity.Player;
@@ -172,8 +172,8 @@ public TARDISData getTARDISMapData(int id) {
172172
}
173173
}
174174
}
175-
String powered = (tardis.isPowered_on()) ? "Yes" : "No";
176-
String siege = (tardis.isSiege_on()) ? "Yes" : "No";
175+
String powered = (tardis.isPoweredOn()) ? "Yes" : "No";
176+
String siege = (tardis.isSiegeOn()) ? "Yes" : "No";
177177
String abandoned = (tardis.isAbandoned()) ? "Yes" : "No";
178178
List<String> occupants = getPlayersInTARDIS(id);
179179
data = new TARDISData(owner, current, console, chameleon, door, powered, siege, abandoned, occupants);
@@ -797,7 +797,7 @@ public String setDesktopWallAndFloor(UUID uuid, String wall, String floor, boole
797797
TARDISUpgradeData tud = new TARDISUpgradeData();
798798
tud.setSchematic(current_console);
799799
tud.setPrevious(current_console);
800-
tud.setLevel(rs.getTardis().getArtron_level());
800+
tud.setLevel(rs.getTardis().getArtronLevel());
801801
tud.setWall(wall);
802802
tud.setFloor(floor);
803803
// change the wall and floor

src/main/java/me/eccentric_nz/TARDIS/api/event/TARDISRoomGrowEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class TARDISRoomGrowEvent extends TARDISEvent {
3434
*
3535
* @param player the player growing the room
3636
* @param tardis the Tardis data object, may be null - if room was manually grown, use {@link
37-
* #getRoomData()}.getTardis_id()
37+
* #getRoomData()}.getTardisId()
3838
* @param slot the TARDISARSSlot data object, may be null - if the room was manually grown, use {@link
3939
* #getRoomData()}.getLocation()
4040
* @param roomData the TARDISRoomData data object

0 commit comments

Comments
 (0)