kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

调整重复检测方法位置

Browse source
This commit is contained in:
17146 2025-06-03 16:48:25 +08:00 • committed by Light_Quanta
parent 0333ee50eb
commit 600a7c55b5
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

159
src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
View file

@ -50,6 +50,7 @@ import net.neoforged.neoforge.network.PacketDistributor;
import java.util.ArrayList;
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Stream;
@EventBusSubscriber
@ -324,81 +325,105 @@ public class LivingEventHandler {
var laserCap = player.getCapability(ModCapabilities.LASER_CAPABILITY);
if (laserCap != null) laserCap.stop();
var oldTag = NBTTool.getTag(oldStack);
var newTag = NBTTool.getTag(newStack);
if (player instanceof ServerPlayer serverPlayer
&& (newStack.getItem() != oldStack.getItem()
|| (newStack.getItem() instanceof GunItem && !GunData.from(newStack).initialized())
|| (oldStack.getItem() instanceof GunItem && !GunData.from(oldStack).initialized())
|| (newStack.getItem() instanceof GunItem && oldStack.getItem() instanceof GunItem && !Objects.equals(GunsTool.getGunUUID(newTag), GunsTool.getGunUUID(oldTag)))
)) {
if (oldStack.getItem() instanceof GunItem oldGun) {
stopGunReloadSound(serverPlayer, oldGun);
var oldData = GunData.from(oldStack);
if (oldData.defaultActionTime() > 0) {
oldData.bolt.actionTimer.reset();
}
oldData.reload.setTime(0);
oldData.reload.setState(ReloadState.NOT_RELOADING);
if (oldData.defaultIterativeTime() != 0) {
oldData.stopped.set(false);
oldData.forceStop.set(false);
oldData.reload.setStage(0);
oldData.reload.prepareTimer.reset();
oldData.reload.prepareLoadTimer.reset();
oldData.reload.iterativeLoadTimer.reset();
oldData.reload.finishTimer.reset();
}
if (oldStack.is(ModItems.SENTINEL.get())) {
oldData.charge.timer.reset();
}
oldData.save();
if (player instanceof ServerPlayer serverPlayer) {
if (newStack.getItem() instanceof GunItem) {
checkCopyGuns(newStack, player);
}
if (newStack.getItem() instanceof GunItem) {
var newData = GunData.from(newStack);
newData.draw.set(true);
if (newStack.getItem() != oldStack.getItem()
|| (newStack.getItem() instanceof GunItem && !GunData.from(newStack).initialized())
|| (oldStack.getItem() instanceof GunItem && !GunData.from(newStack).initialized())
|| (newStack.getItem() instanceof GunItem && oldStack.getItem() instanceof GunItem && !Objects.equals(GunsTool.getGunUUID(NBTTool.getTag(newStack)), GunsTool.getGunUUID(NBTTool.getTag(oldStack))))
) {
if (oldStack.getItem() instanceof GunItem oldGun) {
stopGunReloadSound(serverPlayer, oldGun);
if (newData.defaultActionTime() > 0) {
newData.bolt.actionTimer.reset();
}
var oldData = GunData.from(oldStack);
newData.reload.setState(ReloadState.NOT_RELOADING);
newData.reload.reloadTimer.reset();
if (newData.defaultIterativeTime() != 0) {
newData.forceStop.set(false);
newData.stopped.set(false);
newData.reload.setStage(0);
newData.reload.prepareTimer.reset();
newData.reload.prepareLoadTimer.reset();
newData.reload.iterativeLoadTimer.reset();
newData.reload.finishTimer.reset();
}
if (newStack.is(ModItems.SENTINEL.get())) {
newData.charge.timer.reset();
}
for (Perk.Type type : Perk.Type.values()) {
var instance = newData.perk.getInstance(type);
if (instance != null) {
instance.perk().onChangeSlot(newData, instance, player);
if (oldData.defaultActionTime() > 0) {
oldData.bolt.actionTimer.reset();
}
oldData.reload.setTime(0);
oldData.reload.setState(ReloadState.NOT_RELOADING);
if (oldData.defaultIterativeTime() != 0) {
oldData.stopped.set(false);
oldData.forceStop.set(false);
oldData.reload.setStage(0);
oldData.reload.prepareTimer.reset();
oldData.reload.prepareLoadTimer.reset();
oldData.reload.iterativeLoadTimer.reset();
oldData.reload.finishTimer.reset();
}
if (oldStack.is(ModItems.SENTINEL.get())) {
oldData.charge.timer.reset();
}
oldData.save();
}
if (player.level() instanceof ServerLevel) {
PacketDistributor.sendToPlayer(serverPlayer, new DrawClientMessage(true));
}
if (newStack.getItem() instanceof GunItem) {
var newData = GunData.from(newStack);
newData.draw.set(true);
newData.save();
if (newData.defaultActionTime() > 0) {
newData.bolt.actionTimer.reset();
}
newData.reload.setState(ReloadState.NOT_RELOADING);
newData.reload.reloadTimer.reset();
if (newData.defaultIterativeTime() != 0) {
newData.forceStop.set(false);
newData.stopped.set(false);
newData.reload.setStage(0);
newData.reload.prepareTimer.reset();
newData.reload.prepareLoadTimer.reset();
newData.reload.iterativeLoadTimer.reset();
newData.reload.finishTimer.reset();
}
if (newStack.is(ModItems.SENTINEL.get())) {
newData.charge.timer.reset();
}
for (Perk.Type type : Perk.Type.values()) {
var instance = newData.perk.getInstance(type);
if (instance != null) {
instance.perk().onChangeSlot(newData, instance, player);
}
}
if (player.level() instanceof ServerLevel) {
PacketDistributor.sendToPlayer(serverPlayer, new DrawClientMessage(true));
}
newData.save();
}
}
}
}
}
private static void checkCopyGuns(ItemStack stack, Player player) {
var data = GunData.from(stack);
if (!data.initialized()) return;
if (data.data == null) return;
var uuid = data.data.getUUID("UUID");
for (var item : player.getInventory().items) {
if (item.equals(stack)) continue;
if (item.getItem() instanceof GunItem) {
var itemData = GunData.from(item);
var dataTag = itemData.data;
if (dataTag == null) continue;
if (!dataTag.hasUUID("UUID")) continue;
if (dataTag.getUUID("UUID").equals(uuid)) {
data.data.putUUID("UUID", UUID.randomUUID());
return;
}
}
}

25
src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
View file

@ -108,27 +108,6 @@ public abstract class GunItem extends Item implements CustomRendererItem, GeoIte
return false;
}
private void checkCopyGuns(ItemStack stack, Player player) {
var data = GunData.from(stack);
if (!data.initialized()) return;
if (data.data == null) return;
var uuid = data.data.getUUID("UUID");
for (var item : player.getInventory().items) {
if (item.equals(stack)) continue;
if (item.getItem() instanceof GunItem) {
var itemData = GunData.from(item);
var dataTag = itemData.data;
if (dataTag == null) continue;
if (!dataTag.hasUUID("UUID")) continue;
if (dataTag.getUUID("UUID").equals(uuid)) {
data.data.putUUID("UUID", UUID.randomUUID());
return;
}
}
}
}
@Override
@ParametersAreNonnullByDefault
public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) {
@ -140,10 +119,6 @@ public abstract class GunItem extends Item implements CustomRendererItem, GeoIte
var data = GunData.from(stack);
if (living instanceof Player player && selected) {
checkCopyGuns(stack, player);
}
if (!data.initialized()) {
data.initialize();
if (level.getServer() != null && entity instanceof Player player && player.isCreative()) {