Commit 8daa33b
committed
Merge remote-tracking branch 'origin/master' into feat/mayors
# Conflicts:
# commons/src/main/java/net/swofty/commons/ServiceType.java
# type.galatea/src/main/java/net/swofty/type/galatea/npcs/NPCVaeri.java
# type.generic/src/main/java/net/swofty/type/generic/user/HypixelPlayer.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/GUIConsumeSoulflow.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUICrafting.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIYourBags.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/calendar/GUICalendar.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/profiles/GUIProfileSelectMode.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java
# type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIMissionLog.java
# type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/SkywarsLobbyScoreboard.java417 files changed
Lines changed: 2968 additions & 1851 deletions
File tree
- anticheat
- src/main/java/net/swofty/anticheat
- api
- engine
- event/events
- flag/flags
- loader/minestom/packets
- world
- commons
- src/main/java/net/swofty/commons
- friend
- party
- events
- response
- protocol/objects
- orchestrator
- party
- proxy
- punishment
- skyblock/item
- attribute/attributes
- reforge
- skywars
- configuration/skyblock
- songs
- dungeons
- src/main/java/net/swofty/dungeons
- gradle
- loader
- src/main/java/net/swofty/loader
- packer
- src/main/java/net/swofty/packer
- proxy.api
- src/main/java/net/swofty/proxyapi
- pvp
- src/main/java/net/swofty/pvp
- damage/combat
- events
- feature/explosion
- service.api
- src/main/java/net/swofty/service/api
- http
- service.auctionhouse
- src/main/java/net/swofty/service/auction
- service.bazaar
- src/main/java/net/swofty/service/bazaar
- service.darkauction
- src/main/java/net/swofty/service/darkauction
- loot
- service.datamutex
- src/main/java/net/swofty/service/datamutex
- service.friend
- service.generic
- service.itemtracker
- service.orchestrator
- src/main/java/net/swofty/service/orchestrator
- service.party
- src/main/java/net/swofty/service/party
- service.punishment
- spark
- type.backwaterbayou
- type.bedwarsconfigurator
- type.bedwarsgame
- src/main/java/net/swofty/type/bedwarsgame
- commands
- events
- game
- gui
- item/impl
- redis/service
- type.bedwarslobby
- src/main/java/net/swofty/type/bedwarslobby
- events
- gui
- hologram
- item/impl
- launchpad
- npcs
- util
- type.crimsonisle
- type.deepcaverns
- src/main/java/net/swofty/type/deepcaverns/npcs
- type.dungeonhub
- type.dwarvenmines
- src/main/java/net/swofty/type/dwarvenmines
- commission
- gui
- npcs
- type.galatea
- src/main/java/net/swofty/type/galatea
- npcs
- type.generic
- src/main/java/net/swofty/type/generic
- achievement
- command/commands
- data
- datapoints
- handlers
- mongodb
- entity/npc
- event/actions
- friend
- gui/v2/test
- leaderboard
- packet
- party
- redis
- tab
- user
- type.goldmine
- src/main/java/net/swofty/type/goldmine/npcs
- type.hub
- src/main/java/net/swofty/type/hub
- gui
- npcs
- villagers
- type.island
- type.jerrysworkshop
- src/main/java/net/swofty/type/jerrysworkshop
- npcs
- present
- type.lobby
- src/main/java/net/swofty/type/lobby
- commands
- gui
- item/impl
- parkour
- type.murdermysteryconfigurator
- type.murdermysterygame
- src/main/java/net/swofty/type/murdermysterygame
- events
- game
- type.murdermysterylobby
- src/main/java/net/swofty/type/murdermysterylobby
- gui
- hologram
- npcs
- type.prototypelobby
- type.ravengardgeneric
- src/main/java/net/swofty/type/ravengardgeneric/data
- type.ravengardlobby
- type.skyblockgeneric
- src/main/java/net/swofty/type/skyblockgeneric
- abiphone
- impl
- block
- attribute
- impl
- collection
- commands
- data
- datapoints
- monogdb
- enchantment/impl
- entity/mob
- mobs
- dwarvenmines
- goblin
- hub
- island
- event
- actions
- custom
- item
- player
- blocks
- data
- gui
- custom
- gems
- gui/inventories
- abiphone
- item
- components
- handlers
- ability
- bow
- place
- set/sets
- mission/missions
- lumber
- thepark
- darkthicket
- jungle
- savanna
- spruce
- race
- trials
- noteblock
- redis/service
- region
- mining
- server/eventcaller
- targetpractice
- user
- utility
- type.skywarsconfigurator
- src/main/java/net/swofty/type/skywarsconfigurator
- commands
- type.skywarsgame
- src/main/java/net/swofty/type/skywarsgame
- events
- gui
- luckyblock
- effects
- items
- usables
- weapons
- spawns
- manager
- redis/service
- user
- type.skywarslobby
- src/main/java/net/swofty/type/skywarslobby
- events
- gui
- hologram
- npcs
- soulwell
- type.spidersden
- src/main/java/net/swofty/type/spidersden
- gui
- npcs
- type.theend
- type.thefarmingislands
- src/main/java/net/swofty/type/thefarmingislands/npcs
- villagers
- type.thepark
- src/main/java/net/swofty/type/thepark
- npcs
- velocity.extension
- src/main/java/net/swofty/velocity
- gamemanager
- presence
- redis
- testflow
- viaversion/injector
- website
- .vitepress/theme
- docs
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
| 34 | + | |
| 35 | + | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
7 | 11 | | |
8 | 12 | | |
9 | 13 | | |
10 | 14 | | |
11 | 15 | | |
12 | | - | |
| 16 | + | |
13 | 17 | | |
14 | 18 | | |
15 | 19 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
Lines changed: 1 addition & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 5 | + | |
13 | 6 | | |
14 | 7 | | |
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
8 | | - | |
9 | 7 | | |
10 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | 6 | | |
9 | 7 | | |
10 | 8 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
| |||
0 commit comments