Skip to content

Commit 912eeb5

Browse files
committed
feat: museum and debugging tools
1 parent 7d2434d commit 912eeb5

18 files changed

Lines changed: 355 additions & 176 deletions

File tree

commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
public enum ItemType {
99
SANDBOX_ITEM(Material.BLAZE_POWDER, Rarity.COMMON),
10+
REGION_SELECTOR(Material.BLAZE_ROD, Rarity.ADMIN),
11+
BLOCK_DATA_TOOL(Material.COMPARATOR, Rarity.ADMIN),
1012

1113
/**
1214
* Miscellaneous
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
items:
2+
- id: REGION_SELECTOR
3+
rarity: ADMIN
4+
name: "Region Selector Staff"
5+
components:
6+
- id: REGION_SELECTOR
7+
- id: BLOCK_DATA_TOOL
8+
rarity: ADMIN
9+
name: "Block Data Tool"
10+
components:
11+
- id: BLOCK_DATA_TOOL

type.generic/src/main/java/net/swofty/type/generic/data/HypixelDataHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public enum Data {
179179
if (HypixelConst.getTypeLoader().getType().isSkyBlock()) return;
180180

181181
String teamName = StringUtility.limitStringLength(rank.getPriorityCharacter() + player.getUsername(), 15);
182-
Team team = new TeamBuilder("Z" + teamName, MinecraftServer.getTeamManager())
182+
Team team = new TeamBuilder("H" + teamName, MinecraftServer.getTeamManager())
183183
.prefix(Component.text(rank.getPrefix()))
184184
.teamColor(rank.getTextColor())
185185
.build();
@@ -192,7 +192,7 @@ public enum Data {
192192

193193
Rank rank = (Rank) datapoint.getValue();
194194
String teamName = StringUtility.limitStringLength(rank.getPriorityCharacter() + player.getUsername(), 15);
195-
player.setTeam(new TeamBuilder("Z" + teamName, MinecraftServer.getTeamManager())
195+
player.setTeam(new TeamBuilder("H" + teamName, MinecraftServer.getTeamManager())
196196
.prefix(Component.text(rank.getPrefix()))
197197
.teamColor(rank.getTextColor())
198198
.build());

type.generic/src/main/java/net/swofty/type/generic/entity/hologram/ServerHolograms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Getter
1616
public enum ServerHolograms {
1717
TO_ISLAND(ServerType.SKYBLOCK_HUB, new Pos(0.5, 71, -27.5), "§bTravel to:", "§aYour Island"),
18-
TO_DUNGEON_HUB(ServerType.SKYBLOCK_HUB, new Pos(-34, 73, 26), "§bTravel to:", "§aDungeon Hub"),
18+
TO_DUNGEON_HUB(ServerType.SKYBLOCK_HUB, new Pos(-33.5, 75, 26.5), "§bTravel to:", "§aDungeon Hub"),
1919
;
2020

2121
private static final Map<ExternalHologram, List<HologramEntity>> externalHolograms = new HashMap<>();

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/HubCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import net.swofty.type.generic.HypixelConst;
66
import net.swofty.type.generic.command.CommandParameters;
77
import net.swofty.type.generic.command.HypixelCommand;
8+
import net.swofty.type.generic.user.categories.Rank;
89
import net.swofty.type.skyblockgeneric.mission.MissionSet;
910
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
10-
import net.swofty.type.generic.user.categories.Rank;
1111

1212
@CommandParameters(aliases = "h",
1313
description = "Sends the player to their hub",
@@ -28,7 +28,7 @@ public void registerUsage(MinestomCommand command) {
2828
}
2929

3030
if (HypixelConst.getTypeLoader().getType() == ServerType.SKYBLOCK_HUB) {
31-
player.teleport(new Pos(-2.5, 72.5, -69.5, 180, 0));
31+
player.teleport(new Pos(0.5, 77, -0.5, -180, 0));
3232
return;
3333
}
3434

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/RegionCommand.java

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,33 @@
88
import net.swofty.type.generic.HypixelConst;
99
import net.swofty.type.generic.command.CommandParameters;
1010
import net.swofty.type.generic.command.HypixelCommand;
11+
import net.swofty.type.generic.user.categories.Rank;
12+
import net.swofty.type.skyblockgeneric.item.components.RegionSelectorComponent;
1113
import net.swofty.type.skyblockgeneric.region.RegionType;
1214
import net.swofty.type.skyblockgeneric.region.SkyBlockRegion;
1315
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
14-
import net.swofty.type.generic.user.categories.Rank;
1516

1617
@CommandParameters(aliases = "regions",
17-
description = "Handles regions across the server",
18-
usage = "/signgui <text>",
19-
permission = Rank.STAFF,
20-
allowsConsole = false)
18+
description = "Handles regions across the server",
19+
usage = "/signgui <text>",
20+
permission = Rank.STAFF,
21+
allowsConsole = false)
2122
public class RegionCommand extends HypixelCommand {
2223
@Override
2324
public void registerUsage(MinestomCommand command) {
2425
ArgumentGroup removeRegion = ArgumentType.Group("remove",
25-
ArgumentType.Literal("remove"),
26-
ArgumentType.String("region_id"));
26+
ArgumentType.Literal("remove"),
27+
ArgumentType.String("region_id"));
2728
ArgumentGroup addRegion = ArgumentType.Group("add",
28-
ArgumentType.Literal("add"),
29-
ArgumentType.String("region_id"),
30-
ArgumentType.Enum("region_type", RegionType.class),
31-
ArgumentType.RelativeBlockPosition("pos1"),
32-
ArgumentType.RelativeBlockPosition("pos2"));
29+
ArgumentType.Literal("add"),
30+
ArgumentType.String("region_id"),
31+
ArgumentType.Enum("region_type", RegionType.class),
32+
ArgumentType.RelativeBlockPosition("pos1"),
33+
ArgumentType.RelativeBlockPosition("pos2"));
34+
ArgumentGroup wandRegion = ArgumentType.Group("wand",
35+
ArgumentType.Literal("wand"),
36+
ArgumentType.String("region_id"),
37+
ArgumentType.Enum("region_type", RegionType.class));
3338

3439
command.addSyntax((sender, context) -> {
3540
if (!permissionCheck(sender)) return;
@@ -61,10 +66,31 @@ public void registerUsage(MinestomCommand command) {
6166
sender.sendMessage("§aPosition 2: §e" + vectorPosition2.x() + ", " + vectorPosition2.y() + ", " + vectorPosition2.z());
6267

6368
new SkyBlockRegion(regionId,
64-
new Pos(vectorPosition1.x(), vectorPosition1.y(), vectorPosition1.z()),
65-
new Pos(vectorPosition2.x(), vectorPosition2.y(), vectorPosition2.z()),
66-
regionType,
67-
HypixelConst.getTypeLoader().getType()).save();
69+
new Pos(vectorPosition1.x(), vectorPosition1.y(), vectorPosition1.z()),
70+
new Pos(vectorPosition2.x(), vectorPosition2.y(), vectorPosition2.z()),
71+
regionType,
72+
HypixelConst.getTypeLoader().getType()).save();
6873
}, addRegion);
74+
75+
command.addSyntax((sender, context) -> {
76+
RegionSelectorComponent.SelectedRegion region = RegionSelectorComponent.getPlayerRegionSelection().get((SkyBlockPlayer) sender);
77+
if (region == null || region.getPos1() == null || region.getPos2() == null) {
78+
sender.sendMessage("§cYou must select a region first using the region selector item.");
79+
return;
80+
}
81+
82+
String regionId = context.get(wandRegion).get("region_id");
83+
RegionType regionType = context.get(wandRegion).get("region_type");
84+
85+
sender.sendMessage("§aSuccessfully created region §e" + regionId + "§a with type §e" + regionType.name() + "§a.");
86+
sender.sendMessage("§aPosition 1: §e" + region.getPos1().x() + ", " + region.getPos1().y() + ", " + region.getPos1().z());
87+
sender.sendMessage("§aPosition 2: §e" + region.getPos2().x() + ", " + region.getPos2().y() + ", " + region.getPos2().z());
88+
89+
new SkyBlockRegion(regionId,
90+
new Pos(region.getPos1().x(), region.getPos1().y(), region.getPos1().z()),
91+
new Pos(region.getPos2().x(), region.getPos2().y(), region.getPos2().z()),
92+
regionType,
93+
HypixelConst.getTypeLoader().getType()).save();
94+
}, wandRegion);
6995
}
7096
}

0 commit comments

Comments
 (0)