Skip to content

Commit cfdbedd

Browse files
McPlayHDMcPlayHD
authored
Merge pull request #136 from McPlayHDnet/v1.21.6
v1.21.5 & v.21.6 & v.21.7
2 parents 2eb17e0 + bcfe33e commit cfdbedd

11 files changed

Lines changed: 79 additions & 32 deletions

File tree

‎build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import xyz.jpenilla.resourcefactory.bukkit.BukkitPluginYaml
2+
import xyz.jpenilla.resourcefactory.bukkit.bukkitPluginYaml
23

34
plugins {
45
`java-library`
5-
id("io.papermc.paperweight.userdev") version "2.0.0-beta.14"
6-
id("xyz.jpenilla.run-paper") version "2.2.3" // Adds runServer and runMojangMappedServer tasks for testing
7-
id("xyz.jpenilla.resource-factory-bukkit-convention") version "1.1.1" // Generates plugin.yml based on the Gradle config
8-
id("io.freefair.lombok") version "8.6"
6+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.17"
7+
id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
8+
id("xyz.jpenilla.resource-factory-bukkit-convention") version "1.3.0" // Generates plugin.yml based on the Gradle config
9+
id("io.freefair.lombok") version "8.14"
910
}
1011

1112
group = "forceitembattle"
12-
version = "3.2.0"
13+
version = "3.6.0"
1314
description = "ForceItemBattle for McPlayHD.net"
1415

1516
java {
@@ -25,7 +26,8 @@ repositories {
2526
}
2627

2728
dependencies {
28-
paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
29+
paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
30+
implementation("org.apache.commons:commons-text:1.13.1")
2931
// paperweight.foliaDevBundle("1.20.4-R0.1-SNAPSHOT")
3032
// paperweight.devBundle("com.example.paperfork", "1.20.4-R0.1-SNAPSHOT")
3133
}
@@ -92,6 +94,4 @@ bukkitPluginYaml {
9294
commands.register("achievements")
9395
commands.register("spectate")
9496
commands.register("forceteam")
95-
commands.register("vault")
96-
commands.register("wt")
9797
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Feb 17 01:46:58 CET 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎paper-version.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.21.4",
3-
"build": "212",
4-
"sha256sum": "8795be2df8280dd50ff15c233d8ed5ac882baee30b07dcfaf52354289229ee79"
2+
"version": "1.21.7",
3+
"build": "9",
4+
"sha256sum": "add0402d49e7c89cabd8484fdb4837818b025326333770958690c7a9951dc2df"
55
}

‎src/main/java/forceitembattle/commands/admin/CommandReset.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package forceitembattle.commands.admin;
22

3-
import forceitembattle.ForceItemBattle;
43
import forceitembattle.commands.CustomCommand;
54
import org.bukkit.Bukkit;
6-
import org.bukkit.ChatColor;
75
import org.bukkit.entity.Player;
86

9-
import java.io.File;
107
import java.io.IOException;
118

129
public class CommandReset extends CustomCommand {
@@ -27,7 +24,7 @@ public void onPlayerCommand(Player player, String label, String[] args) {
2724
} catch (IOException e) {
2825
throw new RuntimeException(e);
2926
}
30-
Bukkit.spigot().restart();
27+
Bukkit.restart();
3128
}
3229
}
3330
}

‎src/main/java/forceitembattle/commands/player/CommandInfoWiki.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import forceitembattle.commands.CustomCommand;
44
import forceitembattle.util.ForceItemPlayer;
5-
import org.apache.commons.lang.WordUtils;
5+
import org.apache.commons.text.WordUtils;
66
import org.bukkit.Material;
77
import org.bukkit.entity.Player;
88
import org.bukkit.inventory.ItemStack;

‎src/main/java/forceitembattle/manager/Gamemanager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.kyori.adventure.text.minimessage.MiniMessage;
1212
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
1313
import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
14-
import org.apache.commons.lang.WordUtils;
14+
import org.apache.commons.text.WordUtils;
1515
import org.bukkit.*;
1616
import org.bukkit.entity.Entity;
1717
import org.bukkit.entity.Player;
@@ -63,6 +63,7 @@ public Gamemanager(ForceItemBattle forceItemBattle) {
6363
this.miniMessage = MiniMessage.builder()
6464
.tags(TagResolver.builder()
6565
.resolver(StandardTags.color())
66+
.resolver(StandardTags.shadowColor())
6667
.resolver(StandardTags.gradient())
6768
.resolver(StandardTags.reset())
6869
.resolver(StandardTags.newline())

‎src/main/java/forceitembattle/manager/ItemDifficultiesManager.java‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import forceitembattle.ForceItemBattle;
66
import forceitembattle.settings.GameSetting;
77
import forceitembattle.util.DescriptionItem;
8-
import forceitembattle.util.ItemBuilder;
98
import lombok.Getter;
109
import lombok.Setter;
1110
import org.bukkit.ChatColor;
@@ -237,6 +236,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
237236
Material.CRIMSON_STEM,
238237
Material.CRIMSON_TRAPDOOR,
239238
Material.DAYLIGHT_DETECTOR,
239+
Material.DRIED_GHAST,
240240
Material.ENDER_EYE,
241241
Material.SPLASH_POTION,
242242
Material.GHAST_TEAR,
@@ -246,6 +246,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
246246
Material.KNOWLEDGE_BOOK, // Antimatter Depths Locator
247247
Material.MAGMA_CREAM,
248248
Material.MUSIC_DISC_PIGSTEP,
249+
Material.MUSIC_DISC_TEARS,
249250
Material.NETHER_GOLD_ORE,
250251
Material.NETHER_QUARTZ_ORE,
251252
Material.NETHER_SPROUTS,
@@ -486,6 +487,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
486487
Material.BLACK_CONCRETE_POWDER,
487488
Material.BLACK_DYE,
488489
Material.BLACK_GLAZED_TERRACOTTA,
490+
Material.BLACK_HARNESS,
489491
Material.BLACK_STAINED_GLASS,
490492
Material.BLACK_STAINED_GLASS_PANE,
491493
Material.BLACK_TERRACOTTA,
@@ -498,7 +500,9 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
498500
Material.BLUE_CONCRETE,
499501
Material.BLUE_CONCRETE_POWDER,
500502
Material.BLUE_DYE,
503+
Material.BLUE_EGG,
501504
Material.BLUE_GLAZED_TERRACOTTA,
505+
Material.BLUE_HARNESS,
502506
Material.BLUE_STAINED_GLASS,
503507
Material.BLUE_STAINED_GLASS_PANE,
504508
Material.BLUE_TERRACOTTA,
@@ -522,7 +526,9 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
522526
Material.BROWN_CONCRETE,
523527
Material.BROWN_CONCRETE_POWDER,
524528
Material.BROWN_DYE,
529+
Material.BROWN_EGG,
525530
Material.BROWN_GLAZED_TERRACOTTA,
531+
Material.BROWN_HARNESS,
526532
Material.BROWN_MUSHROOM,
527533
Material.BROWN_STAINED_GLASS,
528534
Material.BROWN_STAINED_GLASS_PANE,
@@ -531,6 +537,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
531537
Material.BRUSH,
532538
Material.BUCKET,
533539
Material.BUNDLE,
540+
Material.BUSH,
534541
Material.CALCITE,
535542
Material.CAMPFIRE,
536543
Material.CARROT,
@@ -641,6 +648,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
641648
Material.FEATHER,
642649
Material.FERN,
643650
Material.FILLED_MAP,
651+
Material.FIREFLY_BUSH,
644652
Material.FIREWORK_ROCKET,
645653
Material.FIREWORK_STAR,
646654
Material.FLETCHING_TABLE,
@@ -684,6 +692,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
684692
Material.GRAY_CONCRETE_POWDER,
685693
Material.GRAY_DYE,
686694
Material.GRAY_GLAZED_TERRACOTTA,
695+
Material.GRAY_HARNESS,
687696
Material.GRAY_STAINED_GLASS,
688697
Material.GRAY_STAINED_GLASS_PANE,
689698
Material.GRAY_TERRACOTTA,
@@ -736,6 +745,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
736745
Material.LAPIS_BLOCK,
737746
Material.LAPIS_LAZULI,
738747
Material.LAVA_BUCKET,
748+
Material.LEAF_LITTER,
739749
Material.LEATHER,
740750
Material.LEATHER_BOOTS,
741751
Material.LEATHER_CHESTPLATE,
@@ -752,6 +762,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
752762
Material.LIGHT_BLUE_CONCRETE_POWDER,
753763
Material.LIGHT_BLUE_DYE,
754764
Material.LIGHT_BLUE_GLAZED_TERRACOTTA,
765+
Material.LIGHT_BLUE_HARNESS,
755766
Material.LIGHT_BLUE_STAINED_GLASS,
756767
Material.LIGHT_BLUE_STAINED_GLASS_PANE,
757768
Material.LIGHT_BLUE_TERRACOTTA,
@@ -764,6 +775,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
764775
Material.LIGHT_GRAY_CONCRETE_POWDER,
765776
Material.LIGHT_GRAY_DYE,
766777
Material.LIGHT_GRAY_GLAZED_TERRACOTTA,
778+
Material.LIGHT_GRAY_HARNESS,
767779
Material.LIGHT_GRAY_STAINED_GLASS,
768780
Material.LIGHT_GRAY_STAINED_GLASS_PANE,
769781
Material.LIGHT_GRAY_TERRACOTTA,
@@ -772,6 +784,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
772784
Material.LIGHTNING_ROD,
773785
Material.LILAC,
774786
Material.LILY_OF_THE_VALLEY,
787+
Material.LODESTONE,
775788
Material.MAGENTA_BANNER,
776789
Material.MAGENTA_BED,
777790
Material.MAGENTA_BUNDLE,
@@ -780,6 +793,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
780793
Material.MAGENTA_CONCRETE_POWDER,
781794
Material.MAGENTA_DYE,
782795
Material.MAGENTA_GLAZED_TERRACOTTA,
796+
Material.MAGENTA_HARNESS,
783797
Material.MAGENTA_STAINED_GLASS,
784798
Material.MAGENTA_STAINED_GLASS_PANE,
785799
Material.MAGENTA_TERRACOTTA,
@@ -834,6 +848,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
834848
Material.ORANGE_CONCRETE_POWDER,
835849
Material.ORANGE_DYE,
836850
Material.ORANGE_GLAZED_TERRACOTTA,
851+
Material.ORANGE_HARNESS,
837852
Material.ORANGE_STAINED_GLASS,
838853
Material.ORANGE_STAINED_GLASS_PANE,
839854
Material.ORANGE_TERRACOTTA,
@@ -870,6 +885,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
870885
Material.PINK_CONCRETE_POWDER,
871886
Material.PINK_DYE,
872887
Material.PINK_GLAZED_TERRACOTTA,
888+
Material.PINK_HARNESS,
873889
Material.PINK_STAINED_GLASS,
874890
Material.PINK_STAINED_GLASS_PANE,
875891
Material.PINK_TERRACOTTA,
@@ -907,6 +923,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
907923
Material.PURPLE_CONCRETE_POWDER,
908924
Material.PURPLE_DYE,
909925
Material.PURPLE_GLAZED_TERRACOTTA,
926+
Material.PURPLE_HARNESS,
910927
Material.PURPLE_STAINED_GLASS,
911928
Material.PURPLE_STAINED_GLASS_PANE,
912929
Material.PURPLE_TERRACOTTA,
@@ -925,6 +942,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
925942
Material.RED_CONCRETE_POWDER,
926943
Material.RED_DYE,
927944
Material.RED_GLAZED_TERRACOTTA,
945+
Material.RED_HARNESS,
928946
Material.RED_MUSHROOM,
929947
Material.RED_STAINED_GLASS,
930948
Material.RED_STAINED_GLASS_PANE,
@@ -943,6 +961,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
943961
Material.RESIN_CLUMP,
944962
Material.ROSE_BUSH,
945963
Material.ROTTEN_FLESH,
964+
Material.SADDLE,
946965
Material.SALMON,
947966
Material.SALMON_BUCKET,
948967
Material.SAND,
@@ -1043,10 +1062,12 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
10431062
Material.WHITE_CONCRETE_POWDER,
10441063
Material.WHITE_DYE,
10451064
Material.WHITE_GLAZED_TERRACOTTA,
1065+
Material.WHITE_HARNESS,
10461066
Material.WHITE_STAINED_GLASS,
10471067
Material.WHITE_STAINED_GLASS_PANE,
10481068
Material.WHITE_TERRACOTTA,
10491069
Material.WHITE_WOOL,
1070+
Material.WILDFLOWERS,
10501071
Material.WOLF_ARMOR,
10511072
Material.WOODEN_AXE,
10521073
Material.WOODEN_HOE,
@@ -1063,6 +1084,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
10631084
Material.YELLOW_CONCRETE_POWDER,
10641085
Material.YELLOW_DYE,
10651086
Material.YELLOW_GLAZED_TERRACOTTA,
1087+
Material.YELLOW_HARNESS,
10661088
Material.YELLOW_STAINED_GLASS,
10671089
Material.YELLOW_STAINED_GLASS_PANE,
10681090
Material.YELLOW_TERRACOTTA,
@@ -1088,6 +1110,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
10881110
Material.BOW,
10891111
Material.BREWING_STAND,
10901112
Material.CACTUS,
1113+
Material.CACTUS_FLOWER,
10911114
Material.CAKE,
10921115
Material.CHERRY_BOAT,
10931116
Material.CHERRY_BUTTON,
@@ -1142,6 +1165,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
11421165
Material.CYAN_CONCRETE_POWDER,
11431166
Material.CYAN_DYE,
11441167
Material.CYAN_GLAZED_TERRACOTTA,
1168+
Material.CYAN_HARNESS,
11451169
Material.CYAN_STAINED_GLASS,
11461170
Material.CYAN_STAINED_GLASS_PANE,
11471171
Material.CYAN_TERRACOTTA,
@@ -1163,6 +1187,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
11631187
Material.DIAMOND_HORSE_ARMOR,
11641188
Material.DIAMOND_LEGGINGS,
11651189
Material.DISPENSER,
1190+
Material.DRIED_GHAST,
11661191
Material.DRIPSTONE_BLOCK,
11671192
Material.EGG,
11681193
Material.ENCHANTING_TABLE,
@@ -1187,6 +1212,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
11871212
Material.GREEN_CONCRETE_POWDER,
11881213
Material.GREEN_DYE,
11891214
Material.GREEN_GLAZED_TERRACOTTA,
1215+
Material.GREEN_HARNESS,
11901216
Material.GREEN_STAINED_GLASS,
11911217
Material.GREEN_STAINED_GLASS_PANE,
11921218
Material.GREEN_TERRACOTTA,
@@ -1205,6 +1231,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
12051231
Material.LIME_CONCRETE_POWDER,
12061232
Material.LIME_DYE,
12071233
Material.LIME_GLAZED_TERRACOTTA,
1234+
Material.LIME_HARNESS,
12081235
Material.LIME_STAINED_GLASS,
12091236
Material.LIME_STAINED_GLASS_PANE,
12101237
Material.LIME_TERRACOTTA,
@@ -1234,6 +1261,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
12341261
Material.MUDDY_MANGROVE_ROOTS,
12351262
Material.MUSHROOM_STEW,
12361263
Material.MUSIC_DISC_PIGSTEP,
1264+
Material.MUSIC_DISC_TEARS,
12371265
Material.NAME_TAG,
12381266
Material.NAUTILUS_SHELL,
12391267
Material.NETHER_BRICK,
@@ -1292,11 +1320,11 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
12921320
Material.RED_TULIP,
12931321
Material.REDSTONE_LAMP,
12941322
Material.ROOTED_DIRT,
1295-
Material.SADDLE,
12961323
Material.SCAFFOLDING,
12971324
Material.SEA_LANTERN,
12981325
Material.SEA_PICKLE,
12991326
Material.SHROOMLIGHT,
1327+
Material.SHORT_DRY_GRASS,
13001328
Material.SLIME_BALL,
13011329
Material.SMALL_DRIPLEAF,
13021330
Material.SMOOTH_QUARTZ,
@@ -1323,6 +1351,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
13231351
Material.STRIPPED_PALE_OAK_WOOD,
13241352
Material.STRIPPED_WARPED_HYPHAE,
13251353
Material.STRIPPED_WARPED_STEM,
1354+
Material.TALL_DRY_GRASS,
13261355
Material.TNT,
13271356
Material.TNT_MINECART,
13281357
Material.TROPICAL_FISH,
@@ -1475,7 +1504,6 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
14751504
Material.LIGHT_GRAY_SHULKER_BOX,
14761505
Material.LIME_CANDLE,
14771506
Material.LIME_SHULKER_BOX,
1478-
Material.LODESTONE,
14791507
Material.MAGENTA_CANDLE,
14801508
Material.MAGENTA_SHULKER_BOX,
14811509
Material.MEDIUM_AMETHYST_BUD,
@@ -1487,6 +1515,7 @@ public ItemDifficultiesManager(ForceItemBattle forceItemBattle) {
14871515
Material.MUSIC_DISC_CAT,
14881516
Material.MUSIC_DISC_CREATOR,
14891517
Material.MUSIC_DISC_CREATOR_MUSIC_BOX,
1518+
Material.MUSIC_DISC_LAVA_CHICKEN,
14901519
Material.MUSIC_DISC_OTHERSIDE,
14911520
Material.MUSIC_DISC_PRECIPICE,
14921521
Material.MYCELIUM,

‎src/main/java/forceitembattle/manager/stats/StatsManager.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import forceitembattle.util.ForceItemPlayerStats;
77
import forceitembattle.util.PlayerStat;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
9-
import org.apache.commons.lang.WordUtils;
9+
import org.apache.commons.text.WordUtils;
1010
import org.bukkit.entity.Player;
1111

1212
import java.io.FileReader;
@@ -15,8 +15,11 @@
1515
import java.nio.file.Files;
1616
import java.nio.file.Paths;
1717
import java.text.DecimalFormat;
18-
import java.text.SimpleDateFormat;
19-
import java.util.*;
18+
import java.util.ArrayList;
19+
import java.util.Comparator;
20+
import java.util.HashMap;
21+
import java.util.List;
22+
import java.util.Map;
2023
import java.util.concurrent.atomic.AtomicInteger;
2124
import java.util.stream.Collectors;
2225

‎src/main/java/forceitembattle/util/FinishInventory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import forceitembattle.settings.GameSetting;
55
import net.kyori.adventure.text.Component;
66
import net.kyori.adventure.title.Title;
7-
import org.apache.commons.lang.WordUtils;
7+
import org.apache.commons.text.WordUtils;
88
import org.bukkit.Bukkit;
99
import org.bukkit.Material;
1010
import org.bukkit.Sound;

0 commit comments

Comments
 (0)