From 4cf47db4b4f8da2685d7dec66205b36e229de9ff Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 30 Dec 2024 03:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK12ItemModel.java | 2 +- .../client/model/item/AK47ItemModel.java | 2 +- .../client/model/item/Aa12ItemModel.java | 2 +- .../client/model/item/AbekiriItemModel.java | 2 +- .../client/model/item/BocekItemModel.java | 2 +- .../client/model/item/DevotionItemModel.java | 2 +- .../client/model/item/Glock17ItemModel.java | 2 +- .../client/model/item/Glock18ItemModel.java | 2 +- .../client/model/item/Hk416ItemModel.java | 2 +- .../model/item/HuntingRifleItemModel.java | 2 +- .../client/model/item/JavelinItemModel.java | 2 +- .../client/model/item/K98ItemModel.java | 2 +- .../client/model/item/M1911ItemModel.java | 2 +- .../client/model/item/M4ItemModel.java | 2 +- .../client/model/item/M60ItemModel.java | 2 +- .../client/model/item/M79ItemModel.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 | 2 +- .../model/item/MosinNagantItemModel.java | 2 +- .../client/model/item/Ntw20Model.java | 2 +- .../client/model/item/Qbz95ItemModel.java | 2 +- .../client/model/item/RpgItemModel.java | 2 +- .../client/model/item/RpkItemModel.java | 2 +- .../client/model/item/SentinelItemModel.java | 2 +- .../client/model/item/SksItemModel.java | 2 +- .../client/model/item/SvdItemModel.java | 2 +- .../client/model/item/TaserItemModel.java | 2 +- .../model/item/TracheliumItemModel.java | 2 +- .../client/model/item/VectorItemModel.java | 2 +- .../{screens => overlay}/AmmoBarOverlay.java | 2 +- .../ArmRendererFixOverlay.java | 2 +- .../ArmorPlateOverlay.java | 2 +- .../CannonHudOverlay.java | 2 +- .../CrossHairOverlay.java | 2 +- .../{screens => overlay}/DroneUIOverlay.java | 2 +- .../JavelinHudOverlay.java | 2 +- .../KillMessageOverlay.java | 2 +- .../{screens => overlay}/M79UIOverlay.java | 8 ++-- .../MortarInfoOverlay.java | 2 +- .../RedTriangleOverlay.java | 2 +- .../SpyglassRangeOverlay.java | 2 +- .../VehicleHudOverlay.java | 2 +- .../VehicleMgHudOverlay.java | 2 +- .../client/screens/FuMO25ScreenHelper.java | 41 +++++++++++++++++++ .../network/ClientPacketHandler.java | 4 +- 48 files changed, 92 insertions(+), 51 deletions(-) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/AmmoBarOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/ArmRendererFixOverlay.java (94%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/ArmorPlateOverlay.java (98%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/CannonHudOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/CrossHairOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/DroneUIOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/JavelinHudOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/KillMessageOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/M79UIOverlay.java (98%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/MortarInfoOverlay.java (97%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/RedTriangleOverlay.java (97%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/SpyglassRangeOverlay.java (98%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/VehicleHudOverlay.java (99%) rename src/main/java/com/atsuishio/superbwarfare/client/{screens => overlay}/VehicleMgHudOverlay.java (98%) create mode 100644 src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java 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 e6758becd..c3d5bce37 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 a23b9ff49..f1ce29930 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Aa12ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Aa12ItemModel.java index 351ed79dc..7a7a54ec5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Aa12ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Aa12ItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java index 0b093b77f..62bcf7779 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AbekiriItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java index fb6d2b460..1c6016cce 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.special.BocekItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java index c0ea7b7df..e50c8b06d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 9ad33edcc..c327b7c34 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; 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 548030005..9de4977eb 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; 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 684a0a2a1..85c12521e 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HuntingRifleItemModel.java index b571302d8..fd0d3bbc3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HuntingRifleItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.HuntingRifleItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/JavelinItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/JavelinItemModel.java index 4b48608cd..6fb35dec7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/JavelinItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/JavelinItemModel.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.launcher.JavelinItem; 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 9dcf50eb0..77b8cd8e8 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; 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 5fa6f37ad..2c680ef78 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.handgun.M1911Item; 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 dd5419f4c..7c6b70bff 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 d4d984d90..f7a57d4f9 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M79ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M79ItemModel.java index a0c5a0639..0043844d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M79ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M79ItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.launcher.M79Item; 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 0a3197e1b..58d688b88 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; 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 8ed72d14f..1a68c143f 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.M98bItem; 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 c6d1ade51..9b1fa4806 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; 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 9f8ef0e5d..bfe795c0a 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; 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 4fa936276..315f1b8d0 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 cce94cfb8..9d80971d1 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.MosinNagantItem; 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 32df48af0..162d6ce91 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 53e0d542a..ce764a9ef 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 1e59b5cb3..33635feb8 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.launcher.RpgItem; 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 c8b165ffa..36ec9dfb0 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; 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 a9fe7813d..1a6e0bd59 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; 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 c0f73d702..e8f7b8adb 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.rifle.SksItem; 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 d0fe33780..020c2e941 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.sniper.SvdItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java index a68b513f9..037c18af7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.special.TaserItem; 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 d4340bb66..297b66ce1 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; 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 da52843d5..cbb36adbf 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 @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.PlayerEventHandler; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/AmmoBarOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/AmmoBarOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java index 3d15505e5..7e1049da0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/AmmoBarOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.DisplayConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/ArmRendererFixOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmRendererFixOverlay.java similarity index 94% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/ArmRendererFixOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmRendererFixOverlay.java index ab8267bca..8eda93945 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/ArmRendererFixOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmRendererFixOverlay.java @@ -1,5 +1,5 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.inventory.InventoryScreen; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/ArmorPlateOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/ArmorPlateOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java index 59f28e78f..84b661d09 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/ArmorPlateOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.DisplayConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/CannonHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/CannonHudOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java index 3efc6060a..b87895e21 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/CannonHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/CrossHairOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/CrossHairOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java index 4f4a42b68..442622f71 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/CrossHairOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.DisplayConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/DroneUIOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/DroneUIOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java index 813dc15c5..020ffe484 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/DroneUIOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/JavelinHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/JavelinHudOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java index 0bf11da2e..d31566fd1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/JavelinHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/KillMessageOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/KillMessageOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java index 5c2618406..ba2fe1057 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/KillMessageOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.KillMessageConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/M79UIOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/M79UIOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java index 9a32b75c1..fa50f51f9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/M79UIOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java @@ -1,12 +1,12 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; +import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.entity.ICannonEntity; +import com.atsuishio.superbwarfare.event.ClientEventHandler; +import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.network.ModVariables; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.init.ModItems; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/MortarInfoOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java similarity index 97% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/MortarInfoOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java index cc962689c..db05df1aa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/MortarInfoOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.entity.MortarEntity; import com.atsuishio.superbwarfare.tools.TraceTool; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/RedTriangleOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java similarity index 97% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/RedTriangleOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java index b47def666..66b6362a7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/RedTriangleOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/SpyglassRangeOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/SpyglassRangeOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java index a2a89f59c..f00e3a242 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/SpyglassRangeOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.tools.TraceTool; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleHudOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java index 60073f532..4dba664e7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.entity.*; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleMgHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleMgHudOverlay.java rename to src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java index cae29ed08..f026e80c2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleMgHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client.screens; +package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java new file mode 100644 index 000000000..b6d58af26 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java @@ -0,0 +1,41 @@ +package com.atsuishio.superbwarfare.client.screens; + +import com.atsuishio.superbwarfare.menu.FuMO25Menu; +import net.minecraft.client.Minecraft; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.entity.player.PlayerContainerEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.LogicalSide; +import net.minecraftforge.fml.common.Mod; + +import java.util.ArrayList; +import java.util.List; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE) +public class FuMO25ScreenHelper { + + public static List entities = new ArrayList<>(); + + @SubscribeEvent + public static void onContainerClosed(PlayerContainerEvent.Close event) { + if (event.getContainer() instanceof FuMO25Menu menu && event.getEntity() instanceof ServerPlayer serverPlayer) { + serverPlayer.displayClientMessage(Component.literal("Closed!"), false); + } + } + + @SubscribeEvent + public static void onClientTick(TickEvent.ClientTickEvent event) { + if (event.side != LogicalSide.CLIENT) return; + if (event.phase != TickEvent.Phase.END) return; + Player player = Minecraft.getInstance().player; + if (player == null) return; + var menu = player.containerMenu; + if (!(menu instanceof FuMO25Menu fuMO25Menu)) return; + + + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/network/ClientPacketHandler.java b/src/main/java/com/atsuishio/superbwarfare/network/ClientPacketHandler.java index dd60c1119..d962b5de7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/ClientPacketHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/ClientPacketHandler.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.network; -import com.atsuishio.superbwarfare.client.screens.CrossHairOverlay; -import com.atsuishio.superbwarfare.client.screens.DroneUIOverlay; +import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; +import com.atsuishio.superbwarfare.client.overlay.DroneUIOverlay; import com.atsuishio.superbwarfare.config.client.KillMessageConfig; import com.atsuishio.superbwarfare.event.KillMessageHandler; import com.atsuishio.superbwarfare.menu.EnergyMenu;