Skip to content

Commit 7fc3da3

Browse files
eccentricdevotioneccentricdevotion
authored
Merge pull request #927 from eccentricdevotion/twentyonepoint2
Update to Spigot / Paper 1.21.3
2 parents b80a7ef + 002bd56 commit 7fc3da3

File tree

117 files changed

+1263
-753
lines changed

Some content is hidden

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

117 files changed

+1263
-753
lines changed

‎Core/pom.xml

+14-8
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>TARDIS-Core</artifactId>
5-
<version>5.7.5</version>
5+
<version>5.8.0</version>
66
<packaging>jar</packaging>
77
<parent>
88
<groupId>me.eccentric_nz.TARDIS</groupId>
99
<artifactId>TARDIS</artifactId>
10-
<version>5.7.5</version>
10+
<version>5.8.0</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<name>TARDIS-Core</name>
@@ -173,9 +173,9 @@
173173
</goals>
174174
<id>remap-obf</id>
175175
<configuration>
176-
<srgIn>org.spigotmc:minecraft-server:1.21.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
176+
<srgIn>org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
177177
<reverse>true</reverse>
178-
<remappedDependencies>org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT:jar:remapped-mojang
178+
<remappedDependencies>org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-mojang
179179
</remappedDependencies>
180180
<remappedArtifactAttached>true</remappedArtifactAttached>
181181
<remappedClassifierName>remapped-obf</remappedClassifierName>
@@ -191,8 +191,8 @@
191191
<inputFile>
192192
${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar
193193
</inputFile>
194-
<srgIn>org.spigotmc:minecraft-server:1.21.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
195-
<remappedDependencies>org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT:jar:remapped-obf
194+
<srgIn>org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
195+
<remappedDependencies>org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-obf
196196
</remappedDependencies>
197197
</configuration>
198198
</execution>
@@ -250,13 +250,13 @@
250250
<dependency>
251251
<groupId>org.spigotmc</groupId>
252252
<artifactId>spigot-api</artifactId>
253-
<version>1.21.1-R0.1-SNAPSHOT</version>
253+
<version>1.21.3-R0.1-SNAPSHOT</version>
254254
<scope>provided</scope>
255255
</dependency>
256256
<dependency>
257257
<groupId>org.spigotmc</groupId>
258258
<artifactId>spigot</artifactId>
259-
<version>1.21.1-R0.1-SNAPSHOT</version>
259+
<version>1.21.3-R0.1-SNAPSHOT</version>
260260
<classifier>remapped-mojang</classifier>
261261
<scope>provided</scope>
262262
</dependency>
@@ -583,5 +583,11 @@
583583
<version>1.0.3</version>
584584
<scope>provided</scope>
585585
</dependency>
586+
<dependency>
587+
<groupId>org.apache.logging.log4j</groupId>
588+
<artifactId>log4j-core</artifactId>
589+
<version>2.19.0</version>
590+
<scope>provided</scope>
591+
</dependency>
586592
</dependencies>
587593
</project>

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

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import me.eccentric_nz.TARDIS.doors.TARDISCustomDoorLoader;
3535
import me.eccentric_nz.TARDIS.enumeration.*;
3636
import me.eccentric_nz.TARDIS.files.*;
37+
import me.eccentric_nz.TARDIS.flight.vehicle.VehicleLoader;
3738
import me.eccentric_nz.TARDIS.handles.TARDISHandlesUpdater;
3839
import me.eccentric_nz.TARDIS.mapping.TARDISBlueMap;
3940
import me.eccentric_nz.TARDIS.mapping.TARDISDynmap;
@@ -1459,6 +1460,7 @@ private void loadCustomConfigs() {
14591460
for (String f : files) {
14601461
// debug(f);
14611462
tardisCopier.copy(f);
1463+
tardisCopier.copy(f);
14621464
}
14631465
new TARDISPlanetsUpdater(this, planetsConfig).checkPlanetsConfig();
14641466
roomsConfig = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "rooms.yml"));
@@ -1565,6 +1567,7 @@ private void loadHelper() {
15651567
tardisHelper = new TARDISHelper(this);
15661568
tardisHelper.enable();
15671569
new EyeLoader(this).enable();
1570+
new VehicleLoader().injectEntity();
15681571
}
15691572

15701573
private void loadPluginRespect() {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
import me.eccentric_nz.TARDIS.flight.TARDISHandbrakeListener;
5555
import me.eccentric_nz.TARDIS.flight.TARDISManualFlightListener;
5656
import me.eccentric_nz.TARDIS.flight.TARDISRegulatorListener;
57+
import me.eccentric_nz.TARDIS.flight.vehicle.PlayerInputListener;
58+
import me.eccentric_nz.TARDIS.flight.vehicle.VehicleLoadListener;
5759
import me.eccentric_nz.TARDIS.handles.TARDISHandlesEventListener;
5860
import me.eccentric_nz.TARDIS.handles.TARDISHandlesListener;
5961
import me.eccentric_nz.TARDIS.handles.TARDISHandlesProgramListener;
@@ -119,7 +121,6 @@
119121
import me.eccentric_nz.tardischemistry.product.ProductGUIListener;
120122
import me.eccentric_nz.tardischemistry.product.SparklerListener;
121123
import me.eccentric_nz.tardischemistry.reducer.ReducerGUIListener;
122-
import me.eccentric_nz.tardischunkgenerator.helpers.ProtocolLibPacketListener;
123124

124125
/**
125126
* Registers all the listeners for the various events required to use the TARDIS.
@@ -138,6 +139,8 @@ class TARDISListenerRegisterer {
138139
* Registers all the listeners for the various events required to use the TARDIS.
139140
*/
140141
void registerListeners() {
142+
plugin.getPM().registerEvents(new PlayerInputListener(plugin), plugin);
143+
plugin.getPM().registerEvents(new VehicleLoadListener(plugin), plugin);
141144
plugin.getPM().registerEvents(new TARDISBonemealListener(plugin), plugin);
142145
plugin.getPM().registerEvents(new TARDISEditAreasGUIListener(plugin), plugin);
143146
plugin.getPM().registerEvents(new TARDISBlockBreakListener(plugin), plugin);
@@ -404,8 +407,5 @@ void registerListeners() {
404407
plugin.getPM().registerEvents(new TARDISShellLoaderListener(plugin), plugin);
405408
}
406409
plugin.getPM().registerEvents(new TARDISWeatherListener(plugin), plugin);
407-
if (plugin.getPM().isPluginEnabled("ProtocolLib")) {
408-
new ProtocolLibPacketListener().enable(plugin);
409-
}
410410
}
411411
}

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

+9
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ public class TARDISTrackerInstanceKeeper {
163163
private final Set<UUID> temporallyLocated = new HashSet<>();
164164
private final Set<UUID> zeroRoomOccupants = new HashSet<>();
165165
private String immortalityGate = "";
166+
private int task = -1;
166167

167168
/**
168169
* Gets the Move Session for a player, this is used to see if they have
@@ -1160,4 +1161,12 @@ public Set<UUID> getStillFlyingNotReturning() {
11601161
public Set<UUID> getHandlesRotation() {
11611162
return handlesRotation;
11621163
}
1164+
1165+
public int getAnimateTask() {
1166+
return task;
1167+
}
1168+
1169+
public void setAnimateTask(int task) {
1170+
this.task = task;
1171+
}
11631172
}

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

+1-1
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_21_R1.entity.CraftEntity;
59+
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
6060
import org.bukkit.entity.Entity;
6161
import org.bukkit.entity.LivingEntity;
6262
import org.bukkit.entity.Player;

‎Core/src/main/java/me/eccentric_nz/TARDIS/arch/TARDISArchCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public boolean force(CommandSender sender, String[] args) {
8989
TARDISArchDisguise.undisguise(player);
9090
}
9191
player.getWorld().strikeLightningEffect(player.getLocation());
92-
double mh = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
92+
double mh = player.getAttribute(Attribute.MAX_HEALTH).getValue();
9393
player.setHealth(mh / 10.0d);
9494
if (inv) {
9595
new TARDISArchInventory().switchInventories(player, 0);

‎Core/src/main/java/me/eccentric_nz/TARDIS/arch/TARDISFobWatchListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onFobWatchClick(PlayerInteractEvent event) {
8181
TARDISArchDisguise.undisguise(player);
8282
}
8383
player.getWorld().strikeLightningEffect(player.getLocation());
84-
double mh = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
84+
double mh = player.getAttribute(Attribute.MAX_HEALTH).getValue();
8585
player.setHealth(mh / 10.0d);
8686
if (inv) {
8787
new TARDISArchInventory().switchInventories(player, 0);

‎Core/src/main/java/me/eccentric_nz/TARDIS/builders/BuildData.java

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public void setRebuild(boolean rebuild) {
5959
this.rebuild = rebuild;
6060
}
6161

62+
public void setAddSign(boolean addSign) {
63+
this.addSign = addSign;
64+
}
65+
6266
private void setPlayerDefaults(String uuid) {
6367
if (uuid == null) {
6468
// sane defaults

‎Core/src/main/java/me/eccentric_nz/TARDIS/builders/TARDISBuilderUtility.java

+47
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@
1717
package me.eccentric_nz.TARDIS.builders;
1818

1919
import me.eccentric_nz.TARDIS.TARDIS;
20+
import me.eccentric_nz.TARDIS.database.resultset.ResultSetColour;
2021
import me.eccentric_nz.TARDIS.database.resultset.ResultSetDoors;
2122
import me.eccentric_nz.TARDIS.database.resultset.ResultSetTardisModel;
2223
import me.eccentric_nz.TARDIS.enumeration.ChameleonPreset;
24+
import org.bukkit.Color;
2325
import org.bukkit.Location;
2426
import org.bukkit.Material;
2527
import org.bukkit.World;
28+
import org.bukkit.entity.ArmorStand;
29+
import org.bukkit.inventory.EntityEquipment;
30+
import org.bukkit.inventory.ItemStack;
31+
import org.bukkit.inventory.meta.ItemMeta;
32+
import org.bukkit.inventory.meta.LeatherArmorMeta;
2633

2734
import java.util.HashMap;
2835

@@ -114,6 +121,46 @@ public static Material getMaterialForArmourStand(ChameleonPreset preset, int id,
114121
}
115122
}
116123

124+
public static void setPoliceBoxHelmet(TARDIS plugin, ChameleonPreset preset, BuildData bd, ArmorStand stand) {
125+
Material dye = TARDISBuilderUtility.getMaterialForArmourStand(preset, bd.getTardisID(), true);
126+
ItemStack is = new ItemStack(dye, 1);
127+
ItemMeta im = is.getItemMeta();
128+
im.setCustomModelData(1001);
129+
if (bd.shouldAddSign()) {
130+
String pb = "";
131+
switch (preset) {
132+
case WEEPING_ANGEL -> pb = "Weeping Angel";
133+
case PANDORICA -> pb = "Pandorica";
134+
case ITEM -> {
135+
for (String k : plugin.getCustomModelConfig().getConfigurationSection("models").getKeys(false)) {
136+
if (plugin.getCustomModelConfig().getString("models." + k + ".item").equals(dye.toString())) {
137+
pb = k;
138+
break;
139+
}
140+
}
141+
}
142+
default -> pb = "Police Box";
143+
}
144+
String name = bd.getPlayer().getName() + "'s " + pb;
145+
im.setDisplayName(name);
146+
stand.setCustomName(name);
147+
stand.setCustomNameVisible(true);
148+
}
149+
if (preset == ChameleonPreset.COLOURED) {
150+
// get the colour
151+
ResultSetColour rsc = new ResultSetColour(plugin, bd.getTardisID());
152+
if (rsc.resultSet()) {
153+
LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta) im;
154+
leatherArmorMeta.setColor(Color.fromRGB(rsc.getRed(), rsc.getGreen(), rsc.getBlue()));
155+
is.setItemMeta(leatherArmorMeta);
156+
}
157+
} else {
158+
is.setItemMeta(im);
159+
}
160+
EntityEquipment ee = stand.getEquipment();
161+
ee.setHelmet(is, true);
162+
}
163+
117164
static void updateChameleonDemat(String preset, int id) {
118165
// update demat field in database
119166
HashMap<String, Object> set = new HashMap<>();

‎Core/src/main/java/me/eccentric_nz/TARDIS/builders/TARDISInstantPoliceBox.java

+16-43
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import me.eccentric_nz.TARDIS.customblocks.TARDISDisplayItemUtils;
2222
import me.eccentric_nz.TARDIS.database.resultset.ResultSetColour;
2323
import me.eccentric_nz.TARDIS.enumeration.ChameleonPreset;
24+
import me.eccentric_nz.TARDIS.flight.vehicle.TARDISArmourStand;
25+
import me.eccentric_nz.TARDIS.flight.vehicle.VehicleUtility;
2426
import me.eccentric_nz.TARDIS.move.TARDISDoorListener;
2527
import me.eccentric_nz.TARDIS.travel.TARDISDoorLocation;
2628
import me.eccentric_nz.TARDIS.utility.TARDISBlockSetters;
@@ -31,7 +33,11 @@
3133
import org.bukkit.block.Block;
3234
import org.bukkit.block.BlockFace;
3335
import org.bukkit.block.data.Levelled;
34-
import org.bukkit.entity.*;
36+
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArmorStand;
37+
import org.bukkit.entity.ArmorStand;
38+
import org.bukkit.entity.Entity;
39+
import org.bukkit.entity.ItemFrame;
40+
import org.bukkit.entity.Player;
3541
import org.bukkit.inventory.EntityEquipment;
3642
import org.bukkit.inventory.ItemStack;
3743
import org.bukkit.inventory.meta.ItemMeta;
@@ -81,7 +87,12 @@ public void buildPreset() {
8187
boolean found = false;
8288
for (Entity e : world.getNearbyEntities(bd.getLocation(), 1.0d, 1.0d, 1.0d)) {
8389
if (e instanceof ArmorStand a) {
84-
stand = a;
90+
if (((CraftArmorStand) a).getHandle() instanceof TARDISArmourStand) {
91+
stand = a;
92+
} else {
93+
stand = (ArmorStand) VehicleUtility.spawnStand(bd.getLocation()).getBukkitEntity();
94+
a.remove();
95+
}
8596
found = true;
8697
break;
8798
}
@@ -100,49 +111,10 @@ public void buildPreset() {
100111
block.setBlockData(TARDISConstants.AIR);
101112
TARDISBlockSetters.setUnderDoorBlock(world, under.getX(), under.getY(), under.getZ(), bd.getTardisID(), false);
102113
// spawn armour stand
103-
stand = (ArmorStand) world.spawnEntity(bd.getLocation().clone().add(0.5d, 0, 0.5d), EntityType.ARMOR_STAND);
114+
stand = (ArmorStand) VehicleUtility.spawnStand(bd.getLocation()).getBukkitEntity();
104115
}
105116
stand.setRotation(bd.getDirection().getYaw(), 0.0f);
106-
Material dye = TARDISBuilderUtility.getMaterialForArmourStand(preset, bd.getTardisID(), true);
107-
ItemStack is = new ItemStack(dye, 1);
108-
ItemMeta im = is.getItemMeta();
109-
im.setCustomModelData(1001);
110-
if (bd.shouldAddSign()) {
111-
String pb = "";
112-
switch (preset) {
113-
case WEEPING_ANGEL -> pb = "Weeping Angel";
114-
case PANDORICA -> pb = "Pandorica";
115-
case ITEM -> {
116-
for (String k : plugin.getCustomModelConfig().getConfigurationSection("models").getKeys(false)) {
117-
if (plugin.getCustomModelConfig().getString("models." + k + ".item").equals(dye.toString())) {
118-
pb = k;
119-
break;
120-
}
121-
}
122-
}
123-
default -> pb = "Police Box";
124-
}
125-
String name = bd.getPlayer().getName() + "'s " + pb;
126-
im.setDisplayName(name);
127-
stand.setCustomName(name);
128-
stand.setCustomNameVisible(true);
129-
}
130-
if (preset == ChameleonPreset.COLOURED) {
131-
// get the colour
132-
ResultSetColour rsc = new ResultSetColour(plugin, bd.getTardisID());
133-
if (rsc.resultSet()) {
134-
LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta) im;
135-
leatherArmorMeta.setColor(Color.fromRGB(rsc.getRed(), rsc.getGreen(), rsc.getBlue()));
136-
is.setItemMeta(leatherArmorMeta);
137-
}
138-
} else {
139-
is.setItemMeta(im);
140-
}
141-
EntityEquipment ee = stand.getEquipment();
142-
ee.setHelmet(is, true);
143-
stand.setInvulnerable(true);
144-
stand.setInvisible(true);
145-
stand.setGravity(false);
117+
TARDISBuilderUtility.setPoliceBoxHelmet(plugin, preset, bd, stand);
146118
// set a light block
147119
Levelled levelled = TARDISConstants.LIGHT;
148120
// set light level from exterior lamp control
@@ -151,4 +123,5 @@ public void buildPreset() {
151123
// add an interaction entity
152124
TARDISDisplayItemUtils.setInteraction(stand, bd.getTardisID());
153125
}
126+
154127
}

0 commit comments

Comments
 (0)