Skip to content

Commit 8317d9e

Browse files
Tigerpanzer02version-bump[github-action]
andauthored
#patch Mc 1.21.6-7 support (#71)
* Bump version from 1.4.2 to 1.4.2-SNAPSHOT0 * Fixed NPE on ServerListPing if plugin isn't fully started / arenaregistry not ready * Bump version from 1.4.2-SNAPSHOT0 to 1.4.2-SNAPSHOT1 * * Added 1.21.6-7 support! * Updated XSeries to 13.3.3 * Updated FastBoard to 2.1.5 * Updated FastInv to 3.1.2 * Bump version from 1.4.2-SNAPSHOT1 to 1.4.2-SNAPSHOT2 * Updated FastInv to v3.1.2 * Bump version from 1.4.2-SNAPSHOT2 to 1.4.2-SNAPSHOT3 * Renamed inputs on MiscUtils to be more confident * Bump version from 1.4.2-SNAPSHOT3 to 1.4.2-SNAPSHOT4 * Only support 6 digit long hex code * Bump version from 1.4.2-SNAPSHOT4 to 1.4.2-SNAPSHOT5 * Updated pom.xml * Bump version from 1.4.2-SNAPSHOT5 to 1.4.2-SNAPSHOT6 * Added prefixes to setup completed messages * Bump version from 1.4.2-SNAPSHOT6 to 1.4.2-SNAPSHOT7 * Fixed NSM on CRAFTING TABLE usage at mc 1.8.8 * Bump version from 1.4.2-SNAPSHOT7 to 1.4.2-SNAPSHOT8 * Removed dup code * Bump version from 1.4.2-SNAPSHOT8 to 1.4.2-SNAPSHOT9 --------- Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
1 parent 5cd526a commit 8317d9e

File tree

16 files changed

+61
-43
lines changed

16 files changed

+61
-43
lines changed

.github/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### 1.4.3 Release (10.07.2025)
2+
* Added 1.21.6-7 support!
3+
* Updated XSeries to 13.3.3
4+
* Updated FastBoard to 2.1.5
5+
* Updated FastInv to 3.1.2
6+
* Fixed NPE on ServerListPing if plugin isn't fully started / arenaregistry not ready
7+
* Fixed NSM on CRAFTING TABLE usage at mc 1.8.8
8+
* Internal Code Cleanup such as prefixes and MiscUtils
9+
* Changed Hex code support to only support 6 digit long hex code!
10+
111
### 1.4.2 Release (09.06.2025)
212
* Added BLOCK_IN_GAME_INTERACTIONS option to block interactions whileas ingame
313
* Added onArrowHitRemoveProjectile event to remove projectiles which got shoot from InGame Players

.github/building/classic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>fr.mrmicky</groupId>
7070
<artifactId>fastboard</artifactId>
71-
<version>2.1.3</version>
71+
<version>2.1.5</version>
7272
<optional>true</optional>
7373
</dependency>
7474
<dependency>

MiniGamesBox API/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.4.2</version>
26+
<version>1.4.2-SNAPSHOT9</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.github.cryptomorin</groupId>
5555
<artifactId>XSeries</artifactId>
56-
<version>13.3.1</version>
56+
<version>13.3.3</version>
5757
<scope>provided</scope>
5858
<optional>true</optional>
5959
</dependency>

MiniGamesBox Classic/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.4.2</version>
26+
<version>1.4.2-SNAPSHOT9</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>fr.mrmicky</groupId>
7070
<artifactId>fastboard</artifactId>
71-
<version>2.1.4</version>
71+
<version>2.1.5</version>
7272
<scope>compile</scope>
7373
<optional>true</optional>
7474
</dependency>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>com.github.cryptomorin</groupId>
8989
<artifactId>XSeries</artifactId>
90-
<version>13.3.1</version>
90+
<version>13.3.3</version>
9191
<scope>compile</scope>
9292
<optional>true</optional>
9393
</dependency>

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/BungeeManager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ public void connectToHub(Player player) {
7676

7777
@EventHandler(priority = EventPriority.HIGHEST)
7878
public void onServerListPing(ServerListPingEvent event) {
79+
if(plugin.getArenaRegistry() == null) {
80+
//can be null on early request after server startup
81+
return;
82+
}
7983
if(plugin.getArenaRegistry().getArenas().isEmpty() || !config.getBoolean("MOTD.Manager")) {
8084
return;
8185
}

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import plugily.projects.minigamesbox.classic.PluginMain;
4545
import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder;
4646
import plugily.projects.minigamesbox.classic.utils.version.ServerVersion;
47+
import plugily.projects.minigamesbox.classic.utils.version.VersionUtils;
4748
import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerInteractEvent;
4849
import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerSwapHandItemsEvent;
4950

@@ -189,13 +190,10 @@ public void onCraft(PlugilyPlayerInteractEvent event) {
189190
return;
190191
}
191192
if(event.getPlayer().getTargetBlock(null, 7).getType() == XMaterial.CRAFTING_TABLE.parseMaterial()) {
192-
if(event.getAction().isRightClick()) {
193+
if(VersionUtils.isRightClick(event.getAction())) {
193194
event.setCancelled(true);
194195
}
195196
}
196-
if(event.getClickedBlock() == null) {
197-
return;
198-
}
199197
if(event.getClickedBlock().getType() == XMaterial.PAINTING.parseMaterial() || event.getClickedBlock().getType() == XMaterial.FLOWER_POT.parseMaterial()) {
200198
event.setCancelled(true);
201199
}

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/BooleanItem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public Prompt acceptInput(ConversationContext context, String input) {
103103
context.getForWhom().sendRawMessage(new MessageBuilder("&e✖ Only a value of the list is allowed, try again by clicking the item again").build());
104104
return Prompt.END_OF_CONVERSATION;
105105
}
106-
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).build());
106+
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).prefix().build());
107107
setupInventory.setConfig(keyName, Boolean.valueOf(input));
108108
return Prompt.END_OF_CONVERSATION;
109109
}
@@ -113,7 +113,7 @@ public Prompt acceptInput(ConversationContext context, String input) {
113113
boolean option = setupInventory.getConfig().getBoolean("instances." + setupInventory.getArenaKey() + "." + keyName, false);
114114
int position = 2;
115115
boolean newOption = !option;
116-
event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).build());
116+
event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).prefix().build());
117117
setupInventory.setConfig(keyName, newOption);
118118
InventoryHolder holder = event.getInventory().getHolder();
119119
if(holder instanceof RefreshableFastInv) {

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/CountItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void onClick(InventoryClickEvent event) {
132132
countInput = 1;
133133
}
134134
updateArenaFile(countInput);
135-
conversationContext.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aCount for " + name.toUpperCase() + " on " + setupInventory.getArenaKey() + " set to " + countInput).build());
135+
conversationContext.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aCount for " + name.toUpperCase() + " on " + setupInventory.getArenaKey() + " set to " + countInput).prefix().build());
136136
//considerable to open setup inventory again?
137137
return Prompt.END_OF_CONVERSATION;
138138
}

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/SwitchItem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public Prompt acceptInput(ConversationContext context, String input) {
104104
context.getForWhom().sendRawMessage(new MessageBuilder("&e✖ Only a value of the list is allowed, try again by clicking the item again").build());
105105
return Prompt.END_OF_CONVERSATION;
106106
}
107-
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).build());
107+
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).prefix().build());
108108
setupInventory.setConfig(keyName, input);
109109
return Prompt.END_OF_CONVERSATION;
110110
}
@@ -114,7 +114,7 @@ public Prompt acceptInput(ConversationContext context, String input) {
114114
String option = setupInventory.getConfig().getString("instances." + setupInventory.getArenaKey() + "." + keyName, switches.get(0));
115115
int position = switches.indexOf(option);
116116
String newOption = switches.get(switches.size() - 1 <= position ? 0 : position + 1);
117-
event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).build());
117+
event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).prefix().build());
118118
setupInventory.setConfig(keyName, newOption);
119119
InventoryHolder holder = event.getInventory().getHolder();
120120
if(holder instanceof RefreshableFastInv) {

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/ValueItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onClick(InventoryClickEvent event) {
9595
@Override
9696
public Prompt acceptInput(ConversationContext context, String input) {
9797
String name = new MessageBuilder(input, false).build();
98-
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aName of &7" + setupInventory.getArenaKey() + " &aset to &r" + name).build());
98+
context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aName of &7" + setupInventory.getArenaKey() + " &aset to &r" + name).prefix().build());
9999
setupInventory.setConfig(keyName, name);
100100
return Prompt.END_OF_CONVERSATION;
101101
}

0 commit comments

Comments
 (0)