diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AK12Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AK12Layer.java index 0dfe173d2..1aab73e0e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AK12Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AK12Layer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -13,7 +13,8 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AK12Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/ak12_e.png"); + + private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ak12_e.png"); public AK12Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AK47Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AK47Layer.java index c7c20ed5c..9021951d3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AK47Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AK47Layer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -13,7 +13,8 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AK47Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/ak47_e.png"); + + private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ak47_e.png"); public AK47Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/Aa12Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Aa12Layer.java index bb593c6ca..bbbf79337 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/Aa12Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Aa12Layer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -13,7 +13,8 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Aa12Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/aa12_e.png"); + + private static final ResourceLocation LAYER = ModUtils.loc("textures/item/aa12_e.png"); public Aa12Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java index a3ad54f3f..297a5032c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AbekiriLayer.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.atsuishio.superbwarfare.item.gun.shotgun.AbekiriItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AbekiriLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/abekiri_e.png"); + private static final ResourceLocation LAYER = ModUtils.loc("textures/item/abekiri_e.png"); public AbekiriLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/GeHelmetM35Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/GeHelmetM35Model.java index c23d2b867..0e1491a98 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/GeHelmetM35Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/GeHelmetM35Model.java @@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class GeHelmetM35Model extends GeoModel { - @Override - public ResourceLocation getAnimationResource(GeHelmetM35 object) { - return null; - } - @Override - public ResourceLocation getModelResource(GeHelmetM35 object) { - return new ResourceLocation(ModUtils.MODID, "geo/ge_helmet_m_35.geo.json"); - } + @Override + public ResourceLocation getAnimationResource(GeHelmetM35 object) { + return null; + } - @Override - public ResourceLocation getTextureResource(GeHelmetM35 object) { - return new ResourceLocation(ModUtils.MODID, "textures/armor/ge_helmet_m_35.png"); - } + @Override + public ResourceLocation getModelResource(GeHelmetM35 object) { + return ModUtils.loc("geo/ge_helmet_m_35.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(GeHelmetM35 object) { + return ModUtils.loc("textures/armor/ge_helmet_m_35.png"); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuChest6b43Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuChest6b43Model.java index 2c9d3b662..ec117273f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuChest6b43Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuChest6b43Model.java @@ -1,23 +1,24 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.item.armor.RuChest6b43; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.armor.RuChest6b43; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class RuChest6b43Model extends GeoModel { - @Override - public ResourceLocation getAnimationResource(RuChest6b43 object) { - return null; - } - @Override - public ResourceLocation getModelResource(RuChest6b43 object) { - return new ResourceLocation(ModUtils.MODID, "geo/ru_chest_6b43.geo.json"); - } + @Override + public ResourceLocation getAnimationResource(RuChest6b43 object) { + return null; + } - @Override - public ResourceLocation getTextureResource(RuChest6b43 object) { - return new ResourceLocation(ModUtils.MODID, "textures/armor/ru_chest_6b43.png"); - } + @Override + public ResourceLocation getModelResource(RuChest6b43 object) { + return ModUtils.loc("geo/ru_chest_6b43.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(RuChest6b43 object) { + return ModUtils.loc("textures/armor/ru_chest_6b43.png"); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuHelmet6b47Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuHelmet6b47Model.java index cb832c4e8..908afbfcc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuHelmet6b47Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/RuHelmet6b47Model.java @@ -6,18 +6,19 @@ import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class RuHelmet6b47Model extends GeoModel { - @Override - public ResourceLocation getAnimationResource(RuHelmet6b47 object) { - return null; - } - @Override - public ResourceLocation getModelResource(RuHelmet6b47 object) { - return new ResourceLocation(ModUtils.MODID, "geo/ru_helmet_6b47.geo.json"); - } + @Override + public ResourceLocation getAnimationResource(RuHelmet6b47 object) { + return null; + } - @Override - public ResourceLocation getTextureResource(RuHelmet6b47 object) { - return new ResourceLocation(ModUtils.MODID, "textures/armor/ru_helmet_6b47.png"); - } + @Override + public ResourceLocation getModelResource(RuHelmet6b47 object) { + return ModUtils.loc("geo/ru_helmet_6b47.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(RuHelmet6b47 object) { + return ModUtils.loc("textures/armor/ru_helmet_6b47.png"); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsChestIotvModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsChestIotvModel.java index 8dc9e5b3e..7ebe76b0b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsChestIotvModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsChestIotvModel.java @@ -1,23 +1,24 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.item.armor.UsChestIotv; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.armor.UsChestIotv; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class UsChestIotvModel extends GeoModel { - @Override - public ResourceLocation getAnimationResource(UsChestIotv object) { - return null; - } - @Override - public ResourceLocation getModelResource(UsChestIotv object) { - return new ResourceLocation(ModUtils.MODID, "geo/us_chest_iotv.geo.json"); - } + @Override + public ResourceLocation getAnimationResource(UsChestIotv object) { + return null; + } - @Override - public ResourceLocation getTextureResource(UsChestIotv object) { - return new ResourceLocation(ModUtils.MODID, "textures/armor/us_chest_iotv.png"); - } + @Override + public ResourceLocation getModelResource(UsChestIotv object) { + return ModUtils.loc("geo/us_chest_iotv.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(UsChestIotv object) { + return ModUtils.loc("textures/armor/us_chest_iotv.png"); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsHelmetPastgModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsHelmetPastgModel.java index 3796377c3..a9c6fcd97 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsHelmetPastgModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/armor/UsHelmetPastgModel.java @@ -1,23 +1,24 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.item.armor.UsHelmetPastg; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.item.armor.UsHelmetPastg; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; public class UsHelmetPastgModel extends GeoModel { - @Override - public ResourceLocation getAnimationResource(UsHelmetPastg object) { - return null; - } - @Override - public ResourceLocation getModelResource(UsHelmetPastg object) { - return new ResourceLocation(ModUtils.MODID, "geo/us_helmet_pastg.geo.json"); - } + @Override + public ResourceLocation getAnimationResource(UsHelmetPastg object) { + return null; + } - @Override - public ResourceLocation getTextureResource(UsHelmetPastg object) { - return new ResourceLocation(ModUtils.MODID, "textures/armor/us_helmet_pastg.png"); - } + @Override + public ResourceLocation getModelResource(UsHelmetPastg object) { + return ModUtils.loc("geo/us_helmet_pastg.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(UsHelmetPastg object) { + return ModUtils.loc("textures/armor/us_helmet_pastg.png"); + } }