Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.stream.Collectors;

public class TypeIslandLoader implements SkyBlockTypeLoader {
public static final Pos SPAWN_POS = new Pos(7.5, 100, 7.5);

@Override
public ServerType getType() {
return ServerType.SKYBLOCK_ISLAND;
Expand All @@ -52,7 +54,7 @@ public void afterInitialize(MinecraftServer server) {
@Override
public HypixelTypeLoader.LoaderValues getLoaderValues() {
return new HypixelTypeLoader.LoaderValues(
(type) -> new Pos(7.5, 100, 7.5), // Spawn position
(_) -> SPAWN_POS, // Spawn position
true // Announce death messages
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void run(IslandFetchedFromDatabaseEvent event) {
);
} else {
jerryInformation.setJerryPosition(
new Pos(2.5, 100, 24.5, 145, 0)
new Pos(9.5, 100, 33.5, 145, 0)
);
}

Expand All @@ -53,7 +53,7 @@ public void run(IslandFetchedFromDatabaseEvent event) {
ServerHolograms.ExternalHologram hologram = ServerHolograms.ExternalHologram.builder()
.text(new String[]{"§6§lNEW UPDATE", "Jerry", "§e§lCLICK"})
.instance(event.getIsland().getIslandInstance())
.pos(jerryInformation.getJerryPosition().add(0, 1, 0))
.pos(jerryInformation.getJerryPosition().add(0, 1.8, 0))
.build();

ServerHolograms.addExternalHologram(hologram);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.swofty.type.island.events.traditional;

import lombok.SneakyThrows;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
import net.swofty.type.generic.HypixelConst;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;
import net.swofty.type.island.TypeIslandLoader;
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;

public class ActionPlayerJoin implements HypixelEventClass {
Expand All @@ -17,6 +17,6 @@ public void run(AsyncPlayerConfigurationEvent event) {
final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
event.setSpawningInstance(HypixelConst.getEmptyInstance());

player.setRespawnPoint(new Pos(0, 100, 0));
player.setRespawnPoint(TypeIslandLoader.SPAWN_POS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import net.minestom.server.inventory.InventoryType;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.swofty.type.generic.gui.inventory.ItemStackCreator;
import net.swofty.type.generic.gui.inventory.HypixelInventoryGUI;
import net.swofty.type.generic.gui.inventory.ItemStackCreator;
import net.swofty.type.generic.gui.inventory.item.GUIClickableItem;
import net.swofty.type.generic.user.HypixelPlayer;
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
Expand All @@ -30,7 +30,6 @@ public void run(InventoryPreClickEvent e, HypixelPlayer p) {

@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return ItemStackCreator.getStack("§aGo Back", Material.ARROW, 1,
"§7To Jerry the Assistant"
);
Expand Down Expand Up @@ -64,7 +63,6 @@ public void run(InventoryPreClickEvent e, HypixelPlayer p) {

@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return ItemStackCreator.getStack("§aGuests limit", Material.SHORT_GRASS, 1,
"§7You can only host a limited",
"§7number of §aguests §7on your",
Expand Down Expand Up @@ -115,7 +113,6 @@ public void run(InventoryPreClickEvent e, HypixelPlayer p) {

@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return ItemStackCreator.getStack("§aModeration", Material.REPEATER, 1,
"§7Manage online guests using the",
"§eGuests Management §7menu.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
public class TypePrototypeLobbyLoader implements LobbyTypeLoader {
private static final LobbyItemHandler itemHandler = new LobbyItemHandler();
public static LobbyParkourManager parkourManager;
private final Pos spawnPoint = new Pos(11.5, 76, 0.5, 90, 0);
private final Pos SPAWN_POS = new Pos(11.5, 75, 0.5, 90, 0);

@Override
public ServerType getType() {
Expand Down Expand Up @@ -121,7 +121,7 @@ public List<TablistModule> getModules() {
@Override
public LoaderValues getLoaderValues() {
return new LoaderValues(
(type) -> spawnPoint,
(type) -> SPAWN_POS,
false
);
}
Expand All @@ -137,7 +137,7 @@ public List<HypixelEventClass> getTraditionalEvents() {
events.add(new LobbyPlayerJoinEvents());
events.add(new LobbyParkourEvents());
events.add(new LobbyBlockBreak());
events.add(new LobbyPlayerMove(spawnPoint));
events.add(new LobbyPlayerMove(SPAWN_POS));
return events;
}

Expand Down
Loading