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
90f98bf0
Commit
90f98bf0
authored
3 years ago
by
Ashijin
Browse files
Options
Download
Email Patches
Plain Diff
actually call the equip method
parent
9faf5b8c
master
Terminated/dev
dev
No related merge requests found
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
59 additions
and
37 deletions
+59
-37
api/src/main/java/io/lumine/cosmetics/api/cosmetics/Cosmetic.java
...main/java/io/lumine/cosmetics/api/cosmetics/Cosmetic.java
+4
-2
api/src/main/java/io/lumine/cosmetics/api/cosmetics/CosmeticManager.java
...va/io/lumine/cosmetics/api/cosmetics/CosmeticManager.java
+9
-0
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java
...va/io/lumine/cosmetics/api/players/CosmeticInventory.java
+1
-1
plugin/src/main/java/io/lumine/cosmetics/managers/AbstractCosmetic.java
...n/java/io/lumine/cosmetics/managers/AbstractCosmetic.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
...java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
+4
-2
plugin/src/main/java/io/lumine/cosmetics/managers/back/BackAccessory.java
...java/io/lumine/cosmetics/managers/back/BackAccessory.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/back/BackManager.java
...n/java/io/lumine/cosmetics/managers/back/BackManager.java
+3
-2
plugin/src/main/java/io/lumine/cosmetics/managers/hats/Hat.java
.../src/main/java/io/lumine/cosmetics/managers/hats/Hat.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/hats/HatManager.java
...in/java/io/lumine/cosmetics/managers/hats/HatManager.java
+3
-2
plugin/src/main/java/io/lumine/cosmetics/managers/modelengine/MEGAccessory.java
...o/lumine/cosmetics/managers/modelengine/MEGAccessory.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/modelengine/MEGManager.java
.../io/lumine/cosmetics/managers/modelengine/MEGManager.java
+3
-2
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleAccessory.java
...lumine/cosmetics/managers/particle/ParticleAccessory.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleManager.java
...o/lumine/cosmetics/managers/particle/ParticleManager.java
+3
-2
plugin/src/main/java/io/lumine/cosmetics/managers/pets/Pet.java
.../src/main/java/io/lumine/cosmetics/managers/pets/Pet.java
+2
-2
plugin/src/main/java/io/lumine/cosmetics/managers/pets/PetManager.java
...in/java/io/lumine/cosmetics/managers/pets/PetManager.java
+3
-2
plugin/src/main/java/io/lumine/cosmetics/nms/VolatileHatHelper.java
.../main/java/io/lumine/cosmetics/nms/VolatileHatHelper.java
+2
-1
plugin/src/main/java/io/lumine/cosmetics/players/Profile.java
...in/src/main/java/io/lumine/cosmetics/players/Profile.java
+1
-6
plugin/src/main/java/io/lumine/cosmetics/players/inventory/DigitalInventory.java
.../lumine/cosmetics/players/inventory/DigitalInventory.java
+7
-1
v1_18/src/main/java/io/lumine/cosmetics/nms/v1_18_R1/VolatileHatImpl.java
...ava/io/lumine/cosmetics/nms/v1_18_R1/VolatileHatImpl.java
+2
-1
v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/cosmetic/VolatileHatImpl.java
...mine/cosmetics/nms/v1_18_R2/cosmetic/VolatileHatImpl.java
+2
-1
No files found.
api/src/main/java/io/lumine/cosmetics/api/cosmetics/Cosmetic.java
View file @
90f98bf0
...
...
@@ -8,14 +8,16 @@ import lombok.Getter;
public
abstract
class
Cosmetic
implements
PropertyHolder
,
MenuData
<
CosmeticProfile
>
{
@Getter
private
final
CosmeticManager
manager
;
@Getter
private
final
String
type
;
@Getter
private
final
String
key
;
public
Cosmetic
(
String
type
,
String
key
)
{
public
Cosmetic
(
CosmeticManager
manager
,
String
type
,
String
key
)
{
this
.
manager
=
manager
;
this
.
type
=
type
;
this
.
key
=
key
;
}
public
boolean
has
(
CosmeticProfile
profile
)
{
return
has
(
profile
.
getCosmeticInventory
());
}
...
...
This diff is collapsed.
Click to expand it.
api/src/main/java/io/lumine/cosmetics/api/cosmetics/CosmeticManager.java
0 → 100644
View file @
90f98bf0
package
io.lumine.cosmetics.api.cosmetics
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
public
interface
CosmeticManager
{
public
void
equip
(
CosmeticProfile
profile
);
}
This diff is collapsed.
Click to expand it.
api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java
View file @
90f98bf0
...
...
@@ -7,7 +7,7 @@ import io.lumine.cosmetics.api.cosmetics.Cosmetic;
public
interface
CosmeticInventory
{
public
void
initialize
();
public
void
initialize
(
CosmeticProfile
profile
);
public
Collection
<
String
>
getUnlocked
(
String
type
);
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/AbstractCosmetic.java
View file @
90f98bf0
...
...
@@ -40,8 +40,8 @@ public abstract class AbstractCosmetic extends Cosmetic {
@Getter
protected
final
ItemStack
menuItem
;
public
AbstractCosmetic
(
File
file
,
String
type
,
String
key
)
{
super
(
type
,
key
);
public
AbstractCosmetic
(
MCCosmeticsManager
manager
,
File
file
,
String
type
,
String
key
)
{
super
(
manager
,
type
,
key
);
this
.
file
=
file
;
this
.
key
=
key
.
toUpperCase
();
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/MCCosmeticsManager.java
View file @
90f98bf0
...
...
@@ -4,6 +4,8 @@ import com.google.common.collect.Lists;
import
com.google.common.collect.Maps
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
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
;
...
...
@@ -20,7 +22,7 @@ import java.util.Collection;
import
java.util.Map
;
import
java.util.Optional
;
public
abstract
class
MCCosmeticsManager
<
T
extends
Cosmetic
>
extends
ReloadableModule
<
MCCosmeticsPlugin
>
{
public
abstract
class
MCCosmeticsManager
<
T
extends
Cosmetic
>
extends
ReloadableModule
<
MCCosmeticsPlugin
>
implements
CosmeticManager
{
protected
final
NodeListProp
KEYS
=
Property
.
NodeList
(
Scope
.
NONE
,
""
);
protected
final
Map
<
String
,
T
>
cosmetics
=
Maps
.
newConcurrentMap
();
...
...
@@ -73,7 +75,7 @@ public abstract class MCCosmeticsManager<T extends Cosmetic> extends ReloadableM
equip
(
getProfiles
().
getProfile
(
player
));
}
public
abstract
void
equip
(
Profile
profile
);
public
abstract
void
equip
(
Cosmetic
Profile
profile
);
protected
ProfileManager
getProfiles
()
{
return
plugin
.
getProfiles
();
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/back/BackAccessory.java
View file @
90f98bf0
...
...
@@ -11,8 +11,8 @@ import java.io.File;
public
class
BackAccessory
extends
AbstractCosmetic
implements
ItemCosmetic
{
public
BackAccessory
(
File
file
,
String
key
)
{
super
(
file
,
CosmeticType
.
type
(
BackAccessory
.
class
),
key
);
public
BackAccessory
(
BackManager
manager
,
File
file
,
String
key
)
{
super
(
manager
,
file
,
CosmeticType
.
type
(
BackAccessory
.
class
),
key
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/back/BackManager.java
View file @
90f98bf0
...
...
@@ -4,6 +4,7 @@ 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.managers.MCCosmeticsManager
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.Events
;
...
...
@@ -84,11 +85,11 @@ public class BackManager extends MCCosmeticsManager<BackAccessory> {
@Override
public
BackAccessory
build
(
File
file
,
String
node
)
{
return
new
BackAccessory
(
file
,
node
);
return
new
BackAccessory
(
this
,
file
,
node
);
}
@Override
public
void
equip
(
Profile
profile
)
{
public
void
equip
(
Cosmetic
Profile
profile
)
{
// TODO: 15/3/2022 Equip backpack cosmetics
}
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/hats/Hat.java
View file @
90f98bf0
...
...
@@ -11,8 +11,8 @@ import java.io.File;
public
class
Hat
extends
AbstractCosmetic
implements
ItemCosmetic
{
public
Hat
(
File
file
,
String
key
)
{
super
(
file
,
CosmeticType
.
type
(
Hat
.
class
),
key
);
public
Hat
(
HatManager
manager
,
File
file
,
String
key
)
{
super
(
manager
,
file
,
CosmeticType
.
type
(
Hat
.
class
),
key
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/hats/HatManager.java
View file @
90f98bf0
...
...
@@ -4,6 +4,7 @@ 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
;
...
...
@@ -85,11 +86,11 @@ public class HatManager extends MCCosmeticsManager<Hat> {
@Override
public
Hat
build
(
File
file
,
String
node
)
{
return
new
Hat
(
file
,
node
);
return
new
Hat
(
this
,
file
,
node
);
}
@Override
public
void
equip
(
Profile
profile
)
{
public
void
equip
(
Cosmetic
Profile
profile
)
{
getPlugin
().
getVolatileCodeHandler
().
getHatHelper
().
applyHatPacket
(
profile
);
}
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/modelengine/MEGAccessory.java
View file @
90f98bf0
...
...
@@ -23,8 +23,8 @@ public class MEGAccessory extends AbstractCosmetic {
@Getter
private
final
Orient
offset
;
public
MEGAccessory
(
File
file
,
String
key
)
{
super
(
file
,
CosmeticType
.
type
(
MEGAccessory
.
class
),
key
);
public
MEGAccessory
(
MEGManager
manager
,
File
file
,
String
key
)
{
super
(
manager
,
file
,
CosmeticType
.
type
(
MEGAccessory
.
class
),
key
);
modelId
=
MODEL
.
fget
(
file
,
this
);
offset
=
OFFSET
.
fget
(
file
,
this
);
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/modelengine/MEGManager.java
View file @
90f98bf0
package
io.lumine.cosmetics.managers.modelengine
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.managers.MCCosmeticsManager
;
import
io.lumine.cosmetics.players.Profile
;
...
...
@@ -14,11 +15,11 @@ public class MEGManager extends MCCosmeticsManager<MEGAccessory> {
@Override
public
MEGAccessory
build
(
File
file
,
String
node
)
{
return
new
MEGAccessory
(
file
,
node
);
return
new
MEGAccessory
(
this
,
file
,
node
);
}
@Override
public
void
equip
(
Profile
profile
)
{
public
void
equip
(
Cosmetic
Profile
profile
)
{
// TODO: 15/3/2022 Impl meg equip
}
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleAccessory.java
View file @
90f98bf0
...
...
@@ -9,8 +9,8 @@ import java.io.File;
public
class
ParticleAccessory
extends
AbstractCosmetic
{
public
ParticleAccessory
(
File
file
,
String
key
)
{
super
(
file
,
CosmeticType
.
type
(
ParticleAccessory
.
class
),
key
);
public
ParticleAccessory
(
ParticleManager
manager
,
File
file
,
String
key
)
{
super
(
manager
,
file
,
CosmeticType
.
type
(
ParticleAccessory
.
class
),
key
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleManager.java
View file @
90f98bf0
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
;
...
...
@@ -14,11 +15,11 @@ public class ParticleManager extends MCCosmeticsManager<ParticleAccessory> {
@Override
public
ParticleAccessory
build
(
File
file
,
String
node
)
{
return
new
ParticleAccessory
(
file
,
node
);
return
new
ParticleAccessory
(
this
,
file
,
node
);
}
@Override
public
void
equip
(
Profile
profile
)
{
public
void
equip
(
Cosmetic
Profile
profile
)
{
// TODO: 15/3/2022 Impl particle accessory
}
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/pets/Pet.java
View file @
90f98bf0
...
...
@@ -18,8 +18,8 @@ public class Pet extends AbstractCosmetic {
@Getter
private
final
String
petId
;
public
Pet
(
File
file
,
String
key
)
{
super
(
file
,
CosmeticType
.
type
(
Pet
.
class
),
key
);
public
Pet
(
PetManager
manager
,
File
file
,
String
key
)
{
super
(
manager
,
file
,
CosmeticType
.
type
(
Pet
.
class
),
key
);
petId
=
PET
.
fget
(
file
,
this
);
}
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/managers/pets/PetManager.java
View file @
90f98bf0
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
;
...
...
@@ -14,11 +15,11 @@ public class PetManager extends MCCosmeticsManager<Pet> {
@Override
public
Pet
build
(
File
file
,
String
node
)
{
return
new
Pet
(
file
,
node
);
return
new
Pet
(
this
,
file
,
node
);
}
@Override
public
void
equip
(
Profile
profile
)
{
public
void
equip
(
Cosmetic
Profile
profile
)
{
// TODO: 15/3/2022 Impl pet
}
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/nms/VolatileHatHelper.java
View file @
90f98bf0
package
io.lumine.cosmetics.nms
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.players.Profile
;
public
interface
VolatileHatHelper
{
public
void
applyHatPacket
(
Profile
profile
);
public
void
applyHatPacket
(
Cosmetic
Profile
profile
);
}
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/players/Profile.java
View file @
90f98bf0
package
io.lumine.cosmetics.players
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
import
org.bukkit.entity.Player
;
import
com.google.common.collect.Maps
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
io.lumine.cosmetics.api.players.CosmeticInventory
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.players.inventory.DigitalInventory
;
import
lombok.Getter
;
...
...
@@ -34,6 +28,7 @@ public class Profile implements CosmeticProfile,io.lumine.utils.storage.players.
public
void
initialize
(
final
Player
player
)
{
this
.
player
=
player
;
this
.
cosmeticInventory
.
initialize
(
this
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
plugin/src/main/java/io/lumine/cosmetics/players/inventory/DigitalInventory.java
View file @
90f98bf0
...
...
@@ -9,6 +9,7 @@ import com.google.common.collect.Lists;
import
com.google.common.collect.Maps
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.api.players.CosmeticInventory
;
import
io.lumine.cosmetics.managers.hats.Hat
;
import
io.lumine.utils.serialize.Optl
;
...
...
@@ -16,6 +17,8 @@ import lombok.Getter;
public
class
DigitalInventory
implements
CosmeticInventory
{
@Getter
private
transient
CosmeticProfile
profile
;
@Getter
private
Map
<
String
,
List
<
String
>>
unlockedCosmetics
=
Maps
.
newConcurrentMap
();
@Getter
private
Map
<
String
,
String
>
equippedCosmetics
=
Maps
.
newConcurrentMap
();
...
...
@@ -24,7 +27,9 @@ public class DigitalInventory implements CosmeticInventory {
private
final
Map
<
String
,
Cosmetic
>
equippedCustom
=
Maps
.
newConcurrentMap
();
@Override
public
void
initialize
()
{
public
void
initialize
(
CosmeticProfile
profile
)
{
this
.
profile
=
profile
;
for
(
var
entry
:
equippedCosmetics
.
entrySet
())
{
}
...
...
@@ -40,6 +45,7 @@ public class DigitalInventory implements CosmeticInventory {
}
else
{
}
cosmetic
.
getManager
().
equip
(
profile
);
}
public
boolean
isEquipped
(
Cosmetic
cosmetic
)
{
...
...
This diff is collapsed.
Click to expand it.
v1_18/src/main/java/io/lumine/cosmetics/nms/v1_18_R1/VolatileHatImpl.java
View file @
90f98bf0
...
...
@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
import
com.mojang.datafixers.util.Pair
;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.nms.VolatileHatHelper
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.protocol.Protocol
;
...
...
@@ -27,7 +28,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
}
@Override
public
void
applyHatPacket
(
Profile
profile
)
{
public
void
applyHatPacket
(
Cosmetic
Profile
profile
)
{
if
(
profile
==
null
)
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/cosmetic/VolatileHatImpl.java
View file @
90f98bf0
...
...
@@ -4,6 +4,7 @@ import com.mojang.datafixers.util.Pair;
import
io.lumine.cosmetics.MCCosmeticsPlugin
;
import
io.lumine.cosmetics.api.cosmetics.Cosmetic
;
import
io.lumine.cosmetics.api.cosmetics.ItemCosmetic
;
import
io.lumine.cosmetics.api.players.CosmeticProfile
;
import
io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_18_R1
;
import
io.lumine.cosmetics.nms.VolatileHatHelper
;
import
io.lumine.cosmetics.players.Profile
;
...
...
@@ -31,7 +32,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
}
@Override
public
void
applyHatPacket
(
Profile
profile
)
{
public
void
applyHatPacket
(
Cosmetic
Profile
profile
)
{
if
(
profile
==
null
)
return
;
Player
player
=
profile
.
getPlayer
();
...
...
This diff is collapsed.
Click to expand it.
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