Merge branch 'master' of https://github.com/petethepossum/HypixelSkyBlock

Author: petethepossum

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/hologram/LeaderboardHologramManager.java

@@ -61,7 +61,7 @@ private static void createSettingsClickZone(Instance instance) {
 				new net.swofty.type.bedwarslobby.gui.GUILeaderboardSettings().open(hypixelPlayer);
 			}
 		});
-		clickZone.setInstance(instance, SETTINGS_HOLOGRAM_POS.add(0, 1.5, 0));
+		clickZone.setInstance(instance, SETTINGS_HOLOGRAM_POS.add(0, 0, 0));
 		clickZones.add(clickZone);
 	}
 

type.generic/src/main/java/net/swofty/type/generic/event/actions/gui/ActionPlayerInventoryClick.java

@@ -61,9 +61,7 @@ public void run(InventoryPreClickEvent event) {
 				int slot = event.getSlot();
 				GUIItem item = gui.get(slot);
 
-				// Cancel click for empty slots - prevents item theft
 				if (item == null) {
-					event.setCancelled(true);
 					return;
 				}
 

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionCraftingTableClick.java

@@ -18,10 +18,8 @@ public void run(PlayerBlockInteractEvent event) {
         if (Material.fromKey(event.getBlock().key()) != Material.CRAFTING_TABLE) {
             return;
         }
-        if (!HypixelConst.isIslandServer()) return;
 
         event.setBlockingItemUse(true);
-
         new GUICrafting().open(player);
     }
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionEnchantmentTableClick.java

@@ -20,7 +20,6 @@ public void run(PlayerBlockInteractEvent event) {
         }
 
         event.setBlockingItemUse(true);
-
         new GUIEnchantmentTable(player.getInstance(), Pos.fromPoint(event.getBlockPosition())).open(player);
     }
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInteractWithCrafting.java

@@ -12,19 +12,18 @@
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class ActionPlayerInteractWithCrafting implements HypixelEventClass {
-
     @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
     public void run(InventoryPreClickEvent event) {
         SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
 
         if (!(event.getInventory() instanceof PlayerInventory)) return;
         if (event.getSlot() < 37 || event.getSlot() > 40) return;
 
-        if (!(event.getClick() instanceof Click.HotbarSwap)) // Fix dupe glitches by numkeying items into recipe grid
-            player.addAndUpdateItem(new SkyBlockItem(event.getClickedItem()));
-
         event.setCancelled(true);
+        player.addAndUpdateItem(player.getInventory().getCursorItem());
         player.getInventory().setCursorItem(ItemStack.AIR);
+        player.getInventory().update();
+
         new GUICrafting().open((SkyBlockPlayer) event.getPlayer());
     }
 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/thepark/savanna/MissionCollectAcaciaLogs.java

@@ -64,7 +64,7 @@ public int getMaxProgress() {
 
 	@Override
 	public String getID() {
-		return "collect_dark_oak_logs";
+		return "collect_acacia_logs";
 	}
 
 	@Override

…ype/thepark/events/ActionPlayerMove.java …a/net/swofty/type/thepark/RyanScene.javatype.thepark/src/main/java/net/swofty/type/thepark/events/ActionPlayerMove.java renamed to type.thepark/src/main/java/net/swofty/type/thepark/RyanScene.java type.thepark/src/main/java/net/swofty/type/thepark/events/ActionPlayerMove.java renamed to type.thepark/src/main/java/net/swofty/type/thepark/RyanScene.java

@@ -1,21 +1,18 @@
-package net.swofty.type.thepark.events;
+package net.swofty.type.thepark;
 
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Entity;
 import net.minestom.server.entity.attribute.Attribute;
-import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.potion.Potion;
 import net.minestom.server.potion.PotionEffect;
 import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
-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.generic.utility.MathUtility;
+import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader;
 import net.swofty.type.skyblockgeneric.mission.MissionData;
 import net.swofty.type.skyblockgeneric.mission.missions.thepark.darkthicket.MissionSneakUpOnRyan;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
@@ -25,14 +22,19 @@
 import java.util.Map;
 import java.util.UUID;
 
-public class ActionPlayerMove implements HypixelEventClass {
+public class RyanScene {
 
-	private final Map<UUID, Long> lastTriggered = new HashMap<>();
+	private static final Map<UUID, Long> lastTriggered = new HashMap<>();
 
-	@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
-	public void onMove(PlayerMoveEvent event) {
-		SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
+	public static void init() {
+		MinecraftServer.getSchedulerManager().scheduleTask(() -> {
+			for (SkyBlockPlayer player : SkyBlockGenericLoader.getLoadedPlayers()) {
+				handlePlayer(player);
+			}
+		}, TaskSchedule.seconds(1), TaskSchedule.tick(5));
+	}
 
+	private static void handlePlayer(SkyBlockPlayer player) {
 		if (lastTriggered.containsKey(player.getUuid())) {
 			long lastTime = lastTriggered.get(player.getUuid());
 			if (System.currentTimeMillis() - lastTime < 5000) {
@@ -96,7 +98,7 @@ public void onMove(PlayerMoveEvent event) {
 		}
 	}
 
-	private boolean isInView(Instance instance, Pos viewer, SkyBlockPlayer player) {
+	private static boolean isInView(Instance instance, Pos viewer, SkyBlockPlayer player) {
 		Pos targetPos = player.getPosition();
 
 		double dx = targetPos.x() - viewer.x();

type.thepark/src/main/java/net/swofty/type/thepark/TrapParticles.java

@@ -29,7 +29,7 @@ public class TrapParticles {
 
 					if (edgeCount == 2) {
 						EDGE_PARTICLES.add(new ParticlePacket(
-								Particle.COMPOSTER,
+								Particle.HAPPY_VILLAGER,
 								false,
 								false,
 								x, y, z,

type.thepark/src/main/java/net/swofty/type/thepark/TypeTheParkLoader.java

@@ -171,10 +171,11 @@ public void afterInitialize(MinecraftServer server) {
 					i++;
 				}
 			}
-			return TaskSchedule.millis(400);
+			return TaskSchedule.millis(800);
 		}, ExecutionType.TICK_START);
 
 		TrialOfFire.init();
+		RyanScene.init();
 	}
 
 	private boolean shouldRenderTraps(SkyBlockPlayer player) {