Skip to content

Commit 294c69b

Browse files
author
Xyness
committed
1.12.0.8
1 parent abde05b commit 294c69b

File tree

11 files changed

+255
-176
lines changed

11 files changed

+255
-176
lines changed

‎src/main/java/fr/xyness/SCS/ClaimMain.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.bukkit.boss.BossBar;
2727
import org.bukkit.command.CommandSender;
2828
import org.bukkit.entity.Player;
29+
import org.bukkit.entity.Vehicle;
2930
import org.bukkit.scheduler.BukkitRunnable;
3031
import org.bukkit.scheduler.BukkitTask;
3132

‎src/main/java/fr/xyness/SCS/Commands/ScsCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
8282
completions.addAll(getSecondaryCompletions(sender, args));
8383
} else if (args.length == 3) {
8484
completions.addAll(getTertiaryCompletions(sender, args));
85-
} else if (args.length == 4 && args[0].equalsIgnoreCase("player") && (args[1].equalsIgnoreCase("tp") || args[1].equalsIgnoreCase("unclaim"))) {
85+
} else if (args.length == 4 && args[0].equalsIgnoreCase("player") && (args[1].equalsIgnoreCase("tp") || args[1].equalsIgnoreCase("unclaim") || args[1].equalsIgnoreCase("main"))) {
8686
String partialInput = args.length > 3 ? args[3].toLowerCase() : "";
8787
completions.addAll(instance.getMain().getClaimsNameFromOwner(args[2]));
8888
if (args[1].equalsIgnoreCase("unclaim")) {

‎src/main/java/fr/xyness/SCS/Config/ClaimGuis.java‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ public class ClaimGuis {
101101
guis_items_perms_clicked_slots.get("natural").put(16, "Pvp");
102102
}
103103

104+
/**
105+
* A map containing the key-to-slot mappings.
106+
*/
107+
public static final Map<String, Integer> keyToSlotMap = new HashMap<>();
108+
109+
/**
110+
* A map containing the key-to-material mappings.
111+
*/
112+
public static final Map<String, Material> keyToMaterialMap = new HashMap<>();
113+
104114
/** Set of settings names */
105115
private Map<String,Set<String>> settings_name = new HashMap<>();
106116

@@ -131,6 +141,76 @@ public ClaimGuis(SimpleClaimSystem instance) {
131141
"Weather","Fly", "Portals", "ItemsPickup", "ItemsDrop", "SpecialBlocks", "Elytra", "Windcharges"));
132142

133143
settings_name.put("natural", Set.of("Explosions","Liquids","Redstone","Firespread","Monsters","Pvp"));
144+
145+
keyToSlotMap.put("Build", 1);
146+
keyToSlotMap.put("Destroy", 2);
147+
keyToSlotMap.put("Buttons", 3);
148+
keyToSlotMap.put("Items", 4);
149+
keyToSlotMap.put("InteractBlocks", 5);
150+
keyToSlotMap.put("Levers", 6);
151+
keyToSlotMap.put("Plates", 7);
152+
keyToSlotMap.put("Doors", 10);
153+
keyToSlotMap.put("Trapdoors", 11);
154+
keyToSlotMap.put("Fencegates", 12);
155+
keyToSlotMap.put("Tripwires", 13);
156+
keyToSlotMap.put("RepeatersComparators", 14);
157+
keyToSlotMap.put("Bells", 15);
158+
keyToSlotMap.put("Entities", 16);
159+
keyToSlotMap.put("Teleportations", 19);
160+
keyToSlotMap.put("Damages", 20);
161+
keyToSlotMap.put("Fly", 21);
162+
keyToSlotMap.put("Frostwalker", 22);
163+
keyToSlotMap.put("Weather", 23);
164+
keyToSlotMap.put("GuiTeleport", 24);
165+
keyToSlotMap.put("Portals", 25);
166+
keyToSlotMap.put("Elytra", 28);
167+
keyToSlotMap.put("Enter", 29);
168+
keyToSlotMap.put("ItemsPickup", 30);
169+
keyToSlotMap.put("ItemsDrop", 32);
170+
keyToSlotMap.put("SpecialBlocks", 33);
171+
keyToSlotMap.put("Windcharges", 34);
172+
173+
keyToSlotMap.put("Explosions", 10);
174+
keyToSlotMap.put("Liquids", 11);
175+
keyToSlotMap.put("Redstone", 12);
176+
keyToSlotMap.put("Firespread", 14);
177+
keyToSlotMap.put("Monsters", 15);
178+
keyToSlotMap.put("Pvp", 16);
179+
180+
keyToMaterialMap.put("Build", Material.OAK_STAIRS);
181+
keyToMaterialMap.put("Destroy", Material.IRON_PICKAXE);
182+
keyToMaterialMap.put("Buttons", Material.STONE_BUTTON);
183+
keyToMaterialMap.put("Items", Material.BOW);
184+
keyToMaterialMap.put("InteractBlocks", Material.RED_SHULKER_BOX);
185+
keyToMaterialMap.put("Levers", Material.LEVER);
186+
keyToMaterialMap.put("Plates", Material.STONE_PRESSURE_PLATE);
187+
keyToMaterialMap.put("Doors", Material.OAK_DOOR);
188+
keyToMaterialMap.put("Trapdoors", Material.OAK_TRAPDOOR);
189+
keyToMaterialMap.put("Fencegates", Material.OAK_FENCE_GATE);
190+
keyToMaterialMap.put("Tripwires", Material.TRIPWIRE_HOOK);
191+
keyToMaterialMap.put("RepeatersComparators", Material.REPEATER);
192+
keyToMaterialMap.put("Bells", Material.BELL);
193+
keyToMaterialMap.put("Entities", Material.ARMOR_STAND);
194+
keyToMaterialMap.put("Explosions", Material.TNT);
195+
keyToMaterialMap.put("Liquids", Material.WATER_BUCKET);
196+
keyToMaterialMap.put("Redstone", Material.REDSTONE);
197+
keyToMaterialMap.put("Frostwalker", Material.DIAMOND_BOOTS);
198+
keyToMaterialMap.put("Firespread", Material.CAMPFIRE);
199+
keyToMaterialMap.put("Teleportations", Material.ENDER_PEARL);
200+
keyToMaterialMap.put("Damages", Material.APPLE);
201+
keyToMaterialMap.put("Monsters", Material.STRING);
202+
keyToMaterialMap.put("GuiTeleport", Material.COMPASS);
203+
keyToMaterialMap.put("Fly", Material.PRISMARINE_SHARD);
204+
keyToMaterialMap.put("Pvp", Material.DIAMOND_SWORD);
205+
keyToMaterialMap.put("Weather", Material.SNOWBALL);
206+
keyToMaterialMap.put("Portals", Material.END_PORTAL_FRAME);
207+
keyToMaterialMap.put("Enter", Material.BIRCH_DOOR);
208+
keyToMaterialMap.put("ItemsPickup", Material.HOPPER);
209+
keyToMaterialMap.put("ItemsDrop", Material.FEATHER);
210+
keyToMaterialMap.put("Elytra", Material.ELYTRA);
211+
keyToMaterialMap.put("SpecialBlocks", Material.SPAWNER);
212+
keyToMaterialMap.put("Windcharges", Material.WHITE_DYE);
213+
134214
}
135215

136216

‎src/main/java/fr/xyness/SCS/Guis/AdminGestion/AdminGestionClaimGui.java‎

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -40,87 +40,6 @@ public class AdminGestionClaimGui implements InventoryHolder {
4040
// * Variables *
4141
// ***************
4242

43-
44-
/**
45-
* A map containing the key-to-slot mappings.
46-
*/
47-
private static final Map<String, Integer> keyToSlotMap = new HashMap<>();
48-
49-
/**
50-
* A map containing the key-to-material mappings.
51-
*/
52-
private static final Map<String, Material> keyToMaterialMap = new HashMap<>();
53-
54-
static {
55-
keyToSlotMap.put("Build", 1);
56-
keyToSlotMap.put("Destroy", 2);
57-
keyToSlotMap.put("Buttons", 3);
58-
keyToSlotMap.put("Items", 4);
59-
keyToSlotMap.put("InteractBlocks", 5);
60-
keyToSlotMap.put("Levers", 6);
61-
keyToSlotMap.put("Plates", 7);
62-
keyToSlotMap.put("Doors", 10);
63-
keyToSlotMap.put("Trapdoors", 11);
64-
keyToSlotMap.put("Fencegates", 12);
65-
keyToSlotMap.put("Tripwires", 13);
66-
keyToSlotMap.put("RepeatersComparators", 14);
67-
keyToSlotMap.put("Bells", 15);
68-
keyToSlotMap.put("Entities", 16);
69-
keyToSlotMap.put("Teleportations", 19);
70-
keyToSlotMap.put("Damages", 20);
71-
keyToSlotMap.put("Fly", 21);
72-
keyToSlotMap.put("Frostwalker", 22);
73-
keyToSlotMap.put("Weather", 23);
74-
keyToSlotMap.put("GuiTeleport", 24);
75-
keyToSlotMap.put("Portals", 25);
76-
keyToSlotMap.put("Elytra", 28);
77-
keyToSlotMap.put("Enter", 29);
78-
keyToSlotMap.put("ItemsPickup", 30);
79-
keyToSlotMap.put("ItemsDrop", 32);
80-
keyToSlotMap.put("SpecialBlocks", 33);
81-
keyToSlotMap.put("Windcharges", 34);
82-
83-
keyToSlotMap.put("Explosions", 10);
84-
keyToSlotMap.put("Liquids", 11);
85-
keyToSlotMap.put("Redstone", 12);
86-
keyToSlotMap.put("Firespread", 14);
87-
keyToSlotMap.put("Monsters", 15);
88-
keyToSlotMap.put("Pvp", 16);
89-
90-
keyToMaterialMap.put("Build", Material.OAK_STAIRS);
91-
keyToMaterialMap.put("Destroy", Material.IRON_PICKAXE);
92-
keyToMaterialMap.put("Buttons", Material.STONE_BUTTON);
93-
keyToMaterialMap.put("Items", Material.BOW);
94-
keyToMaterialMap.put("InteractBlocks", Material.RED_SHULKER_BOX);
95-
keyToMaterialMap.put("Levers", Material.LEVER);
96-
keyToMaterialMap.put("Plates", Material.STONE_PRESSURE_PLATE);
97-
keyToMaterialMap.put("Doors", Material.OAK_DOOR);
98-
keyToMaterialMap.put("Trapdoors", Material.OAK_TRAPDOOR);
99-
keyToMaterialMap.put("Fencegates", Material.OAK_FENCE_GATE);
100-
keyToMaterialMap.put("Tripwires", Material.TRIPWIRE_HOOK);
101-
keyToMaterialMap.put("RepeatersComparators", Material.REPEATER);
102-
keyToMaterialMap.put("Bells", Material.BELL);
103-
keyToMaterialMap.put("Entities", Material.ARMOR_STAND);
104-
keyToMaterialMap.put("Explosions", Material.TNT);
105-
keyToMaterialMap.put("Liquids", Material.WATER_BUCKET);
106-
keyToMaterialMap.put("Redstone", Material.REDSTONE);
107-
keyToMaterialMap.put("Frostwalker", Material.DIAMOND_BOOTS);
108-
keyToMaterialMap.put("Firespread", Material.CAMPFIRE);
109-
keyToMaterialMap.put("Teleportations", Material.ENDER_PEARL);
110-
keyToMaterialMap.put("Damages", Material.APPLE);
111-
keyToMaterialMap.put("Monsters", Material.STRING);
112-
keyToMaterialMap.put("GuiTeleport", Material.COMPASS);
113-
keyToMaterialMap.put("Fly", Material.PRISMARINE_SHARD);
114-
keyToMaterialMap.put("Pvp", Material.DIAMOND_SWORD);
115-
keyToMaterialMap.put("Weather", Material.SNOWBALL);
116-
keyToMaterialMap.put("Portals", Material.END_PORTAL_FRAME);
117-
keyToMaterialMap.put("Enter", Material.BIRCH_DOOR);
118-
keyToMaterialMap.put("ItemsPickup", Material.HOPPER);
119-
keyToMaterialMap.put("ItemsDrop", Material.FEATHER);
120-
keyToMaterialMap.put("Elytra", Material.ELYTRA);
121-
keyToMaterialMap.put("SpecialBlocks", Material.SPAWNER);
122-
keyToMaterialMap.put("Windcharges", Material.WHITE_DYE);
123-
}
12443

12544
/** Inventory for the GUI. */
12645
private Inventory inv;
@@ -244,7 +163,7 @@ public void openInventory(Player player) {
244163
* @return The slot number associated with the key, or -1 if the key is not found.
245164
*/
246165
public static int getSlotByKey(String key) {
247-
return keyToSlotMap.getOrDefault(key, -1);
166+
return ClaimGuis.keyToSlotMap.getOrDefault(key, -1);
248167
}
249168

250169
/**
@@ -254,7 +173,7 @@ public static int getSlotByKey(String key) {
254173
* @return The material associated with the key, or null if the key is not found.
255174
*/
256175
public static Material getMaterialByKey(String key) {
257-
return keyToMaterialMap.getOrDefault(key, null);
176+
return ClaimGuis.keyToMaterialMap.getOrDefault(key, null);
258177
}
259178

260179
/**

‎src/main/java/fr/xyness/SCS/Guis/ClaimSettingsGui.java‎

Lines changed: 3 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.bukkit.inventory.meta.ItemMeta;
1616

1717
import fr.xyness.SCS.SimpleClaimSystem;
18+
import fr.xyness.SCS.Config.ClaimGuis;
1819
import fr.xyness.SCS.Types.CPlayer;
1920
import fr.xyness.SCS.Types.Claim;
2021

@@ -28,87 +29,6 @@ public class ClaimSettingsGui implements InventoryHolder {
2829
// * Variables *
2930
// ***************
3031

31-
32-
/**
33-
* A map containing the key-to-slot mappings.
34-
*/
35-
private static final Map<String, Integer> keyToSlotMap = new HashMap<>();
36-
37-
/**
38-
* A map containing the key-to-material mappings.
39-
*/
40-
private static final Map<String, Material> keyToMaterialMap = new HashMap<>();
41-
42-
static {
43-
keyToSlotMap.put("Build", 1);
44-
keyToSlotMap.put("Destroy", 2);
45-
keyToSlotMap.put("Buttons", 3);
46-
keyToSlotMap.put("Items", 4);
47-
keyToSlotMap.put("InteractBlocks", 5);
48-
keyToSlotMap.put("Levers", 6);
49-
keyToSlotMap.put("Plates", 7);
50-
keyToSlotMap.put("Doors", 10);
51-
keyToSlotMap.put("Trapdoors", 11);
52-
keyToSlotMap.put("Fencegates", 12);
53-
keyToSlotMap.put("Tripwires", 13);
54-
keyToSlotMap.put("RepeatersComparators", 14);
55-
keyToSlotMap.put("Bells", 15);
56-
keyToSlotMap.put("Entities", 16);
57-
keyToSlotMap.put("Teleportations", 19);
58-
keyToSlotMap.put("Damages", 20);
59-
keyToSlotMap.put("Fly", 21);
60-
keyToSlotMap.put("Frostwalker", 22);
61-
keyToSlotMap.put("Weather", 23);
62-
keyToSlotMap.put("GuiTeleport", 24);
63-
keyToSlotMap.put("Portals", 25);
64-
keyToSlotMap.put("Elytra", 28);
65-
keyToSlotMap.put("Enter", 29);
66-
keyToSlotMap.put("ItemsPickup", 30);
67-
keyToSlotMap.put("ItemsDrop", 32);
68-
keyToSlotMap.put("SpecialBlocks", 33);
69-
keyToSlotMap.put("Windcharges", 34);
70-
71-
keyToSlotMap.put("Explosions", 10);
72-
keyToSlotMap.put("Liquids", 11);
73-
keyToSlotMap.put("Redstone", 12);
74-
keyToSlotMap.put("Firespread", 14);
75-
keyToSlotMap.put("Monsters", 15);
76-
keyToSlotMap.put("Pvp", 16);
77-
78-
keyToMaterialMap.put("Build", Material.OAK_STAIRS);
79-
keyToMaterialMap.put("Destroy", Material.IRON_PICKAXE);
80-
keyToMaterialMap.put("Buttons", Material.STONE_BUTTON);
81-
keyToMaterialMap.put("Items", Material.BOW);
82-
keyToMaterialMap.put("InteractBlocks", Material.RED_SHULKER_BOX);
83-
keyToMaterialMap.put("Levers", Material.LEVER);
84-
keyToMaterialMap.put("Plates", Material.STONE_PRESSURE_PLATE);
85-
keyToMaterialMap.put("Doors", Material.OAK_DOOR);
86-
keyToMaterialMap.put("Trapdoors", Material.OAK_TRAPDOOR);
87-
keyToMaterialMap.put("Fencegates", Material.OAK_FENCE_GATE);
88-
keyToMaterialMap.put("Tripwires", Material.TRIPWIRE_HOOK);
89-
keyToMaterialMap.put("RepeatersComparators", Material.REPEATER);
90-
keyToMaterialMap.put("Bells", Material.BELL);
91-
keyToMaterialMap.put("Entities", Material.ARMOR_STAND);
92-
keyToMaterialMap.put("Explosions", Material.TNT);
93-
keyToMaterialMap.put("Liquids", Material.WATER_BUCKET);
94-
keyToMaterialMap.put("Redstone", Material.REDSTONE);
95-
keyToMaterialMap.put("Frostwalker", Material.DIAMOND_BOOTS);
96-
keyToMaterialMap.put("Firespread", Material.CAMPFIRE);
97-
keyToMaterialMap.put("Teleportations", Material.ENDER_PEARL);
98-
keyToMaterialMap.put("Damages", Material.APPLE);
99-
keyToMaterialMap.put("Monsters", Material.STRING);
100-
keyToMaterialMap.put("GuiTeleport", Material.COMPASS);
101-
keyToMaterialMap.put("Fly", Material.PRISMARINE_SHARD);
102-
keyToMaterialMap.put("Pvp", Material.DIAMOND_SWORD);
103-
keyToMaterialMap.put("Weather", Material.SNOWBALL);
104-
keyToMaterialMap.put("Portals", Material.END_PORTAL_FRAME);
105-
keyToMaterialMap.put("Enter", Material.BIRCH_DOOR);
106-
keyToMaterialMap.put("ItemsPickup", Material.HOPPER);
107-
keyToMaterialMap.put("ItemsDrop", Material.FEATHER);
108-
keyToMaterialMap.put("Elytra", Material.ELYTRA);
109-
keyToMaterialMap.put("SpecialBlocks", Material.SPAWNER);
110-
keyToMaterialMap.put("Windcharges", Material.WHITE_DYE);
111-
}
11232

11333
/** Inventory for the GUI. */
11434
private Inventory inv;
@@ -249,7 +169,7 @@ public CompletableFuture<Boolean> loadItems(Player player, Claim claim, String r
249169
* @return The slot number associated with the key, or -1 if the key is not found.
250170
*/
251171
public static int getSlotByKey(String key) {
252-
return keyToSlotMap.getOrDefault(key, -1);
172+
return ClaimGuis.keyToSlotMap.getOrDefault(key, -1);
253173
}
254174

255175
/**
@@ -259,7 +179,7 @@ public static int getSlotByKey(String key) {
259179
* @return The material associated with the key, or null if the key is not found.
260180
*/
261181
public static Material getMaterialByKey(String key) {
262-
return keyToMaterialMap.getOrDefault(key, null);
182+
return ClaimGuis.keyToMaterialMap.getOrDefault(key, null);
263183
}
264184

265185
/**

‎src/main/java/fr/xyness/SCS/Listeners/ClaimEvents.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
404404
blockIterator.remove();
405405
}
406406
}
407-
if (event.getEntityType() == EntityType.WIND_CHARGE) {
407+
if (instance.getMinecraftVersion().contains("1.21") && event.getEntityType() == EntityType.WIND_CHARGE) {
408408
Projectile wind = (Projectile) event.getEntity();
409409
if(wind.getShooter() instanceof Player player) {
410410
Chunk chunk = event.getEntity().getLocation().getChunk();
@@ -461,7 +461,7 @@ public void onProjectileHit(ProjectileHitEvent event) {
461461
entity.setVelocity(new Vector(0, 0, 0));
462462
}
463463
});
464-
} else if (event.getEntityType() == EntityType.WIND_CHARGE) {
464+
} else if (instance.getMinecraftVersion().contains("1.21") && event.getEntityType() == EntityType.WIND_CHARGE) {
465465
if (event.getHitBlock() != null) {
466466
Block block = event.getHitBlock();
467467
Chunk chunk = block.getLocation().getChunk();

0 commit comments

Comments
 (0)