From b5951a237e5e7659acae6189b7af8468d3885725 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Fri, 16 May 2025 03:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=9E=AA=E6=A2=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9B=B8=E5=85=B3=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/api/event/ReloadEvent.java | 2 +- .../superbwarfare/client/AnimationHelper.java | 4 ++-- .../atsuishio/superbwarfare/client/ClickHandler.java | 4 ++-- .../superbwarfare/client/ItemModelHelper.java | 6 +++--- .../com/atsuishio/superbwarfare/client/PoseTool.java | 2 +- .../client/layer/gun/MinigunHeatLayer.java | 2 +- .../client/model/item/AK12ItemModel.java | 4 ++-- .../client/model/item/AK47ItemModel.java | 4 ++-- .../client/model/item/Glock17ItemModel.java | 2 +- .../client/model/item/Glock18ItemModel.java | 4 ++-- .../client/model/item/Hk416ItemModel.java | 6 +++--- .../client/model/item/K98ItemModel.java | 2 +- .../client/model/item/M1911ItemModel.java | 2 +- .../superbwarfare/client/model/item/M4ItemModel.java | 4 ++-- .../client/model/item/M60ItemModel.java | 2 +- .../client/model/item/M870ItemModel.java | 2 +- .../client/model/item/M98bItemModel.java | 2 +- .../client/model/item/MarlinItemModel.java | 2 +- .../client/model/item/MinigunItemModel.java | 2 +- .../client/model/item/Mk14ItemModel.java | 4 ++-- .../client/model/item/MosinNagantItemModel.java | 2 +- .../client/model/item/Mp443ItemModel.java | 2 +- .../superbwarfare/client/model/item/Ntw20Model.java | 4 ++-- .../client/model/item/Qbz95ItemModel.java | 4 ++-- .../client/model/item/RpgItemModel.java | 2 +- .../client/model/item/RpkItemModel.java | 4 ++-- .../client/model/item/SecondaryCataclysmModel.java | 2 +- .../client/model/item/SentinelItemModel.java | 2 +- .../client/model/item/SksItemModel.java | 2 +- .../client/model/item/SvdItemModel.java | 4 ++-- .../client/model/item/TracheliumItemModel.java | 4 ++-- .../client/model/item/VectorItemModel.java | 4 ++-- .../superbwarfare/client/overlay/AmmoBarOverlay.java | 2 +- .../client/overlay/CrossHairOverlay.java | 2 +- .../client/overlay/HandsomeFrameOverlay.java | 2 +- .../client/overlay/JavelinHudOverlay.java | 2 +- .../client/renderer/item/AK12ItemRenderer.java | 4 ++-- .../client/renderer/item/AK47ItemRenderer.java | 5 ++--- .../client/renderer/item/BocekItemRenderer.java | 2 +- .../client/renderer/item/Hk416ItemRenderer.java | 5 ++--- .../client/renderer/item/M4ItemRenderer.java | 4 ++-- .../client/renderer/item/Mk14ItemRenderer.java | 4 ++-- .../client/renderer/item/Ntw20Renderer.java | 5 ++--- .../client/renderer/item/Qbz95ItemRenderer.java | 5 ++--- .../client/renderer/item/RpgItemRenderer.java | 2 +- .../client/renderer/item/RpkItemRenderer.java | 4 ++-- .../client/renderer/item/SvdItemRenderer.java | 5 ++--- .../client/renderer/item/TracheliumItemRenderer.java | 4 ++-- .../client/renderer/item/VectorItemRenderer.java | 4 ++-- .../client/tooltip/ClientBocekImageTooltip.java | 2 +- .../client/tooltip/ClientGunImageTooltip.java | 4 ++-- .../superbwarfare/compat/jei/GunPerksCategory.java | 4 +++- .../{item/gun/data => data/gun}/DefaultGunData.java | 2 +- .../{item/gun/data => data/gun}/FireMode.java | 2 +- .../{item/gun/data => data/gun}/GunData.java | 6 +++--- .../{item/gun/data => data/gun}/ReloadType.java | 2 +- .../gun/data => data/gun}/subdata/Attachment.java | 6 +++--- .../{item/gun/data => data/gun}/subdata/Bolt.java | 8 ++++---- .../{item/gun/data => data/gun}/subdata/Charge.java | 8 ++++---- .../{item/gun/data => data/gun}/subdata/Perks.java | 4 ++-- .../{item/gun/data => data/gun}/subdata/Reload.java | 12 ++++++------ .../gun/data => data/gun}/value/AttachmentType.java | 2 +- .../gun/data => data/gun}/value/BooleanValue.java | 2 +- .../gun/data => data/gun}/value/DoubleValue.java | 2 +- .../{item/gun/data => data/gun}/value/IntValue.java | 2 +- .../gun/data => data/gun}/value/ReloadState.java | 2 +- .../{item/gun/data => data/gun}/value/Starter.java | 2 +- .../gun/data => data/gun}/value/StringEnumValue.java | 2 +- .../{item/gun/data => data/gun}/value/Timer.java | 2 +- .../superbwarfare/event/ClientEventHandler.java | 6 +++--- .../superbwarfare/event/ClientMouseHandler.java | 2 +- .../superbwarfare/event/GunEventHandler.java | 4 ++-- .../superbwarfare/event/LivingEventHandler.java | 5 ++--- .../superbwarfare/event/PlayerEventHandler.java | 2 +- .../superbwarfare/event/ReloadEventHandler.java | 2 +- .../atsuishio/superbwarfare/item/gun/GunEvents.java | 2 +- .../atsuishio/superbwarfare/item/gun/GunItem.java | 4 ++-- .../superbwarfare/item/gun/handgun/Glock17Item.java | 2 +- .../superbwarfare/item/gun/handgun/Glock18Item.java | 2 +- .../superbwarfare/item/gun/handgun/M1911Item.java | 2 +- .../superbwarfare/item/gun/handgun/Mp443Item.java | 2 +- .../superbwarfare/item/gun/handgun/Trachelium.java | 4 ++-- .../superbwarfare/item/gun/heavy/Ntw20Item.java | 4 ++-- .../superbwarfare/item/gun/launcher/JavelinItem.java | 2 +- .../superbwarfare/item/gun/launcher/M79Item.java | 2 +- .../superbwarfare/item/gun/launcher/RpgItem.java | 2 +- .../item/gun/launcher/SecondaryCataclysm.java | 2 +- .../item/gun/machinegun/DevotionItem.java | 2 +- .../superbwarfare/item/gun/machinegun/M60Item.java | 2 +- .../item/gun/machinegun/MinigunItem.java | 2 +- .../superbwarfare/item/gun/machinegun/RpkItem.java | 4 ++-- .../superbwarfare/item/gun/rifle/AK12Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/AK47Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/Hk416Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/InsidiousItem.java | 2 +- .../superbwarfare/item/gun/rifle/M4Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/MarlinItem.java | 2 +- .../superbwarfare/item/gun/rifle/Mk14Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/Qbz95Item.java | 4 ++-- .../superbwarfare/item/gun/rifle/SksItem.java | 2 +- .../superbwarfare/item/gun/shotgun/Aa12Item.java | 2 +- .../item/gun/shotgun/HomemadeShotgunItem.java | 2 +- .../superbwarfare/item/gun/shotgun/M870Item.java | 2 +- .../superbwarfare/item/gun/smg/VectorItem.java | 4 ++-- .../item/gun/sniper/HuntingRifleItem.java | 2 +- .../superbwarfare/item/gun/sniper/K98Item.java | 2 +- .../superbwarfare/item/gun/sniper/M98bItem.java | 2 +- .../item/gun/sniper/MosinNagantItem.java | 2 +- .../superbwarfare/item/gun/sniper/SentinelItem.java | 2 +- .../superbwarfare/item/gun/sniper/SvdItem.java | 4 ++-- .../superbwarfare/item/gun/special/BocekItem.java | 2 +- .../superbwarfare/item/gun/special/TaserItem.java | 2 +- .../superbwarfare/menu/ReforgingTableMenu.java | 2 +- .../network/message/receive/GunsDataMessage.java | 2 +- .../network/message/send/AdjustZoomFovMessage.java | 2 +- .../network/message/send/EditMessage.java | 4 ++-- .../network/message/send/FireKeyMessage.java | 2 +- .../network/message/send/FireModeMessage.java | 4 ++-- .../network/message/send/ReloadMessage.java | 4 ++-- .../network/message/send/SensitivityMessage.java | 2 +- .../network/message/send/ShootMessage.java | 2 +- .../network/message/send/SwitchScopeMessage.java | 2 +- .../network/message/send/ZoomMessage.java | 2 +- .../com/atsuishio/superbwarfare/perk/AmmoPerk.java | 2 +- .../java/com/atsuishio/superbwarfare/perk/Perk.java | 2 +- .../atsuishio/superbwarfare/perk/ammo/APBullet.java | 2 +- .../superbwarfare/perk/ammo/BeastBullet.java | 2 +- .../superbwarfare/perk/ammo/BreadBullet.java | 2 +- .../superbwarfare/perk/ammo/CupidArrow.java | 2 +- .../atsuishio/superbwarfare/perk/ammo/HEBullet.java | 2 +- .../superbwarfare/perk/ammo/IncendiaryBullet.java | 2 +- .../atsuishio/superbwarfare/perk/ammo/JHPBullet.java | 2 +- .../superbwarfare/perk/ammo/LongerWire.java | 2 +- .../superbwarfare/perk/ammo/MicroMissile.java | 2 +- .../superbwarfare/perk/ammo/SilverBullet.java | 2 +- .../superbwarfare/perk/damage/Desperado.java | 2 +- .../atsuishio/superbwarfare/perk/damage/Firefly.java | 2 +- .../superbwarfare/perk/damage/GutshotStraight.java | 2 +- .../superbwarfare/perk/damage/HeadSeeker.java | 2 +- .../superbwarfare/perk/damage/KillClip.java | 2 +- .../superbwarfare/perk/damage/KillingTally.java | 2 +- .../superbwarfare/perk/damage/MagnificentHowl.java | 2 +- .../superbwarfare/perk/damage/MonsterHunter.java | 2 +- .../superbwarfare/perk/damage/VoltOverload.java | 2 +- .../superbwarfare/perk/damage/VorpalWeapon.java | 2 +- .../superbwarfare/perk/functional/FieldDoctor.java | 2 +- .../perk/functional/FourthTimesCharm.java | 2 +- .../superbwarfare/perk/functional/HealClip.java | 2 +- .../perk/functional/PowerfulAttraction.java | 2 +- .../superbwarfare/perk/functional/Regeneration.java | 2 +- .../superbwarfare/perk/functional/Subsistence.java | 2 +- .../superbwarfare/perk/functional/TurboCharger.java | 2 +- .../com/atsuishio/superbwarfare/tools/GunsTool.java | 2 +- 153 files changed, 219 insertions(+), 223 deletions(-) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/DefaultGunData.java (98%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/FireMode.java (93%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/GunData.java (99%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/ReloadType.java (80%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/subdata/Attachment.java (68%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/subdata/Bolt.java (52%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/subdata/Charge.java (56%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/subdata/Perks.java (97%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/subdata/Reload.java (84%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/AttachmentType.java (83%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/BooleanValue.java (93%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/DoubleValue.java (93%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/IntValue.java (93%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/ReloadState.java (61%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/Starter.java (94%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/StringEnumValue.java (94%) rename src/main/java/com/atsuishio/superbwarfare/{item/gun/data => data/gun}/value/Timer.java (92%) diff --git a/src/main/java/com/atsuishio/superbwarfare/api/event/ReloadEvent.java b/src/main/java/com/atsuishio/superbwarfare/api/event/ReloadEvent.java index 42a2b3f87..e36c2d497 100644 --- a/src/main/java/com/atsuishio/superbwarfare/api/event/ReloadEvent.java +++ b/src/main/java/com/atsuishio/superbwarfare/api/event/ReloadEvent.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.api.event; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.neoforged.bus.api.Event; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index bede72656..b2c3e89a7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 7768169ad..f93f4c982 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -3,6 +3,8 @@ package com.atsuishio.superbwarfare.client; import com.atsuishio.superbwarfare.compat.CompatHolder; import com.atsuishio.superbwarfare.compat.clothconfig.ClothConfigHelper; import com.atsuishio.superbwarfare.config.client.ReloadConfig; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.MortarEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity; @@ -11,8 +13,6 @@ import com.atsuishio.superbwarfare.entity.vehicle.base.WeaponVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.network.message.send.*; import com.atsuishio.superbwarfare.tools.NBTTool; import com.atsuishio.superbwarfare.tools.SeekTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java index 8449c0a64..c728099e6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.subdata.Attachment; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.subdata.Attachment; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/PoseTool.java b/src/main/java/com/atsuishio/superbwarfare/client/PoseTool.java index 4819d627c..da7891974 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/PoseTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/PoseTool.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunHeatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunHeatLayer.java index 16fcd8f25..07d4d973a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunHeatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunHeatLayer.java @@ -2,8 +2,8 @@ package com.atsuishio.superbwarfare.client.layer.gun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK12ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK12ItemModel.java index 006ffd001..786cedca1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK12ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK12ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java index bd60b280b..6728a39a0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java index e427575a5..a95f15331 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java index 00f8e9162..daf3b71ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java index a9973789f..ca2f9bd92 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Hk416Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java index 09ec1b1d8..ccc2d10b4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java index 661b34475..37dc79c17 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.handgun.M1911Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java index ba6824ad0..8f9eeb9a1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.M4Item; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java index fb2fc378e..48b5e7382 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.machinegun.M60Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java index 7e2f14e1f..51ac0485f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java index a4b7e5344..7166efea5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.sniper.M98bItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MarlinItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MarlinItemModel.java index a45033fb9..0df94208d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MarlinItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MarlinItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MinigunItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MinigunItemModel.java index df6ef664d..3d961632f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MinigunItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MinigunItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mk14ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mk14ItemModel.java index 134005431..4ee4d4efb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mk14ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mk14ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Mk14Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java index a8d76afe9..e1bb39da5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.sniper.MosinNagantItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java index ec1c13cb4..4404d9690 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java index 9bba9a408..f54c4d3ac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.heavy.Ntw20Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java index e5db693ca..85baef6e8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Qbz95Item; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java index 17cd73c73..52315ceed 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpgItemModel.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.launcher.RpgItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java index 49b4ede38..06c79a6e6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SecondaryCataclysmModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SecondaryCataclysmModel.java index 19b6cdfae..17a94bbb1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SecondaryCataclysmModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SecondaryCataclysmModel.java @@ -4,7 +4,7 @@ import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java index 5e265249e..1539836ed 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java @@ -4,7 +4,7 @@ import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SksItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SksItemModel.java index 68ba431e9..d430349b0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SksItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SksItemModel.java @@ -5,7 +5,7 @@ import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.rifle.SksItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java index b0c440373..f2e62db6b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java @@ -5,8 +5,8 @@ import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.sniper.SvdItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java index ec5d9d2ef..84e56d33a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.handgun.Trachelium; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/VectorItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/VectorItemModel.java index 02eb05a1f..658d0a0cf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/VectorItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/VectorItemModel.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.smg.VectorItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java index da3b7d44f..cbe84414e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java @@ -2,11 +2,11 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.client.DisplayConfig; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModKeyMappings; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.NBTTool; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java index ac954c518..e3dcc6e5d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java @@ -3,12 +3,12 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.config.client.DisplayConfig; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java index 4ccaa1a6c..5d3061938 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.RenderHelper; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.SeekTool; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java index a15e3e647..f9804cdc4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.RenderHelper; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.EntityFindUtil; import com.atsuishio.superbwarfare.tools.SeekTool; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java index d810e466f..99a1bc4e0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.AK12ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java index 0dc5b2b37..373987dce 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.AK47ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -77,7 +77,6 @@ public class AK47ItemRenderer extends GeoItemRenderer { if (player != null) { ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("humu1")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) != 0); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java index 4d2af0b29..82b4d66f8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java @@ -2,8 +2,8 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.model.item.BocekItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.special.BocekItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 0b8c0fd7e..a325a71f1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Hk416ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Hk416Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -77,7 +77,6 @@ public class Hk416ItemRenderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (name.equals("hidden"))) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java index 1a6721764..65f0b597b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.M4ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.M4Item; import com.atsuishio.superbwarfare.tools.NBTTool; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index b4a570a6e..7da4286aa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Mk14ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Mk14Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java index 441233195..e16a7b799 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Ntw20Model; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.heavy.Ntw20Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -78,7 +78,6 @@ public class Ntw20Renderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("ironSight")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index 09ac0dfe1..ac2dcd733 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Qbz95ItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Qbz95Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -78,7 +78,6 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("tiba")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java index 5bb956574..711ac5270 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java @@ -2,8 +2,8 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.model.item.RpgItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.launcher.RpgItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java index 03608312a..fa1c94465 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java @@ -5,8 +5,8 @@ import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.RpkItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java index 2b23a1411..804a9f47b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java @@ -5,8 +5,8 @@ import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.SvdItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.sniper.SvdItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -78,7 +78,6 @@ public class SvdItemRenderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("mount")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 0 || GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java index 21e4c77fc..777df305f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.TracheliumItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.handgun.Trachelium; import com.atsuishio.superbwarfare.tools.NBTTool; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java index 08c54a3a0..17ca4979f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java @@ -3,9 +3,9 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.VectorItemModel; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.smg.VectorItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java index 2f4a585a2..7f239ca28 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.tooltip; import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.FormatTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java index d504aee4e..ace122c71 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -1,12 +1,12 @@ package com.atsuishio.superbwarfare.client.tooltip; import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModKeyMappings; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.FormatTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jei/GunPerksCategory.java b/src/main/java/com/atsuishio/superbwarfare/compat/jei/GunPerksCategory.java index 720fa6ea7..76cf80cf6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jei/GunPerksCategory.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jei/GunPerksCategory.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.compat.jei; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; @@ -22,6 +22,7 @@ import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,7 @@ public class GunPerksCategory implements IRecipeCategory { } @Override + @ParametersAreNonnullByDefault public void draw(ItemStack recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { var name = recipe.getHoverName(); guiGraphics.drawString(Minecraft.getInstance().font, name, diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/DefaultGunData.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/DefaultGunData.java index bedb33079..a2d85c7a4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/DefaultGunData.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data; +package com.atsuishio.superbwarfare.data.gun; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/FireMode.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/FireMode.java similarity index 93% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/FireMode.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/FireMode.java index 4ba8fe524..4062ec2f9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/FireMode.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/FireMode.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data; +package com.atsuishio.superbwarfare.data.gun; import com.atsuishio.superbwarfare.Mod; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/GunData.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/GunData.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java index 77a139325..31a4f59f1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/GunData.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java @@ -1,10 +1,10 @@ -package com.atsuishio.superbwarfare.item.gun.data; +package com.atsuishio.superbwarfare.data.gun; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.subdata.*; +import com.atsuishio.superbwarfare.data.gun.value.*; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.subdata.*; -import com.atsuishio.superbwarfare.item.gun.data.value.*; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.Ammo; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/ReloadType.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/ReloadType.java similarity index 80% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/ReloadType.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/ReloadType.java index 93b16c77b..7a18e0cc0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/ReloadType.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/ReloadType.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data; +package com.atsuishio.superbwarfare.data.gun; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Attachment.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Attachment.java similarity index 68% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Attachment.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Attachment.java index 1fe2cc393..bb1171506 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Attachment.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Attachment.java @@ -1,7 +1,7 @@ -package com.atsuishio.superbwarfare.item.gun.data.subdata; +package com.atsuishio.superbwarfare.data.gun.subdata; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import net.minecraft.nbt.CompoundTag; public final class Attachment { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Bolt.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Bolt.java similarity index 52% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Bolt.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Bolt.java index 8d9c759eb..6af7092f7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Bolt.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Bolt.java @@ -1,8 +1,8 @@ -package com.atsuishio.superbwarfare.item.gun.data.subdata; +package com.atsuishio.superbwarfare.data.gun.subdata; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.BooleanValue; -import com.atsuishio.superbwarfare.item.gun.data.value.Timer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.BooleanValue; +import com.atsuishio.superbwarfare.data.gun.value.Timer; public final class Bolt { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Charge.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Charge.java similarity index 56% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Charge.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Charge.java index 7db73d88f..2726b70cc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Charge.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Charge.java @@ -1,8 +1,8 @@ -package com.atsuishio.superbwarfare.item.gun.data.subdata; +package com.atsuishio.superbwarfare.data.gun.subdata; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.Starter; -import com.atsuishio.superbwarfare.item.gun.data.value.Timer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.Starter; +import com.atsuishio.superbwarfare.data.gun.value.Timer; public final class Charge { public final Timer timer; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Perks.java similarity index 97% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Perks.java index a37c5f3f1..d015b62df 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Perks.java @@ -1,8 +1,8 @@ -package com.atsuishio.superbwarfare.item.gun.data.subdata; +package com.atsuishio.superbwarfare.data.gun.subdata; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.item.PerkItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Reload.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Reload.java similarity index 84% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Reload.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Reload.java index 03f4f9e94..96701ba23 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Reload.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/subdata/Reload.java @@ -1,10 +1,10 @@ -package com.atsuishio.superbwarfare.item.gun.data.subdata; +package com.atsuishio.superbwarfare.data.gun.subdata; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.IntValue; -import com.atsuishio.superbwarfare.item.gun.data.value.ReloadState; -import com.atsuishio.superbwarfare.item.gun.data.value.Starter; -import com.atsuishio.superbwarfare.item.gun.data.value.Timer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.IntValue; +import com.atsuishio.superbwarfare.data.gun.value.ReloadState; +import com.atsuishio.superbwarfare.data.gun.value.Starter; +import com.atsuishio.superbwarfare.data.gun.value.Timer; import net.minecraft.nbt.CompoundTag; public final class Reload { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/AttachmentType.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/AttachmentType.java similarity index 83% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/AttachmentType.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/AttachmentType.java index 742563929..33f1416b4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/AttachmentType.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/AttachmentType.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; public enum AttachmentType { SCOPE("Scope"), diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/BooleanValue.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/BooleanValue.java similarity index 93% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/BooleanValue.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/BooleanValue.java index 8fd072370..ec1342690 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/BooleanValue.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/BooleanValue.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/DoubleValue.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/DoubleValue.java similarity index 93% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/DoubleValue.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/DoubleValue.java index 34909411b..6bebae857 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/DoubleValue.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/DoubleValue.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/IntValue.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/IntValue.java similarity index 93% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/IntValue.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/IntValue.java index 2ef1d8db0..68739cc64 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/IntValue.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/IntValue.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/ReloadState.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/ReloadState.java similarity index 61% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/ReloadState.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/ReloadState.java index c5ff69a80..84e81ec28 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/ReloadState.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/ReloadState.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; public enum ReloadState { NOT_RELOADING, diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Starter.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/Starter.java similarity index 94% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Starter.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/Starter.java index 2c939eaf0..c931734c1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Starter.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/Starter.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/StringEnumValue.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/StringEnumValue.java similarity index 94% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/StringEnumValue.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/StringEnumValue.java index 68bc47fab..8a7688c0c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/StringEnumValue.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/StringEnumValue.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Timer.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/Timer.java similarity index 92% rename from src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Timer.java rename to src/main/java/com/atsuishio/superbwarfare/data/gun/value/Timer.java index c21f6614e..48361ede0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/value/Timer.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/value/Timer.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.item.gun.data.value; +package com.atsuishio.superbwarfare.data.gun.value; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 40b0e80dc..8c48ae8b1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -4,6 +4,9 @@ import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.config.server.MiscConfig; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; @@ -12,9 +15,6 @@ import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.WeaponVehicleEntity; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.network.message.send.*; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java index 78e5deffd..8b468f454 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java @@ -2,12 +2,12 @@ package com.atsuishio.superbwarfare.event; import com.atsuishio.superbwarfare.client.MouseMovementHandler; import com.atsuishio.superbwarfare.config.client.VehicleControlConfig; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.base.AirEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModMobEffects; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 41c748f6f..f63c42514 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -2,13 +2,13 @@ package com.atsuishio.superbwarfare.event; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.api.event.ReloadEvent; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.ReloadState; import com.atsuishio.superbwarfare.init.ModAttachments; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.ReloadState; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.SoundTool; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java index 64fdb2a71..fff6175f1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java @@ -5,6 +5,8 @@ import com.atsuishio.superbwarfare.component.ModDataComponents; import com.atsuishio.superbwarfare.config.common.GameplayConfig; import com.atsuishio.superbwarfare.config.server.MiscConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.ReloadState; import com.atsuishio.superbwarfare.entity.TargetEntity; import com.atsuishio.superbwarfare.entity.mixin.ICustomKnockback; import com.atsuishio.superbwarfare.entity.vehicle.LaserTowerEntity; @@ -14,8 +16,6 @@ import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.common.ammo.box.AmmoBoxInfo; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.ReloadState; import com.atsuishio.superbwarfare.network.message.receive.ClientIndicatorMessage; import com.atsuishio.superbwarfare.network.message.receive.DrawClientMessage; import com.atsuishio.superbwarfare.network.message.receive.PlayerGunKillMessage; @@ -392,7 +392,6 @@ public class LivingEventHandler { if (newStack.getItem() instanceof GunItem) { var newData = GunData.from(newStack); newData.draw.set(true); - newTag = newData.tag(); if (newData.defaultActionTime() > 0) { newData.bolt.actionTimer.reset(); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java index 505cc18ff..b774673da 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.event; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.common.GameplayConfig; import com.atsuishio.superbwarfare.config.server.MiscConfig; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModAttachments; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.network.message.receive.SimulationDistanceMessage; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.NBTTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ReloadEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ReloadEventHandler.java index a09ee6c6e..cccc14c95 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ReloadEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ReloadEventHandler.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.event; import com.atsuishio.superbwarfare.api.event.ReloadEvent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java index 7aee9169b..310df8e4a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.item.gun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.player.ItemEntityPickupEvent; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java index 28c488c0b..e77bb7ee3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -3,6 +3,8 @@ package com.atsuishio.superbwarfare.item.gun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.PoseTool; import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.entity.projectile.ExplosiveProjectile; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.init.ModAttachments; @@ -10,8 +12,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.CustomRendererItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.SoundTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java index e2810b8e4..f6f62d849 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Glock17ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java index d7d8628ce..8dcc35555 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Glock18ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java index ff4481082..d1f6fe10a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M1911ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java index 344a2fb4c..307638884 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Mp443ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index c345865a9..5783f1de5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.TooltipTool; import com.atsuishio.superbwarfare.client.renderer.item.TracheliumItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java index bfd0a1129..0283143ab 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java @@ -3,12 +3,12 @@ package com.atsuishio.superbwarfare.item.gun.heavy; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.Ntw20Renderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java index b326ba9e0..a76f6f572 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java @@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.JavelinItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.DecoyEntity; import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; @@ -10,7 +11,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.network.message.receive.ShootClientMessage; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.*; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java index 87880af0e..d8ad82e0f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M79ItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.ParticleTool; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java index 0e1df2b10..993f021cb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.RpgItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.ParticleTool; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 16b3fc734..2aefd0318 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -10,7 +10,7 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.ParticleTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java index 2beb1efe3..a50d0e034 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.DevotionItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java index 4521c0407..adbdd8a4b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M60ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java index 754b9756a..74c250d1f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MinigunItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java index e39458487..baa85fb8d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.RpkItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java index 949315ad0..c08be8536 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.AK12ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java index 037830b33..f611b68c1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.AK47ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java index 5220a77ac..351d64814 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.Hk416ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java index 558c3afca..432555acd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.InsidiousItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java index 4efc9ba55..8831a30de 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.M4ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java index ae23cd414..fd79aeb17 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MarlinItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java index b0865bb74..9afc712fb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.Mk14ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java index 71cfb2d5d..264565f26 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.Qbz95ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java index 44dfe52c7..050066b01 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java @@ -5,7 +5,7 @@ import com.atsuishio.superbwarfare.client.renderer.item.SksItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java index 7fd6aaf67..0f2f5e359 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Aa12ItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java index f09e09279..1e7d56f20 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.HomemadeShotgunItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.ParticleTool; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java index 83ca6b36b..f5b4f9d3e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java @@ -3,10 +3,10 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M870ItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index d5b6d18e8..88e110837 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java @@ -3,11 +3,11 @@ package com.atsuishio.superbwarfare.item.gun.smg; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.renderer.item.VectorItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java index a853469f9..bd36d0234 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.HuntingRifleItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java index 1ff137cc3..2b36d798a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.K98ItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java index a1b0778af..196238941 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M98bItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java index 94ebbcbfe..4811f8f46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MosinNagantItemRenderer; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index c9ec91356..124debfc0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -8,7 +8,7 @@ import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java index 51229236d..b897b7b19 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java @@ -6,8 +6,8 @@ import com.atsuishio.superbwarfare.client.renderer.item.SvdItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.NBTTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java index 9f5c2911e..f3506a96c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java @@ -3,12 +3,12 @@ package com.atsuishio.superbwarfare.item.gun.special; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.BocekItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.BocekImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.network.message.receive.ShootClientMessage; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index aeec4f09d..07fb4706f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java @@ -10,7 +10,7 @@ import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/atsuishio/superbwarfare/menu/ReforgingTableMenu.java b/src/main/java/com/atsuishio/superbwarfare/menu/ReforgingTableMenu.java index c554348b6..8c78a1378 100644 --- a/src/main/java/com/atsuishio/superbwarfare/menu/ReforgingTableMenu.java +++ b/src/main/java/com/atsuishio/superbwarfare/menu/ReforgingTableMenu.java @@ -1,10 +1,10 @@ package com.atsuishio.superbwarfare.menu; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModBlocks; import com.atsuishio.superbwarfare.init.ModMenuTypes; import com.atsuishio.superbwarfare.item.PerkItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.util.Mth; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/GunsDataMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/GunsDataMessage.java index f2aaddda6..fa0ed964a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/GunsDataMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/GunsDataMessage.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.network.message.receive; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.data.DefaultGunData; +import com.atsuishio.superbwarfare.data.gun.DefaultGunData; import com.atsuishio.superbwarfare.tools.GunsTool; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/AdjustZoomFovMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/AdjustZoomFovMessage.java index 9fd630022..6fb96322c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/AdjustZoomFovMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/AdjustZoomFovMessage.java @@ -1,10 +1,10 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.FormatTool; import com.atsuishio.superbwarfare.tools.SoundTool; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/EditMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/EditMessage.java index 10ffa5389..7311e35fd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/EditMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/EditMessage.java @@ -1,10 +1,10 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.tools.SoundTool; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireKeyMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireKeyMessage.java index 60f81ef7c..54c72a8fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireKeyMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireKeyMessage.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.GunEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireModeMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireModeMessage.java index 2b11f87f3..afb0e69d6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireModeMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireModeMessage.java @@ -1,11 +1,11 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.FireMode; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.FireMode; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.SoundTool; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java index 61621cde7..17ec27927 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; +import com.atsuishio.superbwarfare.data.gun.ReloadType; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.item.gun.data.ReloadType; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SensitivityMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SensitivityMessage.java index a388810d7..d4008f5a1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SensitivityMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SensitivityMessage.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import io.netty.buffer.ByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ShootMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ShootMessage.java index d7b7ed073..f42c1e5cc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ShootMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ShootMessage.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SwitchScopeMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SwitchScopeMessage.java index 8b0c8fd69..bf1804d63 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SwitchScopeMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SwitchScopeMessage.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ZoomMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ZoomMessage.java index 4bcddf382..0a8254f19 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ZoomMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ZoomMessage.java @@ -1,11 +1,11 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.WeaponVehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.tools.SoundTool; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/AmmoPerk.java b/src/main/java/com/atsuishio/superbwarfare/perk/AmmoPerk.java index cd98b260f..9e62f3793 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/AmmoPerk.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/AmmoPerk.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.core.Holder; import net.minecraft.util.Mth; import net.minecraft.world.effect.MobEffect; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java b/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java index ba1853e43..efd02d3ca 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.perk; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.item.PerkItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import net.minecraft.ChatFormatting; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/APBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/APBullet.java index e7322afc4..f9fd0a6d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/APBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/APBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BeastBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BeastBullet.java index 2b0ee50fb..4e8279d1a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BeastBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BeastBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BreadBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BreadBullet.java index 5f152e332..1f3f7161f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BreadBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/BreadBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java index 6d41345f3..5b18a2760 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.mixin.CupidLove; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/HEBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/HEBullet.java index 036139993..b5ad7c9bd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/HEBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/HEBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/IncendiaryBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/IncendiaryBullet.java index 9e6b8303d..460091d98 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/IncendiaryBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/IncendiaryBullet.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/JHPBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/JHPBullet.java index ab56303d6..1b06d889d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/JHPBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/JHPBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/LongerWire.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/LongerWire.java index d4a124314..97a084253 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/LongerWire.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/LongerWire.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.TaserBulletEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/MicroMissile.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/MicroMissile.java index e0f8d93bc..b9efb1729 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/MicroMissile.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/MicroMissile.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.perk.ammo; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/SilverBullet.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/SilverBullet.java index 9c6716b55..a87ea2563 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/ammo/SilverBullet.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/SilverBullet.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.ammo; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java index 8ae4e1032..6623a438b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.damage; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Firefly.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Firefly.java index c05ef708d..927cf5687 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Firefly.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Firefly.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModDamageTypes; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.CustomExplosion; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/GutshotStraight.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/GutshotStraight.java index 07c4a7b5e..105b29075 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/GutshotStraight.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/GutshotStraight.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/HeadSeeker.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/HeadSeeker.java index c3410eda1..3c56ead1c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/HeadSeeker.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/HeadSeeker.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.damage; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillClip.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillClip.java index a5709170e..54e29fba4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillClip.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillClip.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModDamageTypes; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillingTally.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillingTally.java index 86d89746f..a2d21beef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillingTally.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/KillingTally.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.damage; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/MagnificentHowl.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/MagnificentHowl.java index 8dc83f210..fc527dda1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/MagnificentHowl.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/MagnificentHowl.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.damage; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/MonsterHunter.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/MonsterHunter.java index 5caf83b48..31f63833d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/MonsterHunter.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/MonsterHunter.java @@ -1,10 +1,10 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/VoltOverload.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/VoltOverload.java index 3c832f4cc..2036af072 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/VoltOverload.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/VoltOverload.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.TaserBulletEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/VorpalWeapon.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/VorpalWeapon.java index fbd249e0d..5ff26b719 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/VorpalWeapon.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/VorpalWeapon.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.damage; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModDamageTypes; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FieldDoctor.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FieldDoctor.java index d6885a33a..2e574f13d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FieldDoctor.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FieldDoctor.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.functional; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.world.damagesource.DamageSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java index 5a7d86cb6..8267b6748 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.perk.functional; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.world.damagesource.DamageSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/HealClip.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/HealClip.java index cad20080e..5e067a360 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/HealClip.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/HealClip.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.perk.functional; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModDamageTypes; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/PowerfulAttraction.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/PowerfulAttraction.java index 5605392e9..dcc15de25 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/PowerfulAttraction.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/PowerfulAttraction.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.perk.functional; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.DamageTypeTool; import net.minecraft.world.damagesource.DamageSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/Regeneration.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/Regeneration.java index 5921cda8b..bdcb51bd5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/Regeneration.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/Regeneration.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.functional; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/Subsistence.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/Subsistence.java index 0743b9483..e2305e4a7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/Subsistence.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/Subsistence.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.perk.functional; import com.atsuishio.superbwarfare.init.ModAttachments; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.DamageTypeTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/TurboCharger.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/TurboCharger.java index 1c1205946..e832bee91 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/TurboCharger.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/TurboCharger.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.perk.functional; -import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 80a87dd5e..09dae5e03 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.tools; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.data.DefaultGunData; +import com.atsuishio.superbwarfare.data.gun.DefaultGunData; import com.atsuishio.superbwarfare.network.message.receive.GunsDataMessage; import com.google.gson.Gson; import net.minecraft.nbt.CompoundTag;