Skip to content

Commit 4431c28

Browse files
authored
Merge pull request #596 from ArikSquad/feat/abiphone
Abiphone
2 parents 69b0884 + 2914bcd commit 4431c28

191 files changed

Lines changed: 1367 additions & 207 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package net.swofty.commons.skyblock.item.attribute.attributes;
2+
3+
import net.swofty.commons.skyblock.item.attribute.ItemAttribute;
4+
import net.swofty.commons.skyblock.statistics.ItemStatistics;
5+
import org.jetbrains.annotations.Nullable;
6+
7+
import java.util.List;
8+
9+
public class ItemAttributeAbiphoneContacts extends ItemAttribute<List<String>> {
10+
@Override
11+
public String getKey() {
12+
return "abiphone_contacts";
13+
}
14+
15+
@Override
16+
public List<String> getDefaultValue(@Nullable ItemStatistics defaultStatistics) {
17+
return List.of();
18+
}
19+
20+
@Override
21+
public List<String> loadFromString(String string) {
22+
try {
23+
return List.of(string.split(","));
24+
} catch (NumberFormatException e) {
25+
return List.of();
26+
}
27+
}
28+
29+
@Override
30+
public String saveIntoString() {
31+
return String.join(",", getValue());
32+
}
33+
}

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/GameWorldManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
1515
import net.swofty.type.generic.entity.npc.HypixelNPC;
1616
import net.swofty.type.generic.entity.npc.configuration.VillagerConfiguration;
17+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
1718
import net.swofty.type.generic.user.HypixelPlayer;
1819
import org.tinylog.Logger;
1920

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDoormanDave.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minestom.server.coordinate.Pos;
66
import net.swofty.type.generic.entity.npc.HypixelNPC;
77
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
8+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
89
import net.swofty.type.generic.user.HypixelPlayer;
910

1011
public class NPCDoormanDave extends HypixelNPC {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDoubles.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
import net.swofty.type.bedwarslobby.gui.GUIPlay;
1010
import net.swofty.type.generic.entity.npc.HypixelNPC;
1111
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
12+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
1213
import net.swofty.type.generic.user.HypixelPlayer;
1314

1415
import java.util.ArrayList;
1516
import java.util.List;
1617

18+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
19+
1720
public class NPCDoubles extends HypixelNPC {
1821
private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
1922
private static long lastCacheTime = 0;

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDream.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import java.util.ArrayList;
1515
import java.util.List;
1616

17+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
18+
1719
public class NPCDream extends HypixelNPC {
1820
private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
1921
private static long lastCacheTime = 0;

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCFourFour.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import java.util.ArrayList;
1515
import java.util.List;
1616

17+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
18+
1719
public class NPCFourFour extends HypixelNPC {
1820
private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
1921
private static long lastCacheTime = 0;

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCHolidayMan.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
88
import net.swofty.type.generic.user.HypixelPlayer;
99

10+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
11+
1012
public class NPCHolidayMan extends HypixelNPC {
1113

1214
public NPCHolidayMan() {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCHypixelStore.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
88
import net.swofty.type.generic.user.HypixelPlayer;
99

10+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
11+
1012
public class NPCHypixelStore extends HypixelNPC {
1113

1214
public NPCHypixelStore() {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCSlumberTourGuide.java

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

99
import java.util.stream.Stream;
1010

11+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
12+
1113
public class NPCSlumberTourGuide extends HypixelNPC {
1214

1315
public NPCSlumberTourGuide() {

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCSolo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import java.util.ArrayList;
1515
import java.util.List;
1616

17+
import net.swofty.type.generic.event.custom.NPCInteractEvent;
18+
1719
public class NPCSolo extends HypixelNPC {
1820
private static List<UnderstandableProxyServer> cacheServers = new ArrayList<>();
1921
private static long lastCacheTime = 0;

0 commit comments

Comments
 (0)