Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Remove even more useless stuff

Browse Source
This commit is contained in:
YoyoNow
2026-05-16 22:21:06 +02:00
parent cfa650bcf4
commit fcc370c353
45 changed files with 278 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
+4 -5
View File
@@ -51,9 +51,8 @@ public class GUI {
@SuppressWarnings("deprecation")
private static void addTeamRequest(Player p, SWInventory inv, int pos, FightTeam team) {
byte colorCode = ColorConverter.chat2dye(team.getColor()).getDyeData();
String name = team.getLeader() != null ? team.getLeader().getEntity().getName() : team.getName();
inv.setItem(pos, SWItem.getDye(colorCode), colorCode, msg.parse("JOIN_REQUEST_TEAM", p, team.getColor() + name), click -> {
inv.setItem(pos, ColorConverter.chat2dye(team.getColor()), msg.parse("JOIN_REQUEST_TEAM", p, team.getColor() + name), click -> {
p.closeInventory();
if(ArenaMode.ManualTeams.contains(Config.mode) && team.canbeLeader(p))
@@ -226,7 +225,7 @@ public class GUI {
});
if (Fight.publicOnly()) {
inv.setItem(row * 9, SWItem.getDye(8), (byte)8, msg.parse("SCHEM_PRIVATE_FORBIDDEN", p, type.name()), (ClickType click)->{});
inv.setItem(row * 9, Material.GRAY_DYE, (byte)8, msg.parse("SCHEM_PRIVATE_FORBIDDEN", p, type.name()), (ClickType click)->{});
return;
}
@@ -238,11 +237,11 @@ public class GUI {
}
if (SchematicNode.getAllAccessibleSchematicsOfType(SteamwarUser.get(p.getUniqueId()).getId(), type.toDB()).isEmpty() && !Config.test()) {
inv.setItem(row * 9, SWItem.getDye(8), (byte)8, msg.parse("SCHEM_NO_PRIVATE", p, type.name()), (ClickType click)->{});
inv.setItem(row * 9, Material.GRAY_DYE, (byte)8, msg.parse("SCHEM_NO_PRIVATE", p, type.name()), (ClickType click)->{});
return;
}
inv.setItem(row * 9, SWItem.getMaterial("CAULDRON_ITEM"), msg.parse("SCHEM_PRIVATE", p, type.name()), (ClickType click) -> {
inv.setItem(row * 9, Material.CAULDRON, msg.parse("SCHEM_PRIVATE", p, type.name()), (ClickType click) -> {
p.closeInventory();
schemDialog(p, type, false, false);
});
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class FightSchematic extends StateDependent {
private void replaceTeamColor(Clipboard clipboard) {
try {
WorldeditWrapper.impl.replaceTeamColor(clipboard, ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dye(team.getColor()) : DyeColor.PINK);
WorldeditWrapper.impl.replaceTeamColor(clipboard, ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dyeColor(team.getColor()) : DyeColor.PINK);
} catch (WorldEditException e) {
Bukkit.getLogger().log(Level.SEVERE, "Could not recolor schematic", e);
}
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
+4 -4
View File
@@ -78,19 +78,19 @@ public class FightTeam {
}
if(Config.test())
notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(Material.CAULDRON).enchant().build(), GUI::preSchemDialog);
notReadyKit.setItem(3, "MANAGE_PLAYERS", SWItem.getPlayerSkull("AdmiralSeekrank").getItemStack(), GUI::managePlayers);
notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(SWItem.getDye(10), (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(Material.LIME_DYE, (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
}
private static final HotbarKit chooseSchemKit = new HotbarKit(notReadyKit);
static {
chooseSchemKit.setItem(4, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
chooseSchemKit.setItem(4, "CHOOSE_SCHEMATIC", new ItemBuilder(Material.CAULDRON).enchant().build(), GUI::preSchemDialog);
}
private static final HotbarKit readyKit = new HotbarKit(memberKit);
static {
readyKit.setItem(1, null, null, null);
readyKit.setItem(4, "TEAM_READY", new ItemBuilder(SWItem.getDye(8), (short) 8).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(false));
readyKit.setItem(4, "TEAM_READY", new ItemBuilder(Material.GRAY_DYE, (short) 8).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(false));
}
@Getter
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
+6 -6
View File
@@ -295,7 +295,7 @@ public class Kit {
int pos = 44;
while(it.hasNext()){
PotionEffect effect = it.next();
SWItem item = new SWItem(SWItem.getMaterial("POTION"), effect.getType().getName());
SWItem item = new SWItem(Material.POTION, effect.getType().getName());
inv.setItem(pos, item);
pos--;
}
@@ -303,12 +303,12 @@ public class Kit {
inv.setCallback(-999, click -> player.closeInventory());
if(Config.GameModeConfig.Kits.PersonalKits){
inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
inv.setItem(49, Material.WOODEN_AXE, FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
inv.setItem(53, Material.BARRIER, FightSystem.getMessage().parse("KIT_PREVIEW_DELETE", player), clickType -> {
player.closeInventory();
SWInventory conf = new SWInventory(player, 9, FightSystem.getMessage().parse("KIT_DELETION_CONFIRMATION", player));
conf.setItem(8, SWItem.getDye(1), FightSystem.getMessage().parse("KIT_DELETION_ABORT", player), click -> player.closeInventory());
conf.setItem(0, SWItem.getDye(10), FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
conf.setItem(8, Material.RED_DYE, FightSystem.getMessage().parse("KIT_DELETION_ABORT", player), click -> player.closeInventory());
conf.setItem(0, Material.LIME_DYE, FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
player.closeInventory();
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
PersonalKit kit = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), name);
@@ -327,11 +327,11 @@ public class Kit {
conf.open();
});
}
inv.setItem(45, SWItem.getDye(10), (byte)10, FightSystem.getMessage().parse("KIT_PREVIEW_CHOOSE", player), click -> {
inv.setItem(45, Material.LIME_DYE, (byte)10, FightSystem.getMessage().parse("KIT_PREVIEW_CHOOSE", player), click -> {
Commands.kit(player, name);
player.closeInventory();
});
inv.setItem(53, SWItem.getDye(1), (byte)1, FightSystem.getMessage().parse("KIT_PREVIEW_BACK", player), click -> GUI.kitSelection(player, ""));
inv.setItem(53, Material.RED_DYE, (byte)1, FightSystem.getMessage().parse("KIT_PREVIEW_BACK", player), click -> GUI.kitSelection(player, ""));
inv.open();
}
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+2 -1
View File
@@ -43,6 +43,7 @@ import de.steamwar.techhider.BlockIds;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.minecraft.world.entity.Pose;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -291,7 +292,7 @@ public class PacketProcessor implements Listener {
int entityId = source.readInt();
boolean sneaking = source.readBoolean();
execSync(() -> entities.get(entityId).setPose(sneaking ? de.steamwar.core.FlatteningWrapper.EntityPose.SNEAKING : de.steamwar.core.FlatteningWrapper.EntityPose.NORMAL));
execSync(() -> entities.get(entityId).setPose(sneaking ? Pose.CROUCHING : Pose.STANDING));
}
private void entityAnimation() throws IOException {
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java
+41 -18
View File
@@ -21,6 +21,7 @@ package de.steamwar.fightsystem.utils;
import org.bukkit.ChatColor;
import org.bukkit.DyeColor;
import org.bukkit.Material;
import java.util.EnumMap;
import java.util.Map;
@@ -28,28 +29,50 @@ import java.util.Map;
public class ColorConverter {
private ColorConverter(){}
private static final Map<ChatColor, DyeColor> chat2dye = new EnumMap<>(ChatColor.class);
private static final Map<ChatColor, DyeColor> chat2dyeColor = new EnumMap<>(ChatColor.class);
private static final Map<ChatColor, Material> chat2dye = new EnumMap<>(ChatColor.class);
static{
chat2dye.put(ChatColor.WHITE, DyeColor.WHITE);
chat2dye.put(ChatColor.GOLD, DyeColor.ORANGE);
chat2dye.put(ChatColor.LIGHT_PURPLE, DyeColor.MAGENTA);
chat2dye.put(ChatColor.BLUE, DyeColor.LIGHT_BLUE);
chat2dye.put(ChatColor.YELLOW, DyeColor.YELLOW);
chat2dye.put(ChatColor.GREEN, DyeColor.LIME);
chat2dye.put(ChatColor.RED, DyeColor.RED);
chat2dye.put(ChatColor.DARK_GRAY, DyeColor.GRAY);
chat2dye.put(ChatColor.DARK_AQUA, DyeColor.CYAN);
chat2dye.put(ChatColor.DARK_PURPLE, DyeColor.PURPLE);
chat2dye.put(ChatColor.DARK_BLUE, DyeColor.BLUE);
chat2dye.put(ChatColor.AQUA, DyeColor.CYAN);
chat2dye.put(ChatColor.DARK_GREEN, DyeColor.GREEN);
chat2dye.put(ChatColor.DARK_RED, DyeColor.RED);
chat2dye.put(ChatColor.BLACK, DyeColor.BLACK);
chat2dye.put(ChatColor.GRAY, FlatteningWrapper.impl.getSilver());
chat2dyeColor.put(ChatColor.WHITE, DyeColor.WHITE);
chat2dyeColor.put(ChatColor.GOLD, DyeColor.ORANGE);
chat2dyeColor.put(ChatColor.LIGHT_PURPLE, DyeColor.MAGENTA);
chat2dyeColor.put(ChatColor.BLUE, DyeColor.LIGHT_BLUE);
chat2dyeColor.put(ChatColor.YELLOW, DyeColor.YELLOW);
chat2dyeColor.put(ChatColor.GREEN, DyeColor.LIME);
chat2dyeColor.put(ChatColor.RED, DyeColor.RED);
chat2dyeColor.put(ChatColor.DARK_GRAY, DyeColor.GRAY);
chat2dyeColor.put(ChatColor.DARK_AQUA, DyeColor.CYAN);
chat2dyeColor.put(ChatColor.DARK_PURPLE, DyeColor.PURPLE);
chat2dyeColor.put(ChatColor.DARK_BLUE, DyeColor.BLUE);
chat2dyeColor.put(ChatColor.AQUA, DyeColor.CYAN);
chat2dyeColor.put(ChatColor.DARK_GREEN, DyeColor.GREEN);
chat2dyeColor.put(ChatColor.DARK_RED, DyeColor.RED);
chat2dyeColor.put(ChatColor.BLACK, DyeColor.BLACK);
chat2dyeColor.put(ChatColor.GRAY, DyeColor.LIGHT_GRAY);
chat2dye.put(ChatColor.WHITE, Material.WHITE_DYE);
chat2dye.put(ChatColor.GOLD, Material.ORANGE_DYE);
chat2dye.put(ChatColor.LIGHT_PURPLE, Material.MAGENTA_DYE);
chat2dye.put(ChatColor.BLUE, Material.LIGHT_BLUE_DYE);
chat2dye.put(ChatColor.YELLOW, Material.YELLOW_DYE);
chat2dye.put(ChatColor.GREEN, Material.LIME_DYE);
chat2dye.put(ChatColor.RED, Material.RED_DYE);
chat2dye.put(ChatColor.DARK_GRAY, Material.GRAY_DYE);
chat2dye.put(ChatColor.DARK_AQUA, Material.CYAN_DYE);
chat2dye.put(ChatColor.DARK_PURPLE, Material.PURPLE_DYE);
chat2dye.put(ChatColor.DARK_BLUE, Material.BLUE_DYE);
chat2dye.put(ChatColor.AQUA, Material.CYAN_DYE);
chat2dye.put(ChatColor.DARK_GREEN, Material.GREEN_DYE);
chat2dye.put(ChatColor.DARK_RED, Material.RED_DYE);
chat2dye.put(ChatColor.BLACK, Material.BLACK_DYE);
chat2dye.put(ChatColor.GRAY, Material.LIGHT_GRAY_DYE);
}
public static DyeColor chat2dye(ChatColor color){
public static DyeColor chat2dyeColor(ChatColor color){
return chat2dyeColor.get(color);
}
public static Material chat2dye(ChatColor color){
return chat2dye.get(color);
}
}
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java
-5
View File
@@ -19,7 +19,6 @@
package de.steamwar.fightsystem.utils;
import org.bukkit.DyeColor;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
@@ -36,10 +35,6 @@ import org.bukkit.inventory.meta.ItemMeta;
public class FlatteningWrapper {
public static final FlatteningWrapper impl = new FlatteningWrapper();
public DyeColor getSilver() {
return DyeColor.LIGHT_GRAY;
}
public boolean isWater(Block block) {
if(block.getType() == Material.WATER)
return true;
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
+1 -2
View File
@@ -25,7 +25,6 @@ import de.steamwar.fightsystem.fight.FightTeam;
import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentTask;
import de.steamwar.fightsystem.utils.Message;
import de.steamwar.inventory.SWItem;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -37,7 +36,7 @@ import java.util.function.Predicate;
public abstract class WinconditionBlocks extends Wincondition implements PrintableWincondition {
public static final Material PUMPKIN_LANTERN = SWItem.getMaterial("JACK_O_LANTERN");
public static final Material PUMPKIN_LANTERN = Material.JACK_O_LANTERN;
private final Map<FightTeam, TeamBlocks> teamMap = new HashMap<>();
private final String barMessage;