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
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.swofty.commons.item.attribute.ItemAttribute;
import net.swofty.commons.statistics.ItemStatistics;
import org.jetbrains.annotations.Nullable;

import org.json.JSONArray;
import org.json.JSONObject;

Expand Down Expand Up @@ -89,7 +88,7 @@ public static class HotPotatoBookData {
public void addAmount(ItemType itemType, int amount) {
if (!appliedItems.containsKey(itemType)) {
appliedItems.put(itemType, amount);
}else{
} else {
appliedItems.put(itemType, appliedItems.get(itemType) + amount);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"from": [2, 0, 0],
"to": [14, 2, 2],
"faces": {
"north": { "texture": "#side", "uv": [2, 0, 14, 2] , "cullface": "north" },
"north": { "texture": "#side", "uv": [2, 0, 14, 2], "cullface": "north" },
"south": { "texture": "#side", "uv": [2, 2, 14, 4] },
"down": { "texture": "#bottom", "cullface": "bottom" }
}
Expand All @@ -117,7 +117,7 @@
"to": [14, 2, 16],
"faces": {
"north": { "texture": "#side", "uv": [14, 0, 2, 2] },
"south": { "texture": "#side", "uv": [2, 0, 14, 2] , "cullface": "south" },
"south": { "texture": "#side", "uv": [2, 0, 14, 2], "cullface": "south" },
"down": { "texture": "#bottom", "cullface": "bottom" }
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"to": [ 8, 12, 15 ],
"shade": false,
"faces": {
"down": { "uv": [ 8, 0, 0, 8 ], "texture": "#top" , "rotation": 270},
"up": { "uv": [ 0, 0, 8, 8 ], "texture": "#top" , "rotation": 270}
"down": { "uv": [ 8, 0, 0, 8 ], "texture": "#top", "rotation": 270},
"up": { "uv": [ 0, 0, 8, 8 ], "texture": "#top", "rotation": 270}
}
},
{ "from": [ 8, 2, 8 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"firstperson_lefthand": {
"rotation": [ 0, 115, 5 ],
"translation": [ 0 , -2.5, -7.5 ]
"translation": [ 0, -2.5, -7.5 ]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ Stand up for equality in your community!
[this splash text is now available]
Contains simulated goats!
Home-made!
There's <<a cat on ,my keyboard!~
There's <<a cat on, my keyboard!~
The cutest predator you'll ever meet!
Now you are thinking with pistons!
Get to the coppah!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public String getName() {
return player.getUsername();
} else if (this.delegate instanceof ConsoleSender) {
return "Console";
}else {
} else {
return "unknown:" + this.delegate.getClass().getSimpleName();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class ActionPlayerJoin implements HypixelEventClass {

@SneakyThrows
@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void run(AsyncPlayerConfigurationEvent event) {
final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.swofty.type.generic.entity.animalnpc.HypixelAnimalNPC;
import net.swofty.type.generic.entity.hologram.PlayerHolograms;
import net.swofty.type.generic.entity.npc.NPCDialogue;
import net.swofty.type.generic.entity.npc.HypixelNPC;
import net.swofty.type.generic.entity.npc.NPCDialogue;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;
Expand All @@ -18,7 +18,7 @@
public class ActionPlayerClearCache implements HypixelEventClass {

@SneakyThrows
@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void run(PlayerDisconnectEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
import net.minestom.server.entity.PlayerHand;
import net.minestom.server.event.player.PlayerEntityInteractEvent;
import net.swofty.type.generic.HypixelConst;
import net.swofty.type.generic.entity.animalnpc.NPCAnimalEntityImpl;
import net.swofty.type.generic.entity.animalnpc.HypixelAnimalNPC;
import net.swofty.type.generic.entity.animalnpc.NPCAnimalEntityImpl;
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.user.HypixelPlayer;

public class ActionPlayerClickedAnimalNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerEntityInteractEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

import net.minestom.server.entity.PlayerHand;
import net.minestom.server.event.player.PlayerEntityInteractEvent;
import net.swofty.type.generic.entity.npc.NPCEntityImpl;
import net.swofty.type.generic.entity.npc.HypixelNPC;
import net.swofty.type.generic.entity.npc.NPCEntityImpl;
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.user.HypixelPlayer;

public class ActionPlayerClickedNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerEntityInteractEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class ActionPlayerClickedVillagerNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run( PlayerEntityInteractEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class ActionPlayerMoveAnimalNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerMoveEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class ActionPlayerMoveNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerMoveEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class ActionPlayerMoveVillagerNPC implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerMoveEvent event) {
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.timer.TaskSchedule;
import net.swofty.type.generic.user.HypixelPlayer;
import net.swofty.type.generic.gui.inventory.item.GUIItem;
import net.swofty.type.generic.user.HypixelPlayer;

import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -274,7 +274,7 @@ public void open(HypixelPlayer player) {
}

previouslyOpen.onClose(
new InventoryCloseEvent(previouslyOpen.getInventory(), player , true),
new InventoryCloseEvent(previouslyOpen.getInventory(), player, true),
net.swofty.type.generic.gui.inventory.HypixelInventoryGUI.CloseReason.SERVER_EXITED
);
GUI_MAP.remove(player.getUuid());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public AntiCheatHandler getAntiCheatHandler() {
}

public PlayerSkin getPlayerSkin() {
String texture = getDataHandler().get(HypixelDataHandler.Data.SKIN_TEXTURE , DatapointString.class).getValue();
String signature = getDataHandler().get(HypixelDataHandler.Data.SKIN_SIGNATURE , DatapointString.class).getValue();
return new PlayerSkin(texture , signature);
String texture = getDataHandler().get(HypixelDataHandler.Data.SKIN_TEXTURE, DatapointString.class).getValue();
String signature = getDataHandler().get(HypixelDataHandler.Data.SKIN_SIGNATURE, DatapointString.class).getValue();
return new PlayerSkin(texture, signature);
}

public void sendTo(ServerType type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public enum Rank {
GAMEMASTER("§2[GM] ", true, NamedTextColor.DARK_GREEN),
MOD("§2[MOD] ", true, NamedTextColor.DARK_GREEN),
HELPER("§9[HELPER] ", true, NamedTextColor.BLUE),
JRHELPER("§9[JR HELPER] ", true , NamedTextColor.BLUE),
JRHELPER("§9[JR HELPER] ", true, NamedTextColor.BLUE),
BT("§d[BT] ", false, NamedTextColor.LIGHT_PURPLE),
YOUTUBE("§c[§fYOUTUBE§c] ", false, NamedTextColor.RED),
MVP_PLUS("§b[MVP§c+§b] ", false, NamedTextColor.AQUA),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

public class BlockUtility {

public static Block applyTexture(Block block , String texture) {
public static Block applyTexture(Block block, String texture) {
JSONObject json = new JSONObject();
json.put("isPublic", true);
json.put("signatureRequired", false);
Expand All @@ -16,8 +16,8 @@ public static Block applyTexture(Block block , String texture) {
/*

String texturesEncoded = Base64.getEncoder().encodeToString(json.toString().getBytes());
block = block.withTag(ExtraItemTags.SKULL_OWNER , new ExtraItemTags.SkullOwner(null , "25" ,
new PlayerSkin(texturesEncoded , null)));*/
block = block.withTag(ExtraItemTags.SKULL_OWNER, new ExtraItemTags.SkullOwner(null, "25",
new PlayerSkin(texturesEncoded, null)));*/
return block;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class ActionPlayerClickMuseumDisplay implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerEntityInteractEvent event) {
SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class ActionPlayerClicksMuseumNPCDisplay implements HypixelEventClass {


@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true , isAsync = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true, isAsync = true)
public void run(PlayerBlockInteractEvent event) {
SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
Pos displayPosition = new Pos(-23, 67, 80);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class ActionPlayerClicksOnRunePedestal implements HypixelEventClass {


@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true)
public void run(PlayerEntityInteractEvent event) {
if (!(event.getTarget() instanceof RuneEntityImpl)) return;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class ActionPlayerJoin implements HypixelEventClass {

@SneakyThrows
@HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false)
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void run(AsyncPlayerConfigurationEvent event) {
final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import net.swofty.commons.StringUtility;
import net.swofty.commons.item.Rarity;
import net.swofty.type.generic.data.datapoints.DatapointDouble;
import net.swofty.type.generic.user.HypixelPlayer;
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.gui.inventory.item.GUIItem;
import net.swofty.type.generic.user.HypixelPlayer;
import net.swofty.type.skyblockgeneric.data.SkyBlockDataHandler;
import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
import net.swofty.type.skyblockgeneric.item.components.PetComponent;
Expand Down Expand Up @@ -91,7 +91,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return PlayerItemUpdater.playerUpdate(player , item.getItemStack());
return PlayerItemUpdater.playerUpdate(player, item.getItemStack());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.swofty.commons.item.attribute.attributes.ItemAttributeRuneInfusedWith;
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.gui.inventory.item.GUIItem;
import net.swofty.type.generic.user.HypixelPlayer;
import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
import net.swofty.type.skyblockgeneric.item.components.RuneableComponent;
import net.swofty.type.skyblockgeneric.item.updater.PlayerItemUpdater;
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
import net.swofty.type.generic.user.HypixelPlayer;

public class GUIRuneRemoval extends HypixelInventoryGUI {
private final int[] borderSlots = {
Expand Down Expand Up @@ -96,7 +96,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return PlayerItemUpdater.playerUpdate(player , item.getItemStack());
return PlayerItemUpdater.playerUpdate(player, item.getItemStack());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
import net.minestom.server.item.Material;
import net.swofty.commons.StringUtility;
import net.swofty.commons.item.ItemType;
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.gui.inventory.item.GUIItem;
import net.swofty.type.generic.user.HypixelPlayer;
import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
import net.swofty.type.skyblockgeneric.item.components.PetComponent;
import net.swofty.type.skyblockgeneric.item.handlers.pet.KatUpgrade;
import net.swofty.type.skyblockgeneric.item.updater.PlayerItemUpdater;
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;

import java.util.ArrayList;
import net.swofty.type.generic.user.HypixelPlayer;

public class GUIKat extends HypixelInventoryGUI {

Expand Down Expand Up @@ -94,7 +94,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) {
@Override
public ItemStack.Builder getItem(HypixelPlayer p) {
SkyBlockPlayer player = (SkyBlockPlayer) p;
return PlayerItemUpdater.playerUpdate(player , item.getItemStack());
return PlayerItemUpdater.playerUpdate(player, item.getItemStack());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public String[] holograms() {

@Override
public Pos position() {
return new Pos(10.5 ,70 ,-41.5);
return new Pos(10.5,70,-41.5);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public String[] holograms() {

@Override
public Pos position() {
return new Pos(-21.5 ,68 ,-124.5);
return new Pos(-21.5,68,-124.5);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void afterInitialize(MinecraftServer server) {
@Override
public HypixelTypeLoader.LoaderValues getLoaderValues() {
return new HypixelTypeLoader.LoaderValues(
(type) -> new Pos(0, 100 ,0), // Spawn position
(type) -> new Pos(0, 100, 0), // Spawn position
true // Announce death messages
);
}
Expand Down
Loading
Loading