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
85e16907
Commit
85e16907
authored
2 years ago
by
Ashijin
Browse files
Options
Download
Email Patches
Plain Diff
Fixed errors from hats/offhands on some versions
parent
bb07d922
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
plugin/src/main/java/io/lumine/cosmetics/players/wardrobe/WardrobeExecutor.java
...o/lumine/cosmetics/players/wardrobe/WardrobeExecutor.java
+1
-1
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileHatImpl.java
...ne/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileHatImpl.java
+5
-2
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileOffhandImpl.java
...osmetics/nms/v1_19_R1_2/cosmetic/VolatileOffhandImpl.java
+4
-2
No files found.
plugin/src/main/java/io/lumine/cosmetics/players/wardrobe/WardrobeExecutor.java
View file @
85e16907
...
...
@@ -47,7 +47,7 @@ public class WardrobeExecutor extends ReloadableModule<MCCosmeticsPlugin> implem
CommandHelper
.
sendEditorMessage
(
player
,
new
String
[]
{
"<green>You're now in Wardrobe Mode!"
,
"
Any c
osmetics equipped will go on your mannequin"
,
"
C
osmetics equipped will go on your mannequin"
,
"To exit, type the command again or walk away"
});
}
...
...
This diff is collapsed.
Click to expand it.
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileHatImpl.java
View file @
85e16907
...
...
@@ -12,6 +12,7 @@ import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import
io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.logging.Log
;
import
io.lumine.utils.reflection.Reflector
;
import
io.netty.buffer.Unpooled
;
import
lombok.Getter
;
import
net.minecraft.network.FriendlyByteBuf
;
...
...
@@ -158,6 +159,8 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
nmsHandler
.
broadcastAroundAndSelf
(
player
,
equipmentPacket
);
}
private
static
Reflector
<
ClientboundSetEquipmentPacket
>
refEq
=
new
Reflector
(
ClientboundSetEquipmentPacket
.
class
,
"c"
);
private
void
modifyPacket
(
Profile
profile
,
ClientboundSetEquipmentPacket
packet
)
{
final
var
maybeEquipped
=
profile
.
getEquipped
(
Hat
.
class
);
if
(
maybeEquipped
.
isEmpty
())
{
...
...
@@ -189,8 +192,8 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
if
(!
foundHead
)
{
newSlots
.
add
(
Pair
.
of
(
EquipmentSlot
.
HEAD
,
nmsItem
));
}
packet
.
getSlots
().
clear
();
packet
.
getSlots
().
addAll
(
newSlots
);
refEq
.
set
(
packet
,
"c"
,
newSlots
);
}
}
This diff is collapsed.
Click to expand it.
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileOffhandImpl.java
View file @
85e16907
...
...
@@ -12,6 +12,7 @@ import io.lumine.cosmetics.managers.offhand.Offhand;
import
io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2
;
import
io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper
;
import
io.lumine.cosmetics.players.Profile
;
import
io.lumine.utils.reflection.Reflector
;
import
io.netty.buffer.Unpooled
;
import
lombok.Getter
;
import
net.minecraft.network.FriendlyByteBuf
;
...
...
@@ -133,6 +134,8 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
nmsHandler
.
broadcastAroundAndSelf
(
player
,
equipmentPacket
);
}
private
static
Reflector
<
ClientboundSetEquipmentPacket
>
refEq
=
new
Reflector
(
ClientboundSetEquipmentPacket
.
class
,
"c"
);
private
void
modifyPacket
(
Profile
profile
,
ClientboundSetEquipmentPacket
packet
)
{
final
var
maybeEquipped
=
profile
.
getEquipped
(
Hat
.
class
);
if
(
maybeEquipped
.
isEmpty
())
{
...
...
@@ -164,8 +167,7 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
if
(!
foundHead
)
{
newSlots
.
add
(
Pair
.
of
(
EquipmentSlot
.
HEAD
,
nmsItem
));
}
packet
.
getSlots
().
clear
();
packet
.
getSlots
().
addAll
(
newSlots
);
refEq
.
set
(
packet
,
"c"
,
newSlots
);
}
}
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