Skip to content

Commit 9d2ceea

Browse files
eccentricdevotioneccentricdevotion
authored
Merge pull request #1044 from eccentricdevotion/mayhem
1.21.11 Mounts of Mayhem update
2 parents 302f67a + 629f182 commit 9d2ceea

File tree

59 files changed

+2114
-1222
lines changed

Some content is hidden

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

59 files changed

+2114
-1222
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
branches: [ "master" ]
1010

1111
env:
12-
VERSION: '6.2.4'
13-
RELEASE_TAG: '1.21.10'
12+
VERSION: '6.3.0'
13+
RELEASE_TAG: '1.21.11'
1414

1515
jobs:
1616
build:

‎build.gradle.kts‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import java.io.ByteArrayOutputStream
55
plugins {
66
`java-library`
77
id("io.papermc.paperweight.userdev") version "2.0.0-SNAPSHOT"
8-
id("com.gradleup.shadow") version "9.2.2"
8+
id("com.gradleup.shadow") version "9.3.0"
99
id("java")
1010
id("io.papermc.hangar-publish-plugin") version "0.1.3"
1111
}
1212

1313
group = "me.eccentric_nz"
1414
val buildNumber = "-b${System.getenv("BUILD_NUMBER") ?: (System.getenv("SHORT_SHA") ?: ".local")}"
15-
version = "6.2.4${buildNumber}"
15+
version = "6.3.0${buildNumber}"
1616

1717
repositories {
1818
mavenCentral()
@@ -87,18 +87,29 @@ repositories {
8787
}
8888

8989
dependencies {
90-
paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
91-
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
90+
paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
91+
compileOnly("com.sk89q.worldedit:worldedit-core:7.4.0-SNAPSHOT") {
92+
isTransitive = false
93+
}
94+
compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT") {
95+
isTransitive = false
96+
}
97+
compileOnly("com.sk89q.worldguard:worldguard-core:7.1.0-SNAPSHOT") {
98+
isTransitive = false
99+
}
100+
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") {
101+
isTransitive = false
102+
}
92103
compileOnly("net.citizensnpcs:citizensapi:2.0.40-SNAPSHOT") {
93104
isTransitive = false
94105
}
95-
compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.0") {
106+
compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.1") {
96107
isTransitive = false
97108
}
98109
compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.3.4") {
99110
isTransitive = false
100111
}
101-
compileOnly("org.mvplugins.multiverse.inventories:multiverse-inventories:5.2.1") {
112+
compileOnly("org.mvplugins.multiverse.inventories:multiverse-inventories:5.2.2") {
102113
isTransitive = false
103114
}
104115
compileOnly("dev.kitteh:factionsuuid:0.7.0") {
@@ -150,7 +161,7 @@ dependencies {
150161
compileOnly("net.luckperms:api:5.5")
151162
compileOnly("org.apache.commons:commons-lang3:3.20.0")
152163
compileOnly(files("libs/TerraformGenerator.jar"))
153-
compileOnly("com.formdev:flatlaf:3.6.2") {
164+
compileOnly("com.formdev:flatlaf:3.7") {
154165
isTransitive = false
155166
}
156167
compileOnly("org.swinglabs:swing-layout:1.0.3") {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
paperVersion=1.21.10
1+
paperVersion=1.21.11

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public void onEnable() {
266266
persistentDataTypeUUID = new TARDISUUIDDataType();
267267
console = getServer().getConsoleSender();
268268
ModuleDescriptor.Version serverVersion = getServerVersion(getServer().getVersion());
269-
ModuleDescriptor.Version minVersion = ModuleDescriptor.Version.parse("1.21.10");
269+
ModuleDescriptor.Version minVersion = ModuleDescriptor.Version.parse("1.21.11");
270270
// check server version
271271
if (serverVersion.compareTo(minVersion) >= 0) {
272272
// don't start if TARDISChunkGenerator is present
@@ -1480,7 +1480,7 @@ private void loadWorldGuard() {
14801480
}
14811481

14821482
/**
1483-
* If the LuckPerms plugin is available, load a custom permissions context.
1483+
* If the LuckPerms plugin is available, load a custom permission context.
14841484
*/
14851485
private void loadLuckPerms() {
14861486
if (pm.getPlugin("LuckPerms") != null) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import me.eccentric_nz.TARDIS.info.TARDISIndexFileSectionListener;
6868
import me.eccentric_nz.TARDIS.info.TARDISInformationSystemListener;
6969
import me.eccentric_nz.TARDIS.junk.TARDISJunkControlListener;
70+
import me.eccentric_nz.TARDIS.lazarus.TARDISLazarusChoiceListener;
7071
import me.eccentric_nz.TARDIS.lazarus.TARDISLazarusGUIListener;
7172
import me.eccentric_nz.TARDIS.lazarus.TARDISLazarusListener;
7273
import me.eccentric_nz.TARDIS.lazarus.TARDISLazarusSkinsListener;
@@ -346,6 +347,7 @@ void registerListeners() {
346347
}
347348
}
348349
plugin.getPM().registerEvents(new TARDISLazarusListener(plugin), plugin);
350+
plugin.getPM().registerEvents(new TARDISLazarusChoiceListener(plugin), plugin);
349351
plugin.getPM().registerEvents(new TARDISLazarusGUIListener(plugin), plugin);
350352
plugin.getPM().registerEvents(new TARDISLazarusSkinsListener(plugin), plugin);
351353
plugin.getPM().registerEvents(new TARDISItemFrameUpdateListener(plugin), plugin);

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public class TARDISTrackerInstanceKeeper {
7171
private final HashMap<UUID, Bind> bindRemoval = new HashMap<>();
7272
private final HashMap<UUID, Block> invisibleDoors = new HashMap<>();
7373
private final HashMap<UUID, Block> lazarus = new HashMap<>();
74+
private final HashMap<UUID, String> disguises = new HashMap<>();
7475
private final HashMap<UUID, BuildData> flightData = new HashMap<>();
7576
private final HashMap<UUID, CastData> casters = new HashMap<>();
7677
private final HashMap<UUID, ComehereRequest> comehereRequests = new HashMap<>();
@@ -372,6 +373,15 @@ public HashMap<UUID, Block> getLazarus() {
372373
return lazarus;
373374
}
374375

376+
/**
377+
* Tracks the lazarus disguise a player is wearing
378+
*
379+
* @return a Map of player UUIDs and the disguise they are currently using
380+
*/
381+
public HashMap<UUID, String> getDisguises() {
382+
return disguises;
383+
}
384+
375385
/**
376386
* Tracks players using Manual or Regulator flight modes
377387
*

‎src/main/java/me/eccentric_nz/TARDIS/artron/TARDISCondensables.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,20 @@ public void makeCondensables() {
13241324
condensables.put("WAXED_EXPOSED_COPPER_LANTERN", 20);
13251325
condensables.put("WAXED_WEATHERED_COPPER_LANTERN", 20);
13261326
condensables.put("WAXED_OXIDIZED_COPPER_LANTERN", 20);
1327+
// 1.21.11
1328+
condensables.put("COPPER_NAUTILUS_ARMOR", 2);
1329+
condensables.put("COPPER_SPEAR", 20);
1330+
condensables.put("DIAMOND_NAUTILUS_ARMOR", 200);
1331+
condensables.put("DIAMOND_SPEAR", 200);
1332+
condensables.put("GOLDEN_NAUTILUS_ARMOR", 12);
1333+
condensables.put("GOLDEN_SPEAR", 110);
1334+
condensables.put("IRON_NAUTILUS_ARMOR", 3);
1335+
condensables.put("IRON_SPEAR", 25);
1336+
condensables.put("NETHERITE_HORSE_ARMOR", 2500);
1337+
condensables.put("NETHERITE_NAUTILUS_ARMOR", 1000);
1338+
condensables.put("NETHERITE_SPEAR", 1220);
1339+
condensables.put("STONE_SPEAR", 3);
1340+
condensables.put("WOODEN_SPEAR", 1);
13271341
} else {
13281342
Set<String> items = plugin.getCondensablesConfig().getKeys(false);
13291343
items.forEach((item) -> condensables.put(item, plugin.getCondensablesConfig().getInt(item)));

‎src/main/java/me/eccentric_nz/TARDIS/commands/utils/TARDISWorldCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
9696
plugin.getMessenger().message(player, "Difficulty -> " + world.getDifficulty());
9797
plugin.getMessenger().message(player, "Gamerules -> ");
9898
for (String s : world.getGameRules()) {
99-
GameRule rule = GameRule.getByName(s);
99+
GameRule rule = Registry.GAME_RULE.getOrThrow(NamespacedKey.minecraft(s.toLowerCase(Locale.ROOT)));
100100
if (rule != null) {
101101
plugin.getMessenger().message(player, " " + s + " -> " + world.getGameRuleValue(rule));
102102
}
@@ -250,11 +250,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
250250
World telos = plugin.getServer().getWorld("telos");
251251
if (telos != null) {
252252
telos.setTime(13000);
253-
telos.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
254-
plugin.getPlanetsConfig().set("planets.telos.gamerules.doDaylightCycle", false);
253+
telos.setGameRule(GameRules.ADVANCE_TIME, false);
254+
plugin.getPlanetsConfig().set("planets.telos.gamerules.advance_time", false);
255255
}
256256
} else {
257-
plugin.getPlanetsConfig().set("planets.telos.gamerules.doDaylightCycle", true);
257+
plugin.getPlanetsConfig().set("planets.telos.gamerules.advance_time", true);
258258
}
259259
String planetsPath = plugin.getDataFolder() + File.separator + "planets.yml";
260260
try {

‎src/main/java/me/eccentric_nz/TARDIS/custommodels/GUIGeneticManipulator.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,28 @@
1717
package me.eccentric_nz.TARDIS.custommodels;
1818

1919
import me.eccentric_nz.TARDIS.custommodels.keys.Button;
20+
import me.eccentric_nz.TARDIS.custommodels.keys.GuiVariant;
2021
import org.bukkit.Material;
2122

2223
public record GUIGeneticManipulator() {
2324

2425
// Genetic Manipulator
25-
public static final GUIData BUTTON_SKINS = new GUIData(Button.SKINS.getKey(), 43, Material.BOWL);
26-
public static final GUIData BUTTON_TWA = new GUIData(Button.TWA.getKey(), 44, Material.BOWL);
27-
public static final GUIData BUTTON_MASTER = new GUIData(Button.MASTER_OFF.getKey(), 45, Material.REPEATER);
26+
public static final GUIData BUTTON_PASSIVE = new GUIData(Button.PASSIVE.getKey(), 1, Material.BOWL);
27+
public static final GUIData BUTTON_NEUTRAL = new GUIData(Button.NEUTRAL.getKey(), 3, Material.BOWL);
28+
public static final GUIData BUTTON_HOSTILE = new GUIData(Button.HOSTILE.getKey(), 5, Material.BOWL);
29+
public static final GUIData BUTTON_ADJACENT = new GUIData(Button.ADJACENT.getKey(), 7, Material.BOWL);
30+
public static final GUIData BUTTON_DOCTORS = new GUIData(Button.DOCTOR.getKey(), 9, Material.BROWN_STAINED_GLASS_PANE);
31+
public static final GUIData BUTTON_COMPANIONS = new GUIData(Button.COMPANION.getKey(), 11, Material.BROWN_STAINED_GLASS_PANE);
32+
public static final GUIData BUTTON_CHARACTERS = new GUIData(Button.CHARACTER.getKey(), 13, Material.BROWN_STAINED_GLASS_PANE);
33+
public static final GUIData BUTTON_TWA = new GUIData(Button.MONSTER.getKey(), 15, Material.BROWN_STAINED_GLASS_PANE);
34+
public static final GUIData BUTTON_MASTER = new GUIData(Button.MASTER_OFF.getKey(), 17, Material.REPEATER);
2835
public static final GUIData BUTTON_AGE = new GUIData(Button.AGE.getKey(), 47, Material.HOPPER);
2936
public static final GUIData BUTTON_TYPE = new GUIData(Button.TYPE.getKey(), 48, Material.CYAN_DYE);
3037
public static final GUIData BUTTON_OPTS = new GUIData(Button.OPTIONS.getKey(), 49, Material.LEAD);
3138
public static final GUIData BUTTON_RESTORE = new GUIData(Button.RESTORE.getKey(), 51, Material.APPLE);
3239
public static final GUIData BUTTON_DNA = new GUIData(Button.DNA.getKey(), 52, Material.WRITABLE_BOOK);
40+
public static final GUIData BUTTON_PREVIOUS = new GUIData(GuiVariant.PREV.getKey(), 36, Material.ARROW);
41+
public static final GUIData BUTTON_BACK = new GUIData(GuiVariant.BACK.getKey(), 40, Material.BOWL);
42+
public static final GUIData BUTTON_NEXT = new GUIData(GuiVariant.NEXT.getKey(), 44, Material.ARROW);
3343
public static final GUIData BUTTON_CANCEL = new GUIData(Button.CANCEL.getKey(), 53, Material.BOWL);
3444
}

‎src/main/java/me/eccentric_nz/TARDIS/custommodels/keys/Button.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public enum Button {
2323

2424
ADAPT(new NamespacedKey(TARDIS.plugin, "button_adapt")),
2525
ADD_COMPANION(new NamespacedKey(TARDIS.plugin, "button_add_companion")),
26+
ADJACENT(new NamespacedKey(TARDIS.plugin, "button_adjacent")),
2627
ADMIN(new NamespacedKey(TARDIS.plugin, "button_admin")),
2728
AGE(new NamespacedKey(TARDIS.plugin, "button_age")),
2829
AREAS(new NamespacedKey(TARDIS.plugin, "button_areas")),
@@ -32,6 +33,8 @@ public enum Button {
3233
BACK(new NamespacedKey(TARDIS.plugin, "button_back")),
3334
CANCEL(new NamespacedKey(TARDIS.plugin, "button_cancel")),
3435
CHAMELEON(new NamespacedKey(TARDIS.plugin, "button_chameleon")),
36+
CHARACTER(new NamespacedKey(TARDIS.plugin, "button_character")),
37+
COMPANION(new NamespacedKey(TARDIS.plugin, "button_companion")),
3538
COMPANION_ALL(new NamespacedKey(TARDIS.plugin, "button_companion_all")),
3639
COMPANION_LIST(new NamespacedKey(TARDIS.plugin, "button_companion_list")),
3740
CONSTRUCT(new NamespacedKey(TARDIS.plugin, "button_construct")),
@@ -40,17 +43,22 @@ public enum Button {
4043
DELETE(new NamespacedKey(TARDIS.plugin, "button_delete")),
4144
DIRECTION(new NamespacedKey(TARDIS.plugin, "button_direction")),
4245
DNA(new NamespacedKey(TARDIS.plugin, "button_dna")),
46+
DOCTOR(new NamespacedKey(TARDIS.plugin, "button_doctor")),
4347
FARMING_PREFERENCES(new NamespacedKey(TARDIS.plugin, "button_farm_prefs")),
4448
FLIGHT_MODE(new NamespacedKey(TARDIS.plugin, "button_flight_mode")),
4549
HANDBRAKE(new NamespacedKey(TARDIS.plugin, "button_handbrake")),
4650
HIDE(new NamespacedKey(TARDIS.plugin, "button_hide")),
51+
HOSTILE(new NamespacedKey(TARDIS.plugin, "button_hostile")),
4752
INFO(new NamespacedKey(TARDIS.plugin, "button_info")),
4853
INVISIBLE(new NamespacedKey(TARDIS.plugin, "button_invisible")),
4954
LOCK(new NamespacedKey(TARDIS.plugin, "button_lock")),
5055
MASTER_OFF(new NamespacedKey(TARDIS.plugin, "button_master_off")),
5156
MASTER_ON(new NamespacedKey(TARDIS.plugin, "button_master_on")),
57+
MONSTER(new NamespacedKey(TARDIS.plugin, "button_monster")),
58+
NEUTRAL(new NamespacedKey(TARDIS.plugin, "button_neutral")),
5259
OPTIONS(new NamespacedKey(TARDIS.plugin, "button_opts")),
5360
PARTICLES(new NamespacedKey(TARDIS.plugin, "button_particles")),
61+
PASSIVE(new NamespacedKey(TARDIS.plugin, "button_passive")),
5462
PREFERENCES(new NamespacedKey(TARDIS.plugin, "button_prefs")),
5563
RANDOM(new NamespacedKey(TARDIS.plugin, "button_random")),
5664
REBUILD(new NamespacedKey(TARDIS.plugin, "button_rebuild")),
@@ -71,10 +79,6 @@ public enum Button {
7179
TRANSMAT(new NamespacedKey(TARDIS.plugin, "button_transmat")),
7280
TWA(new NamespacedKey(TARDIS.plugin, "button_twa")),
7381
TYPE(new NamespacedKey(TARDIS.plugin, "button_type")),
74-
DOCTOR(new NamespacedKey(TARDIS.plugin, "button_doctor")),
75-
COMPANION(new NamespacedKey(TARDIS.plugin, "button_companion")),
76-
CHARACTER(new NamespacedKey(TARDIS.plugin, "button_character")),
77-
MONSTER(new NamespacedKey(TARDIS.plugin, "button_monster")),
7882
ZERO(new NamespacedKey(TARDIS.plugin, "button_zero"));
7983

8084
private final NamespacedKey key;

0 commit comments

Comments
 (0)