Skip to content

Commit 7bfb6c5

Browse files
committed
refactor: Add unapplied code and check empty item.
1 parent 765b5f7 commit 7bfb6c5

5 files changed

Lines changed: 18 additions & 24 deletions

File tree

api/src/main/java/kr/toxicity/model/api/bone/RenderedBone.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ public boolean createHitBox(@NotNull EntityAdapter entity, @NotNull Predicate<Re
138138
public boolean enchant(@NotNull BonePredicate predicate, boolean enchant) {
139139
if (predicate.test(this)) {
140140
itemStack = itemStack.modify(i -> {
141+
if (i.isEmpty()) return i;
141142
var meta = i.getItemMeta();
142143
if (enchant) {
143144
meta.addEnchant(Enchantment.UNBREAKING, 0, true);

api/src/main/java/kr/toxicity/model/api/util/TransformedItemStack.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ public record TransformedItemStack(@NotNull Vector3f offset, @NotNull Vector3f s
5959
* @return is air
6060
*/
6161
public boolean isEmpty() {
62-
return switch (itemStack.getType()) {
63-
case AIR, CAVE_AIR, VOID_AIR -> true;
64-
default -> false;
65-
};
62+
return itemStack.isEmpty();
6663
}
6764

6865
/**

api/src/main/java/kr/toxicity/model/api/version/MinecraftVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ public int compareTo(@NotNull MinecraftVersion o) {
7070

7171
/**
7272
* Parses version from string
73-
* @param version version like "1.21.4"
73+
* @param version version like "1.21.5"
7474
*/
7575
public MinecraftVersion(@NotNull String version) {
7676
this(version.split("\\."));
7777
}
7878
/**
7979
* Parses version from string array
80-
* @param version version array like ["1", "21", "4"]
80+
* @param version version array like ["1", "21", "5"]
8181
*/
8282
public MinecraftVersion(@NotNull String[] version) {
8383
this(

nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/NMSImpl.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup
44
import com.google.gson.JsonParser
55
import com.mojang.authlib.GameProfile
66
import com.mojang.datafixers.util.Pair
7-
import io.netty.buffer.Unpooled
87
import io.netty.channel.ChannelDuplexHandler
98
import io.netty.channel.ChannelHandlerContext
109
import io.netty.channel.ChannelPromise
@@ -17,7 +16,6 @@ import kr.toxicity.model.api.tracker.ModelRotation
1716
import kr.toxicity.model.api.tracker.Tracker
1817
import net.minecraft.core.component.DataComponents
1918
import net.minecraft.network.Connection
20-
import net.minecraft.network.FriendlyByteBuf
2119
import net.minecraft.network.protocol.Packet
2220
import net.minecraft.network.protocol.game.*
2321
import net.minecraft.network.syncher.EntityDataAccessor
@@ -296,13 +294,12 @@ class NMSImpl : NMS {
296294
private fun EntityTracker.mountPacket(entity: Entity = adapter.handle() as Entity, array: IntArray = entity.passengers.map {
297295
it.id
298296
}.toIntArray()): ClientboundSetPassengersPacket {
299-
val buffer = FriendlyByteBuf(Unpooled.buffer())
300-
buffer.writeVarInt(entity.id)
301-
buffer.writeVarIntArray((displays().mapNotNull {
302-
(it as? ModelDisplayImpl)?.display?.id
303-
}.toIntArray() + array))
304-
return ClientboundSetPassengersPacket.STREAM_CODEC.decode(buffer).apply {
305-
buffer.release()
297+
return useByteBuf { buffer ->
298+
buffer.writeVarInt(entity.id)
299+
buffer.writeVarIntArray((displays().mapNotNull {
300+
(it as? ModelDisplayImpl)?.display?.id
301+
}.toIntArray() + array))
302+
ClientboundSetPassengersPacket.STREAM_CODEC.decode(buffer)
306303
}
307304
}
308305

@@ -477,6 +474,7 @@ class NMSImpl : NMS {
477474
)
478475

479476
override fun tint(itemStack: ItemStack, rgb: Int): ItemStack {
477+
if (itemStack.isEmpty) return itemStack
480478
return CraftItemStack.asBukkitCopy(CraftItemStack.asNMSCopy(itemStack).apply {
481479
set(DataComponents.DYED_COLOR, DyedItemColor(rgb, false))
482480
set(DataComponents.CUSTOM_MODEL_DATA, get(DataComponents.CUSTOM_MODEL_DATA)?.let {

nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/nms/v1_21_R4/NMSImpl.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup
44
import com.google.gson.JsonParser
55
import com.mojang.authlib.GameProfile
66
import com.mojang.datafixers.util.Pair
7-
import io.netty.buffer.Unpooled
87
import io.netty.channel.ChannelDuplexHandler
98
import io.netty.channel.ChannelHandlerContext
109
import io.netty.channel.ChannelPromise
@@ -17,7 +16,6 @@ import kr.toxicity.model.api.tracker.ModelRotation
1716
import kr.toxicity.model.api.tracker.Tracker
1817
import net.minecraft.core.component.DataComponents
1918
import net.minecraft.network.Connection
20-
import net.minecraft.network.FriendlyByteBuf
2119
import net.minecraft.network.protocol.Packet
2220
import net.minecraft.network.protocol.game.*
2321
import net.minecraft.network.syncher.EntityDataAccessor
@@ -296,13 +294,12 @@ class NMSImpl : NMS {
296294
private fun EntityTracker.mountPacket(entity: Entity = adapter.handle() as Entity, array: IntArray = entity.passengers.map {
297295
it.id
298296
}.toIntArray()): ClientboundSetPassengersPacket {
299-
val buffer = FriendlyByteBuf(Unpooled.buffer())
300-
buffer.writeVarInt(entity.id)
301-
buffer.writeVarIntArray((displays().mapNotNull {
302-
(it as? ModelDisplayImpl)?.display?.id
303-
}.toIntArray() + array))
304-
return ClientboundSetPassengersPacket.STREAM_CODEC.decode(buffer).apply {
305-
buffer.release()
297+
return useByteBuf { buffer ->
298+
buffer.writeVarInt(entity.id)
299+
buffer.writeVarIntArray((displays().mapNotNull {
300+
(it as? ModelDisplayImpl)?.display?.id
301+
}.toIntArray() + array))
302+
ClientboundSetPassengersPacket.STREAM_CODEC.decode(buffer)
306303
}
307304
}
308305

@@ -477,6 +474,7 @@ class NMSImpl : NMS {
477474
)
478475

479476
override fun tint(itemStack: ItemStack, rgb: Int): ItemStack {
477+
if (itemStack.isEmpty) return itemStack
480478
return CraftItemStack.asBukkitCopy(CraftItemStack.asNMSCopy(itemStack).apply {
481479
set(DataComponents.DYED_COLOR, DyedItemColor(rgb))
482480
set(DataComponents.CUSTOM_MODEL_DATA, get(DataComponents.CUSTOM_MODEL_DATA)?.let {

0 commit comments

Comments
 (0)