Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
MythicCraft
MythicCosmetics
Commits
1c7b9068
Commit
1c7b9068
authored
3 years ago
by
Ticxo
Browse files
Options
Download
Email Patches
Plain Diff
whoops
parent
e64e0418
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
46 additions
and
74 deletions
+46
-74
api/src/main/java/io/lumine/cosmetics/api/events/CosmeticPlayerLoadedEvent.java
...umine/cosmetics/api/events/CosmeticPlayerLoadedEvent.java
+2
-3
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java
...va/io/lumine/cosmetics/api/players/CosmeticInventory.java
+2
-2
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticProfile.java
...java/io/lumine/cosmetics/api/players/CosmeticProfile.java
+2
-3
plugin/src/main/java/io/lumine/cosmetics/MCCosmeticsPlugin.java
.../src/main/java/io/lumine/cosmetics/MCCosmeticsPlugin.java
+3
-4
plugin/src/main/java/io/lumine/cosmetics/commands/BaseCommand.java
...c/main/java/io/lumine/cosmetics/commands/BaseCommand.java
+5
-6
plugin/src/main/java/io/lumine/cosmetics/commands/CustomizeCommand.java
...n/java/io/lumine/cosmetics/commands/CustomizeCommand.java
+5
-6
plugin/src/main/java/io/lumine/cosmetics/commands/admin/AdminCommand.java
...java/io/lumine/cosmetics/commands/admin/AdminCommand.java
+4
-5
plugin/src/main/java/io/lumine/cosmetics/commands/admin/ReloadCommand.java
...ava/io/lumine/cosmetics/commands/admin/ReloadCommand.java
+4
-6
plugin/src/main/java/io/lumine/cosmetics/compat/CompatibilityManager.java
...java/io/lumine/cosmetics/compat/CompatibilityManager.java
+3
-4
plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
...ain/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
+3
-3
plugin/src/main/java/io/lumine/cosmetics/config/Configuration.java
...c/main/java/io/lumine/cosmetics/config/Configuration.java
+3
-4
plugin/src/main/java/io/lumine/cosmetics/constants/CosmeticType.java
...main/java/io/lumine/cosmetics/constants/CosmeticType.java
+0
-1
plugin/src/main/java/io/lumine/cosmetics/logging/MCLogger.java
...n/src/main/java/io/lumine/cosmetics/logging/MCLogger.java
+2
-6
plugin/src/main/java/io/lumine/cosmetics/managers/CosmeticsExecutor.java
.../java/io/lumine/cosmetics/managers/CosmeticsExecutor.java
+4
-5
plugin/src/main/java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
...java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
+0
-1
plugin/src/main/java/io/lumine/cosmetics/managers/hats/HatManager.java
...in/java/io/lumine/cosmetics/managers/hats/HatManager.java
+1
-7
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleManager.java
...o/lumine/cosmetics/managers/particle/ParticleManager.java
+0
-1
plugin/src/main/java/io/lumine/cosmetics/managers/pets/PetManager.java
...in/java/io/lumine/cosmetics/managers/pets/PetManager.java
+0
-1
plugin/src/main/java/io/lumine/cosmetics/menus/CosmeticMenu.java
...src/main/java/io/lumine/cosmetics/menus/CosmeticMenu.java
+1
-3
plugin/src/main/java/io/lumine/cosmetics/menus/CustomizeMenu.java
...rc/main/java/io/lumine/cosmetics/menus/CustomizeMenu.java
+2
-3
No files found.
api/src/main/java/io/lumine/cosmetics/api/events/CosmeticPlayerLoadedEvent.java
View file @
1c7b9068
package
io.lumine.cosmetics.api.events
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
lombok.Getter
;
import
org.bukkit.entity.Player
;
import
org.bukkit.event.Event
;
import
org.bukkit.event.HandlerList
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
lombok.Getter
;
public
class
CosmeticPlayerLoadedEvent
extends
Event
{
@Getter
private
final
Player
player
;
...
...
This diff is collapsed.
Click to expand it.
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java
View file @
1c7b9068
package
io.lumine.cosmetics.api.players
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
java.util.Collection
;
import
java.util.Optional
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
public
interface
CosmeticInventory
{
void
initialize
(
CosmeticProfile
profile
);
...
...
This diff is collapsed.
Click to expand it.
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticProfile.java
View file @
1c7b9068
package
io.lumine.cosmetics.api.players
;
import
java.util.UUID
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
org.bukkit.entity.Player
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
java.util.UUID
;
public
interface
CosmeticProfile
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/MCCosmeticsPlugin.java
View file @
1c7b9068
package
io.lumine.cosmetics
;
import
io.lumine.cosmetics.listeners.PlayerListeners
;
import
io.lumine.cosmetics.managers.back.BackManager
;
import
org.bukkit.Bukkit
;
import
io.lumine.cosmetics.commands.BaseCommand
;
import
io.lumine.cosmetics.commands.admin.AdminCommand
;
import
io.lumine.cosmetics.compat.CompatibilityManager
;
import
io.lumine.cosmetics.config.Configuration
;
import
io.lumine.cosmetics.listeners.PlayerListeners
;
import
io.lumine.cosmetics.logging.MCLogger
;
import
io.lumine.cosmetics.managers.CosmeticsExecutor
;
import
io.lumine.cosmetics.managers.back.BackManager
;
import
io.lumine.cosmetics.managers.hats.HatManager
;
import
io.lumine.cosmetics.menus.MenuManager
;
import
io.lumine.cosmetics.metrics.bStats
;
...
...
@@ -21,6 +19,7 @@ import io.lumine.utils.logging.ConsoleColor;
import
io.lumine.utils.plugin.LuminePlugin
;
import
io.lumine.utils.version.ServerVersion
;
import
lombok.Getter
;
import
org.bukkit.Bukkit
;
public
class
MCCosmeticsPlugin
extends
LuminePlugin
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/commands/BaseCommand.java
View file @
1c7b9068
package
io.lumine.cosmetics.commands
;
import
java.util.Collections
;
import
java.util.List
;
import
org.bukkit.command.CommandSender
;
import
org.bukkit.entity.Player
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.constants.Permissions
;
import
io.lumine.utils.commands.Command
;
import
org.bukkit.command.CommandSender
;
import
org.bukkit.entity.Player
;
import
java.util.Collections
;
import
java.util.List
;
public
class
BaseCommand
extends
Command
<
MCCosmeticsPlugin
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/commands/CustomizeCommand.java
View file @
1c7b9068
package
io.lumine.cosmetics.commands
;
import
java.util.Collections
;
import
java.util.List
;
import
org.bukkit.command.CommandSender
;
import
org.bukkit.entity.Player
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.constants.Permissions
;
import
io.lumine.utils.commands.Command
;
import
org.bukkit.command.CommandSender
;
import
org.bukkit.entity.Player
;
import
java.util.Collections
;
import
java.util.List
;
public
class
CustomizeCommand
extends
Command
<
MCCosmeticsPlugin
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/commands/admin/AdminCommand.java
View file @
1c7b9068
package
io.lumine.cosmetics.commands.admin
;
import
java.util.Collections
;
import
java.util.List
;
import
org.bukkit.command.CommandSender
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.commands.CommandHelper
;
import
io.lumine.cosmetics.constants.Permissions
;
import
io.lumine.utils.commands.Command
;
import
org.bukkit.command.CommandSender
;
import
java.util.Collections
;
import
java.util.List
;
public
class
AdminCommand
extends
Command
<
MCCosmeticsPlugin
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/commands/admin/ReloadCommand.java
View file @
1c7b9068
package
io.lumine.cosmetics.commands.admin
;
import
java.util.Collections
;
import
java.util.List
;
import
org.bukkit.command.CommandSender
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.MCCosmetics
;
import
io.lumine.cosmetics.commands.CommandHelper
;
import
io.lumine.cosmetics.constants.Permissions
;
import
io.lumine.utils.commands.Command
;
import
org.bukkit.command.CommandSender
;
import
java.util.Collections
;
import
java.util.List
;
public
class
ReloadCommand
extends
Command
<
MCCosmeticsPlugin
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/compat/CompatibilityManager.java
View file @
1c7b9068
package
io.lumine.cosmetics.compat
;
import
java.util.Optional
;
import
org.bukkit.Bukkit
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.utils.plugin.ReloadableModule
;
import
lombok.Getter
;
import
org.bukkit.Bukkit
;
import
java.util.Optional
;
public
class
CompatibilityManager
extends
ReloadableModule
<
MCCosmeticsPlugin
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
View file @
1c7b9068
package
io.lumine.cosmetics.compat
;
import
java.util.Optional
;
import
java.util.UUID
;
import
io.lumine.core.LumineCore
;
import
io.lumine.core.players.PlayerProfile
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
...
...
@@ -11,6 +8,9 @@ import io.lumine.utils.plugin.PluginModule;
import
io.lumine.utils.promise.Promise
;
import
io.lumine.utils.storage.players.PlayerStorageAdapter
;
import
java.util.Optional
;
import
java.util.UUID
;
public
class
LumineCoreCompat
{
private
final
MCCosmeticsPlugin
plugin
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/config/Configuration.java
View file @
1c7b9068
package
io.lumine.cosmetics.config
;
import
java.io.File
;
import
java.util.Collection
;
import
com.google.common.collect.Lists
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.utils.config.properties.Property
;
import
io.lumine.utils.config.properties.PropertyHolder
;
...
...
@@ -13,6 +9,9 @@ import io.lumine.utils.config.properties.types.IntProp;
import
io.lumine.utils.plugin.ReloadableModule
;
import
lombok.Getter
;
import
java.io.File
;
import
java.util.Collection
;
public
class
Configuration
extends
ReloadableModule
<
MCCosmeticsPlugin
>
implements
PropertyHolder
{
private
static
final
IntProp
CLOCK_INTERVAL
=
Property
.
Int
(
Scope
.
CONFIG
,
"Clock.Interval"
,
1
);
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/constants/CosmeticType.java
View file @
1c7b9068
...
...
@@ -6,7 +6,6 @@ import io.lumine.cosmetics.managers.hats.Hat;
import
io.lumine.cosmetics.managers.modelengine.MEGAccessory
;
import
io.lumine.cosmetics.managers.particle.ParticleAccessory
;
import
io.lumine.cosmetics.managers.pets.Pet
;
import
io.lumine.utils.logging.Log
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/logging/MCLogger.java
View file @
1c7b9068
package
io.lumine.cosmetics.logging
;
import
java.io.File
;
import
java.io.PrintWriter
;
import
java.util.logging.Level
;
import
org.bukkit.Bukkit
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.utils.logging.ConsoleColor
;
import
java.util.logging.Level
;
public
class
MCLogger
{
private
static
MCCosmeticsPlugin
getPlugin
()
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/CosmeticsExecutor.java
View file @
1c7b9068
package
io.lumine.cosmetics.managers
;
import
java.util.Collection
;
import
java.util.Map
;
import
java.util.Optional
;
import
com.google.common.collect.Maps
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.utils.plugin.ReloadableModule
;
import
lombok.Getter
;
import
java.util.Collection
;
import
java.util.Map
;
import
java.util.Optional
;
public
class
CosmeticsExecutor
extends
ReloadableModule
<
MCCosmeticsPlugin
>
{
@Getter
private
final
Map
<
String
,
MCCosmeticsManager
>
cosmeticManagers
=
Maps
.
newConcurrentMap
();
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
View file @
1c7b9068
...
...
@@ -8,7 +8,6 @@ import io.lumine.cosmetics.api.cosmetics.CosmeticManager;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.config.Scope
;
import
io.lumine.cosmetics.constants.CosmeticType
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.cosmetics.players.ProfileManager
;
import
io.lumine.utils.config.properties.Property
;
import
io.lumine.utils.config.properties.types.NodeListProp
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/hats/HatManager.java
View file @
1c7b9068
package
io.lumine.cosmetics.managers.hats
;
import
com.comphenix.protocol.PacketType
;
import
com.comphenix.protocol.events.PacketContainer
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.events.CosmeticPlayerLoadedEvent
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.constants.CosmeticType
;
import
io.lumine.cosmetics.managers.MCCosmeticsManager
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.Events
;
import
io.lumine.utils.events.extra.ArmorEquipEvent
;
import
io.lumine.utils.protocol.Protocol
;
import
org.bukkit.entity.Entity
;
import
io.lumine.utils.events.extra.ArmorEquipEvent
;
import
org.bukkit.entity.Player
;
import
org.bukkit.event.inventory.InventoryClickEvent
;
import
org.bukkit.event.inventory.InventoryCloseEvent
;
import
org.bukkit.event.player.PlayerRespawnEvent
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleManager.java
View file @
1c7b9068
...
...
@@ -3,7 +3,6 @@ package io.lumine.cosmetics.managers.particle;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.managers.MCCosmeticsManager
;
import
io.lumine.cosmetics.players.Profile
;
import
java.io.File
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/pets/PetManager.java
View file @
1c7b9068
...
...
@@ -3,7 +3,6 @@ package io.lumine.cosmetics.managers.pets;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.managers.MCCosmeticsManager
;
import
io.lumine.cosmetics.players.Profile
;
import
java.io.File
;
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/menus/CosmeticMenu.java
View file @
1c7b9068
package
io.lumine.cosmetics.menus
;
import
org.bukkit.entity.Player
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.config.properties.types.MenuProp
;
import
io.lumine.utils.menu.EditableMenuBuilder
;
import
io.lumine.utils.menu.Menu
;
import
io.lumine.utils.menu.ReloadableMenu
;
import
lombok.Getter
;
import
org.bukkit.entity.Player
;
public
abstract
class
CosmeticMenu
<
T
>
extends
ReloadableMenu
<
T
>
{
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/menus/CustomizeMenu.java
View file @
1c7b9068
package
io.lumine.cosmetics.menus
;
import
java.util.List
;
import
com.google.common.collect.Lists
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
io.lumine.cosmetics.players.Profile
;
...
...
@@ -11,6 +8,8 @@ import io.lumine.utils.config.properties.types.MenuProp;
import
io.lumine.utils.logging.Log
;
import
io.lumine.utils.menu.EditableMenuBuilder
;
import
java.util.List
;
public
class
CustomizeMenu
extends
CosmeticMenu
<
Profile
>
{
public
CustomizeMenu
(
MCCosmeticsPlugin
core
,
MenuManager
manager
)
{
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment