diff --git a/src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomGunRenderer.java similarity index 95% rename from src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java rename to src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomGunRenderer.java index 36eb73068..12c8498c7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomGunRenderer.java @@ -1,6 +1,5 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.renderer; -import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; @@ -62,10 +61,6 @@ public class CustomGunRenderer extends GeoItemRe poseStack.pushPose(); Color renderColor = getRenderColor(animatable, partialTick, packedLight); - float red = renderColor.getRedFloat(); - float green = renderColor.getGreenFloat(); - float blue = renderColor.getBlueFloat(); - float alpha = renderColor.getAlphaFloat(); int packedOverlay = getPackedOverlay(animatable, 0, partialTick); BakedGeoModel model = getGeoModel().getBakedModel(getGeoModel().getModelResource(animatable)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java index ad03f3d2f..988a6c4ca 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.BocekItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java index 26060a604..5c8f71b64 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Glock17ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java index 770949428..6d1025deb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Glock18ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java index 3800ee663..f0e121bfb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Hk416ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java index 8ce3cfff1..671ea758a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java index e249e988f..b37018cb9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.HuntingRifleItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.HuntingRifleItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/InsidiousItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/InsidiousItemRenderer.java index 3a5aee098..b370f8cc7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/InsidiousItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/InsidiousItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.InsidiousItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.rifle.InsidiousItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/JavelinItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/JavelinItemRenderer.java index 45bdf49ba..d116d9833 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/JavelinItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/JavelinItemRenderer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.JavelinItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.launcher.JavelinItem; public class JavelinItemRenderer extends CustomGunRenderer { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java index 306a401d2..4c30ae51e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.K98ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java index 044792c8a..bf5fea84c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.M4ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java index 1c1236cf3..99ffd5d47 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.M60ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.machinegun.M60Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java index 61be54d4e..d1762e7aa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.M79ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.launcher.M79Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java index f7db60f80..f8d58cf04 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.M870ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java index d9cc7d8e5..40c58ab8f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.M98bItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.M98bItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java index 3f5acf4f3..84b062797 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MarlinItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java index b8c1adeae..55691e5d4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MinigunItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java index 056421d73..ffe816234 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Mk14ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java index 0839cdcac..16694d715 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MosinNagantItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.MosinNagantItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java index f7699272c..266212d8e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Mp443ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java index 71b336fe2..ff8a790ac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Ntw20Model; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java index 5f42bf17b..e678eb79a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Qbz95ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java index 84eb46d6f..07efa73b0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.RpgItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.launcher.RpgItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java index c2e68f7e7..6b1b95615 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.RpkItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java index eba13a554..f63e823d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SentinelItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SentinelItemRenderer.java index 4e2853ae4..11d04d156 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SentinelItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SentinelItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.SentinelItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java index 32158589f..f111f67d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.SksItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.rifle.SksItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java index 92be32c89..2787b55ff 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.SvdItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java index 3dab90bf9..d5fc22638 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.TaserItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.special.TaserItem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java index e0ac80c73..43ad8bbe3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.TracheliumItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -38,7 +38,6 @@ public class TracheliumItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("humu")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 0 && GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java index f6d3bd000..09d8371d7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.VectorItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.GunItem;