diff --git a/src/main/java/com/atsuishio/superbwarfare/ModUtils.java b/src/main/java/com/atsuishio/superbwarfare/Mod.java similarity index 96% rename from src/main/java/com/atsuishio/superbwarfare/ModUtils.java rename to src/main/java/com/atsuishio/superbwarfare/Mod.java index 12b7099f1..068b51e75 100644 --- a/src/main/java/com/atsuishio/superbwarfare/ModUtils.java +++ b/src/main/java/com/atsuishio/superbwarfare/Mod.java @@ -11,7 +11,6 @@ import net.minecraft.resources.ResourceLocation; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; -import net.neoforged.fml.common.Mod; import net.neoforged.fml.config.ModConfig; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.ClientTickEvent; @@ -26,15 +25,15 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; -@Mod(ModUtils.MODID) -public class ModUtils { +@net.neoforged.fml.common.Mod(Mod.MODID) +public class Mod { public static final String MODID = "superbwarfare"; public static final String ATTRIBUTE_MODIFIER = "superbwarfare_attribute_modifier"; - public static final Logger LOGGER = LogManager.getLogger(ModUtils.class); + public static final Logger LOGGER = LogManager.getLogger(Mod.class); - public ModUtils(IEventBus bus, ModContainer container) { + public Mod(IEventBus bus, ModContainer container) { container.registerConfig(ModConfig.Type.CLIENT, ClientConfig.init()); container.registerConfig(ModConfig.Type.COMMON, CommonConfig.init()); container.registerConfig(ModConfig.Type.SERVER, ServerConfig.init()); diff --git a/src/main/java/com/atsuishio/superbwarfare/capability/ModCapabilities.java b/src/main/java/com/atsuishio/superbwarfare/capability/ModCapabilities.java index b67b42b39..39c60e3ee 100644 --- a/src/main/java/com/atsuishio/superbwarfare/capability/ModCapabilities.java +++ b/src/main/java/com/atsuishio/superbwarfare/capability/ModCapabilities.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.capability; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.ChargingStationBlockEntity; import com.atsuishio.superbwarfare.block.entity.CreativeChargingStationBlockEntity; import com.atsuishio.superbwarfare.capability.energy.BlockEnergyStorageProvider; @@ -20,11 +20,11 @@ import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.EntityCapability; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class ModCapabilities { - public static final EntityCapability LASER_CAPABILITY = EntityCapability.createVoid(ModUtils.loc("laser_capability"), LaserCapability.class); - public static final EntityCapability PLAYER_VARIABLE = EntityCapability.createVoid(ModUtils.loc("player_variable"), PlayerVariable.class); + public static final EntityCapability LASER_CAPABILITY = EntityCapability.createVoid(Mod.loc("laser_capability"), LaserCapability.class); + public static final EntityCapability PLAYER_VARIABLE = EntityCapability.createVoid(Mod.loc("player_variable"), PlayerVariable.class); @SubscribeEvent public static void registerCapabilities(RegisterCapabilitiesEvent event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/capability/player/PlayerVariable.java b/src/main/java/com/atsuishio/superbwarfare/capability/player/PlayerVariable.java index 9a7d0cded..9afa586aa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/capability/player/PlayerVariable.java +++ b/src/main/java/com/atsuishio/superbwarfare/capability/player/PlayerVariable.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.capability.player; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.network.message.receive.PlayerVariablesSyncMessage; import com.atsuishio.superbwarfare.tools.AmmoType; @@ -14,7 +14,7 @@ import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.network.PacketDistributor; // TODO 在退出世界时正确持久化弹药数量 -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class PlayerVariable { public boolean zoom = false; public boolean holdFire = false; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java index 6bd4b96d2..0a99456f4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.TargetEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TargetLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/target_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/target_e.png"); public TargetLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK12Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK12Layer.java index 668b31f87..75f6f9f85 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK12Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK12Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AK12Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ak12_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/ak12_e.png"); public AK12Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java index 76ae8390f..5e9df3e96 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AK47Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ak47_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/ak47_e.png"); public AK47Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Aa12Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Aa12Layer.java index 0860bd905..2c95ce202 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Aa12Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Aa12Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Aa12Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/aa12_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/aa12_e.png"); public Aa12Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/BocekLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/BocekLayer.java index c3add013e..ad4c6a512 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/BocekLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/BocekLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.special.BocekItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class BocekLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/bocek_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/bocek_e.png"); public BocekLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/DevotionLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/DevotionLayer.java index 4febab4e6..6f1ab6aa7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/DevotionLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/DevotionLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.machinegun.DevotionItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class DevotionLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/devotion_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/devotion_e.png"); public DevotionLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17Layer.java index 3334357cf..5e4753a28 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Glock17Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/glock17_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/glock17_e.png"); public Glock17Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17LightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17LightLayer.java index 93fefbcd1..aa8e7a220 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17LightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock17LightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Glock17LightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/glock17_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/glock17_e.png"); public Glock17LightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18Layer.java index 543b34bd9..523735c6b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Glock18Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/glock17_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/glock17_e.png"); public Glock18Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18LightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18LightLayer.java index 818db10f6..185fb51ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18LightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Glock18LightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Glock18LightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/glock17_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/glock17_e.png"); public Glock18LightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Hk416Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Hk416Layer.java index f804b7f39..a20838005 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Hk416Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Hk416Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.Hk416Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Hk416Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/hk416_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/hk416_e.png"); public Hk416Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HomemadeShotgunLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HomemadeShotgunLayer.java index 12d147acb..cd25fc55a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HomemadeShotgunLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HomemadeShotgunLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class HomemadeShotgunLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/homemade_shotgun_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/homemade_shotgun_e.png"); public HomemadeShotgunLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HuntingRifleLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HuntingRifleLayer.java index 08acc2ff1..d584f5362 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HuntingRifleLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/HuntingRifleLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.HuntingRifleItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class HuntingRifleLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/hunting_rifle_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/hunting_rifle_e.png"); public HuntingRifleLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/K98Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/K98Layer.java index 82460b22f..95184eaf0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/K98Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/K98Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class K98Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/k98_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/k98_e.png"); public K98Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M1911Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M1911Layer.java index 029b4e55c..e5e2ffc2a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M1911Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M1911Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.handgun.M1911Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M1911Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m1911_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m1911_e.png"); public M1911Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M4Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M4Layer.java index 1a4a97bf1..7181b8759 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M4Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M4Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.M4Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M4Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m4_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m4_e.png"); public M4Layer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M60Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M60Layer.java index 43cd83218..58aa55eca 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M60Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M60Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.machinegun.M60Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M60Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m60_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m60_e.png"); public M60Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M79Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M79Layer.java index 23b0dd214..becb20b93 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M79Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M79Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.launcher.M79Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M79Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m79_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m79_e.png"); public M79Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M870Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M870Layer.java index f25535ab1..8cec2cfd6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M870Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M870Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M870Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m870_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m870_e.png"); public M870Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M98bLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M98bLayer.java index 0edb9ce16..de35b7668 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M98bLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/M98bLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.M98bItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class M98bLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/m98b_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/m98b_e.png"); public M98bLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MarlinLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MarlinLayer.java index d6538776d..3c8d8bd6e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MarlinLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MarlinLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MarlinLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/marlin_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/marlin_e.png"); public MarlinLayer(GeoRenderer entityRenderer) { super(entityRenderer); 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 333f31f55..ac68cc6f7 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; @@ -20,7 +20,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MinigunHeatLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/minigun_heat_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/minigun_heat_e.png"); public MinigunHeatLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunLayer.java index 1958151b9..fd73a4d12 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MinigunLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MinigunLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/minigun_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/minigun_e.png"); public MinigunLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java index 0511fa799..261a1bbfe 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.Mk14Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mk14Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/mk14_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/mk14_e.png"); public Mk14Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MosinNagantLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MosinNagantLayer.java index bc20ed07a..18414a156 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MosinNagantLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/MosinNagantLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.MosinNagantItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MosinNagantLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/mosin_nagant_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/mosin_nagant_e.png"); public MosinNagantLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443Layer.java index a0e65e5df..5b5eed66c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mp443Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/mp443_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/mp443_e.png"); public Mp443Layer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443LightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443LightLayer.java index b3fabb09b..16b13e812 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443LightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mp443LightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mp443LightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/mp443_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/mp443_e.png"); public Mp443LightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java index eca176393..141a606a6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.heavy.Ntw20Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Ntw20Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ntw_20_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/ntw_20_e.png"); public Ntw20Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java index e49e77223..5080b9de2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.Qbz95Item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Qbz95Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/qbz95_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/qbz95_e.png"); public Qbz95Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java index 4f7f8e206..d01044e63 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class RpkLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/rpk_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/rpk_e.png"); public RpkLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SecondaryCataclysmLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SecondaryCataclysmLightLayer.java index 2716e1217..5924306b9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SecondaryCataclysmLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SecondaryCataclysmLightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SecondaryCataclysmLightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/secondary_cataclysm_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/secondary_cataclysm_e.png"); public SecondaryCataclysmLightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLayer.java index f4e85fcb6..09e487bf1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SentinelLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/sentinel_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/sentinel_e.png"); public SentinelLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLightLayer.java index c7daafffd..bd6c09a92 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SentinelLightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SentinelLightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/sentinel_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/sentinel_e.png"); public SentinelLightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SksLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SksLayer.java index 034431eb4..430a749ef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SksLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SksLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.rifle.SksItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SksLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/sks_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/sks_e.png"); public SksLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SvdLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SvdLayer.java index bdc0051ae..5f0b7d72f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SvdLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/SvdLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.sniper.SvdItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SvdLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/ak12_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/ak12_e.png"); public SvdLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLayer.java index 687c1a885..bda6f76c9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.handgun.Trachelium; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TracheliumLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/trachelium_texture_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/trachelium_texture_e.png"); public TracheliumLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLightLayer.java index da3960719..2c1136708 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/TracheliumLightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.item.gun.handgun.Trachelium; import com.mojang.blaze3d.vertex.PoseStack; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class TracheliumLightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/trachelium_texture_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/trachelium_texture_e.png"); public TracheliumLightLayer(GeoRenderer itemGeoRenderer) { super(itemGeoRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java index 9a8f60052..37e0dd144 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.gun.smg.VectorItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class VectorLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/item/vector_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/item/vector_e.png"); public VectorLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/CannonShellLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/CannonShellLayer.java index 10bd8b7d2..e1493f8e1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/CannonShellLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/CannonShellLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class CannonShellLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/cannon_shell_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/cannon_shell_e.png"); public CannonShellLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/GunGrenadeLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/GunGrenadeLayer.java index d6ddb971b..1641788a2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/GunGrenadeLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/GunGrenadeLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class GunGrenadeLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/cannon_shell_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/cannon_shell_e.png"); public GunGrenadeLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/HeliRocketLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/HeliRocketLayer.java index 2170d525b..8b77a9a4c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/HeliRocketLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/HeliRocketLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.HeliRocketEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class HeliRocketLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/rpg_rocket_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/rpg_rocket_e.png"); public HeliRocketLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/JavelinMissleLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/JavelinMissleLayer.java index c9b6edff5..c598f873d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/JavelinMissleLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/JavelinMissleLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class JavelinMissleLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/rpg_rocket_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/rpg_rocket_e.png"); public JavelinMissleLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityInsideLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityInsideLayer.java index 2c77f99c2..ba4161062 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityInsideLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityInsideLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class ProjectileEntityInsideLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/projectile_entity_inside.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/projectile_entity_inside.png"); public ProjectileEntityInsideLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityLayer.java index 130b865cc..e66afc5e5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/ProjectileEntityLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class ProjectileEntityLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/projectile_entity.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/projectile_entity.png"); public ProjectileEntityLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/RpgRocketLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/RpgRocketLayer.java index abf6328e7..592ff7ffa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/RpgRocketLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/RpgRocketLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class RpgRocketLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/rpg_rocket_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/rpg_rocket_e.png"); public RpgRocketLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/SmallCannonShellLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/SmallCannonShellLayer.java index b3db4b0fd..a6e74988f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/SmallCannonShellLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/SmallCannonShellLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.SmallCannonShellEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SmallCannonShellLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/cannon_shell_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/cannon_shell_e.png"); public SmallCannonShellLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/WgMissileLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/WgMissileLayer.java index bdf516ad3..35ff9f125 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/WgMissileLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/projectile/WgMissileLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.projectile; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.WgMissileEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class WgMissileLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/rpg_rocket_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/rpg_rocket_e.png"); public WgMissileLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java index 3e4b4f2e4..0e14e0fa8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; @@ -15,7 +15,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorGlowLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_glow_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_glow_e.png"); public AnnihilatorGlowLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLayer.java index c6e6dc9ae..784aa7095 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_e.png"); public AnnihilatorLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLayer.java index e84e903f9..214ab1f2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorLedLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_led.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_led.png"); public AnnihilatorLedLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLightLayer.java index b8f158a23..c0910af0b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorLedLightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorLedLightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_led.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_led.png"); public AnnihilatorLedLightLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLayer.java index d8c30fe10..3afc78eec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -16,7 +16,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorPowerLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_power.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_power.png"); public AnnihilatorPowerLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLightLayer.java index 597aa49ee..589d28dde 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorPowerLightLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -16,7 +16,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class AnnihilatorPowerLightLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/annihilator_power.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/annihilator_power.png"); public AnnihilatorPowerLightLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Bmp2Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Bmp2Layer.java index 8e9606e08..e67895080 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Bmp2Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Bmp2Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Bmp2Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Bmp2Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/speedboat_e.png"); public Bmp2Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerLaserLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerLaserLayer.java index 49e768a79..e82f2dfa6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerLaserLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerLaserLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.LaserTowerEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class LaserTowerLaserLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/laser_tower_laser.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/laser_tower_laser.png"); public LaserTowerLaserLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerPowerLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerPowerLayer.java index 8bb6d778f..b9dca88ea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerPowerLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/LaserTowerPowerLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.LaserTowerEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -16,7 +16,7 @@ import static com.atsuishio.superbwarfare.entity.vehicle.LaserTowerEntity.ACTIVE public class LaserTowerPowerLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/laser_tower_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/laser_tower_e.png"); public LaserTowerPowerLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Lav150Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Lav150Layer.java index 838b793a4..ea218fc3b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Lav150Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Lav150Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Lav150Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Lav150Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/speedboat_e.png"); public Lav150Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mk42Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mk42Layer.java index f33518ec9..fcb8ecd6c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mk42Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mk42Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mk42Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/sherman_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/sherman_e.png"); public Mk42Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mle1934Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mle1934Layer.java index 70addf2f5..095e4029b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mle1934Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Mle1934Layer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -13,7 +13,7 @@ import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Mle1934Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/sherman_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/sherman_e.png"); public Mle1934Layer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/MortarLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/MortarLayer.java index c43d287bd..6185ef1ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/MortarLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/MortarLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.MortarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class MortarLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/mortar_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/mortar_e.png"); public MortarLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatHeatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatHeatLayer.java index 045418d18..1f1de4ea0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatHeatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatHeatLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -16,7 +16,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; import static com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity.HEAT; public class SpeedBoatHeatLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_heat.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/speedboat_heat.png"); public SpeedBoatHeatLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatLayer.java index 5221fabc3..0337a4547 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SpeedBoatLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_e.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/speedboat_e.png"); public SpeedBoatLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatPowerLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatPowerLayer.java index f0a923a29..c21b9fe6f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatPowerLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/SpeedBoatPowerLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -14,7 +14,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class SpeedBoatPowerLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_power.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/speedboat_power.png"); public SpeedBoatPowerLayer(GeoRenderer entityRenderer) { super(entityRenderer); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java index 7d1dc2ac6..bdea6317a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.entity.vehicle.Yx100Entity; import com.mojang.blaze3d.vertex.PoseStack; @@ -15,7 +15,7 @@ import software.bernie.geckolib.renderer.layer.GeoRenderLayer; public class Yx100GlowLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/yx_100_glow.png"); + private static final ResourceLocation LAYER = Mod.loc("textures/entity/yx_100_glow.png"); public Yx100GlowLayer(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 0e1491a98..0ccf79cbb 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.armor.GeHelmetM35; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class GeHelmetM35Model extends GeoModel { @Override public ResourceLocation getModelResource(GeHelmetM35 object) { - return ModUtils.loc("geo/ge_helmet_m_35.geo.json"); + return Mod.loc("geo/ge_helmet_m_35.geo.json"); } @Override public ResourceLocation getTextureResource(GeHelmetM35 object) { - return ModUtils.loc("textures/armor/ge_helmet_m_35.png"); + return Mod.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 ec117273f..3e0d1d492 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.armor.RuChest6b43; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class RuChest6b43Model extends GeoModel { @Override public ResourceLocation getModelResource(RuChest6b43 object) { - return ModUtils.loc("geo/ru_chest_6b43.geo.json"); + return Mod.loc("geo/ru_chest_6b43.geo.json"); } @Override public ResourceLocation getTextureResource(RuChest6b43 object) { - return ModUtils.loc("textures/armor/ru_chest_6b43.png"); + return Mod.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 908afbfcc..c128400de 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.armor.RuHelmet6b47; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class RuHelmet6b47Model extends GeoModel { @Override public ResourceLocation getModelResource(RuHelmet6b47 object) { - return ModUtils.loc("geo/ru_helmet_6b47.geo.json"); + return Mod.loc("geo/ru_helmet_6b47.geo.json"); } @Override public ResourceLocation getTextureResource(RuHelmet6b47 object) { - return ModUtils.loc("textures/armor/ru_helmet_6b47.png"); + return Mod.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 7ebe76b0b..f2ea0fff0 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.armor.UsChestIotv; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class UsChestIotvModel extends GeoModel { @Override public ResourceLocation getModelResource(UsChestIotv object) { - return ModUtils.loc("geo/us_chest_iotv.geo.json"); + return Mod.loc("geo/us_chest_iotv.geo.json"); } @Override public ResourceLocation getTextureResource(UsChestIotv object) { - return ModUtils.loc("textures/armor/us_chest_iotv.png"); + return Mod.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 a9c6fcd97..819732970 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.armor; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.armor.UsHelmetPastg; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class UsHelmetPastgModel extends GeoModel { @Override public ResourceLocation getModelResource(UsHelmetPastg object) { - return ModUtils.loc("geo/us_helmet_pastg.geo.json"); + return Mod.loc("geo/us_helmet_pastg.geo.json"); } @Override public ResourceLocation getTextureResource(UsHelmetPastg object) { - return ModUtils.loc("textures/armor/us_helmet_pastg.png"); + return Mod.loc("textures/armor/us_helmet_pastg.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/block/ContainerBlockModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/block/ContainerBlockModel.java index a97b81e9e..a853903e3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/block/ContainerBlockModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/block/ContainerBlockModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.block; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.ContainerBlockEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class ContainerBlockModel extends GeoModel { @Override public ResourceLocation getAnimationResource(ContainerBlockEntity animatable) { - return ModUtils.loc("animations/container.animation.json"); + return Mod.loc("animations/container.animation.json"); } @Override public ResourceLocation getModelResource(ContainerBlockEntity animatable) { - return ModUtils.loc("geo/container.geo.json"); + return Mod.loc("geo/container.geo.json"); } @Override public ResourceLocation getTextureResource(ContainerBlockEntity animatable) { - return ModUtils.loc("textures/block/container.png"); + return Mod.loc("textures/block/container.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/block/FuMO25Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/block/FuMO25Model.java index dc6fa2b9c..c17cf4c83 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/block/FuMO25Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/block/FuMO25Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.block; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.FuMO25BlockEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -13,11 +13,11 @@ public class FuMO25Model extends GeoModel { @Override public ResourceLocation getModelResource(FuMO25BlockEntity animatable) { - return ModUtils.loc("geo/fumo_25.geo.json"); + return Mod.loc("geo/fumo_25.geo.json"); } @Override public ResourceLocation getTextureResource(FuMO25BlockEntity animatable) { - return ModUtils.loc("textures/block/fumo_25.png"); + return Mod.loc("textures/block/fumo_25.png"); } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/block/SmallContainerBlockModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/block/SmallContainerBlockModel.java index b84033d88..a1df96629 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/block/SmallContainerBlockModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/block/SmallContainerBlockModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.block; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.SmallContainerBlockEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,19 +9,19 @@ public class SmallContainerBlockModel extends GeoModel { } if (distance < 32) { - return ModUtils.loc("geo/ah_6.geo.json"); + return Mod.loc("geo/ah_6.geo.json"); } else if (distance < 64) { - return ModUtils.loc("geo/ah_6.lod1.geo.json"); + return Mod.loc("geo/ah_6.lod1.geo.json"); } else if (distance < 96) { - return ModUtils.loc("geo/ah_6.lod2.geo.json"); + return Mod.loc("geo/ah_6.lod2.geo.json"); } else { - return ModUtils.loc("geo/ah_6.lod3.geo.json"); + return Mod.loc("geo/ah_6.lod3.geo.json"); } } @Override public ResourceLocation getTextureResource(Ah6Entity entity) { - return ModUtils.loc("textures/entity/ah_6.png"); + return Mod.loc("textures/entity/ah_6.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java index 03e412dd2..9a97b912b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import net.minecraft.client.Minecraft; @@ -19,7 +19,7 @@ public class AnnihilatorModel extends GeoModel { @Override public ResourceLocation getAnimationResource(AnnihilatorEntity entity) { - return ModUtils.loc("animations/annihilator.animation.json"); + return Mod.loc("animations/annihilator.animation.json"); } @Override @@ -33,15 +33,15 @@ public class AnnihilatorModel extends GeoModel { } if (distance < 64) { - return ModUtils.loc("geo/annihilator.geo.json"); + return Mod.loc("geo/annihilator.geo.json"); } else { - return ModUtils.loc("geo/annihilator.lod1.geo.json"); + return Mod.loc("geo/annihilator.lod1.geo.json"); } } @Override public ResourceLocation getTextureResource(AnnihilatorEntity entity) { - return ModUtils.loc("textures/entity/annihilator.png"); + return Mod.loc("textures/entity/annihilator.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Bmp2Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Bmp2Model.java index 53933102b..1cae9bf43 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Bmp2Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Bmp2Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Bmp2Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,12 +9,12 @@ public class Bmp2Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Bmp2Entity entity) { - return ModUtils.loc("animations/lav.animation.json"); + return Mod.loc("animations/lav.animation.json"); } @Override public ResourceLocation getModelResource(Bmp2Entity entity) { - return ModUtils.loc("geo/bmp2.geo.json"); + return Mod.loc("geo/bmp2.geo.json"); // Player player = Minecraft.getInstance().player; // // int distance = 0; @@ -32,6 +32,6 @@ public class Bmp2Model extends GeoModel { @Override public ResourceLocation getTextureResource(Bmp2Entity entity) { - return ModUtils.loc("textures/entity/bmp2.png"); + return Mod.loc("textures/entity/bmp2.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/C4Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/C4Model.java index 7d290d5f8..17b90cfd3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/C4Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/C4Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.C4Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -11,20 +11,20 @@ public class C4Model extends GeoModel { @Override public ResourceLocation getAnimationResource(C4Entity entity) { - return ModUtils.loc("animations/c4.animation.json"); + return Mod.loc("animations/c4.animation.json"); } @Override public ResourceLocation getModelResource(C4Entity entity) { - return ModUtils.loc("geo/c4.geo.json"); + return Mod.loc("geo/c4.geo.json"); } @Override public ResourceLocation getTextureResource(C4Entity entity) { UUID uuid = entity.getUUID(); if (uuid.getLeastSignificantBits() % 114 == 0) { - return ModUtils.loc("textures/item/c4_alter.png"); + return Mod.loc("textures/item/c4_alter.png"); } - return ModUtils.loc("textures/item/c4.png"); + return Mod.loc("textures/item/c4.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java index 937b1d2c8..753aecb75 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.animation.AnimationState; @@ -11,17 +11,17 @@ public class CannonShellEntityModel extends GeoModel { @Override public ResourceLocation getAnimationResource(CannonShellEntity entity) { - return ModUtils.loc("animations/cannon_shell.animation.json"); + return Mod.loc("animations/cannon_shell.animation.json"); } @Override public ResourceLocation getModelResource(CannonShellEntity entity) { - return ModUtils.loc("geo/cannon_shell.geo.json"); + return Mod.loc("geo/cannon_shell.geo.json"); } @Override public ResourceLocation getTextureResource(CannonShellEntity entity) { - return ModUtils.loc("textures/entity/cannon_shell.png"); + return Mod.loc("textures/entity/cannon_shell.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java index 59397b8e2..b9656566d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.ClaymoreEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -11,20 +11,20 @@ public class ClaymoreModel extends GeoModel { @Override public ResourceLocation getAnimationResource(ClaymoreEntity entity) { - return ModUtils.loc("animations/claymore.animation.json"); + return Mod.loc("animations/claymore.animation.json"); } @Override public ResourceLocation getModelResource(ClaymoreEntity entity) { - return ModUtils.loc("geo/claymore.geo.json"); + return Mod.loc("geo/claymore.geo.json"); } @Override public ResourceLocation getTextureResource(ClaymoreEntity entity) { UUID uuid = entity.getUUID(); if (uuid.getLeastSignificantBits() % 514 == 0) { - return ModUtils.loc("textures/entity/claymore_alter.png"); + return Mod.loc("textures/entity/claymore_alter.png"); } - return ModUtils.loc("textures/entity/claymore.png"); + return Mod.loc("textures/entity/claymore.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java index f57960447..ad011b3b0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -8,16 +8,16 @@ import software.bernie.geckolib.model.GeoModel; public class DroneModel extends GeoModel { @Override public ResourceLocation getAnimationResource(DroneEntity entity) { - return ModUtils.loc("animations/drone.animation.json"); + return Mod.loc("animations/drone.animation.json"); } @Override public ResourceLocation getModelResource(DroneEntity entity) { - return ModUtils.loc("geo/drone.geo.json"); + return Mod.loc("geo/drone.geo.json"); } @Override public ResourceLocation getTextureResource(DroneEntity entity) { - return ModUtils.loc("textures/entity/drone.png"); + return Mod.loc("textures/entity/drone.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java index 63eb60096..3f4b5f7f6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.animation.AnimationState; @@ -11,17 +11,17 @@ public class GunGrenadeModel extends GeoModel { @Override public ResourceLocation getAnimationResource(GunGrenadeEntity entity) { - return ModUtils.loc("animations/cannon_shell.animation.json"); + return Mod.loc("animations/cannon_shell.animation.json"); } @Override public ResourceLocation getModelResource(GunGrenadeEntity entity) { - return ModUtils.loc("geo/cannon_shell.geo.json"); + return Mod.loc("geo/cannon_shell.geo.json"); } @Override public ResourceLocation getTextureResource(GunGrenadeEntity entity) { - return ModUtils.loc("textures/entity/cannon_shell.png"); + return Mod.loc("textures/entity/cannon_shell.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java index 1a77ba6df..48c955d65 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.HandGrenadeEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class HandGrenadeEntityModel extends GeoModel { @Override public ResourceLocation getModelResource(HandGrenadeEntity entity) { - return ModUtils.loc("geo/hand_grenade.geo.json"); + return Mod.loc("geo/hand_grenade.geo.json"); } @Override public ResourceLocation getTextureResource(HandGrenadeEntity entity) { - return ModUtils.loc("textures/entity/hand_grenade.png"); + return Mod.loc("textures/entity/hand_grenade.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HeliRocketModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HeliRocketModel.java index bce2d6280..d51413b26 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HeliRocketModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HeliRocketModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.HeliRocketEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class HeliRocketModel extends GeoModel { @Override public ResourceLocation getAnimationResource(HeliRocketEntity entity) { - return ModUtils.loc("animations/rpg_rocket.animation.json"); + return Mod.loc("animations/rpg_rocket.animation.json"); } @Override public ResourceLocation getModelResource(HeliRocketEntity entity) { - return ModUtils.loc("geo/heli_rocket.geo.json"); + return Mod.loc("geo/heli_rocket.geo.json"); } @Override public ResourceLocation getTextureResource(HeliRocketEntity entity) { - return ModUtils.loc("textures/entity/heli_rocket.png"); + return Mod.loc("textures/entity/heli_rocket.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java index e0be95d98..dbe6df485 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class JavelinMissileModel extends GeoModel { @Override public ResourceLocation getAnimationResource(JavelinMissileEntity entity) { - return ModUtils.loc("animations/javelin_missile.animation.json"); + return Mod.loc("animations/javelin_missile.animation.json"); } @Override public ResourceLocation getModelResource(JavelinMissileEntity entity) { - return ModUtils.loc("geo/javelin_missile.geo.json"); + return Mod.loc("geo/javelin_missile.geo.json"); } @Override public ResourceLocation getTextureResource(JavelinMissileEntity entity) { - return ModUtils.loc("textures/entity/javelin_missile.png"); + return Mod.loc("textures/entity/javelin_missile.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/LaserTowerModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/LaserTowerModel.java index a2f192d90..23b7fcab8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/LaserTowerModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/LaserTowerModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.LaserTowerEntity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -15,7 +15,7 @@ public class LaserTowerModel extends GeoModel { @Override public ResourceLocation getAnimationResource(LaserTowerEntity entity) { - return ModUtils.loc("animations/laser_tower.animation.json"); + return Mod.loc("animations/laser_tower.animation.json"); } @Override @@ -29,17 +29,17 @@ public class LaserTowerModel extends GeoModel { } if (distance < 24 || player.isScoping()) { - return ModUtils.loc("geo/laser_tower.geo.json"); + return Mod.loc("geo/laser_tower.geo.json"); } else if (distance < 48) { - return ModUtils.loc("geo/laser_tower.lod1.geo.json"); + return Mod.loc("geo/laser_tower.lod1.geo.json"); } else { - return ModUtils.loc("geo/laser_tower.lod2.geo.json"); + return Mod.loc("geo/laser_tower.lod2.geo.json"); } } @Override public ResourceLocation getTextureResource(LaserTowerEntity entity) { - return ModUtils.loc("textures/entity/laser_tower.png"); + return Mod.loc("textures/entity/laser_tower.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Lav150Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Lav150Model.java index d5c2b2766..b868dc5fd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Lav150Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Lav150Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Lav150Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,12 +9,12 @@ public class Lav150Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Lav150Entity entity) { - return ModUtils.loc("animations/lav.animation.json"); + return Mod.loc("animations/lav.animation.json"); } @Override public ResourceLocation getModelResource(Lav150Entity entity) { - return ModUtils.loc("geo/lav150.geo.json"); + return Mod.loc("geo/lav150.geo.json"); // Player player = Minecraft.getInstance().player; // // int distance = 0; @@ -32,6 +32,6 @@ public class Lav150Model extends GeoModel { @Override public ResourceLocation getTextureResource(Lav150Entity entity) { - return ModUtils.loc("textures/entity/lav150.png"); + return Mod.loc("textures/entity/lav150.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java index c3e9cbaf2..2fbb53a54 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -16,7 +16,7 @@ public class Mk42Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Mk42Entity entity) { - return ModUtils.loc("animations/mk_42.animation.json"); + return Mod.loc("animations/mk_42.animation.json"); } @Override @@ -30,17 +30,17 @@ public class Mk42Model extends GeoModel { } if (distance < 32) { - return ModUtils.loc("geo/sherman.geo.json"); + return Mod.loc("geo/sherman.geo.json"); } else if (distance < 64) { - return ModUtils.loc("geo/sherman_lod1.geo.json"); + return Mod.loc("geo/sherman_lod1.geo.json"); } else { - return ModUtils.loc("geo/sherman_lod2.geo.json"); + return Mod.loc("geo/sherman_lod2.geo.json"); } } @Override public ResourceLocation getTextureResource(Mk42Entity entity) { - return ModUtils.loc("textures/entity/mk42.png"); + return Mod.loc("textures/entity/mk42.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java index a83ad703a..b91dba03f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -16,7 +16,7 @@ public class Mle1934Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Mle1934Entity entity) { - return ModUtils.loc("animations/mle1934.animation.json"); + return Mod.loc("animations/mle1934.animation.json"); } @Override @@ -29,15 +29,15 @@ public class Mle1934Model extends GeoModel { } if (distance < 32) { - return ModUtils.loc("geo/mle1934.geo.json"); + return Mod.loc("geo/mle1934.geo.json"); } else { - return ModUtils.loc("geo/mle1934_lod1.geo.json"); + return Mod.loc("geo/mle1934_lod1.geo.json"); } } @Override public ResourceLocation getTextureResource(Mle1934Entity entity) { - return ModUtils.loc("textures/entity/mle1934.png"); + return Mod.loc("textures/entity/mle1934.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java index b86b1208f..08d70f6b3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.MortarEntity; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -14,17 +14,17 @@ public class MortarModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MortarEntity entity) { - return ModUtils.loc("animations/mortar.animation.json"); + return Mod.loc("animations/mortar.animation.json"); } @Override public ResourceLocation getModelResource(MortarEntity entity) { - return ModUtils.loc("geo/mortar.geo.json"); + return Mod.loc("geo/mortar.geo.json"); } @Override public ResourceLocation getTextureResource(MortarEntity entity) { - return ModUtils.loc("textures/entity/mortar.png"); + return Mod.loc("textures/entity/mortar.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java index 53f4e6c52..a9ecf530c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.MortarShellEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class MortarShellEntityModel extends GeoModel { @Override public ResourceLocation getModelResource(MortarShellEntity entity) { - return ModUtils.loc("geo/mortar_shell.geo.json"); + return Mod.loc("geo/mortar_shell.geo.json"); } @Override public ResourceLocation getTextureResource(MortarShellEntity entity) { - return ModUtils.loc("textures/entity/mortar.png"); + return Mod.loc("textures/entity/mortar.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java index b64c6a783..800e952e5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -23,7 +23,7 @@ public class ProjectileEntityModel extends GeoModel { public ResourceLocation getModelResource(ProjectileEntity entity) { Player player = Minecraft.getInstance().player; if (player == null) { - return ModUtils.loc("geo/projectile_entity2.geo.json"); + return Mod.loc("geo/projectile_entity2.geo.json"); } if ((ClientEventHandler.zoom && !player.getMainHandItem().is(ModItems.MINIGUN.get())) @@ -31,15 +31,15 @@ public class ProjectileEntityModel extends GeoModel { || player.getMainHandItem().is(ModItems.GLOCK_18.get()) || player.getMainHandItem().is(ModItems.BOCEK.get()) || (player.getVehicle() instanceof ArmedVehicleEntity)) { - return ModUtils.loc("geo/projectile_entity.geo.json"); + return Mod.loc("geo/projectile_entity.geo.json"); } else { - return ModUtils.loc("geo/projectile_entity2.geo.json"); + return Mod.loc("geo/projectile_entity2.geo.json"); } } @Override public ResourceLocation getTextureResource(ProjectileEntity entity) { - return ModUtils.loc("textures/entity/empty.png"); + return Mod.loc("textures/entity/empty.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java index 8f44fc7f4..63d352349 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.RgoGrenadeEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class RgoGrenadeEntityModel extends GeoModel { @Override public ResourceLocation getModelResource(RgoGrenadeEntity entity) { - return ModUtils.loc("geo/rgo_grenade.geo.json"); + return Mod.loc("geo/rgo_grenade.geo.json"); } @Override public ResourceLocation getTextureResource(RgoGrenadeEntity entity) { - return ModUtils.loc("textures/item/rgo_grenade.png"); + return Mod.loc("textures/item/rgo_grenade.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java index b845ae496..0798aecad 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class RpgRocketModel extends GeoModel { @Override public ResourceLocation getAnimationResource(RpgRocketEntity entity) { - return ModUtils.loc("animations/rpg_rocket.animation.json"); + return Mod.loc("animations/rpg_rocket.animation.json"); } @Override public ResourceLocation getModelResource(RpgRocketEntity entity) { - return ModUtils.loc("geo/rpg_rocket.geo.json"); + return Mod.loc("geo/rpg_rocket.geo.json"); } @Override public ResourceLocation getTextureResource(RpgRocketEntity entity) { - return ModUtils.loc("textures/entity/rpg_rocket.png"); + return Mod.loc("textures/entity/rpg_rocket.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java index 79b456a7a..154fb7a83 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.SenpaiEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class SenpaiModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SenpaiEntity entity) { - return ModUtils.loc("animations/senpai.animation.json"); + return Mod.loc("animations/senpai.animation.json"); } @Override public ResourceLocation getModelResource(SenpaiEntity entity) { - return ModUtils.loc("geo/senpai.geo.json"); + return Mod.loc("geo/senpai.geo.json"); } @Override public ResourceLocation getTextureResource(SenpaiEntity entity) { - return ModUtils.loc("textures/entity/senpai.png"); + return Mod.loc("textures/entity/senpai.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SmallCannonShellModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SmallCannonShellModel.java index 5f56a520d..f045676b5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SmallCannonShellModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SmallCannonShellModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.SmallCannonShellEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.animation.AnimationState; @@ -11,17 +11,17 @@ public class SmallCannonShellModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SmallCannonShellEntity entity) { - return ModUtils.loc("animations/cannon_shell.animation.json"); + return Mod.loc("animations/cannon_shell.animation.json"); } @Override public ResourceLocation getModelResource(SmallCannonShellEntity entity) { - return ModUtils.loc("geo/cannon_shell.geo.json"); + return Mod.loc("geo/cannon_shell.geo.json"); } @Override public ResourceLocation getTextureResource(SmallCannonShellEntity entity) { - return ModUtils.loc("textures/entity/cannon_shell.png"); + return Mod.loc("textures/entity/cannon_shell.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java index 46dde8e33..f344b5603 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -11,7 +11,7 @@ public class SpeedboatModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SpeedboatEntity entity) { - return ModUtils.loc("animations/speedboat.animation.json"); + return Mod.loc("animations/speedboat.animation.json"); } @Override @@ -25,14 +25,14 @@ public class SpeedboatModel extends GeoModel { } if (distance < 32) { - return ModUtils.loc("geo/speedboat.geo.json"); + return Mod.loc("geo/speedboat.geo.json"); } else { - return ModUtils.loc("geo/speedboat.lod1.geo.json"); + return Mod.loc("geo/speedboat.lod1.geo.json"); } } @Override public ResourceLocation getTextureResource(SpeedboatEntity entity) { - return ModUtils.loc("textures/entity/speedboat.png"); + return Mod.loc("textures/entity/speedboat.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java index 9c74b947a..496de1bbb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.TargetEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class TargetModel extends GeoModel { @Override public ResourceLocation getAnimationResource(TargetEntity entity) { - return ModUtils.loc("animations/target.animation.json"); + return Mod.loc("animations/target.animation.json"); } @Override public ResourceLocation getModelResource(TargetEntity entity) { - return ModUtils.loc("geo/target.geo.json"); + return Mod.loc("geo/target.geo.json"); } @Override public ResourceLocation getTextureResource(TargetEntity entity) { - return ModUtils.loc("textures/entity/target.png"); + return Mod.loc("textures/entity/target.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java index 4cbe34bf6..8dd41c16f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.TaserBulletEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -14,11 +14,11 @@ public class TaserBulletProjectileModel extends GeoModel { @Override public ResourceLocation getModelResource(TaserBulletEntity entity) { - return ModUtils.loc("geo/taser_rod.geo.json"); + return Mod.loc("geo/taser_rod.geo.json"); } @Override public ResourceLocation getTextureResource(TaserBulletEntity entity) { - return ModUtils.loc("textures/entity/taser_rod.png"); + return Mod.loc("textures/entity/taser_rod.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Tom6Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Tom6Model.java index 97d61dd88..c48139414 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Tom6Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Tom6Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Tom6Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -15,11 +15,11 @@ public class Tom6Model extends GeoModel { @Override public ResourceLocation getModelResource(Tom6Entity entity) { - return ModUtils.loc("geo/tom_6.geo.json"); + return Mod.loc("geo/tom_6.geo.json"); } @Override public ResourceLocation getTextureResource(Tom6Entity entity) { - return ModUtils.loc("textures/entity/tom_6.png"); + return Mod.loc("textures/entity/tom_6.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WgMissileModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WgMissileModel.java index 711a18950..a5010ad0e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WgMissileModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WgMissileModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.WgMissileEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class WgMissileModel extends GeoModel { @Override public ResourceLocation getAnimationResource(WgMissileEntity entity) { - return ModUtils.loc("animations/javelin_missile.animation.json"); + return Mod.loc("animations/javelin_missile.animation.json"); } @Override public ResourceLocation getModelResource(WgMissileEntity entity) { - return ModUtils.loc("geo/wg_missile.geo.json"); + return Mod.loc("geo/wg_missile.geo.json"); } @Override public ResourceLocation getTextureResource(WgMissileEntity entity) { - return ModUtils.loc("textures/entity/javelin_missile.png"); + return Mod.loc("textures/entity/javelin_missile.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java index 22f09743d..510485146 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.WheelChairEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -15,11 +15,11 @@ public class WheelChairModel extends GeoModel { @Override public ResourceLocation getModelResource(WheelChairEntity entity) { - return ModUtils.loc("geo/wheel_chair.geo.json"); + return Mod.loc("geo/wheel_chair.geo.json"); } @Override public ResourceLocation getTextureResource(WheelChairEntity entity) { - return ModUtils.loc("textures/entity/wheel_chair.png"); + return Mod.loc("textures/entity/wheel_chair.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Yx100Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Yx100Model.java index 754ccfe9a..c1f045bf1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Yx100Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Yx100Model.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.Yx100Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,12 +9,12 @@ public class Yx100Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Yx100Entity entity) { - return ModUtils.loc("animations/yx_100.animation.json"); + return Mod.loc("animations/yx_100.animation.json"); } @Override public ResourceLocation getModelResource(Yx100Entity entity) { - return ModUtils.loc("geo/yx_100.geo.json"); + return Mod.loc("geo/yx_100.geo.json"); // Player player = Minecraft.getInstance().player; // // int distance = 0; @@ -32,6 +32,6 @@ public class Yx100Model extends GeoModel { @Override public ResourceLocation getTextureResource(Yx100Entity entity) { - return ModUtils.loc("textures/entity/yx_100.png"); + return Mod.loc("textures/entity/yx_100.png"); } } 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 07f1094e1..9930bad30 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -27,17 +27,17 @@ public class AK12ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(AK12Item animatable) { - return ModUtils.loc("animations/ak12.animation.json"); + return Mod.loc("animations/ak12.animation.json"); } @Override public ResourceLocation getModelResource(AK12Item animatable) { - return ModUtils.loc("geo/ak12.geo.json"); + return Mod.loc("geo/ak12.geo.json"); } @Override public ResourceLocation getTextureResource(AK12Item animatable) { - return ModUtils.loc("textures/item/ak12.png"); + return Mod.loc("textures/item/ak12.png"); } @Override 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 ad1356b4a..2ae8dabe4 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -27,17 +27,17 @@ public class AK47ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(AK47Item animatable) { - return ModUtils.loc("animations/ak.animation.json"); + return Mod.loc("animations/ak.animation.json"); } @Override public ResourceLocation getModelResource(AK47Item animatable) { - return ModUtils.loc("geo/ak.geo.json"); + return Mod.loc("geo/ak.geo.json"); } @Override public ResourceLocation getTextureResource(AK47Item animatable) { - return ModUtils.loc("textures/item/ak47.png"); + return Mod.loc("textures/item/ak47.png"); } @Override 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 e9543fd1d..a37ca6aac 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -19,17 +19,17 @@ public class Aa12ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Aa12Item animatable) { - return ModUtils.loc("animations/aa12.animation.json"); + return Mod.loc("animations/aa12.animation.json"); } @Override public ResourceLocation getModelResource(Aa12Item animatable) { - return ModUtils.loc("geo/aa12.geo.json"); + return Mod.loc("geo/aa12.geo.json"); } @Override public ResourceLocation getTextureResource(Aa12Item animatable) { - return ModUtils.loc("textures/item/aa12_new.png"); + return Mod.loc("textures/item/aa12_new.png"); } @Override 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 c0a63377c..5af3b0cc2 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,17 +19,17 @@ public class BocekItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(BocekItem animatable) { - return ModUtils.loc("animations/bocek.animation.json"); + return Mod.loc("animations/bocek.animation.json"); } @Override public ResourceLocation getModelResource(BocekItem animatable) { - return ModUtils.loc("geo/bocek.geo.json"); + return Mod.loc("geo/bocek.geo.json"); } @Override public ResourceLocation getTextureResource(BocekItem animatable) { - return ModUtils.loc("textures/item/bocek.png"); + return Mod.loc("textures/item/bocek.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/ContainerItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/ContainerItemModel.java index 79c210fbb..f4465b9de 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/ContainerItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/ContainerItemModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.ContainerBlockItem; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class ContainerItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(ContainerBlockItem animatable) { - return ModUtils.loc("animations/container.animation.json"); + return Mod.loc("animations/container.animation.json"); } @Override public ResourceLocation getModelResource(ContainerBlockItem animatable) { - return ModUtils.loc("geo/container.geo.json"); + return Mod.loc("geo/container.geo.json"); } @Override public ResourceLocation getTextureResource(ContainerBlockItem animatable) { - return ModUtils.loc("textures/block/container.png"); + return Mod.loc("textures/block/container.png"); } } 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 5052394ca..21e2d1521 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -22,17 +22,17 @@ public class DevotionItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(DevotionItem animatable) { - return ModUtils.loc("animations/devotion.animation.json"); + return Mod.loc("animations/devotion.animation.json"); } @Override public ResourceLocation getModelResource(DevotionItem animatable) { - return ModUtils.loc("geo/devotion.geo.json"); + return Mod.loc("geo/devotion.geo.json"); } @Override public ResourceLocation getTextureResource(DevotionItem animatable) { - return ModUtils.loc("textures/item/devotion.png"); + return Mod.loc("textures/item/devotion.png"); } @Override 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 9599aa158..5add357c5 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class Glock17ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Glock17Item animatable) { - return ModUtils.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock17.animation.json"); } @Override public ResourceLocation getModelResource(Glock17Item animatable) { - return ModUtils.loc("geo/glock17.geo.json"); + return Mod.loc("geo/glock17.geo.json"); } @Override public ResourceLocation getTextureResource(Glock17Item animatable) { - return ModUtils.loc("textures/item/glock17.png"); + return Mod.loc("textures/item/glock17.png"); } @Override 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 eea3b0640..88f0cd7c6 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class Glock18ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Glock18Item animatable) { - return ModUtils.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock17.animation.json"); } @Override public ResourceLocation getModelResource(Glock18Item animatable) { - return ModUtils.loc("geo/glock18.geo.json"); + return Mod.loc("geo/glock18.geo.json"); } @Override public ResourceLocation getTextureResource(Glock18Item animatable) { - return ModUtils.loc("textures/item/glock17.png"); + return Mod.loc("textures/item/glock17.png"); } @Override 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 c40511e75..19e453547 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -27,17 +27,17 @@ public class Hk416ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Hk416Item animatable) { - return ModUtils.loc("animations/m4.animation.json"); + return Mod.loc("animations/m4.animation.json"); } @Override public ResourceLocation getModelResource(Hk416Item animatable) { - return ModUtils.loc("geo/hk416.geo.json"); + return Mod.loc("geo/hk416.geo.json"); } @Override public ResourceLocation getTextureResource(Hk416Item animatable) { - return ModUtils.loc("textures/item/hk416.png"); + return Mod.loc("textures/item/hk416.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java index e8ba20b55..387e240ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -19,17 +19,17 @@ public class HomemadeShotgunItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(HomemadeShotgunItem animatable) { - return ModUtils.loc("animations/homemade_shotgun.animation.json"); + return Mod.loc("animations/homemade_shotgun.animation.json"); } @Override public ResourceLocation getModelResource(HomemadeShotgunItem animatable) { - return ModUtils.loc("geo/homemade_shotgun.geo.json"); + return Mod.loc("geo/homemade_shotgun.geo.json"); } @Override public ResourceLocation getTextureResource(HomemadeShotgunItem animatable) { - return ModUtils.loc("textures/item/homemade_shotgun.png"); + return Mod.loc("textures/item/homemade_shotgun.png"); } @Override 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 c258ef836..6d5421ad0 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -19,17 +19,17 @@ public class HuntingRifleItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(HuntingRifleItem animatable) { - return ModUtils.loc("animations/hunting_rifle.animation.json"); + return Mod.loc("animations/hunting_rifle.animation.json"); } @Override public ResourceLocation getModelResource(HuntingRifleItem animatable) { - return ModUtils.loc("geo/hunting_rifle.geo.json"); + return Mod.loc("geo/hunting_rifle.geo.json"); } @Override public ResourceLocation getTextureResource(HuntingRifleItem animatable) { - return ModUtils.loc("textures/item/hunting_rifle.png"); + return Mod.loc("textures/item/hunting_rifle.png"); } @Override 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 1f617ef38..6a3a7aa97 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,17 +19,17 @@ public class JavelinItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(JavelinItem animatable) { - return ModUtils.loc("animations/javelin.animation.json"); + return Mod.loc("animations/javelin.animation.json"); } @Override public ResourceLocation getModelResource(JavelinItem animatable) { - return ModUtils.loc("geo/javelin.geo.json"); + return Mod.loc("geo/javelin.geo.json"); } @Override public ResourceLocation getTextureResource(JavelinItem animatable) { - return ModUtils.loc("textures/item/javelin.png"); + return Mod.loc("textures/item/javelin.png"); } @Override 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 63eb6d97f..de7fc5494 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -20,17 +20,17 @@ public class K98ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(K98Item animatable) { - return ModUtils.loc("animations/k98.animation.json"); + return Mod.loc("animations/k98.animation.json"); } @Override public ResourceLocation getModelResource(K98Item animatable) { - return ModUtils.loc("geo/kar98k.geo.json"); + return Mod.loc("geo/kar98k.geo.json"); } @Override public ResourceLocation getTextureResource(K98Item animatable) { - return ModUtils.loc("textures/item/k98.png"); + return Mod.loc("textures/item/k98.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/LungeMineModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/LungeMineModel.java index 0e6014700..468b86370 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/LungeMineModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/LungeMineModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.LungeMine; import net.minecraft.resources.ResourceLocation; @@ -13,17 +13,17 @@ public class LungeMineModel extends GeoModel { @Override public ResourceLocation getAnimationResource(LungeMine animatable) { - return ModUtils.loc("animations/lunge_mine.animation.json"); + return Mod.loc("animations/lunge_mine.animation.json"); } @Override public ResourceLocation getModelResource(LungeMine animatable) { - return ModUtils.loc("geo/lunge_mine.geo.json"); + return Mod.loc("geo/lunge_mine.geo.json"); } @Override public ResourceLocation getTextureResource(LungeMine animatable) { - return ModUtils.loc("textures/item/lunge_mine.png"); + return Mod.loc("textures/item/lunge_mine.png"); } @Override 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 a9e955eef..efcead831 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class M1911ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M1911Item animatable) { - return ModUtils.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock17.animation.json"); } @Override public ResourceLocation getModelResource(M1911Item animatable) { - return ModUtils.loc("geo/m1911.geo.json"); + return Mod.loc("geo/m1911.geo.json"); } @Override public ResourceLocation getTextureResource(M1911Item animatable) { - return ModUtils.loc("textures/item/m1911.png"); + return Mod.loc("textures/item/m1911.png"); } @Override 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 81af71418..5be3ed84b 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -31,17 +31,17 @@ public class M4ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M4Item animatable) { - return ModUtils.loc("animations/m4.animation.json"); + return Mod.loc("animations/m4.animation.json"); } @Override public ResourceLocation getModelResource(M4Item animatable) { - return ModUtils.loc("geo/m4.geo.json"); + return Mod.loc("geo/m4.geo.json"); } @Override public ResourceLocation getTextureResource(M4Item animatable) { - return ModUtils.loc("textures/item/m4.png"); + return Mod.loc("textures/item/m4.png"); } @Override 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 ca9232521..075188c00 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -22,17 +22,17 @@ public class M60ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M60Item animatable) { - return ModUtils.loc("animations/m60.animation.json"); + return Mod.loc("animations/m60.animation.json"); } @Override public ResourceLocation getModelResource(M60Item animatable) { - return ModUtils.loc("geo/m60.geo.json"); + return Mod.loc("geo/m60.geo.json"); } @Override public ResourceLocation getTextureResource(M60Item animatable) { - return ModUtils.loc("textures/item/m60.png"); + return Mod.loc("textures/item/m60.png"); } @Override 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 cea6207bb..c920b5e0c 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -19,17 +19,17 @@ public class M79ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M79Item animatable) { - return ModUtils.loc("animations/m79.animation.json"); + return Mod.loc("animations/m79.animation.json"); } @Override public ResourceLocation getModelResource(M79Item animatable) { - return ModUtils.loc("geo/m79.geo.json"); + return Mod.loc("geo/m79.geo.json"); } @Override public ResourceLocation getTextureResource(M79Item animatable) { - return ModUtils.loc("textures/item/m79.png"); + return Mod.loc("textures/item/m79.png"); } @Override 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 8a51ef4a0..96663df8e 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,17 +19,17 @@ public class M870ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M870Item animatable) { - return ModUtils.loc("animations/m870.animation.json"); + return Mod.loc("animations/m870.animation.json"); } @Override public ResourceLocation getModelResource(M870Item animatable) { - return ModUtils.loc("geo/m870.geo.json"); + return Mod.loc("geo/m870.geo.json"); } @Override public ResourceLocation getTextureResource(M870Item animatable) { - return ModUtils.loc("textures/item/m870.png"); + return Mod.loc("textures/item/m870.png"); } @Override 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 9e60b385d..67fe78f52 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -20,17 +20,17 @@ public class M98bItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M98bItem animatable) { - return ModUtils.loc("animations/m98b.animation.json"); + return Mod.loc("animations/m98b.animation.json"); } @Override public ResourceLocation getModelResource(M98bItem animatable) { - return ModUtils.loc("geo/m98b.geo.json"); + return Mod.loc("geo/m98b.geo.json"); } @Override public ResourceLocation getTextureResource(M98bItem animatable) { - return ModUtils.loc("textures/item/m98b.png"); + return Mod.loc("textures/item/m98b.png"); } @Override 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 5361c4499..3ec420c49 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -20,17 +20,17 @@ public class MarlinItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MarlinItem animatable) { - return ModUtils.loc("animations/marlin.animation.json"); + return Mod.loc("animations/marlin.animation.json"); } @Override public ResourceLocation getModelResource(MarlinItem animatable) { - return ModUtils.loc("geo/marlin.geo.json"); + return Mod.loc("geo/marlin.geo.json"); } @Override public ResourceLocation getTextureResource(MarlinItem animatable) { - return ModUtils.loc("textures/item/marlin.png"); + return Mod.loc("textures/item/marlin.png"); } @Override 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 95a389d3b..b7387078e 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,17 +19,17 @@ public class MinigunItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MinigunItem animatable) { - return ModUtils.loc("animations/minigun.animation.json"); + return Mod.loc("animations/minigun.animation.json"); } @Override public ResourceLocation getModelResource(MinigunItem animatable) { - return ModUtils.loc("geo/minigun.geo.json"); + return Mod.loc("geo/minigun.geo.json"); } @Override public ResourceLocation getTextureResource(MinigunItem animatable) { - return ModUtils.loc("textures/item/minigun.png"); + return Mod.loc("textures/item/minigun.png"); } @Override 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 59115baf6..b2b792717 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -27,17 +27,17 @@ public class Mk14ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Mk14Item animatable) { - return ModUtils.loc("animations/mk14ebr.animation.json"); + return Mod.loc("animations/mk14ebr.animation.json"); } @Override public ResourceLocation getModelResource(Mk14Item animatable) { - return ModUtils.loc("geo/mk14ebr.geo.json"); + return Mod.loc("geo/mk14ebr.geo.json"); } @Override public ResourceLocation getTextureResource(Mk14Item animatable) { - return ModUtils.loc("textures/item/mk14.png"); + return Mod.loc("textures/item/mk14.png"); } @Override 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 a80fa544c..aeda3cee2 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -20,17 +20,17 @@ public class MosinNagantItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(MosinNagantItem animatable) { - return ModUtils.loc("animations/mosin_nagant.animation.json"); + return Mod.loc("animations/mosin_nagant.animation.json"); } @Override public ResourceLocation getModelResource(MosinNagantItem animatable) { - return ModUtils.loc("geo/mosin_nagant.geo.json"); + return Mod.loc("geo/mosin_nagant.geo.json"); } @Override public ResourceLocation getTextureResource(MosinNagantItem animatable) { - return ModUtils.loc("textures/item/mosin_nagant.png"); + return Mod.loc("textures/item/mosin_nagant.png"); } @Override 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 e9d286872..2efd54d6d 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class Mp443ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Mp443Item animatable) { - return ModUtils.loc("animations/glock17.animation.json"); + return Mod.loc("animations/glock17.animation.json"); } @Override public ResourceLocation getModelResource(Mp443Item animatable) { - return ModUtils.loc("geo/mp443.geo.json"); + return Mod.loc("geo/mp443.geo.json"); } @Override public ResourceLocation getTextureResource(Mp443Item animatable) { - return ModUtils.loc("textures/item/mp443.png"); + return Mod.loc("textures/item/mp443.png"); } @Override 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 cd2f1d426..0c01cce20 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -26,17 +26,17 @@ public class Ntw20Model extends GeoModel { @Override public ResourceLocation getAnimationResource(Ntw20Item animatable) { - return ModUtils.loc("animations/ntw_20.animation.json"); + return Mod.loc("animations/ntw_20.animation.json"); } @Override public ResourceLocation getModelResource(Ntw20Item animatable) { - return ModUtils.loc("geo/ntw_20.geo.json"); + return Mod.loc("geo/ntw_20.geo.json"); } @Override public ResourceLocation getTextureResource(Ntw20Item animatable) { - return ModUtils.loc("textures/item/ntw_20.png"); + return Mod.loc("textures/item/ntw_20.png"); } @Override 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 5237b378e..2f7f947a1 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -34,17 +34,17 @@ public class Qbz95ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Qbz95Item animatable) { - return ModUtils.loc("animations/qbz95.animation.json"); + return Mod.loc("animations/qbz95.animation.json"); } @Override public ResourceLocation getModelResource(Qbz95Item animatable) { - return ModUtils.loc("geo/qbz95.geo.json"); + return Mod.loc("geo/qbz95.geo.json"); } @Override public ResourceLocation getTextureResource(Qbz95Item animatable) { - return ModUtils.loc("textures/item/qbz95.png"); + return Mod.loc("textures/item/qbz95.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RocketItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RocketItemModel.java index c6dca6802..be9656899 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RocketItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RocketItemModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.common.ammo.Rocket; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class RocketItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Rocket animatable) { - return ModUtils.loc("animations/rpg.head.animation.json"); + return Mod.loc("animations/rpg.head.animation.json"); } @Override public ResourceLocation getModelResource(Rocket animatable) { - return ModUtils.loc("geo/rpg.head.geo.json"); + return Mod.loc("geo/rpg.head.geo.json"); } @Override public ResourceLocation getTextureResource(Rocket animatable) { - return ModUtils.loc("textures/entity/rpg_rocket.png"); + return Mod.loc("textures/entity/rpg_rocket.png"); } } 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 16529e400..0eb007782 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class RpgItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(RpgItem animatable) { - return ModUtils.loc("animations/rpg.animation.json"); + return Mod.loc("animations/rpg.animation.json"); } @Override public ResourceLocation getModelResource(RpgItem animatable) { - return ModUtils.loc("geo/rpg.geo.json"); + return Mod.loc("geo/rpg.geo.json"); } @Override public ResourceLocation getTextureResource(RpgItem animatable) { - return ModUtils.loc("textures/item/rpg7.png"); + return Mod.loc("textures/item/rpg7.png"); } @Override 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 75d993cee..4435c8f66 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -20,17 +20,17 @@ public class RpkItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(RpkItem animatable) { - return ModUtils.loc("animations/rpk.animation.json"); + return Mod.loc("animations/rpk.animation.json"); } @Override public ResourceLocation getModelResource(RpkItem animatable) { - return ModUtils.loc("geo/rpk.geo.json"); + return Mod.loc("geo/rpk.geo.json"); } @Override public ResourceLocation getTextureResource(RpkItem animatable) { - return ModUtils.loc("textures/item/rpk.png"); + return Mod.loc("textures/item/rpk.png"); } @Override 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 9d3c54cc6..3a8870b5f 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,17 +19,17 @@ public class SecondaryCataclysmModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SecondaryCataclysm animatable) { - return ModUtils.loc("animations/secondary_cataclysm.animation.json"); + return Mod.loc("animations/secondary_cataclysm.animation.json"); } @Override public ResourceLocation getModelResource(SecondaryCataclysm animatable) { - return ModUtils.loc("geo/secondary_cataclysm.geo.json"); + return Mod.loc("geo/secondary_cataclysm.geo.json"); } @Override public ResourceLocation getTextureResource(SecondaryCataclysm animatable) { - return ModUtils.loc("textures/item/secondary_cataclysm.png"); + return Mod.loc("textures/item/secondary_cataclysm.png"); } @Override 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 683f0389f..0bc0ec507 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,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -20,17 +20,17 @@ public class SentinelItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SentinelItem animatable) { - return ModUtils.loc("animations/sentinel.animation.json"); + return Mod.loc("animations/sentinel.animation.json"); } @Override public ResourceLocation getModelResource(SentinelItem animatable) { - return ModUtils.loc("geo/sentinel.geo.json"); + return Mod.loc("geo/sentinel.geo.json"); } @Override public ResourceLocation getTextureResource(SentinelItem animatable) { - return ModUtils.loc("textures/item/sentinel.png"); + return Mod.loc("textures/item/sentinel.png"); } @Override 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 0a93e8c71..632a986cb 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -21,17 +21,17 @@ public class SksItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SksItem animatable) { - return ModUtils.loc("animations/sks.animation.json"); + return Mod.loc("animations/sks.animation.json"); } @Override public ResourceLocation getModelResource(SksItem animatable) { - return ModUtils.loc("geo/sks.geo.json"); + return Mod.loc("geo/sks.geo.json"); } @Override public ResourceLocation getTextureResource(SksItem animatable) { - return ModUtils.loc("textures/item/sks.png"); + return Mod.loc("textures/item/sks.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SmallContainerItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SmallContainerItemModel.java index e083c7f5a..7f5feabb1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SmallContainerItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SmallContainerItemModel.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.SmallContainerBlockItem; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; @@ -9,16 +9,16 @@ public class SmallContainerItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SmallContainerBlockItem animatable) { - return ModUtils.loc("animations/small_container.animation.json"); + return Mod.loc("animations/small_container.animation.json"); } @Override public ResourceLocation getModelResource(SmallContainerBlockItem animatable) { - return ModUtils.loc("geo/small_container.geo.json"); + return Mod.loc("geo/small_container.geo.json"); } @Override public ResourceLocation getTextureResource(SmallContainerBlockItem animatable) { - return ModUtils.loc("textures/block/small_container.png"); + return Mod.loc("textures/block/small_container.png"); } } 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 9bba55d5f..a44824826 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -27,17 +27,17 @@ public class SvdItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(SvdItem animatable) { - return ModUtils.loc("animations/svd.animation.json"); + return Mod.loc("animations/svd.animation.json"); } @Override public ResourceLocation getModelResource(SvdItem animatable) { - return ModUtils.loc("geo/svd.geo.json"); + return Mod.loc("geo/svd.geo.json"); } @Override public ResourceLocation getTextureResource(SvdItem animatable) { - return ModUtils.loc("textures/item/svd.png"); + return Mod.loc("textures/item/svd.png"); } @Override 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 85688666f..ac9f43e38 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -19,17 +19,17 @@ public class TaserItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(TaserItem animatable) { - return ModUtils.loc("animations/taser.animation.json"); + return Mod.loc("animations/taser.animation.json"); } @Override public ResourceLocation getModelResource(TaserItem animatable) { - return ModUtils.loc("geo/taser.geo.json"); + return Mod.loc("geo/taser.geo.json"); } @Override public ResourceLocation getTextureResource(TaserItem animatable) { - return ModUtils.loc("textures/item/tasergun.png"); + return Mod.loc("textures/item/tasergun.png"); } @Override 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 e4a15e28e..505be91c3 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -31,17 +31,17 @@ public class TracheliumItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(Trachelium animatable) { - return ModUtils.loc("animations/trachelium.animation.json"); + return Mod.loc("animations/trachelium.animation.json"); } @Override public ResourceLocation getModelResource(Trachelium animatable) { - return ModUtils.loc("geo/trachelium.geo.json"); + return Mod.loc("geo/trachelium.geo.json"); } @Override public ResourceLocation getTextureResource(Trachelium animatable) { - return ModUtils.loc("textures/item/trachelium_texture.png"); + return Mod.loc("textures/item/trachelium_texture.png"); } @Override 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 b060acf85..161195a4f 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.model.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -27,17 +27,17 @@ public class VectorItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(VectorItem animatable) { - return ModUtils.loc("animations/vector.animation.json"); + return Mod.loc("animations/vector.animation.json"); } @Override public ResourceLocation getModelResource(VectorItem animatable) { - return ModUtils.loc("geo/vector.geo.json"); + return Mod.loc("geo/vector.geo.json"); } @Override public ResourceLocation getTextureResource(VectorItem animatable) { - return ModUtils.loc("textures/item/vector.png"); + return Mod.loc("textures/item/vector.png"); } @Override 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 89562bdbe..939443c46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.capability.player.PlayerVariable; import com.atsuishio.superbwarfare.config.client.DisplayConfig; @@ -34,13 +34,13 @@ import net.neoforged.neoforge.client.event.RenderGuiEvent; @EventBusSubscriber(value = Dist.CLIENT) public class AmmoBarOverlay { - private static final ResourceLocation LINE = ModUtils.loc("textures/gun_icon/fire_mode/line.png"); - private static final ResourceLocation SEMI = ModUtils.loc("textures/gun_icon/fire_mode/semi.png"); - private static final ResourceLocation BURST = ModUtils.loc("textures/gun_icon/fire_mode/burst.png"); - private static final ResourceLocation AUTO = ModUtils.loc("textures/gun_icon/fire_mode/auto.png"); - private static final ResourceLocation TOP = ModUtils.loc("textures/gun_icon/fire_mode/top.png"); - private static final ResourceLocation DIR = ModUtils.loc("textures/gun_icon/fire_mode/dir.png"); - private static final ResourceLocation MOUSE = ModUtils.loc("textures/gun_icon/fire_mode/mouse.png"); + private static final ResourceLocation LINE = Mod.loc("textures/gun_icon/fire_mode/line.png"); + private static final ResourceLocation SEMI = Mod.loc("textures/gun_icon/fire_mode/semi.png"); + private static final ResourceLocation BURST = Mod.loc("textures/gun_icon/fire_mode/burst.png"); + private static final ResourceLocation AUTO = Mod.loc("textures/gun_icon/fire_mode/auto.png"); + private static final ResourceLocation TOP = Mod.loc("textures/gun_icon/fire_mode/top.png"); + private static final ResourceLocation DIR = Mod.loc("textures/gun_icon/fire_mode/dir.png"); + private static final ResourceLocation MOUSE = Mod.loc("textures/gun_icon/fire_mode/mouse.png"); private static boolean hasCreativeAmmo() { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoOverlay.java index 2e8f981f1..dcc3fa7c4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.component.ModDataComponents; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; @@ -22,7 +22,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderGuiEvent; -@EventBusSubscriber(modid = ModUtils.MODID, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, value = Dist.CLIENT) public class AmmoOverlay { private static final AnimationTimer ammoInfoTimer = new AnimationTimer(500, 2000) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java index c0784cc18..2484a5cb0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/ArmorPlateOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.tools.NBTTool; @@ -17,13 +17,13 @@ import net.neoforged.neoforge.client.event.RenderGuiEvent; @EventBusSubscriber(value = Dist.CLIENT) public class ArmorPlateOverlay { - private static final ResourceLocation ICON = ModUtils.loc("textures/screens/armor_plate_icon.png"); - private static final ResourceLocation LEVEL1 = ModUtils.loc("textures/screens/armor_plate_level1.png"); - private static final ResourceLocation LEVEL2 = ModUtils.loc("textures/screens/armor_plate_level2.png"); - private static final ResourceLocation LEVEL3 = ModUtils.loc("textures/screens/armor_plate_level3.png"); - private static final ResourceLocation LEVEL1_FRAME = ModUtils.loc("textures/screens/armor_plate_level1_frame.png"); - private static final ResourceLocation LEVEL2_FRAME = ModUtils.loc("textures/screens/armor_plate_level2_frame.png"); - private static final ResourceLocation LEVEL3_FRAME = ModUtils.loc("textures/screens/armor_plate_level3_frame.png"); + private static final ResourceLocation ICON = Mod.loc("textures/screens/armor_plate_icon.png"); + private static final ResourceLocation LEVEL1 = Mod.loc("textures/screens/armor_plate_level1.png"); + private static final ResourceLocation LEVEL2 = Mod.loc("textures/screens/armor_plate_level2.png"); + private static final ResourceLocation LEVEL3 = Mod.loc("textures/screens/armor_plate_level3.png"); + private static final ResourceLocation LEVEL1_FRAME = Mod.loc("textures/screens/armor_plate_level1_frame.png"); + private static final ResourceLocation LEVEL2_FRAME = Mod.loc("textures/screens/armor_plate_level2_frame.png"); + private static final ResourceLocation LEVEL3_FRAME = Mod.loc("textures/screens/armor_plate_level3_frame.png"); @SubscribeEvent public static void onRenderGui(RenderGuiEvent.Pre event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java index a7e791ace..b21b31455 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; @@ -63,14 +63,14 @@ public class CannonHudOverlay { RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderSystem.setShaderColor(1, 1, 1, 1); - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/compass_white.png"), (float) w / 2 - 128, (float) 10, 128 + ((float) 64 / 45 * (Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.yRotO, cannon.getYRot()))), 0, 256, 16, 512, 16); - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/roll_ind_white.png"), w / 2F - 4, 27, 0, 0.0F, 8, 8, 8, 8); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/compass_white.png"), (float) w / 2 - 128, (float) 10, 128 + ((float) 64 / 45 * (Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.yRotO, cannon.getYRot()))), 0, 256, 16, 512, 16); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/roll_ind_white.png"), w / 2F - 4, 27, 0, 0.0F, 8, 8, 8, 8); String angle = FormatTool.DECIMAL_FORMAT_1ZZ.format(Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.yRotO, cannon.getYRot())); int width = Minecraft.getInstance().font.width(angle); event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.literal(angle), w / 2 - width / 2, 40, -1, false); - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_pitch.png"), w / 2F + 166, h / 2F - 64, 0, 0.0F, 8, 128, 8, 128); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/cannon_pitch.png"), w / 2F + 166, h / 2F - 64, 0, 0.0F, 8, 128, 8, 128); String pitch = FormatTool.DECIMAL_FORMAT_1ZZ.format(-Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.xRotO, cannon.getXRot())); int widthP = Minecraft.getInstance().font.width(pitch); @@ -78,7 +78,7 @@ public class CannonHudOverlay { poseStack.pushPose(); event.getGuiGraphics().pose().translate(0, Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.xRotO, cannon.getXRot()) * 0.7, 0); - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_pitch_ind.png"), w / 2F + 158, h / 2F - 4, 0, 0.0F, 8, 8, 8, 8); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/cannon_pitch_ind.png"), w / 2F + 158, h / 2F - 4, 0, 0.0F, 8, 8, 8, 8); event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.literal(pitch), w / 2 + 157 - widthP, h / 2 - 4, -1, false); poseStack.popPose(); @@ -121,15 +121,15 @@ public class CannonHudOverlay { } } if (cannon instanceof AnnihilatorEntity) { - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/laser_cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/laser_cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); } else { - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); } float diffY = -Mth.wrapDegrees(Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), player.yHeadRotO, player.getYHeadRot()) - Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), cannon.yRotO, cannon.getYRot())); - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/indicator.png"), w / 2F - 4.3f + 0.45f * diffY, h / 2F - 10, 0, 0.0F, 8, 8, 8, 8); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/indicator.png"), w / 2F - 4.3f + 0.45f * diffY, h / 2F - 10, 0, 0.0F, 8, 8, 8, 8); } else { - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j); } renderKillIndicator(guiGraphics, w, h); } else if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && !ClientEventHandler.zoomVehicle) { @@ -143,7 +143,7 @@ public class CannonHudOverlay { float y = (float) p.y; poseStack.pushPose(); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); + preciseBlit(guiGraphics, Mod.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); renderKillIndicator3P(guiGraphics, x - 7.5f + (float) (2 * (Math.random() - 0.5f)), y - 7.5f + (float) (2 * (Math.random() - 0.5f))); poseStack.pushPose(); 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 bff46aff7..b8b36bba0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; @@ -35,8 +35,8 @@ import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit; @EventBusSubscriber(value = Dist.CLIENT) public class CrossHairOverlay { - private static final ResourceLocation REX_HORIZONTAL = ModUtils.loc("textures/screens/rex_horizontal.png"); - private static final ResourceLocation REX_VERTICAL = ModUtils.loc("textures/screens/rex_vertical.png"); + private static final ResourceLocation REX_HORIZONTAL = Mod.loc("textures/screens/rex_horizontal.png"); + private static final ResourceLocation REX_VERTICAL = Mod.loc("textures/screens/rex_vertical.png"); public static int HIT_INDICATOR = 0; public static int HEAD_INDICATOR = 0; @@ -91,7 +91,7 @@ public class CrossHairOverlay { float finPosY = ((h - finLength) / 2) + moveY; if (shouldRenderCrossHair(player) || (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON && stack.is(ModItems.MINIGUN.get())) || (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && (ClientEventHandler.zoomTime > 0 || ClientEventHandler.pullPos > 0))) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/point.png"), w / 2f - 7.5f + moveX, h / 2f - 7.5f + moveY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/point.png"), w / 2f - 7.5f + moveX, h / 2f - 7.5f + moveY, 0, 0, 16, 16, 16, 16); if (!player.isSprinting() || player.getPersistentData().getDouble("noRun") > 0) { if (stack.is(ModTags.Items.SHOTGUN)) { if (perk instanceof AmmoPerk ammoPerk && ammoPerk.slug) { @@ -107,7 +107,7 @@ public class CrossHairOverlay { if (stack.is(ModItems.BOCEK.get())) { if (NBTTool.getTag(stack).getBoolean("HoloHidden")) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/point.png"), w / 2f - 7.5f + moveX, h / 2f - 7.5f + moveY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/point.png"), w / 2f - 7.5f + moveX, h / 2f - 7.5f + moveY, 0, 0, 16, 16, 16, 16); if (!player.isSprinting() || player.getPersistentData().getDouble("noRun") > 0 || ClientEventHandler.pullPos > 0) { if (ClientEventHandler.zoomTime < 0.1) { if (perk instanceof AmmoPerk ammoPerk && ammoPerk.slug) { @@ -147,7 +147,7 @@ public class CrossHairOverlay { } private static void shotgunCrossHair(GuiGraphics guiGraphics, float finPosX, float finPosY, float finLength) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/shotgun_hud.png"), finPosX, finPosY, 0, 0.0F, finLength, finLength, finLength, finLength); + preciseBlit(guiGraphics, Mod.loc("textures/screens/shotgun_hud.png"), finPosX, finPosY, 0, 0.0F, finLength, finLength, finLength, finLength); } private static boolean shouldRenderCrossHair(Player player) { @@ -167,15 +167,15 @@ public class CrossHairOverlay { float rate = (40 - KILL_INDICATOR * 5) / 5.5f; if (HIT_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); } if (VEHICLE_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker_vehicle.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker_vehicle.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); } if (HEAD_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/headshot_mark.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/headshot_mark.png"), posX + moveX, posY + moveY, 0, 0, 16, 16, 16, 16); } if (KILL_INDICATOR > 0) { @@ -184,10 +184,10 @@ public class CrossHairOverlay { float posX2 = w / 2f - 7.5f + 2 - rate + moveX; float posY2 = h / 2f - 7.5f + 2 - rate + moveY; - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java index 546cb85e2..a23ba8026 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -39,7 +39,7 @@ import static com.atsuishio.superbwarfare.entity.vehicle.DroneEntity.KAMIKAZE_MO public class DroneUIOverlay { public static int MAX_DISTANCE = 256; - private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/frame/frame.png"); + private static final ResourceLocation FRAME = Mod.loc("textures/screens/frame/frame.png"); @SubscribeEvent public static void eventHandler(RenderGuiEvent.Pre event) { @@ -67,10 +67,10 @@ public class DroneUIOverlay { var tag = NBTTool.getTag(stack); if (stack.is(ModItems.MONITOR.get()) && tag.getBoolean("Using") && tag.getBoolean("Linked")) { - guiGraphics.blit(ModUtils.loc("textures/screens/drone.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); - guiGraphics.blit(ModUtils.loc("textures/screens/drone_fov.png"), w / 2 + 100, h / 2 - 64, 0, 0, 64, 129, 64, 129); + guiGraphics.blit(Mod.loc("textures/screens/drone.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); + guiGraphics.blit(Mod.loc("textures/screens/drone_fov.png"), w / 2 + 100, h / 2 - 64, 0, 0, 64, 129, 64, 129); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone_fov_move.png"), (float) w / 2 + 100, (float) (h / 2 - 64 - ((ClientEventHandler.droneFovLerp - 1) * 23.8)), 0, 0, 64, 129, 64, 129); + preciseBlit(guiGraphics, Mod.loc("textures/screens/drone_fov_move.png"), (float) w / 2 + 100, (float) (h / 2 - 64 - ((ClientEventHandler.droneFovLerp - 1) * 23.8)), 0, 0, 64, 129, 64, 129); guiGraphics.drawString(mc.font, Component.literal(FormatTool.format1D(ClientEventHandler.droneFovLerp, "x")), w / 2 + 144, h / 2 + 56 - (int) ((ClientEventHandler.droneFovLerp - 1) * 23.8), -1, false); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/GrenadeLauncherOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/GrenadeLauncherOverlay.java index 1f45e01ef..3ef45599d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/GrenadeLauncherOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/GrenadeLauncherOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity; @@ -46,7 +46,7 @@ public class GrenadeLauncherOverlay { RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderSystem.setShaderColor(1, 1, 1, 1); - guiGraphics.blit(ModUtils.loc("textures/screens/rex.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); + guiGraphics.blit(Mod.loc("textures/screens/rex.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); RenderSystem.depthMask(true); RenderSystem.defaultBlendFunc(); 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 401934ade..297dde4d7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HandsomeFrameOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; @@ -31,10 +31,10 @@ import java.util.List; @EventBusSubscriber(value = Dist.CLIENT) public class HandsomeFrameOverlay { - private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/frame/frame.png"); - private static final ResourceLocation FRAME_WEAK = ModUtils.loc("textures/screens/frame/frame_weak.png"); - private static final ResourceLocation FRAME_TARGET = ModUtils.loc("textures/screens/frame/frame_target.png"); - private static final ResourceLocation FRAME_LOCK = ModUtils.loc("textures/screens/frame/frame_lock.png"); + private static final ResourceLocation FRAME = Mod.loc("textures/screens/frame/frame.png"); + private static final ResourceLocation FRAME_WEAK = Mod.loc("textures/screens/frame/frame_weak.png"); + private static final ResourceLocation FRAME_TARGET = Mod.loc("textures/screens/frame/frame_target.png"); + private static final ResourceLocation FRAME_LOCK = Mod.loc("textures/screens/frame/frame_lock.png"); @SubscribeEvent(priority = EventPriority.LOWEST) public static void eventHandler(RenderGuiEvent.Pre event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java index 1795b3397..c35512e3d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; @@ -82,23 +82,23 @@ public class HelicopterHudOverlay { float l = ((h - j) / 2); if (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_base.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/heli_base.png"), k, l, 0, 0.0F, i, j, i, j); renderDriverAngle(guiGraphics, player, mobileVehicle, k, l, i, j, event.getPartialTick().getGameTimeDeltaTicks()); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/compass.png"), (float) w / 2 - 128, (float) 6, 128 + ((float) 64 / 45 * mobileVehicle.getYRot()), 0, 256, 16, 512, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/compass.png"), (float) w / 2 - 128, (float) 6, 128 + ((float) 64 / 45 * mobileVehicle.getYRot()), 0, 256, 16, 512, 16); poseStack.pushPose(); poseStack.rotateAround(Axis.ZP.rotationDegrees(-iHelicopterEntity.getRotZ(event.getPartialTick().getGameTimeDeltaTicks())), w / 2f, h / 2f, 0); float pitch = iHelicopterEntity.getRotX(event.getPartialTick().getGameTimeDeltaTicks()); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_line.png"), (float) w / 2 - 128, (float) h / 2 - 512 - 5.475f * pitch, 0, 0, 256, 1024, 256, 1024); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/heli_line.png"), (float) w / 2 - 128, (float) h / 2 - 512 - 5.475f * pitch, 0, 0, 256, 1024, 256, 1024); poseStack.popPose(); poseStack.pushPose(); poseStack.rotateAround(Axis.ZP.rotationDegrees(iHelicopterEntity.getRotZ(event.getPartialTick().getGameTimeDeltaTicks())), w / 2f, h / 2f - 56, 0); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/roll_ind.png"), (float) w / 2 - 8, (float) h / 2 - 88, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/roll_ind.png"), (float) w / 2 - 8, (float) h / 2 - 88, 0, 0, 16, 16, 16, 16); poseStack.popPose(); - guiGraphics.blit(ModUtils.loc("textures/screens/helicopter/heli_power_ruler.png"), w / 2 + 100, h / 2 - 64, 0, 0, 64, 128, 64, 128); + guiGraphics.blit(Mod.loc("textures/screens/helicopter/heli_power_ruler.png"), w / 2 + 100, h / 2 - 64, 0, 0, 64, 128, 64, 128); double height = mobileVehicle.position().distanceTo((Vec3.atLowerCornerOf(mobileVehicle.level().clip(new ClipContext(mobileVehicle.position(), mobileVehicle.position().add(new Vec3(0, -1, 0).scale(100)), ClipContext.Block.OUTLINE, ClipContext.Fluid.ANY, mobileVehicle)).getBlockPos()))); @@ -107,14 +107,14 @@ public class HelicopterHudOverlay { float power = iHelicopterEntity.getPower(); lerpPower = Mth.lerp(0.001f * event.getPartialTick().getGameTimeDeltaTicks(), lerpPower, power); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_power.png"), (float) w / 2 + 130f, ((float) h / 2 - 64 + 124 - power * 980), 0, 0, 4, power * 980, 4, power * 980); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/heli_power.png"), (float) w / 2 + 130f, ((float) h / 2 - 64 + 124 - power * 980), 0, 0, 4, power * 980, 4, power * 980); lerpVy = (float) Mth.lerp(0.021f * event.getPartialTick().getGameTimeDeltaTicks(), lerpVy, mobileVehicle.getDeltaMovement().y()); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_vy_move.png"), (float) w / 2 + 138, ((float) h / 2 - 3 - Math.max(lerpVy * 20, -24) * 2.5f), 0, 0, 8, 8, 8, 8); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/heli_vy_move.png"), (float) w / 2 + 138, ((float) h / 2 - 3 - Math.max(lerpVy * 20, -24) * 2.5f), 0, 0, 8, 8, 8, 8); guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(FormatTool.format0D(lerpVy * 20, "m/s")), w / 2 + 146, (int) (h / 2 - 3 - Math.max(lerpVy * 20, -24) * 2.5), (lerpVy * 20 < -24 || ((lerpVy * 20 < -10 || (lerpVy * 20 < -1 && length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72 > 100)) && height < 36) || (length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72 > 40 && blockInWay < 72) ? -65536 : 0x66FF00), false); guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(FormatTool.format0D(mobileVehicle.getY())), w / 2 + 104, h / 2, 0x66FF00, false); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/speed_frame.png"), (float) w / 2 - 144, (float) h / 2 - 6, 0, 0, 50, 18, 50, 18); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/speed_frame.png"), (float) w / 2 - 144, (float) h / 2 - 6, 0, 0, 50, 18, 50, 18); guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(FormatTool.format0D(length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72, "km/h")), w / 2 - 140, h / 2, 0x66FF00, false); @@ -173,12 +173,12 @@ public class HelicopterHudOverlay { if (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/crosshair_ind.png"), x - 8, y - 8, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/crosshair_ind.png"), x - 8, y - 8, 0, 0, 16, 16, 16, 16); renderKillIndicator(guiGraphics, x - 7.5f + (float) (2 * (Math.random() - 0.5f)), y - 7.5f + (float) (2 * (Math.random() - 0.5f))); } else if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK) { poseStack.pushPose(); poseStack.rotateAround(Axis.ZP.rotationDegrees(iHelicopterEntity.getRotZ(event.getPartialTick().getGameTimeDeltaTicks())), x, y, 0); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone.png"), x - 8, y - 8, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/drone.png"), x - 8, y - 8, 0, 0, 16, 16, 16, 16); renderKillIndicator(guiGraphics, x - 7.5f + (float) (2 * (Math.random() - 0.5f)), y - 7.5f + (float) (2 * (Math.random() - 0.5f))); poseStack.pushPose(); @@ -217,7 +217,7 @@ public class HelicopterHudOverlay { float diffY = Mth.wrapDegrees(Mth.lerp(ticks, player.yHeadRotO, player.getYHeadRot()) - Mth.lerp(ticks, heli.yRotO, heli.getYRot())) * 0.35f; float diffX = Mth.wrapDegrees(Mth.lerp(ticks, player.xRotO, player.getXRot()) - Mth.lerp(ticks, heli.xRotO, heli.getXRot())) * 0.072f; - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_driver_angle.png"), k + diffY, l + diffX, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/heli_driver_angle.png"), k + diffY, l + diffX, 0, 0.0F, i, j, i, j); } public static Matrix4f getVehicleTransform(VehicleEntity vehicle, float partialTicks) { 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 7352ec89e..c495d4601 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; @@ -35,9 +35,9 @@ import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit; @EventBusSubscriber(value = Dist.CLIENT) public class JavelinHudOverlay { - private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/frame/frame.png"); - private static final ResourceLocation FRAME_TARGET = ModUtils.loc("textures/screens/frame/frame_target.png"); - private static final ResourceLocation FRAME_LOCK = ModUtils.loc("textures/screens/frame/frame_lock.png"); + private static final ResourceLocation FRAME = Mod.loc("textures/screens/frame/frame.png"); + private static final ResourceLocation FRAME_TARGET = Mod.loc("textures/screens/frame/frame_target.png"); + private static final ResourceLocation FRAME_LOCK = Mod.loc("textures/screens/frame/frame_lock.png"); private static float scopeScale = 1; @SubscribeEvent(priority = EventPriority.LOWEST) @@ -76,11 +76,11 @@ public class JavelinHudOverlay { float l = ((h - j) / 2) + moveY; float i1 = k + i; float j1 = l + j; - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/javelin/javelin_hud.png"), k, l, 0, 0.0F, i, j, i, j); - preciseBlit(event.getGuiGraphics(), ModUtils.loc(tag.getBoolean("TopMode") ? "textures/screens/javelin/top.png" : "textures/screens/javelin/dir.png"), k, l, 0, 0.0F, i, j, i, j); - preciseBlit(event.getGuiGraphics(), ModUtils.loc(GunsTool.getGunIntTag(stack, "Ammo", 0) > 0 ? "textures/screens/javelin/missile_green.png" : "textures/screens/javelin/missile_red.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/javelin/javelin_hud.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc(tag.getBoolean("TopMode") ? "textures/screens/javelin/top.png" : "textures/screens/javelin/dir.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc(GunsTool.getGunIntTag(stack, "Ammo", 0) > 0 ? "textures/screens/javelin/missile_green.png" : "textures/screens/javelin/missile_red.png"), k, l, 0, 0.0F, i, j, i, j); if (tag.getInt("SeekTime") > 1 && tag.getInt("SeekTime") < 20) { - preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/javelin/seek.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), Mod.loc("textures/screens/javelin/seek.png"), k, l, 0, 0.0F, i, j, i, j); } event.getGuiGraphics().fill(RenderType.guiOverlay(), 0, (int) l, (int) k + 3, (int) j1, -90, -16777216); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java index 4b64f4481..315969260 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.client.KillMessageConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; @@ -33,22 +33,22 @@ import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit; @EventBusSubscriber(value = Dist.CLIENT) public class KillMessageOverlay { - private static final ResourceLocation HEADSHOT = ModUtils.loc("textures/screens/damage_types/headshot.png"); + private static final ResourceLocation HEADSHOT = Mod.loc("textures/screens/damage_types/headshot.png"); - private static final ResourceLocation KNIFE = ModUtils.loc("textures/screens/damage_types/knife.png"); - private static final ResourceLocation EXPLOSION = ModUtils.loc("textures/screens/damage_types/explosion.png"); - private static final ResourceLocation CLAYMORE = ModUtils.loc("textures/screens/damage_types/claymore.png"); - private static final ResourceLocation GENERIC = ModUtils.loc("textures/screens/damage_types/generic.png"); - private static final ResourceLocation BEAST = ModUtils.loc("textures/screens/damage_types/beast.png"); - private static final ResourceLocation BLEEDING = ModUtils.loc("textures/screens/damage_types/bleeding.png"); - private static final ResourceLocation SHOCK = ModUtils.loc("textures/screens/damage_types/shock.png"); - private static final ResourceLocation BLOOD_CRYSTAL = ModUtils.loc("textures/screens/damage_types/blood_crystal.png"); - private static final ResourceLocation BURN = ModUtils.loc("textures/screens/damage_types/burn.png"); - private static final ResourceLocation DRONE = ModUtils.loc("textures/screens/damage_types/drone.png"); - private static final ResourceLocation LASER = ModUtils.loc("textures/screens/damage_types/laser.png"); - private static final ResourceLocation VEHICLE = ModUtils.loc("textures/screens/damage_types/vehicle_strike.png"); + private static final ResourceLocation KNIFE = Mod.loc("textures/screens/damage_types/knife.png"); + private static final ResourceLocation EXPLOSION = Mod.loc("textures/screens/damage_types/explosion.png"); + private static final ResourceLocation CLAYMORE = Mod.loc("textures/screens/damage_types/claymore.png"); + private static final ResourceLocation GENERIC = Mod.loc("textures/screens/damage_types/generic.png"); + private static final ResourceLocation BEAST = Mod.loc("textures/screens/damage_types/beast.png"); + private static final ResourceLocation BLEEDING = Mod.loc("textures/screens/damage_types/bleeding.png"); + private static final ResourceLocation SHOCK = Mod.loc("textures/screens/damage_types/shock.png"); + private static final ResourceLocation BLOOD_CRYSTAL = Mod.loc("textures/screens/damage_types/blood_crystal.png"); + private static final ResourceLocation BURN = Mod.loc("textures/screens/damage_types/burn.png"); + private static final ResourceLocation DRONE = Mod.loc("textures/screens/damage_types/drone.png"); + private static final ResourceLocation LASER = Mod.loc("textures/screens/damage_types/laser.png"); + private static final ResourceLocation VEHICLE = Mod.loc("textures/screens/damage_types/vehicle_strike.png"); - private static final ResourceLocation WORLD_PEACE_STAFF = ModUtils.loc("textures/gun_icon/compat/world_peace_staff.png"); + private static final ResourceLocation WORLD_PEACE_STAFF = Mod.loc("textures/gun_icon/compat/world_peace_staff.png"); @SubscribeEvent public static void onRenderGui(RenderGuiEvent.Pre event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java index 3c3acbbeb..2116dd821 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.base.ArmedVehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; @@ -22,7 +22,7 @@ import net.neoforged.neoforge.client.event.RenderGuiEvent; @EventBusSubscriber(value = Dist.CLIENT) public class RedTriangleOverlay { - private static final ResourceLocation TRIANGLE = ModUtils.loc("textures/screens/red_triangle.png"); + private static final ResourceLocation TRIANGLE = Mod.loc("textures/screens/red_triangle.png"); @SubscribeEvent public static void eventHandler(RenderGuiEvent.Pre event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java index 58fc35ebc..833e11e67 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.entity.vehicle.Bmp2Entity; @@ -57,15 +57,15 @@ import static com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntit public class VehicleHudOverlay { private static float scopeScale = 1; - private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/land/tv_frame.png"); - private static final ResourceLocation ARMOR = ModUtils.loc("textures/screens/armor.png"); - private static final ResourceLocation ENERGY = ModUtils.loc("textures/screens/energy.png"); - private static final ResourceLocation HEALTH = ModUtils.loc("textures/screens/armor_value.png"); - private static final ResourceLocation HEALTH_FRAME = ModUtils.loc("textures/screens/armor_value_frame.png"); - private static final ResourceLocation DRIVER = ModUtils.loc("textures/screens/driver.png"); - private static final ResourceLocation PASSENGER = ModUtils.loc("textures/screens/passenger.png"); - private static final ResourceLocation SELECTED = ModUtils.loc("textures/screens/vehicle_weapon/selected.png"); - private static final ResourceLocation NUMBER = ModUtils.loc("textures/screens/vehicle_weapon/number.png"); + private static final ResourceLocation FRAME = Mod.loc("textures/screens/land/tv_frame.png"); + private static final ResourceLocation ARMOR = Mod.loc("textures/screens/armor.png"); + private static final ResourceLocation ENERGY = Mod.loc("textures/screens/energy.png"); + private static final ResourceLocation HEALTH = Mod.loc("textures/screens/armor_value.png"); + private static final ResourceLocation HEALTH_FRAME = Mod.loc("textures/screens/armor_value_frame.png"); + private static final ResourceLocation DRIVER = Mod.loc("textures/screens/driver.png"); + private static final ResourceLocation PASSENGER = Mod.loc("textures/screens/passenger.png"); + private static final ResourceLocation SELECTED = Mod.loc("textures/screens/vehicle_weapon/selected.png"); + private static final ResourceLocation NUMBER = Mod.loc("textures/screens/vehicle_weapon/number.png"); public static final int ANIMATION_TIME = 300; private static final AnimationTimer[] weaponSlotsTimer = AnimationTimer.createTimers(9, ANIMATION_TIME, AnimationCurves.EASE_OUT_CIRC); @@ -177,35 +177,35 @@ public class VehicleHudOverlay { int addW = (w / h) * 48; int addH = (w / h) * 27; preciseBlit(guiGraphics, FRAME, (float) -addW / 2, (float) -addH / 2, 10, 0, 0.0F, w + addW, h + addH, w + addW, h + addH); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/line.png"), w / 2f - 64, h - 56, 0, 0.0F, 128, 1, 128, 1); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/line.png"), w / 2f + 112, h - 71, 0, 0.0F, 1, 16, 1, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/line.png"), w / 2f - 64, h - 56, 0, 0.0F, 128, 1, 128, 1); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/line.png"), w / 2f + 112, h - 71, 0, 0.0F, 1, 16, 1, 16); // 不同武器种类的准星 if (weaponVehicle instanceof Yx100Entity) { if (weaponVehicle.getWeaponIndex(0) == 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/tank_cannon_cross_ap.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/tank_cannon_cross_ap.png"), k, l, 0, 0.0F, i, j, i, j); } else if (weaponVehicle.getWeaponIndex(0) == 1) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/tank_cannon_cross_he.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/tank_cannon_cross_he.png"), k, l, 0, 0.0F, i, j, i, j); } } else { if (weaponVehicle.getWeaponIndex(0) == 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/lav_cannon_cross.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/lav_cannon_cross.png"), k, l, 0, 0.0F, i, j, i, j); } else if (weaponVehicle.getWeaponIndex(0) == 1) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/lav_gun_cross.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/lav_gun_cross.png"), k, l, 0, 0.0F, i, j, i, j); } else if (weaponVehicle.getWeaponIndex(0) == 2) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/lav_missile_cross.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/lav_missile_cross.png"), k, l, 0, 0.0F, i, j, i, j); } } // 指南针 - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/compass.png"), (float) w / 2 - 128, (float) 10, 128 + ((float) 64 / 45 * player.getYRot()), 0, 256, 16, 512, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/roll_ind.png"), w / 2f - 8, 30, 0, 0.0F, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/compass.png"), (float) w / 2 - 128, (float) 10, 128 + ((float) 64 / 45 * player.getYRot()), 0, 256, 16, 512, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/helicopter/roll_ind.png"), w / 2f - 8, 30, 0, 0.0F, 16, 16, 16, 16); // 炮塔方向 poseStack.pushPose(); poseStack.rotateAround(Axis.ZP.rotationDegrees(Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), iLand.turretYRotO(), iLand.turretYRot())), w / 2f + 112, h - 56, 0); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/body.png"), w / 2f + 96, h - 72, 0, 0.0F, 32, 32, 32, 32); + preciseBlit(guiGraphics, Mod.loc("textures/screens/land/body.png"), w / 2f + 96, h - 72, 0, 0.0F, 32, 32, 32, 32); poseStack.popPose(); // 时速 @@ -302,7 +302,7 @@ public class VehicleHudOverlay { float y = (float) p.y; poseStack.pushPose(); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); + preciseBlit(guiGraphics, Mod.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); renderKillIndicator3P(guiGraphics, x - 7.5f + (float) (2 * (Math.random() - 0.5f)), y - 7.5f + (float) (2 * (Math.random() - 0.5f))); poseStack.pushPose(); @@ -366,15 +366,15 @@ public class VehicleHudOverlay { float rate = (40 - KILL_INDICATOR * 5) / 5.5f; if (HIT_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (VEHICLE_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker_vehicle.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker_vehicle.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (HEAD_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/headshot_mark.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/headshot_mark.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (KILL_INDICATOR > 0) { @@ -383,10 +383,10 @@ public class VehicleHudOverlay { float posX2 = w / 2f - 7.5f + 2 - rate; float posY2 = h / 2f - 7.5f + 2 - rate; - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); } } @@ -394,15 +394,15 @@ public class VehicleHudOverlay { float rate = (40 - KILL_INDICATOR * 5) / 5.5f; if (HIT_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (VEHICLE_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/hit_marker_vehicle.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/hit_marker_vehicle.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (HEAD_INDICATOR > 0) { - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/headshot_mark.png"), posX, posY, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/headshot_mark.png"), posX, posY, 0, 0, 16, 16, 16, 16); } if (KILL_INDICATOR > 0) { @@ -411,10 +411,10 @@ public class VehicleHudOverlay { float posX2 = posX + 2 - rate; float posY2 = posY + 2 - rate; - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark1.png"), posX1, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark2.png"), posX2, posY1, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark3.png"), posX1, posY2, 0, 0, 16, 16, 16, 16); + preciseBlit(guiGraphics, Mod.loc("textures/screens/kill_mark4.png"), posX2, posY2, 0, 0, 16, 16, 16, 16); } } @@ -511,7 +511,7 @@ public class VehicleHudOverlay { for (int i = weapons.size() - 1; i >= 0 && i < 9; i--) { var weapon = weapons.get(i); - ResourceLocation frame = ModUtils.loc("textures/screens/vehicle_weapon/frame_" + (i + 1) + ".png"); + ResourceLocation frame = Mod.loc("textures/screens/vehicle_weapon/frame_" + (i + 1) + ".png"); pose.pushPose(); // 相对于最左边的偏移量 diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java index fd54dae68..e7b751523 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.overlay; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.atsuishio.superbwarfare.entity.vehicle.Yx100Entity; @@ -71,7 +71,7 @@ public class VehicleMgHudOverlay { int j = Mth.floor(f * f1); int k = (w - i) / 2; int l = (h - j) / 2; - RenderHelper.preciseBlit(guiGraphics, ModUtils.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j); + RenderHelper.preciseBlit(guiGraphics, Mod.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j); VehicleHudOverlay.renderKillIndicator(guiGraphics, w, h); } else if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && !ClientEventHandler.zoomVehicle) { Vec3 p = RenderHelper.worldToScreen(new Vec3(Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), player.xo, player.getX()), Mth.lerp(event.getPartialTick().getGameTimeDeltaTicks(), player.yo + player.getEyeHeight(), player.getEyeY()), @@ -84,7 +84,7 @@ public class VehicleMgHudOverlay { float y = (float) p.y; poseStack.pushPose(); - preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); + preciseBlit(guiGraphics, Mod.loc("textures/screens/drone.png"), x - 12, y - 12, 0, 0, 24, 24, 24, 24); renderKillIndicator3P(guiGraphics, x - 7.5f + (float) (2 * (Math.random() - 0.5f)), y - 7.5f + (float) (2 * (Math.random() - 0.5f))); poseStack.pushPose(); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/FlareDecoyEntityRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/FlareDecoyEntityRenderer.java index 63f94d041..b0338903a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/FlareDecoyEntityRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/FlareDecoyEntityRenderer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.FlareDecoyEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -48,7 +48,7 @@ public class FlareDecoyEntityRenderer extends EntityRenderer { } private static ResourceLocation texture(Entity entity) { - return ModUtils.loc("textures/particle/fire_star_" + (entity.tickCount % 8 + 1) + ".png"); + return Mod.loc("textures/particle/fire_star_" + (entity.tickCount % 8 + 1) + ".png"); } public ResourceLocation getTextureLocation(FlareDecoyEntity pEntity) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/LaserEntityRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/LaserEntityRenderer.java index 31c3399b1..3899dcf54 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/LaserEntityRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/LaserEntityRenderer.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.LaserEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -27,7 +27,7 @@ public class LaserEntityRenderer extends AbstractLaserEntityRenderer { - private static final ResourceLocation TEXTURE = ModUtils.loc("textures/gui/charging_station.png"); + private static final ResourceLocation TEXTURE = Mod.loc("textures/gui/charging_station.png"); public ChargingStationScreen(ChargingStationMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java index 07bfdd823..25ab5db15 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.screens; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.FuMO25BlockEntity; import com.atsuishio.superbwarfare.client.RenderHelper; import com.atsuishio.superbwarfare.menu.FuMO25Menu; @@ -30,8 +30,8 @@ import java.util.Optional; @OnlyIn(Dist.CLIENT) public class FuMO25Screen extends AbstractContainerScreen { - private static final ResourceLocation TEXTURE = ModUtils.loc("textures/gui/radar.png"); - private static final ResourceLocation SCAN = ModUtils.loc("textures/gui/radar_scan.png"); + private static final ResourceLocation TEXTURE = Mod.loc("textures/gui/radar.png"); + private static final ResourceLocation SCAN = Mod.loc("textures/gui/radar_scan.png"); private BlockPos currentPos = null; private Entity currentTarget = null; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java index 66b67bf22..8fa1a4aff 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.screens; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.FuMO25BlockEntity; import com.atsuishio.superbwarfare.menu.FuMO25Menu; import com.atsuishio.superbwarfare.tools.SeekTool; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.client.event.ClientTickEvent; import java.util.List; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) public class FuMO25ScreenHelper { public static BlockPos pos = null; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java index 1008fc8d7..9f471601f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.screens; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.menu.ReforgingTableMenu; import com.atsuishio.superbwarfare.perk.Perk; import com.mojang.blaze3d.systems.RenderSystem; @@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull; @OnlyIn(Dist.CLIENT) public class ReforgingTableScreen extends AbstractContainerScreen { - private static final ResourceLocation TEXTURE = ModUtils.loc("textures/gui/reforging_table.png"); + private static final ResourceLocation TEXTURE = Mod.loc("textures/gui/reforging_table.png"); public ReforgingTableScreen(ReforgingTableMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleScreen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleScreen.java index 2d344f5c2..d6d6ba774 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleScreen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/VehicleScreen.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.client.screens; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.menu.VehicleMenu; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; @OnlyIn(Dist.CLIENT) public class VehicleScreen extends AbstractContainerScreen { - private static final ResourceLocation TEXTURE = ModUtils.loc("textures/gui/vehicle.png"); + private static final ResourceLocation TEXTURE = Mod.loc("textures/gui/vehicle.png"); public VehicleScreen(VehicleMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); diff --git a/src/main/java/com/atsuishio/superbwarfare/command/CommandRegister.java b/src/main/java/com/atsuishio/superbwarfare/command/CommandRegister.java index 1569fbe35..5084b1813 100644 --- a/src/main/java/com/atsuishio/superbwarfare/command/CommandRegister.java +++ b/src/main/java/com/atsuishio/superbwarfare/command/CommandRegister.java @@ -1,12 +1,12 @@ package com.atsuishio.superbwarfare.command; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.commands.Commands; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.RegisterCommandsEvent; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class CommandRegister { @SubscribeEvent public static void registerCommand(RegisterCommandsEvent event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jade/elements/WrenchHealthElement.java b/src/main/java/com/atsuishio/superbwarfare/compat/jade/elements/WrenchHealthElement.java index f3506cbbb..786ce8853 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jade/elements/WrenchHealthElement.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jade/elements/WrenchHealthElement.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.compat.jade.elements; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -27,7 +27,7 @@ public class WrenchHealthElement extends Element { return new Vec2(8F + font.width(this.text), 10.0F); } - private static final ResourceLocation WRENCH_ICON = ModUtils.loc("textures/screens/vehicle_health.png"); + private static final ResourceLocation WRENCH_ICON = Mod.loc("textures/screens/vehicle_health.png"); @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/C4InfoProvider.java b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/C4InfoProvider.java index 0a7e16725..9377bcfad 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/C4InfoProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/C4InfoProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.compat.jade.providers; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.entity.projectile.C4Entity; import net.minecraft.ChatFormatting; @@ -14,7 +14,7 @@ import snownee.jade.api.config.IPluginConfig; public enum C4InfoProvider implements IEntityComponentProvider { INSTANCE; - private static final ResourceLocation ID = ModUtils.loc("c4_info"); + private static final ResourceLocation ID = Mod.loc("c4_info"); public void appendTooltip(ITooltip tooltip, EntityAccessor accessor, IPluginConfig config) { var c4 = (C4Entity) accessor.getEntity(); diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/ContainerEntityProvider.java b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/ContainerEntityProvider.java index 2882c53eb..5e1c68cc4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/ContainerEntityProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/ContainerEntityProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.compat.jade.providers; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.ContainerBlock; import com.atsuishio.superbwarfare.block.entity.ContainerBlockEntity; import net.minecraft.ChatFormatting; @@ -15,7 +15,7 @@ import snownee.jade.api.config.IPluginConfig; public enum ContainerEntityProvider implements IBlockComponentProvider { INSTANCE; - private static final ResourceLocation ID = ModUtils.loc("container_entity"); + private static final ResourceLocation ID = Mod.loc("container_entity"); public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) { var container = (ContainerBlockEntity) blockAccessor.getBlockEntity(); diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/VehicleHealthProvider.java b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/VehicleHealthProvider.java index a61e6ae9b..ee9d1d721 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/VehicleHealthProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jade/providers/VehicleHealthProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.compat.jade.providers; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.compat.jade.elements.WrenchHealthElement; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import net.minecraft.resources.ResourceLocation; @@ -12,7 +12,7 @@ import snownee.jade.api.config.IPluginConfig; public enum VehicleHealthProvider implements IEntityComponentProvider { INSTANCE; - private static final ResourceLocation ID = ModUtils.loc("vehicle_health"); + private static final ResourceLocation ID = Mod.loc("vehicle_health"); public void appendTooltip(ITooltip tooltip, EntityAccessor accessor, IPluginConfig config) { // 对EntityHealthAndArmorProvider的拙劣模仿罢了 diff --git a/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java b/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java index fdbad44c8..03d8c0a51 100644 --- a/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java +++ b/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.component; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.common.ammo.box.AmmoBoxInfo; import com.atsuishio.superbwarfare.tools.AmmoType; import com.mojang.datafixers.util.Pair; @@ -17,7 +17,7 @@ import java.util.function.UnaryOperator; public class ModDataComponents { public static final DeferredRegister> DATA_COMPONENT_TYPES = - DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, ModUtils.MODID); + DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, Mod.MODID); public static final DeferredHolder, DataComponentType> BLOCK_POS = register( "coordinates", diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java b/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java index 0e98b41ba..c0b683aed 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; @@ -11,7 +11,7 @@ import net.neoforged.neoforge.data.event.GatherDataEvent; import java.util.concurrent.CompletableFuture; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { @SubscribeEvent diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java index ed6121644..420f37a8f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModBlocks; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; @@ -15,7 +15,7 @@ import net.neoforged.neoforge.registries.DeferredHolder; public class ModBlockStateProvider extends BlockStateProvider { public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { - super(output, ModUtils.MODID, exFileHelper); + super(output, Mod.MODID, exFileHelper); } @Override @@ -52,7 +52,7 @@ public class ModBlockStateProvider extends BlockStateProvider { } private void blockItem(DeferredHolder blockRegistryObject) { - simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(ModUtils.MODID + + simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(Mod.MODID + ":block/" + BuiltInRegistries.BLOCK.getKey(blockRegistryObject.get()).getPath())); } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java index be7bb7e5c..9b0e788e5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockTagProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModBlocks; import com.atsuishio.superbwarfare.init.ModTags; import net.minecraft.core.HolderLookup; @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; public class ModBlockTagProvider extends BlockTagsProvider { public ModBlockTagProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { - super(output, lookupProvider, ModUtils.MODID, existingFileHelper); + super(output, lookupProvider, Mod.MODID, existingFileHelper); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java index eed5b1572..22d0c3c6b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModTags; import net.minecraft.core.HolderLookup; @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; public class ModDamageTypeTagProvider extends DamageTypeTagsProvider { public ModDamageTypeTagProvider(PackOutput pOutput, CompletableFuture pLookupProvider, @Nullable ExistingFileHelper existingFileHelper) { - super(pOutput, pLookupProvider, ModUtils.MODID, existingFileHelper); + super(pOutput, pLookupProvider, Mod.MODID, existingFileHelper); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 6e4bfbe7f..7ea33906e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModBlocks; import com.atsuishio.superbwarfare.init.ModItems; import net.minecraft.core.registries.BuiltInRegistries; @@ -16,7 +16,7 @@ import net.neoforged.neoforge.registries.DeferredHolder; @SuppressWarnings({"ConstantConditions", "UnusedReturnValue", "SameParameterValue", "unused"}) public class ModItemModelProvider extends ItemModelProvider { public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { - super(output, ModUtils.MODID, existingFileHelper); + super(output, Mod.MODID, existingFileHelper); } @Override @@ -167,31 +167,31 @@ public class ModItemModelProvider extends ItemModelProvider { private ItemModelBuilder simpleItem(DeferredHolder item, String location) { return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) - .texture("layer0", ModUtils.loc("item/" + location + item.getId().getPath())); + .texture("layer0", Mod.loc("item/" + location + item.getId().getPath())); } private ItemModelBuilder simpleItem(DeferredHolder item, String location, String renderType) { return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) - .texture("layer0", ModUtils.loc("item/" + location + item.getId().getPath())).renderType(renderType); + .texture("layer0", Mod.loc("item/" + location + item.getId().getPath())).renderType(renderType); } public void evenSimplerBlockItem(DeferredHolder block) { - this.withExistingParent(ModUtils.MODID + ":" + BuiltInRegistries.BLOCK.getKey(block.get()).getPath(), + this.withExistingParent(Mod.MODID + ":" + BuiltInRegistries.BLOCK.getKey(block.get()).getPath(), modLoc("block/" + BuiltInRegistries.BLOCK.getKey(block.get()).getPath())); } private ItemModelBuilder gunBlueprintItem(DeferredHolder item) { return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) - .texture("layer0", ModUtils.loc("item/gun_blueprint")); + .texture("layer0", Mod.loc("item/gun_blueprint")); } private ItemModelBuilder cannonBlueprintItem(DeferredHolder item) { return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) - .texture("layer0", ModUtils.loc("item/cannon_blueprint")); + .texture("layer0", Mod.loc("item/cannon_blueprint")); } private ItemModelBuilder handheldItem(DeferredHolder item) { return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/handheld")) - .texture("layer0", ModUtils.loc("item/" + item.getId().getPath())); + .texture("layer0", Mod.loc("item/" + item.getId().getPath())); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index 0293c6892..ef79de12c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.datagen; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; import net.minecraft.core.HolderLookup; @@ -22,7 +22,7 @@ public class ModItemTagProvider extends ItemTagsProvider { public ModItemTagProvider(PackOutput packOutput, CompletableFuture providerCompletableFuture, CompletableFuture> tagLookupCompletableFuture, @Nullable ExistingFileHelper existingFileHelper) { - super(packOutput, providerCompletableFuture, tagLookupCompletableFuture, ModUtils.MODID, existingFileHelper); + super(packOutput, providerCompletableFuture, tagLookupCompletableFuture, Mod.MODID, existingFileHelper); } @SuppressWarnings("unchecked") diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java index 8edb978f9..fdde71be0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.*; @@ -197,7 +197,7 @@ public class ClaymoreEntity extends Entity implements GeoEntity, OwnableEntity { this.discard(); } - ModUtils.queueServerWork(1, () -> { + Mod.queueServerWork(1, () -> { if (!level.isClientSide()) { triggerExplode(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java index e00584805..aa0d88788 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.gui.RangeHelper; import com.atsuishio.superbwarfare.entity.projectile.MortarShellEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; @@ -122,7 +122,7 @@ public class MortarEntity extends VehicleEntity implements GeoEntity { this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_FIRE.get(), SoundSource.PLAYERS, 8f, 1f); this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_DISTANT.get(), SoundSource.PLAYERS, 32f, 1f); } - ModUtils.queueServerWork(20, () -> { + Mod.queueServerWork(20, () -> { Level level = this.level(); if (level instanceof ServerLevel server) { MortarShellEntity entityToSpawn = shell.createShell(player, level, stack); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java index 309a4a336..2069acb79 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; @@ -36,7 +36,7 @@ import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.animation.*; import software.bernie.geckolib.util.GeckoLibUtil; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class TargetEntity extends LivingEntity implements GeoEntity { public static final EntityDataAccessor DOWN_TIME = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.INT); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java index 4615244bb..64c01fd8a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.*; @@ -101,7 +101,7 @@ public class Ah6Entity extends ContainerMobileVehicleEntity implements GeoEntity .heBullet(1) .bypassArmorRate(0.1f) .sound(ModSounds.INTO_CANNON.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/cannon_20mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/cannon_20mm.png")), new HeliRocketWeapon() .damage(VehicleConfig.AH_6_ROCKET_DAMAGE.get()) .explosionDamage(VehicleConfig.AH_6_ROCKET_EXPLOSION_DAMAGE.get()) @@ -766,7 +766,7 @@ public class Ah6Entity extends ContainerMobileVehicleEntity implements GeoEntity @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/ah_6_icon.png"); + return Mod.loc("textures/vehicle_icon/ah_6_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java index 83ef83eec..99f9fb268 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.C4Entity; @@ -627,6 +627,6 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity, @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/annihilator_icon.png"); + return Mod.loc("textures/vehicle_icon/annihilator_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java index 2aac61653..28c58df42 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.MelonBombEntity; @@ -90,13 +90,13 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit .explosionDamage(VehicleConfig.BMP_2_CANNON_EXPLOSION_DAMAGE.get()) .explosionRadius(VehicleConfig.BMP_2_CANNON_EXPLOSION_RADIUS.get().floatValue()) .sound(ModSounds.INTO_MISSILE.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/cannon_30mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/cannon_30mm.png")), new ProjectileWeapon() .damage(9.5f) .headShot(2) .zoom(false) .sound(ModSounds.INTO_CANNON.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/gun_7_62mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/gun_7_62mm.png")), new WgMissileWeapon() .damage(ExplosionConfig.WIRE_GUIDE_MISSILE_DAMAGE.get()) .explosionDamage(ExplosionConfig.WIRE_GUIDE_MISSILE_EXPLOSION_DAMAGE.get()) @@ -687,6 +687,6 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/bmp2_icon.png"); + return Mod.loc("textures/vehicle_icon/bmp2_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java index 6efa54cfc..f204e6487 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.MelonBombEntity; @@ -82,13 +82,13 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt .explosionDamage(VehicleConfig.LAV_150_CANNON_EXPLOSION_DAMAGE.get()) .explosionRadius(VehicleConfig.LAV_150_CANNON_EXPLOSION_RADIUS.get().floatValue()) .sound(ModSounds.INTO_MISSILE.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/cannon_20mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/cannon_20mm.png")), new ProjectileWeapon() .damage(9.5f) .headShot(2) .zoom(false) .sound(ModSounds.INTO_CANNON.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/gun_7_62mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/gun_7_62mm.png")), } }; } @@ -600,6 +600,6 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/lav150_icon.png"); + return Mod.loc("textures/vehicle_icon/lav150_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java index 0badf8101..15ef7ab2f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity; @@ -82,7 +82,7 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity .explosionRadius(VehicleConfig.MK42_AP_EXPLOSION_RADIUS.get().floatValue()) .durability(60) .sound(ModSounds.CANNON_RELOAD.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/ap_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/ap_shell.png")), new CannonShellWeapon() .hitDamage(VehicleConfig.MK42_HE_DAMAGE.get()) .explosionDamage(VehicleConfig.MK42_HE_EXPLOSION_DAMAGE.get()) @@ -91,7 +91,7 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity .fireProbability(0.18F) .fireTime(2) .sound(ModSounds.CANNON_RELOAD.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/he_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/he_shell.png")), } }; } @@ -411,6 +411,6 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/sherman_icon.png"); + return Mod.loc("textures/vehicle_icon/sherman_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java index 4dcf0869f..4658fbab5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity; @@ -76,7 +76,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt .explosionRadius(VehicleConfig.MLE1934_AP_EXPLOSION_RADIUS.get().floatValue()) .durability(70) .sound(ModSounds.CANNON_RELOAD.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/ap_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/ap_shell.png")), new CannonShellWeapon() .hitDamage(VehicleConfig.MLE1934_HE_DAMAGE.get()) .explosionDamage(VehicleConfig.MLE1934_HE_EXPLOSION_DAMAGE.get()) @@ -85,7 +85,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt .fireProbability(0.24F) .fireTime(5) .sound(ModSounds.CANNON_RELOAD.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/he_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/he_shell.png")), } }; } @@ -402,7 +402,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt if (player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, ModSounds.MK_42_FIRE_1P.get(), 2, 1); - ModUtils.queueServerWork(44, () -> SoundTool.playLocalSound(serverPlayer, ModSounds.CANNON_RELOAD.get(), 2, 1)); + Mod.queueServerWork(44, () -> SoundTool.playLocalSound(serverPlayer, ModSounds.CANNON_RELOAD.get(), 2, 1)); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FIRE_3P.get(), SoundSource.PLAYERS, 6, 1); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_FAR.get(), SoundSource.PLAYERS, 16, 1); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.MK_42_VERYFAR.get(), SoundSource.PLAYERS, 32, 1); @@ -514,6 +514,6 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/mle1934_icon.png"); + return Mod.loc("textures/vehicle_icon/mle1934_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java index 35b00cb94..d5fa777e7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.*; @@ -67,7 +67,7 @@ public class SpeedboatEntity extends ContainerMobileVehicleEntity implements Geo .damage(VehicleConfig.HEAVY_MACHINE_GUN_DAMAGE.get()) .headShot(2) .zoom(false) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/gun_12_7mm.png")) + .icon(Mod.loc("textures/screens/vehicle_weapon/gun_12_7mm.png")) } }; } @@ -552,7 +552,7 @@ public class SpeedboatEntity extends ContainerMobileVehicleEntity implements Geo @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/speedboat_icon.png"); + return Mod.loc("textures/vehicle_icon/speedboat_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java index 8b218c6a6..c131a9c0a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.MelonBombEntity; @@ -357,7 +357,7 @@ public class Tom6Entity extends MobileVehicleEntity implements GeoEntity { @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/tom_6_icon.png"); + return Mod.loc("textures/vehicle_icon/tom_6_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java index 6d65eeec2..445b69bf2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.MortarEntity; @@ -322,7 +322,7 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/wheel_chair_icon.png"); + return Mod.loc("textures/vehicle_icon/wheel_chair_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java index 52cda5290..a84f1a368 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.C4Entity; @@ -98,7 +98,7 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti .velocity(40) .sound(ModSounds.INTO_MISSILE.get()) .ammo(ModItems.AP_5_INCHES.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/ap_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/ap_shell.png")), // HE new CannonShellWeapon() .hitDamage(VehicleConfig.YX_100_HE_CANNON_DAMAGE.get()) @@ -110,7 +110,7 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti .velocity(25) .sound(ModSounds.INTO_CANNON.get()) .ammo(ModItems.HE_5_INCHES.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/he_shell.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/he_shell.png")), }, new VehicleWeapon[]{ // 机枪 @@ -120,7 +120,7 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti .zoom(false) .bypassArmorRate(0.4f) .ammo(ModItems.HEAVY_AMMO.get()) - .icon(ModUtils.loc("textures/screens/vehicle_weapon/gun_12_7mm.png")), + .icon(Mod.loc("textures/screens/vehicle_weapon/gun_12_7mm.png")), } }; } @@ -888,6 +888,6 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti @Override public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/vehicle_icon/yx_100_icon.png"); + return Mod.loc("textures/vehicle_icon/yx_100_icon.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java index 743989f1f..d6d84b27b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle.base; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier; import com.atsuishio.superbwarfare.entity.vehicle.weapon.VehicleWeapon; @@ -829,7 +829,7 @@ public abstract class VehicleEntity extends Entity { } public ResourceLocation getVehicleIcon() { - return ModUtils.loc("textures/gun_icon/default_icon.png"); + return Mod.loc("textures/gun_icon/default_icon.png"); } public boolean allowFreeCam() { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/HeliRocketWeapon.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/HeliRocketWeapon.java index 03728c34a..9e2ac29b0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/HeliRocketWeapon.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/HeliRocketWeapon.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle.weapon; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.HeliRocketEntity; import net.minecraft.world.entity.LivingEntity; @@ -9,7 +9,7 @@ public class HeliRocketWeapon extends VehicleWeapon { public float damage = 140, explosionDamage = 60, explosionRadius = 5; public HeliRocketWeapon() { - this.icon = ModUtils.loc("textures/screens/vehicle_weapon/rocket_70mm.png"); + this.icon = Mod.loc("textures/screens/vehicle_weapon/rocket_70mm.png"); } public HeliRocketWeapon damage(float damage) { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/LaserWeapon.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/LaserWeapon.java index e85a6f3a9..1f98ed458 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/LaserWeapon.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/LaserWeapon.java @@ -1,11 +1,11 @@ package com.atsuishio.superbwarfare.entity.vehicle.weapon; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; public class LaserWeapon extends VehicleWeapon { public LaserWeapon() { - this.icon = ModUtils.loc("textures/screens/vehicle_weapon/laser.png"); + this.icon = Mod.loc("textures/screens/vehicle_weapon/laser.png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/VehicleWeapon.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/VehicleWeapon.java index 1186eab7c..6bacdff50 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/VehicleWeapon.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/VehicleWeapon.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle.weapon; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; @@ -9,7 +9,7 @@ import net.minecraft.world.item.Item; public abstract class VehicleWeapon { // 武器的图标 - public ResourceLocation icon = ModUtils.loc("textures/screens/vehicle_weapon/empty.png"); + public ResourceLocation icon = Mod.loc("textures/screens/vehicle_weapon/empty.png"); // 武器的名称 public Component name; // 武器使用的弹药类型 diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/WgMissileWeapon.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/WgMissileWeapon.java index 25932012d..dd124f16f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/WgMissileWeapon.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/weapon/WgMissileWeapon.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.entity.vehicle.weapon; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.projectile.WgMissileEntity; import net.minecraft.world.entity.LivingEntity; @@ -9,7 +9,7 @@ public class WgMissileWeapon extends VehicleWeapon { public float damage = 250, explosionDamage = 200, explosionRadius = 10; public WgMissileWeapon() { - this.icon = ModUtils.loc("textures/screens/vehicle_weapon/missile_9m113.png"); + this.icon = Mod.loc("textures/screens/vehicle_weapon/missile_9m113.png"); } public WgMissileWeapon damage(float damage) { diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 921f6a06b..27487b93c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.event; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.config.client.DisplayConfig; @@ -61,7 +61,7 @@ import java.util.List; import static com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity.COAX_HEAT; import static com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity.HEAT; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) public class ClientEventHandler { public static double zoomTime = 0; @@ -609,7 +609,7 @@ public class ClientEventHandler { double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1, 0).scale(10)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))); - ModUtils.queueClientWork((int) (1 + 1.5 * shooterHeight), () -> player.playSound(ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1)); + Mod.queueClientWork((int) (1 + 1.5 * shooterHeight), () -> player.playSound(ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1)); } handleClientShoot(); @@ -671,7 +671,7 @@ public class ClientEventHandler { var charged = cap != null && cap.getEnergyStored() > 0; if (charged) { - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc("sentinel_charge_fire_1p")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc("sentinel_charge_fire_1p")); if (sound1p != null) { player.playSound(sound1p, 2f, 1); } @@ -687,7 +687,7 @@ public class ClientEventHandler { int barrelType = GunsTool.getAttachmentType(stack, GunsTool.AttachmentType.BARREL); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + (barrelType == 2 ? "_fire_1p_s" : "_fire_1p"))); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + (barrelType == 2 ? "_fire_1p_s" : "_fire_1p"))); if (sound1p != null) { player.playSound(sound1p, 2f, 1); @@ -696,7 +696,7 @@ public class ClientEventHandler { double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1, 0).scale(10)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))); - ModUtils.queueClientWork((int) (1 + 1.5 * shooterHeight), () -> { + Mod.queueClientWork((int) (1 + 1.5 * shooterHeight), () -> { if (gunItem.canEjectShell(stack)) { if (stack.is(ModTags.Items.SHOTGUN)) { player.playSound(ModSounds.SHELL_CASING_SHOTGUN.get(), (float) Math.max(0.75 - 0.12 * shooterHeight, 0), 1); @@ -861,7 +861,7 @@ public class ClientEventHandler { handleDroneCamera(event, living); } else { var effect = Minecraft.getInstance().gameRenderer.currentEffect(); - if (effect != null && effect.getName().equals(ModUtils.MODID + ":shaders/post/scan_pincushion.json")) { + if (effect != null && effect.getName().equals(Mod.MODID + ":shaders/post/scan_pincushion.json")) { Minecraft.getInstance().gameRenderer.shutdownEffect(); } } @@ -926,7 +926,7 @@ public class ClientEventHandler { if (drone != null && NBTTool.getTag(stack).getBoolean("Using")) { if (Minecraft.getInstance().gameRenderer.currentEffect() == null) { - Minecraft.getInstance().gameRenderer.loadEffect(ModUtils.loc("shaders/post/scan_pincushion.json")); + Minecraft.getInstance().gameRenderer.loadEffect(Mod.loc("shaders/post/scan_pincushion.json")); } } } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 44da46ed3..96bd15c87 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.event; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.capability.player.PlayerVariable; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; @@ -37,7 +37,7 @@ import java.util.ArrayList; import static com.atsuishio.superbwarfare.tools.NBTTool.saveTag; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class GunEventHandler { @SubscribeEvent @@ -95,17 +95,17 @@ public class GunEventHandler { if (cap != null && cap.getEnergyStored() > 0) { float soundRadius = (float) GunsTool.getGunDoubleTag(stack, "SoundRadius"); - SoundEvent sound3p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc("sentinel_charge_fire_3p")); + SoundEvent sound3p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc("sentinel_charge_fire_3p")); if (sound3p != null) { player.playSound(sound3p, soundRadius * 0.4f, 1f); } - SoundEvent soundFar = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc("sentinel_charge_far")); + SoundEvent soundFar = BuiltInRegistries.SOUND_EVENT.get(Mod.loc("sentinel_charge_far")); if (soundFar != null) { player.playSound(soundFar, soundRadius * 0.7f, 1f); } - SoundEvent soundVeryFar = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc("sentinel_charge_veryfar")); + SoundEvent soundVeryFar = BuiltInRegistries.SOUND_EVENT.get(Mod.loc("sentinel_charge_veryfar")); if (soundVeryFar != null) { player.playSound(soundVeryFar, soundRadius, 1f); } @@ -124,17 +124,17 @@ public class GunEventHandler { int barrelType = GunsTool.getAttachmentType(stack, GunsTool.AttachmentType.BARREL); - SoundEvent sound3p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + (barrelType == 2 ? "_fire_3p_s" : "_fire_3p"))); + SoundEvent sound3p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + (barrelType == 2 ? "_fire_3p_s" : "_fire_3p"))); if (sound3p != null) { player.playSound(sound3p, soundRadius * 0.4f, 1f); } - SoundEvent soundFar = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + (barrelType == 2 ? "_far_s" : "_far"))); + SoundEvent soundFar = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + (barrelType == 2 ? "_far_s" : "_far"))); if (soundFar != null) { player.playSound(soundFar, soundRadius * 0.7f, 1f); } - SoundEvent soundVeryFar = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + (barrelType == 2 ? "_veryfar_s" : "_veryfar"))); + SoundEvent soundVeryFar = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + (barrelType == 2 ? "_veryfar_s" : "_veryfar"))); if (soundVeryFar != null) { player.playSound(soundVeryFar, soundRadius, 1f); } @@ -151,7 +151,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_bolt")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_bolt")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 2f, 1f); @@ -160,7 +160,7 @@ public class GunEventHandler { if (stack.is(ModTags.Items.REVOLVER)) return; - ModUtils.queueServerWork((int) (GunsTool.getGunDoubleTag(stack, "BoltActionTime", 0) / 2 + 1.5 * shooterHeight), () -> { + Mod.queueServerWork((int) (GunsTool.getGunDoubleTag(stack, "BoltActionTime", 0) / 2 + 1.5 * shooterHeight), () -> { if (stack.is(ModTags.Items.SHOTGUN)) { SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_SHOTGUN.get(), (float) Math.max(0.75 - 0.12 * shooterHeight, 0), 1); } else if (stack.is(ModTags.Items.SNIPER_RIFLE)) { @@ -483,7 +483,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_reload_empty")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_reload_empty")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); } @@ -502,7 +502,7 @@ public class GunEventHandler { SoundEvent sound1p; - sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_reload_normal")); + sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_reload_normal")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); @@ -759,7 +759,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_prepare")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_prepare")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); } @@ -776,14 +776,14 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_prepare_empty")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_prepare_empty")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1, 0).scale(10)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))); - ModUtils.queueServerWork((int) (GunsTool.getGunIntTag(stack, "PrepareEmptyTime", 0) / 2 + 3 + 1.5 * shooterHeight), () -> { + Mod.queueServerWork((int) (GunsTool.getGunIntTag(stack, "PrepareEmptyTime", 0) / 2 + 3 + 1.5 * shooterHeight), () -> { if (stack.is(ModTags.Items.SHOTGUN)) { SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_SHOTGUN.get(), (float) Math.max(0.75 - 0.12 * shooterHeight, 0), 1); } else if (stack.is(ModTags.Items.SNIPER_RIFLE) || stack.is(ModTags.Items.HEAVY_WEAPON)) { @@ -806,14 +806,14 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_prepare_load")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_prepare_load")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1, 0).scale(10)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))); - ModUtils.queueServerWork((int) (8 + 1.5 * shooterHeight), () -> { + Mod.queueServerWork((int) (8 + 1.5 * shooterHeight), () -> { if (stack.is(ModTags.Items.SHOTGUN)) { SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_SHOTGUN.get(), (float) Math.max(0.75 - 0.12 * shooterHeight, 0), 1); } else if (stack.is(ModTags.Items.SNIPER_RIFLE) || stack.is(ModTags.Items.HEAVY_WEAPON)) { @@ -836,7 +836,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_loop")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_loop")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); } @@ -853,7 +853,7 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc(name + "_end")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc(name + "_end")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 10f, 1f); @@ -861,7 +861,7 @@ public class GunEventHandler { ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos()))); if (stack.is(ModItems.MARLIN.get())) { - ModUtils.queueServerWork((int) (5 + 1.5 * shooterHeight), () -> SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1)); + Mod.queueServerWork((int) (5 + 1.5 * shooterHeight), () -> SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1)); } } } @@ -877,7 +877,7 @@ public class GunEventHandler { GunsTool.setGunIntTag(stack, "ChargeTime", 127); GunsTool.setGunBooleanTag(stack, "Charging", true); - SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(ModUtils.loc("sentinel_charge")); + SoundEvent sound1p = BuiltInRegistries.SOUND_EVENT.get(Mod.loc("sentinel_charge")); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 2f, 1f); } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModArmorMaterials.java b/src/main/java/com/atsuishio/superbwarfare/init/ModArmorMaterials.java index cd1c32e0f..be6eaa85f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModArmorMaterials.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModArmorMaterials.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.Util; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.sounds.SoundEvents; @@ -15,7 +15,7 @@ import java.util.List; public class ModArmorMaterials { - public static final DeferredRegister MATERIALS = DeferredRegister.create(BuiltInRegistries.ARMOR_MATERIAL, ModUtils.MODID); + public static final DeferredRegister MATERIALS = DeferredRegister.create(BuiltInRegistries.ARMOR_MATERIAL, Mod.MODID); public static final DeferredHolder CEMENTED_CARBIDE = MATERIALS.register("cemented_carbide", () -> new ArmorMaterial( Util.make(new EnumMap<>(ArmorItem.Type.class), p -> { diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModAttributes.java b/src/main/java/com/atsuishio/superbwarfare/init/ModAttributes.java index e05a91a62..780a3dd4f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModAttributes.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModAttributes.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -17,9 +17,9 @@ import java.util.List; @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class ModAttributes { - public static final DeferredRegister ATTRIBUTES = DeferredRegister.create(BuiltInRegistries.ATTRIBUTE, ModUtils.MODID); + public static final DeferredRegister ATTRIBUTES = DeferredRegister.create(BuiltInRegistries.ATTRIBUTE, Mod.MODID); - public static final DeferredHolder BULLET_RESISTANCE = ATTRIBUTES.register("bullet_resistance", () -> (new RangedAttribute("attribute." + ModUtils.MODID + ".bullet_resistance", 0, 0, 1)).setSyncable(true)); + public static final DeferredHolder BULLET_RESISTANCE = ATTRIBUTES.register("bullet_resistance", () -> (new RangedAttribute("attribute." + Mod.MODID + ".bullet_resistance", 0, 0, 1)).setSyncable(true)); @SubscribeEvent public static void addAttributes(EntityAttributeModificationEvent event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModBlockEntities.java b/src/main/java/com/atsuishio/superbwarfare/init/ModBlockEntities.java index cc8d6319d..d75fbfd4f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModBlockEntities.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModBlockEntities.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.entity.*; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -9,7 +9,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; public class ModBlockEntities { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, ModUtils.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, Mod.MODID); public static final DeferredHolder, BlockEntityType> CONTAINER = REGISTRY.register("container", () -> BlockEntityType.Builder.of(ContainerBlockEntity::new, ModBlocks.CONTAINER.get()).build(null)); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java index ad2300e60..72a778d15 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.block.*; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.Block; @@ -13,7 +13,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; @SuppressWarnings("unused") public class ModBlocks { - public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.BLOCK, ModUtils.MODID); + public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.BLOCK, Mod.MODID); public static final DeferredHolder SANDBAG = REGISTRY.register("sandbag", () -> new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.SNARE).sound(SoundType.SAND).strength(10f, 20f))); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModDamageTypes.java b/src/main/java/com/atsuishio/superbwarfare/init/ModDamageTypes.java index 0299b2fed..10e650ec8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModDamageTypes.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModDamageTypes.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.Registries; @@ -17,25 +17,25 @@ import javax.annotation.Nullable; @SuppressWarnings({"OptionalGetWithoutIsPresent", "unused"}) public class ModDamageTypes { - public static final ResourceKey GUN_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("gunfire")); - public static final ResourceKey GUN_FIRE_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("gunfire_absolute")); - public static final ResourceKey GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("gunfire_headshot")); - public static final ResourceKey GUN_FIRE_HEADSHOT_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("gunfire_headshot_absolute")); - public static final ResourceKey BURN = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("burn")); - public static final ResourceKey MINE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("mine")); - public static final ResourceKey BEAST = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("beast")); - public static final ResourceKey SHOCK = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("shock")); - public static final ResourceKey PROJECTILE_BOOM = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("projectile_boom")); - public static final ResourceKey CANNON_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("cannon_fire")); - public static final ResourceKey CUSTOM_EXPLOSION = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("custom_explosion")); - public static final ResourceKey DRONE_HIT = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("drone_hit")); - public static final ResourceKey LASER = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("laser")); - public static final ResourceKey LASER_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("laser_headshot")); - public static final ResourceKey LASER_STATIC = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("laser_static")); - public static final ResourceKey VEHICLE_STRIKE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("vehicle_strike")); - public static final ResourceKey AIR_CRASH = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("air_crash")); - public static final ResourceKey LUNGE_MINE = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("lunge_mine")); - public static final ResourceKey VEHICLE_EXPLOSION = ResourceKey.create(Registries.DAMAGE_TYPE, ModUtils.loc("vehicle_explosion")); + public static final ResourceKey GUN_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("gunfire")); + public static final ResourceKey GUN_FIRE_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("gunfire_absolute")); + public static final ResourceKey GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("gunfire_headshot")); + public static final ResourceKey GUN_FIRE_HEADSHOT_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("gunfire_headshot_absolute")); + public static final ResourceKey BURN = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("burn")); + public static final ResourceKey MINE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("mine")); + public static final ResourceKey BEAST = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("beast")); + public static final ResourceKey SHOCK = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("shock")); + public static final ResourceKey PROJECTILE_BOOM = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("projectile_boom")); + public static final ResourceKey CANNON_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("cannon_fire")); + public static final ResourceKey CUSTOM_EXPLOSION = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("custom_explosion")); + public static final ResourceKey DRONE_HIT = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("drone_hit")); + public static final ResourceKey LASER = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("laser")); + public static final ResourceKey LASER_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("laser_headshot")); + public static final ResourceKey LASER_STATIC = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("laser_static")); + public static final ResourceKey VEHICLE_STRIKE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("vehicle_strike")); + public static final ResourceKey AIR_CRASH = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("air_crash")); + public static final ResourceKey LUNGE_MINE = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("lunge_mine")); + public static final ResourceKey VEHICLE_EXPLOSION = ResourceKey.create(Registries.DAMAGE_TYPE, Mod.loc("vehicle_explosion")); public static DamageSource causeGunFireDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE), directEntity, attacker); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java b/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java index 0eb22181a..2af4b8682 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.server.SpawnConfig; import com.atsuishio.superbwarfare.entity.ClaymoreEntity; import com.atsuishio.superbwarfare.entity.MortarEntity; @@ -23,7 +23,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class ModEntities { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.ENTITY_TYPE, ModUtils.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.ENTITY_TYPE, Mod.MODID); // Living Entities public static final DeferredHolder, EntityType> TARGET = register("target", diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModEntityRenderers.java b/src/main/java/com/atsuishio/superbwarfare/init/ModEntityRenderers.java index 1a612dffc..23e8e1d42 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModEntityRenderers.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModEntityRenderers.java @@ -1,13 +1,13 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.entity.*; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.EntityRenderersEvent; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ModEntityRenderers { @SubscribeEvent diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index fa60b44b1..b4bd8ae96 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.*; import com.atsuishio.superbwarfare.item.armor.*; import com.atsuishio.superbwarfare.item.common.BlueprintItem; @@ -48,7 +48,7 @@ public class ModItems { /** * guns */ - public static final DeferredRegister GUNS = DeferredRegister.create(BuiltInRegistries.ITEM, ModUtils.MODID); + public static final DeferredRegister GUNS = DeferredRegister.create(BuiltInRegistries.ITEM, Mod.MODID); public static final DeferredHolder TASER = GUNS.register("taser", TaserItem::new); public static final DeferredHolder GLOCK_17 = GUNS.register("glock_17", Glock17Item::new); @@ -88,7 +88,7 @@ public class ModItems { /** * Ammo */ - public static final DeferredRegister AMMO = DeferredRegister.create(BuiltInRegistries.ITEM, ModUtils.MODID); + public static final DeferredRegister AMMO = DeferredRegister.create(BuiltInRegistries.ITEM, Mod.MODID); public static final DeferredHolder HANDGUN_AMMO = AMMO.register("handgun_ammo", () -> new AmmoSupplierItem(AmmoType.HANDGUN, 1, new Item.Properties())); public static final DeferredHolder RIFLE_AMMO = AMMO.register("rifle_ammo", () -> new AmmoSupplierItem(AmmoType.RIFLE, 1, new Item.Properties())); @@ -122,7 +122,7 @@ public class ModItems { /** * items */ - public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, ModUtils.MODID); + public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, Mod.MODID); public static final DeferredHolder CONTAINER = ITEMS.register("container", ContainerBlockItem::new); public static final DeferredHolder SMALL_CONTAINER = ITEMS.register("small_container", SmallContainerBlockItem::new); @@ -255,7 +255,7 @@ public class ModItems { /** * Block */ - public static final DeferredRegister BLOCKS = DeferredRegister.create(BuiltInRegistries.ITEM, ModUtils.MODID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(BuiltInRegistries.ITEM, Mod.MODID); public static final DeferredHolder GALENA_ORE = block(ModBlocks.GALENA_ORE); public static final DeferredHolder DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); @@ -280,7 +280,7 @@ public class ModItems { /** * Perk Items */ - public static final DeferredRegister PERKS = DeferredRegister.create(BuiltInRegistries.ITEM, ModUtils.MODID); + public static final DeferredRegister PERKS = DeferredRegister.create(BuiltInRegistries.ITEM, Mod.MODID); public static void registerPerkItems() { ModPerks.AMMO_PERKS.getEntries().stream().filter(p -> p != ModPerks.AP_BULLET) diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java b/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java index 00249b2cd..7e89afefb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModKeyMappings.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.network.message.send.BreathMessage; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; @@ -15,7 +15,7 @@ import net.neoforged.neoforge.client.settings.KeyModifier; import net.neoforged.neoforge.network.PacketDistributor; import org.lwjgl.glfw.GLFW; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ModKeyMappings { public static final KeyMapping RELOAD = new KeyMapping("key.superbwarfare.reload", GLFW.GLFW_KEY_R, "key.categories.superbwarfare"); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java b/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java index 1edf074cd..de517072b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModLootModifier.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.mojang.serialization.MapCodec; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -9,7 +9,7 @@ import net.neoforged.neoforge.common.loot.IGlobalLootModifier; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.NeoForgeRegistries; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class ModLootModifier { // TODO loot table modifier // public static class TargetModLootTableModifier extends LootModifier { @@ -39,7 +39,7 @@ public class ModLootModifier { //// } // } - public static final DeferredRegister> LOOT_MODIFIERS = DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, ModUtils.MODID); + public static final DeferredRegister> LOOT_MODIFIERS = DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, Mod.MODID); // public static final DeferredHolder, Codec> LOOT_MODIFIER = LOOT_MODIFIERS.register(ModUtils.MODID + "_loot_modifier", TargetModLootTableModifier.CODEC); @SubscribeEvent diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModMenuTypes.java b/src/main/java/com/atsuishio/superbwarfare/init/ModMenuTypes.java index 9ac0de46d..2242c7948 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModMenuTypes.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModMenuTypes.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.menu.ChargingStationMenu; import com.atsuishio.superbwarfare.menu.FuMO25Menu; import com.atsuishio.superbwarfare.menu.ReforgingTableMenu; @@ -14,7 +14,7 @@ import java.util.function.Supplier; public class ModMenuTypes { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.MENU, ModUtils.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.MENU, Mod.MODID); public static final Supplier> REFORGING_TABLE_MENU = REGISTRY.register("reforging_table_menu", diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModMobEffects.java b/src/main/java/com/atsuishio/superbwarfare/init/ModMobEffects.java index 57cc216da..2ebaeddb4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModMobEffects.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModMobEffects.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.mobeffect.BurnMobEffect; import com.atsuishio.superbwarfare.mobeffect.ShockMobEffect; import net.minecraft.core.registries.BuiltInRegistries; @@ -9,7 +9,7 @@ import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; public class ModMobEffects { - public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.MOB_EFFECT, ModUtils.MODID); + public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.MOB_EFFECT, Mod.MODID); public static final DeferredHolder SHOCK = REGISTRY.register("shock", ShockMobEffect::new); public static final DeferredHolder BURN = REGISTRY.register("burn", BurnMobEffect::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModParticleTypes.java b/src/main/java/com/atsuishio/superbwarfare/init/ModParticleTypes.java index 17f501aa8..db1276f5c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModParticleTypes.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModParticleTypes.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.core.registries.BuiltInRegistries; @@ -8,7 +8,7 @@ import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; public class ModParticleTypes { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, ModUtils.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, Mod.MODID); public static final DeferredHolder, SimpleParticleType> FIRE_STAR = REGISTRY.register("fire_star", () -> new SimpleParticleType(false)); public static final DeferredHolder, SimpleParticleType> BULLET_HOLE = REGISTRY.register("bullet_hole", () -> new SimpleParticleType(false)); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java b/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java index bac526f0f..12c0b7e0c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import net.minecraft.resources.ResourceKey; @@ -19,13 +19,13 @@ public class ModPerks { @SubscribeEvent public static void registry(NewRegistryEvent event) { - event.create(new RegistryBuilder(ResourceKey.createRegistryKey(ModUtils.loc("perk")))); + event.create(new RegistryBuilder(ResourceKey.createRegistryKey(Mod.loc("perk")))); } /** * Ammo Perks */ - public static final DeferredRegister AMMO_PERKS = DeferredRegister.create(ModUtils.loc("perk"), ModUtils.MODID); + public static final DeferredRegister AMMO_PERKS = DeferredRegister.create(Mod.loc("perk"), Mod.MODID); public static final DeferredHolder AP_BULLET = AMMO_PERKS.register("ap_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("ap_bullet", Perk.Type.AMMO).bypassArmorRate(0.4f).damageRate(0.9f).speedRate(1.2f).slug(true).rgb(230, 70, 35))); @@ -50,7 +50,7 @@ public class ModPerks { /** * Functional Perks */ - public static final DeferredRegister FUNC_PERKS = DeferredRegister.create(ModUtils.loc("perk"), ModUtils.MODID); + public static final DeferredRegister FUNC_PERKS = DeferredRegister.create(Mod.loc("perk"), Mod.MODID); public static final DeferredHolder HEAL_CLIP = FUNC_PERKS.register("heal_clip", () -> new Perk("heal_clip", Perk.Type.FUNCTIONAL)); public static final DeferredHolder FOURTH_TIMES_CHARM = FUNC_PERKS.register("fourth_times_charm", () -> new Perk("fourth_times_charm", Perk.Type.FUNCTIONAL)); @@ -64,7 +64,7 @@ public class ModPerks { /** * Damage Perks */ - public static final DeferredRegister DAMAGE_PERKS = DeferredRegister.create(ModUtils.loc("perk"), ModUtils.MODID); + public static final DeferredRegister DAMAGE_PERKS = DeferredRegister.create(Mod.loc("perk"), Mod.MODID); public static final DeferredHolder KILL_CLIP = DAMAGE_PERKS.register("kill_clip", () -> new Perk("kill_clip", Perk.Type.DAMAGE)); public static final DeferredHolder GUTSHOT_STRAIGHT = DAMAGE_PERKS.register("gutshot_straight", () -> new Perk("gutshot_straight", Perk.Type.DAMAGE)); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModPotion.java b/src/main/java/com/atsuishio/superbwarfare/init/ModPotion.java index 972dcc8b9..503654f59 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModPotion.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModPotion.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.alchemy.Potion; @@ -9,7 +9,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; @SuppressWarnings("unused") public class ModPotion { - public static final DeferredRegister POTIONS = DeferredRegister.create(BuiltInRegistries.POTION, ModUtils.MODID); + public static final DeferredRegister POTIONS = DeferredRegister.create(BuiltInRegistries.POTION, Mod.MODID); public static final DeferredHolder SHOCK = POTIONS.register("superbwarfare_shock", () -> new Potion(new MobEffectInstance(ModMobEffects.SHOCK, 100, 0))); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModRecipes.java b/src/main/java/com/atsuishio/superbwarfare/init/ModRecipes.java index 09a9a9d01..e4bb94436 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModRecipes.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModRecipes.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.crafting.RecipeSerializer; import net.neoforged.neoforge.registries.DeferredRegister; @@ -8,7 +8,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; @SuppressWarnings("unused") public class ModRecipes { // TODO recipes - public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(BuiltInRegistries.RECIPE_SERIALIZER, ModUtils.MODID); + public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(BuiltInRegistries.RECIPE_SERIALIZER, Mod.MODID); // public static final RegistryObject> POTION_MORTAR_SHELL_SERIALIZER = // RECIPE_SERIALIZERS.register("potion_mortar_shell", () -> new SimpleCraftingRecipeSerializer<>(PotionMortarShellRecipe::new)); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModScreens.java b/src/main/java/com/atsuishio/superbwarfare/init/ModScreens.java index f8f33d501..7ef1fa0cb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModScreens.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModScreens.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.screens.ChargingStationScreen; import com.atsuishio.superbwarfare.client.screens.FuMO25Screen; import com.atsuishio.superbwarfare.client.screens.ReforgingTableScreen; @@ -10,7 +10,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ModScreens { @SubscribeEvent diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModSerializers.java b/src/main/java/com/atsuishio/superbwarfare/init/ModSerializers.java index b6a4b3e44..46ed91a28 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModSerializers.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModSerializers.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.syncher.EntityDataSerializer; import net.neoforged.neoforge.registries.DeferredHolder; @@ -11,7 +11,7 @@ import java.util.List; public class ModSerializers { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(NeoForgeRegistries.Keys.ENTITY_DATA_SERIALIZERS, ModUtils.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(NeoForgeRegistries.Keys.ENTITY_DATA_SERIALIZERS, Mod.MODID); public static final DeferredHolder, EntityDataSerializer>> INT_LIST_SERIALIZER = REGISTRY.register("int_list_serializer", () -> EntityDataSerializer.forValueType(ByteBufCodecs.VAR_INT.apply(ByteBufCodecs.list())) diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java index 73c012b57..19f68bc1a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.sounds.SoundEvent; import net.neoforged.neoforge.registries.DeferredHolder; @@ -9,423 +9,423 @@ import net.neoforged.neoforge.registries.DeferredRegister; @SuppressWarnings("unused") public class ModSounds { - public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.SOUND_EVENT, ModUtils.MODID); + public static final DeferredRegister REGISTRY = DeferredRegister.create(BuiltInRegistries.SOUND_EVENT, Mod.MODID); - public static final DeferredHolder TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("taser_fire_1p"))); - public static final DeferredHolder TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("taser_fire_3p"))); - public static final DeferredHolder TASER_RELOAD_EMPTY = REGISTRY.register("taser_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("taser_reload_empty"))); + public static final DeferredHolder TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("taser_fire_1p"))); + public static final DeferredHolder TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("taser_fire_3p"))); + public static final DeferredHolder TASER_RELOAD_EMPTY = REGISTRY.register("taser_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("taser_reload_empty"))); - public static final DeferredHolder SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("shock"))); - public static final DeferredHolder ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("electric"))); + public static final DeferredHolder SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(Mod.loc("shock"))); + public static final DeferredHolder ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(Mod.loc("electric"))); - public static final DeferredHolder TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_fire_1p"))); - public static final DeferredHolder TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_fire_3p"))); - public static final DeferredHolder TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_far"))); - public static final DeferredHolder TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_veryfar"))); + public static final DeferredHolder TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_fire_1p"))); + public static final DeferredHolder TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_fire_3p"))); + public static final DeferredHolder TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_far"))); + public static final DeferredHolder TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_veryfar"))); - public static final DeferredHolder TRACHELIUM_FIRE_1P_S = REGISTRY.register("trachelium_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_fire_1p_s"))); - public static final DeferredHolder TRACHELIUM_FIRE_3P_S = REGISTRY.register("trachelium_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_fire_3p_s"))); - public static final DeferredHolder TRACHELIUM_FAR_S = REGISTRY.register("trachelium_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_far_s"))); - public static final DeferredHolder TRACHELIUM_RELOAD_EMPTY = REGISTRY.register("trachelium_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_reload_empty"))); - public static final DeferredHolder TRACHELIUM_BOLT = REGISTRY.register("trachelium_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("trachelium_bolt"))); + public static final DeferredHolder TRACHELIUM_FIRE_1P_S = REGISTRY.register("trachelium_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_fire_1p_s"))); + public static final DeferredHolder TRACHELIUM_FIRE_3P_S = REGISTRY.register("trachelium_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_fire_3p_s"))); + public static final DeferredHolder TRACHELIUM_FAR_S = REGISTRY.register("trachelium_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_far_s"))); + public static final DeferredHolder TRACHELIUM_RELOAD_EMPTY = REGISTRY.register("trachelium_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_reload_empty"))); + public static final DeferredHolder TRACHELIUM_BOLT = REGISTRY.register("trachelium_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("trachelium_bolt"))); - public static final DeferredHolder TRIGGER_CLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("triggerclick"))); - public static final DeferredHolder HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hit"))); - public static final DeferredHolder TARGET_DOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("targetdown"))); - public static final DeferredHolder INDICATION = REGISTRY.register("indication", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("indication"))); - public static final DeferredHolder INDICATION_VEHICLE = REGISTRY.register("indication_vehicle", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("indication_vehicle"))); - public static final DeferredHolder JUMP = REGISTRY.register("jump", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("jump"))); - public static final DeferredHolder DOUBLE_JUMP = REGISTRY.register("doublejump", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("doublejump"))); + public static final DeferredHolder TRIGGER_CLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(Mod.loc("triggerclick"))); + public static final DeferredHolder HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hit"))); + public static final DeferredHolder TARGET_DOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(Mod.loc("targetdown"))); + public static final DeferredHolder INDICATION = REGISTRY.register("indication", () -> SoundEvent.createVariableRangeEvent(Mod.loc("indication"))); + public static final DeferredHolder INDICATION_VEHICLE = REGISTRY.register("indication_vehicle", () -> SoundEvent.createVariableRangeEvent(Mod.loc("indication_vehicle"))); + public static final DeferredHolder JUMP = REGISTRY.register("jump", () -> SoundEvent.createVariableRangeEvent(Mod.loc("jump"))); + public static final DeferredHolder DOUBLE_JUMP = REGISTRY.register("doublejump", () -> SoundEvent.createVariableRangeEvent(Mod.loc("doublejump"))); - public static final DeferredHolder EXPLOSION_CLOSE = REGISTRY.register("explosion_close", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("explosion_close"))); - public static final DeferredHolder EXPLOSION_FAR = REGISTRY.register("explosion_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("explosion_far"))); - public static final DeferredHolder EXPLOSION_VERY_FAR = REGISTRY.register("explosion_very_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("explosion_very_far"))); - public static final DeferredHolder HUGE_EXPLOSION_CLOSE = REGISTRY.register("huge_explosion_close", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("huge_explosion_close"))); - public static final DeferredHolder HUGE_EXPLOSION_FAR = REGISTRY.register("huge_explosion_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("huge_explosion_far"))); - public static final DeferredHolder HUGE_EXPLOSION_VERY_FAR = REGISTRY.register("huge_explosion_very_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("huge_explosion_very_far"))); - public static final DeferredHolder EXPLOSION_WATER = REGISTRY.register("explosion_water", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("explosion_water"))); + public static final DeferredHolder EXPLOSION_CLOSE = REGISTRY.register("explosion_close", () -> SoundEvent.createVariableRangeEvent(Mod.loc("explosion_close"))); + public static final DeferredHolder EXPLOSION_FAR = REGISTRY.register("explosion_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("explosion_far"))); + public static final DeferredHolder EXPLOSION_VERY_FAR = REGISTRY.register("explosion_very_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("explosion_very_far"))); + public static final DeferredHolder HUGE_EXPLOSION_CLOSE = REGISTRY.register("huge_explosion_close", () -> SoundEvent.createVariableRangeEvent(Mod.loc("huge_explosion_close"))); + public static final DeferredHolder HUGE_EXPLOSION_FAR = REGISTRY.register("huge_explosion_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("huge_explosion_far"))); + public static final DeferredHolder HUGE_EXPLOSION_VERY_FAR = REGISTRY.register("huge_explosion_very_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("huge_explosion_very_far"))); + public static final DeferredHolder EXPLOSION_WATER = REGISTRY.register("explosion_water", () -> SoundEvent.createVariableRangeEvent(Mod.loc("explosion_water"))); - public static final DeferredHolder HUNTING_RIFLE_FIRE_1P = REGISTRY.register("hunting_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hunting_rifle_fire_1p"))); - public static final DeferredHolder HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hunting_rifle_fire_3p"))); - public static final DeferredHolder HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hunting_rifle_far"))); - public static final DeferredHolder HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hunting_rifle_veryfar"))); - public static final DeferredHolder HUNTING_RIFLE_RELOAD_EMPTY = REGISTRY.register("hunting_rifle_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hunting_rifle_reload_empty"))); + public static final DeferredHolder HUNTING_RIFLE_FIRE_1P = REGISTRY.register("hunting_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hunting_rifle_fire_1p"))); + public static final DeferredHolder HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hunting_rifle_fire_3p"))); + public static final DeferredHolder HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hunting_rifle_far"))); + public static final DeferredHolder HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hunting_rifle_veryfar"))); + public static final DeferredHolder HUNTING_RIFLE_RELOAD_EMPTY = REGISTRY.register("hunting_rifle_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hunting_rifle_reload_empty"))); - public static final DeferredHolder OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ouch"))); - public static final DeferredHolder STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("step"))); - public static final DeferredHolder GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("growl"))); - public static final DeferredHolder IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("idle"))); - public static final DeferredHolder HENG = REGISTRY.register("heng", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heng"))); + public static final DeferredHolder OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ouch"))); + public static final DeferredHolder STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(Mod.loc("step"))); + public static final DeferredHolder GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(Mod.loc("growl"))); + public static final DeferredHolder IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(Mod.loc("idle"))); + public static final DeferredHolder HENG = REGISTRY.register("heng", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heng"))); - public static final DeferredHolder M_79_FIRE_1P = REGISTRY.register("m_79_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_79_fire_1p"))); - public static final DeferredHolder M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_79_fire_3p"))); - public static final DeferredHolder M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_79_far"))); - public static final DeferredHolder M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_79_veryfar"))); - public static final DeferredHolder M_79_RELOAD_EMPTY = REGISTRY.register("m_79_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_79_reload_empty"))); + public static final DeferredHolder M_79_FIRE_1P = REGISTRY.register("m_79_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_79_fire_1p"))); + public static final DeferredHolder M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_79_fire_3p"))); + public static final DeferredHolder M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_79_far"))); + public static final DeferredHolder M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_79_veryfar"))); + public static final DeferredHolder M_79_RELOAD_EMPTY = REGISTRY.register("m_79_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_79_reload_empty"))); - public static final DeferredHolder SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_fire_1p"))); - public static final DeferredHolder SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_fire_3p"))); - public static final DeferredHolder SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_reload_normal"))); - public static final DeferredHolder SKS_RELOAD_EMPTY = REGISTRY.register("sks_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_reload_empty"))); - public static final DeferredHolder SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_far"))); - public static final DeferredHolder SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sks_veryfar"))); + public static final DeferredHolder SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_fire_1p"))); + public static final DeferredHolder SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_fire_3p"))); + public static final DeferredHolder SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_reload_normal"))); + public static final DeferredHolder SKS_RELOAD_EMPTY = REGISTRY.register("sks_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_reload_empty"))); + public static final DeferredHolder SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_far"))); + public static final DeferredHolder SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sks_veryfar"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_FIRE_1P = REGISTRY.register("homemade_shotgun_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_fire_1p"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_FIRE_3P = REGISTRY.register("homemade_shotgun_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_fire_3p"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_FAR = REGISTRY.register("homemade_shotgun_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_far"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_VERYFAR = REGISTRY.register("homemade_shotgun_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_veryfar"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_NORMAL = REGISTRY.register("homemade_shotgun_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_reload_normal"))); - public static final DeferredHolder HOMEMADE_SHOTGUN_RELOAD_EMPTY = REGISTRY.register("homemade_shotgun_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("homemade_shotgun_reload_empty"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_FIRE_1P = REGISTRY.register("homemade_shotgun_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_fire_1p"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_FIRE_3P = REGISTRY.register("homemade_shotgun_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_fire_3p"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_FAR = REGISTRY.register("homemade_shotgun_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_far"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_VERYFAR = REGISTRY.register("homemade_shotgun_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_veryfar"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_NORMAL = REGISTRY.register("homemade_shotgun_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_reload_normal"))); + public static final DeferredHolder HOMEMADE_SHOTGUN_RELOAD_EMPTY = REGISTRY.register("homemade_shotgun_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("homemade_shotgun_reload_empty"))); - public static final DeferredHolder AK_47_FIRE_1P = REGISTRY.register("ak_47_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_1p"))); - public static final DeferredHolder AK_47_FIRE_3P = REGISTRY.register("ak_47_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_3p"))); - public static final DeferredHolder AK_47_FIRE_1P_S = REGISTRY.register("ak_47_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_1p_s"))); - public static final DeferredHolder AK_47_FIRE_3P_S = REGISTRY.register("ak_47_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_fire_3p_s"))); - public static final DeferredHolder AK_47_FAR = REGISTRY.register("ak_47_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_far"))); - public static final DeferredHolder AK_47_VERYFAR = REGISTRY.register("ak_47_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_veryfar"))); - public static final DeferredHolder AK_47_FAR_S = REGISTRY.register("ak_47_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far_s"))); - public static final DeferredHolder AK_47_VERYFAR_S = REGISTRY.register("ak_47_veryfar_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar_s"))); - public static final DeferredHolder AK_47_RELOAD_NORMAL = REGISTRY.register("ak_47_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_reload_normal"))); - public static final DeferredHolder AK_47_RELOAD_EMPTY = REGISTRY.register("ak_47_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_47_reload_empty"))); + public static final DeferredHolder AK_47_FIRE_1P = REGISTRY.register("ak_47_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_fire_1p"))); + public static final DeferredHolder AK_47_FIRE_3P = REGISTRY.register("ak_47_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_fire_3p"))); + public static final DeferredHolder AK_47_FIRE_1P_S = REGISTRY.register("ak_47_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_fire_1p_s"))); + public static final DeferredHolder AK_47_FIRE_3P_S = REGISTRY.register("ak_47_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_fire_3p_s"))); + public static final DeferredHolder AK_47_FAR = REGISTRY.register("ak_47_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_far"))); + public static final DeferredHolder AK_47_VERYFAR = REGISTRY.register("ak_47_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_veryfar"))); + public static final DeferredHolder AK_47_FAR_S = REGISTRY.register("ak_47_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far_s"))); + public static final DeferredHolder AK_47_VERYFAR_S = REGISTRY.register("ak_47_veryfar_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar_s"))); + public static final DeferredHolder AK_47_RELOAD_NORMAL = REGISTRY.register("ak_47_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_reload_normal"))); + public static final DeferredHolder AK_47_RELOAD_EMPTY = REGISTRY.register("ak_47_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_47_reload_empty"))); - public static final DeferredHolder AK_12_FIRE_1P = REGISTRY.register("ak_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_fire_1p"))); - public static final DeferredHolder AK_12_FIRE_3P = REGISTRY.register("ak_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_fire_3p"))); - public static final DeferredHolder AK_12_FIRE_1P_S = REGISTRY.register("ak_12_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_fire_1p_s"))); - public static final DeferredHolder AK_12_FIRE_3P_S = REGISTRY.register("ak_12_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_fire_3p_s"))); - public static final DeferredHolder AK_12_FAR = REGISTRY.register("ak_12_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far"))); - public static final DeferredHolder AK_12_VERYFAR = REGISTRY.register("ak_12_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar"))); - public static final DeferredHolder AK_12_FAR_S = REGISTRY.register("ak_12_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far_s"))); - public static final DeferredHolder AK_12_VERYFAR_S = REGISTRY.register("ak_12_veryfar_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar_s"))); - public static final DeferredHolder AK_12_RELOAD_NORMAL = REGISTRY.register("ak_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_reload_normal"))); - public static final DeferredHolder AK_12_RELOAD_EMPTY = REGISTRY.register("ak_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_reload_empty"))); + public static final DeferredHolder AK_12_FIRE_1P = REGISTRY.register("ak_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_fire_1p"))); + public static final DeferredHolder AK_12_FIRE_3P = REGISTRY.register("ak_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_fire_3p"))); + public static final DeferredHolder AK_12_FIRE_1P_S = REGISTRY.register("ak_12_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_fire_1p_s"))); + public static final DeferredHolder AK_12_FIRE_3P_S = REGISTRY.register("ak_12_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_fire_3p_s"))); + public static final DeferredHolder AK_12_FAR = REGISTRY.register("ak_12_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far"))); + public static final DeferredHolder AK_12_VERYFAR = REGISTRY.register("ak_12_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar"))); + public static final DeferredHolder AK_12_FAR_S = REGISTRY.register("ak_12_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far_s"))); + public static final DeferredHolder AK_12_VERYFAR_S = REGISTRY.register("ak_12_veryfar_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar_s"))); + public static final DeferredHolder AK_12_RELOAD_NORMAL = REGISTRY.register("ak_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_reload_normal"))); + public static final DeferredHolder AK_12_RELOAD_EMPTY = REGISTRY.register("ak_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_reload_empty"))); - public static final DeferredHolder LAND = REGISTRY.register("land", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("land"))); - public static final DeferredHolder HEADSHOT = REGISTRY.register("headshot", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("headshot"))); + public static final DeferredHolder LAND = REGISTRY.register("land", () -> SoundEvent.createVariableRangeEvent(Mod.loc("land"))); + public static final DeferredHolder HEADSHOT = REGISTRY.register("headshot", () -> SoundEvent.createVariableRangeEvent(Mod.loc("headshot"))); - public static final DeferredHolder DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_fire_1p"))); - public static final DeferredHolder DEVOTION_FIRE_3P = REGISTRY.register("devotion_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_fire_3p"))); - public static final DeferredHolder DEVOTION_FAR = REGISTRY.register("devotion_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_far"))); - public static final DeferredHolder DEVOTION_VERYFAR = REGISTRY.register("devotion_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_veryfar"))); - public static final DeferredHolder DEVOTION_RELOAD_NORMAL = REGISTRY.register("devotion_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_reload_normal"))); - public static final DeferredHolder DEVOTION_RELOAD_EMPTY = REGISTRY.register("devotion_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("devotion_reload_empty"))); + public static final DeferredHolder DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_fire_1p"))); + public static final DeferredHolder DEVOTION_FIRE_3P = REGISTRY.register("devotion_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_fire_3p"))); + public static final DeferredHolder DEVOTION_FAR = REGISTRY.register("devotion_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_far"))); + public static final DeferredHolder DEVOTION_VERYFAR = REGISTRY.register("devotion_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_veryfar"))); + public static final DeferredHolder DEVOTION_RELOAD_NORMAL = REGISTRY.register("devotion_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_reload_normal"))); + public static final DeferredHolder DEVOTION_RELOAD_EMPTY = REGISTRY.register("devotion_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("devotion_reload_empty"))); - public static final DeferredHolder RPG_FIRE_1P = REGISTRY.register("rpg_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpg_fire_1p"))); - public static final DeferredHolder RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpg_fire_3p"))); - public static final DeferredHolder RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpg_far"))); - public static final DeferredHolder RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpg_veryfar"))); - public static final DeferredHolder RPG_RELOAD_EMPTY = REGISTRY.register("rpg_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpg_reload_empty"))); + public static final DeferredHolder RPG_FIRE_1P = REGISTRY.register("rpg_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpg_fire_1p"))); + public static final DeferredHolder RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpg_fire_3p"))); + public static final DeferredHolder RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpg_far"))); + public static final DeferredHolder RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpg_veryfar"))); + public static final DeferredHolder RPG_RELOAD_EMPTY = REGISTRY.register("rpg_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpg_reload_empty"))); - public static final DeferredHolder MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mortar_fire"))); - public static final DeferredHolder MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mortar_load"))); - public static final DeferredHolder MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mortar_distant"))); + public static final DeferredHolder MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mortar_fire"))); + public static final DeferredHolder MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mortar_load"))); + public static final DeferredHolder MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mortar_distant"))); - public static final DeferredHolder FIRE_RATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("firerate"))); + public static final DeferredHolder FIRE_RATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(Mod.loc("firerate"))); - public static final DeferredHolder M_4_FIRE_1P = REGISTRY.register("m_4_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_fire_1p"))); - public static final DeferredHolder M_4_FIRE_3P = REGISTRY.register("m_4_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_fire_3p"))); - public static final DeferredHolder M_4_FIRE_1P_S = REGISTRY.register("m_4_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_fire_1p_s"))); - public static final DeferredHolder M_4_FIRE_3P_S = REGISTRY.register("m_4_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_fire_3p_s"))); - public static final DeferredHolder M_4_FAR = REGISTRY.register("m_4_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_far"))); - public static final DeferredHolder M_4_VERYFAR = REGISTRY.register("m_4_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_veryfar"))); - public static final DeferredHolder M_4_RELOAD_NORMAL = REGISTRY.register("m_4_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_reload_normal"))); - public static final DeferredHolder M_4_RELOAD_EMPTY = REGISTRY.register("m_4_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_4_reload_empty"))); - public static final DeferredHolder M_4_FAR_S = REGISTRY.register("m_4_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far_s"))); - public static final DeferredHolder M_4_VERYFAR_S = REGISTRY.register("m_4_veryfar_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar_s"))); + public static final DeferredHolder M_4_FIRE_1P = REGISTRY.register("m_4_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_fire_1p"))); + public static final DeferredHolder M_4_FIRE_3P = REGISTRY.register("m_4_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_fire_3p"))); + public static final DeferredHolder M_4_FIRE_1P_S = REGISTRY.register("m_4_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_fire_1p_s"))); + public static final DeferredHolder M_4_FIRE_3P_S = REGISTRY.register("m_4_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_fire_3p_s"))); + public static final DeferredHolder M_4_FAR = REGISTRY.register("m_4_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_far"))); + public static final DeferredHolder M_4_VERYFAR = REGISTRY.register("m_4_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_veryfar"))); + public static final DeferredHolder M_4_RELOAD_NORMAL = REGISTRY.register("m_4_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_reload_normal"))); + public static final DeferredHolder M_4_RELOAD_EMPTY = REGISTRY.register("m_4_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_4_reload_empty"))); + public static final DeferredHolder M_4_FAR_S = REGISTRY.register("m_4_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far_s"))); + public static final DeferredHolder M_4_VERYFAR_S = REGISTRY.register("m_4_veryfar_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar_s"))); - public static final DeferredHolder AA_12_FIRE_1P = REGISTRY.register("aa_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_fire_1p"))); - public static final DeferredHolder AA_12_FIRE_3P = REGISTRY.register("aa_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_fire_3p"))); - public static final DeferredHolder AA_12_FAR = REGISTRY.register("aa_12_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_far"))); - public static final DeferredHolder AA_12_VERYFAR = REGISTRY.register("aa_12_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_veryfar"))); - public static final DeferredHolder AA_12_RELOAD_NORMAL = REGISTRY.register("aa_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_reload_normal"))); - public static final DeferredHolder AA_12_RELOAD_EMPTY = REGISTRY.register("aa_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("aa_12_reload_empty"))); + public static final DeferredHolder AA_12_FIRE_1P = REGISTRY.register("aa_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_fire_1p"))); + public static final DeferredHolder AA_12_FIRE_3P = REGISTRY.register("aa_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_fire_3p"))); + public static final DeferredHolder AA_12_FAR = REGISTRY.register("aa_12_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_far"))); + public static final DeferredHolder AA_12_VERYFAR = REGISTRY.register("aa_12_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_veryfar"))); + public static final DeferredHolder AA_12_RELOAD_NORMAL = REGISTRY.register("aa_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_reload_normal"))); + public static final DeferredHolder AA_12_RELOAD_EMPTY = REGISTRY.register("aa_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("aa_12_reload_empty"))); - public static final DeferredHolder BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_zoom_fire_1p"))); - public static final DeferredHolder BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_zoom_fire_3p"))); - public static final DeferredHolder BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_shatter_cap_fire_1p"))); - public static final DeferredHolder BOCEK_SHATTER_CAP_FIRE_3P = REGISTRY.register("bocek_shatter_cap_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_shatter_cap_fire_3p"))); - public static final DeferredHolder BOCEK_PULL_1P = REGISTRY.register("bocek_pull_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_pull_1p"))); - public static final DeferredHolder BOCEK_PULL_3P = REGISTRY.register("bocek_pull_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bocek_pull_3p"))); + public static final DeferredHolder BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_zoom_fire_1p"))); + public static final DeferredHolder BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_zoom_fire_3p"))); + public static final DeferredHolder BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_shatter_cap_fire_1p"))); + public static final DeferredHolder BOCEK_SHATTER_CAP_FIRE_3P = REGISTRY.register("bocek_shatter_cap_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_shatter_cap_fire_3p"))); + public static final DeferredHolder BOCEK_PULL_1P = REGISTRY.register("bocek_pull_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_pull_1p"))); + public static final DeferredHolder BOCEK_PULL_3P = REGISTRY.register("bocek_pull_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bocek_pull_3p"))); - public static final DeferredHolder HK_416_FIRE_1P = REGISTRY.register("hk_416_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_fire_1p"))); - public static final DeferredHolder HK_416_FIRE_3P = REGISTRY.register("hk_416_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_fire_3p"))); - public static final DeferredHolder HK_416_FIRE_1P_S = REGISTRY.register("hk_416_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_fire_1p_s"))); - public static final DeferredHolder HK_416_FIRE_3P_S = REGISTRY.register("hk_416_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_fire_3p_s"))); - public static final DeferredHolder HK_416_FAR = REGISTRY.register("hk_416_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_far"))); - public static final DeferredHolder HK_416_VERYFAR = REGISTRY.register("hk_416_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_veryfar"))); - public static final DeferredHolder HK_416_RELOAD_NORMAL = REGISTRY.register("hk_416_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_reload_normal"))); - public static final DeferredHolder HK_416_RELOAD_EMPTY = REGISTRY.register("hk_416_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("hk_416_reload_empty"))); - public static final DeferredHolder HK_416_FAR_S = REGISTRY.register("hk_416_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far_s"))); - public static final DeferredHolder HK_416_VERYFAR_S = REGISTRY.register("hk_416_veryfar_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar_s"))); + public static final DeferredHolder HK_416_FIRE_1P = REGISTRY.register("hk_416_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_fire_1p"))); + public static final DeferredHolder HK_416_FIRE_3P = REGISTRY.register("hk_416_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_fire_3p"))); + public static final DeferredHolder HK_416_FIRE_1P_S = REGISTRY.register("hk_416_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_fire_1p_s"))); + public static final DeferredHolder HK_416_FIRE_3P_S = REGISTRY.register("hk_416_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_fire_3p_s"))); + public static final DeferredHolder HK_416_FAR = REGISTRY.register("hk_416_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_far"))); + public static final DeferredHolder HK_416_VERYFAR = REGISTRY.register("hk_416_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_veryfar"))); + public static final DeferredHolder HK_416_RELOAD_NORMAL = REGISTRY.register("hk_416_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_reload_normal"))); + public static final DeferredHolder HK_416_RELOAD_EMPTY = REGISTRY.register("hk_416_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("hk_416_reload_empty"))); + public static final DeferredHolder HK_416_FAR_S = REGISTRY.register("hk_416_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far_s"))); + public static final DeferredHolder HK_416_VERYFAR_S = REGISTRY.register("hk_416_veryfar_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar_s"))); - public static final DeferredHolder RPK_FIRE_1P = REGISTRY.register("rpk_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_fire_1p"))); - public static final DeferredHolder RPK_FIRE_3P = REGISTRY.register("rpk_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_fire_3p"))); - public static final DeferredHolder RPK_FAR = REGISTRY.register("rpk_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_far"))); - public static final DeferredHolder RPK_VERYFAR = REGISTRY.register("rpk_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_veryfar"))); - public static final DeferredHolder RPK_RELOAD_NORMAL = REGISTRY.register("rpk_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_reload_normal"))); - public static final DeferredHolder RPK_RELOAD_EMPTY = REGISTRY.register("rpk_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("rpk_reload_empty"))); + public static final DeferredHolder RPK_FIRE_1P = REGISTRY.register("rpk_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_fire_1p"))); + public static final DeferredHolder RPK_FIRE_3P = REGISTRY.register("rpk_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_fire_3p"))); + public static final DeferredHolder RPK_FAR = REGISTRY.register("rpk_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_far"))); + public static final DeferredHolder RPK_VERYFAR = REGISTRY.register("rpk_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_veryfar"))); + public static final DeferredHolder RPK_RELOAD_NORMAL = REGISTRY.register("rpk_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_reload_normal"))); + public static final DeferredHolder RPK_RELOAD_EMPTY = REGISTRY.register("rpk_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("rpk_reload_empty"))); - public static final DeferredHolder NTW_20_FIRE_1P = REGISTRY.register("ntw_20_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_fire_1p"))); - public static final DeferredHolder NTW_20_FIRE_3P = REGISTRY.register("ntw_20_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_fire_3p"))); - public static final DeferredHolder NTW_20_FAR = REGISTRY.register("ntw_20_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_far"))); - public static final DeferredHolder NTW_20_VERYFAR = REGISTRY.register("ntw_20_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_veryfar"))); - public static final DeferredHolder NTW_20_RELOAD_NORMAL = REGISTRY.register("ntw_20_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_reload_normal"))); - public static final DeferredHolder NTW_20_RELOAD_EMPTY = REGISTRY.register("ntw_20_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_reload_empty"))); - public static final DeferredHolder NTW_20_BOLT = REGISTRY.register("ntw_20_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ntw_20_bolt"))); + public static final DeferredHolder NTW_20_FIRE_1P = REGISTRY.register("ntw_20_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_fire_1p"))); + public static final DeferredHolder NTW_20_FIRE_3P = REGISTRY.register("ntw_20_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_fire_3p"))); + public static final DeferredHolder NTW_20_FAR = REGISTRY.register("ntw_20_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_far"))); + public static final DeferredHolder NTW_20_VERYFAR = REGISTRY.register("ntw_20_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_veryfar"))); + public static final DeferredHolder NTW_20_RELOAD_NORMAL = REGISTRY.register("ntw_20_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_reload_normal"))); + public static final DeferredHolder NTW_20_RELOAD_EMPTY = REGISTRY.register("ntw_20_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_reload_empty"))); + public static final DeferredHolder NTW_20_BOLT = REGISTRY.register("ntw_20_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ntw_20_bolt"))); - public static final DeferredHolder VECTOR_FIRE_1P = REGISTRY.register("vector_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_fire_1p"))); - public static final DeferredHolder VECTOR_FIRE_3P = REGISTRY.register("vector_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_fire_3p"))); - public static final DeferredHolder VECTOR_FAR = REGISTRY.register("vector_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_far"))); - public static final DeferredHolder VECTOR_VERYFAR = REGISTRY.register("vector_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_veryfar"))); - public static final DeferredHolder VECTOR_FIRE_1P_S = REGISTRY.register("vector_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_fire_1p_s"))); - public static final DeferredHolder VECTOR_FIRE_3P_S = REGISTRY.register("vector_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_fire_3p_s"))); - public static final DeferredHolder VECTOR_FAR_S = REGISTRY.register("vector_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_far_s"))); - public static final DeferredHolder VECTOR_RELOAD_NORMAL = REGISTRY.register("vector_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_reload_normal"))); - public static final DeferredHolder VECTOR_RELOAD_EMPTY = REGISTRY.register("vector_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vector_reload_empty"))); + public static final DeferredHolder VECTOR_FIRE_1P = REGISTRY.register("vector_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_fire_1p"))); + public static final DeferredHolder VECTOR_FIRE_3P = REGISTRY.register("vector_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_fire_3p"))); + public static final DeferredHolder VECTOR_FAR = REGISTRY.register("vector_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_far"))); + public static final DeferredHolder VECTOR_VERYFAR = REGISTRY.register("vector_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_veryfar"))); + public static final DeferredHolder VECTOR_FIRE_1P_S = REGISTRY.register("vector_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_fire_1p_s"))); + public static final DeferredHolder VECTOR_FIRE_3P_S = REGISTRY.register("vector_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_fire_3p_s"))); + public static final DeferredHolder VECTOR_FAR_S = REGISTRY.register("vector_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_far_s"))); + public static final DeferredHolder VECTOR_RELOAD_NORMAL = REGISTRY.register("vector_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_reload_normal"))); + public static final DeferredHolder VECTOR_RELOAD_EMPTY = REGISTRY.register("vector_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vector_reload_empty"))); - public static final DeferredHolder MINIGUN_FIRE_1P = REGISTRY.register("minigun_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_fire_1p"))); - public static final DeferredHolder MINIGUN_FIRE_3P = REGISTRY.register("minigun_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_fire_3p"))); - public static final DeferredHolder MINIGUN_FAR = REGISTRY.register("minigun_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_far"))); - public static final DeferredHolder MINIGUN_VERYFAR = REGISTRY.register("minigun_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_veryfar"))); - public static final DeferredHolder MINIGUN_ROT = REGISTRY.register("minigun_rot", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_rot"))); - public static final DeferredHolder MINIGUN_OVERHEAT = REGISTRY.register("minigun_overheat", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("minigun_overheat"))); + public static final DeferredHolder MINIGUN_FIRE_1P = REGISTRY.register("minigun_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_fire_1p"))); + public static final DeferredHolder MINIGUN_FIRE_3P = REGISTRY.register("minigun_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_fire_3p"))); + public static final DeferredHolder MINIGUN_FAR = REGISTRY.register("minigun_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_far"))); + public static final DeferredHolder MINIGUN_VERYFAR = REGISTRY.register("minigun_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_veryfar"))); + public static final DeferredHolder MINIGUN_ROT = REGISTRY.register("minigun_rot", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_rot"))); + public static final DeferredHolder MINIGUN_OVERHEAT = REGISTRY.register("minigun_overheat", () -> SoundEvent.createVariableRangeEvent(Mod.loc("minigun_overheat"))); - public static final DeferredHolder MK_14_FIRE_1P = REGISTRY.register("mk_14_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_fire_1p"))); - public static final DeferredHolder MK_14_FIRE_3P = REGISTRY.register("mk_14_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_fire_3p"))); - public static final DeferredHolder MK_14_FAR = REGISTRY.register("mk_14_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_far"))); - public static final DeferredHolder MK_14_VERYFAR = REGISTRY.register("mk_14_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_veryfar"))); - public static final DeferredHolder MK_14_FIRE_1P_S = REGISTRY.register("mk_14_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_fire_1p_s"))); - public static final DeferredHolder MK_14_FIRE_3P_S = REGISTRY.register("mk_14_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_fire_3p_s"))); - public static final DeferredHolder MK_14_FAR_S = REGISTRY.register("mk_14_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_far_s"))); - public static final DeferredHolder MK_14_RELOAD_NORMAL = REGISTRY.register("mk_14_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_reload_normal"))); - public static final DeferredHolder MK_14_RELOAD_EMPTY = REGISTRY.register("mk_14_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_14_reload_empty"))); + public static final DeferredHolder MK_14_FIRE_1P = REGISTRY.register("mk_14_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_fire_1p"))); + public static final DeferredHolder MK_14_FIRE_3P = REGISTRY.register("mk_14_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_fire_3p"))); + public static final DeferredHolder MK_14_FAR = REGISTRY.register("mk_14_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_far"))); + public static final DeferredHolder MK_14_VERYFAR = REGISTRY.register("mk_14_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_veryfar"))); + public static final DeferredHolder MK_14_FIRE_1P_S = REGISTRY.register("mk_14_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_fire_1p_s"))); + public static final DeferredHolder MK_14_FIRE_3P_S = REGISTRY.register("mk_14_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_fire_3p_s"))); + public static final DeferredHolder MK_14_FAR_S = REGISTRY.register("mk_14_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_far_s"))); + public static final DeferredHolder MK_14_RELOAD_NORMAL = REGISTRY.register("mk_14_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_reload_normal"))); + public static final DeferredHolder MK_14_RELOAD_EMPTY = REGISTRY.register("mk_14_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_14_reload_empty"))); - public static final DeferredHolder SENTINEL_FIRE_1P = REGISTRY.register("sentinel_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_fire_1p"))); - public static final DeferredHolder SENTINEL_FIRE_3P = REGISTRY.register("sentinel_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_fire_3p"))); - public static final DeferredHolder SENTINEL_CHARGE_FIRE_1P = REGISTRY.register("sentinel_charge_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_charge_fire_1p"))); - public static final DeferredHolder SENTINEL_CHARGE_FIRE_3P = REGISTRY.register("sentinel_charge_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_charge_fire_3p"))); - public static final DeferredHolder SENTINEL_FAR = REGISTRY.register("sentinel_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_far"))); - public static final DeferredHolder SENTINEL_VERYFAR = REGISTRY.register("sentinel_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_veryfar"))); - public static final DeferredHolder SENTINEL_CHARGE_FAR = REGISTRY.register("sentinel_charge_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_charge_far"))); - public static final DeferredHolder SENTINEL_CHARGE_VERYFAR = REGISTRY.register("sentinel_charge_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_charge_veryfar"))); - public static final DeferredHolder SENTINEL_RELOAD_NORMAL = REGISTRY.register("sentinel_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_reload_normal"))); - public static final DeferredHolder SENTINEL_RELOAD_EMPTY = REGISTRY.register("sentinel_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_reload_empty"))); - public static final DeferredHolder SENTINEL_CHARGE = REGISTRY.register("sentinel_charge", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_charge"))); - public static final DeferredHolder SENTINEL_BOLT = REGISTRY.register("sentinel_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("sentinel_bolt"))); + public static final DeferredHolder SENTINEL_FIRE_1P = REGISTRY.register("sentinel_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_fire_1p"))); + public static final DeferredHolder SENTINEL_FIRE_3P = REGISTRY.register("sentinel_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_fire_3p"))); + public static final DeferredHolder SENTINEL_CHARGE_FIRE_1P = REGISTRY.register("sentinel_charge_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_charge_fire_1p"))); + public static final DeferredHolder SENTINEL_CHARGE_FIRE_3P = REGISTRY.register("sentinel_charge_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_charge_fire_3p"))); + public static final DeferredHolder SENTINEL_FAR = REGISTRY.register("sentinel_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_far"))); + public static final DeferredHolder SENTINEL_VERYFAR = REGISTRY.register("sentinel_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_veryfar"))); + public static final DeferredHolder SENTINEL_CHARGE_FAR = REGISTRY.register("sentinel_charge_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_charge_far"))); + public static final DeferredHolder SENTINEL_CHARGE_VERYFAR = REGISTRY.register("sentinel_charge_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_charge_veryfar"))); + public static final DeferredHolder SENTINEL_RELOAD_NORMAL = REGISTRY.register("sentinel_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_reload_normal"))); + public static final DeferredHolder SENTINEL_RELOAD_EMPTY = REGISTRY.register("sentinel_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_reload_empty"))); + public static final DeferredHolder SENTINEL_CHARGE = REGISTRY.register("sentinel_charge", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_charge"))); + public static final DeferredHolder SENTINEL_BOLT = REGISTRY.register("sentinel_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("sentinel_bolt"))); - public static final DeferredHolder M_60_FIRE_1P = REGISTRY.register("m_60_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_fire_1p"))); - public static final DeferredHolder M_60_FIRE_3P = REGISTRY.register("m_60_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_fire_3p"))); - public static final DeferredHolder M_60_FAR = REGISTRY.register("m_60_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_far"))); - public static final DeferredHolder M_60_VERYFAR = REGISTRY.register("m_60_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_veryfar"))); - public static final DeferredHolder M_60_RELOAD_NORMAL = REGISTRY.register("m_60_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_reload_normal"))); - public static final DeferredHolder M_60_RELOAD_EMPTY = REGISTRY.register("m_60_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_60_reload_empty"))); + public static final DeferredHolder M_60_FIRE_1P = REGISTRY.register("m_60_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_fire_1p"))); + public static final DeferredHolder M_60_FIRE_3P = REGISTRY.register("m_60_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_fire_3p"))); + public static final DeferredHolder M_60_FAR = REGISTRY.register("m_60_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_far"))); + public static final DeferredHolder M_60_VERYFAR = REGISTRY.register("m_60_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_veryfar"))); + public static final DeferredHolder M_60_RELOAD_NORMAL = REGISTRY.register("m_60_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_reload_normal"))); + public static final DeferredHolder M_60_RELOAD_EMPTY = REGISTRY.register("m_60_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_60_reload_empty"))); - public static final DeferredHolder SVD_FIRE_1P = REGISTRY.register("svd_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_fire_1p"))); - public static final DeferredHolder SVD_FIRE_3P = REGISTRY.register("svd_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_fire_3p"))); - public static final DeferredHolder SVD_FAR = REGISTRY.register("svd_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_far"))); - public static final DeferredHolder SVD_VERYFAR = REGISTRY.register("svd_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_veryfar"))); - public static final DeferredHolder SVD_FIRE_1P_S = REGISTRY.register("svd_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_fire_1p_s"))); - public static final DeferredHolder SVD_FIRE_3P_S = REGISTRY.register("svd_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_fire_3p_s"))); - public static final DeferredHolder SVD_FAR_S = REGISTRY.register("svd_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_far_s"))); - public static final DeferredHolder SVD_RELOAD_NORMAL = REGISTRY.register("svd_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_reload_normal"))); - public static final DeferredHolder SVD_RELOAD_EMPTY = REGISTRY.register("svd_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("svd_reload_empty"))); + public static final DeferredHolder SVD_FIRE_1P = REGISTRY.register("svd_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_fire_1p"))); + public static final DeferredHolder SVD_FIRE_3P = REGISTRY.register("svd_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_fire_3p"))); + public static final DeferredHolder SVD_FAR = REGISTRY.register("svd_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_far"))); + public static final DeferredHolder SVD_VERYFAR = REGISTRY.register("svd_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_veryfar"))); + public static final DeferredHolder SVD_FIRE_1P_S = REGISTRY.register("svd_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_fire_1p_s"))); + public static final DeferredHolder SVD_FIRE_3P_S = REGISTRY.register("svd_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_fire_3p_s"))); + public static final DeferredHolder SVD_FAR_S = REGISTRY.register("svd_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_far_s"))); + public static final DeferredHolder SVD_RELOAD_NORMAL = REGISTRY.register("svd_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_reload_normal"))); + public static final DeferredHolder SVD_RELOAD_EMPTY = REGISTRY.register("svd_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("svd_reload_empty"))); - public static final DeferredHolder M_98B_FIRE_1P = REGISTRY.register("m_98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_fire_1p"))); - public static final DeferredHolder M_98B_FIRE_3P = REGISTRY.register("m_98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_fire_3p"))); - public static final DeferredHolder M_98B_FAR = REGISTRY.register("m_98b_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_far"))); - public static final DeferredHolder M_98B_VERYFAR = REGISTRY.register("m_98b_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_veryfar"))); - public static final DeferredHolder M_98B_RELOAD_NORMAL = REGISTRY.register("m_98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_reload_normal"))); - public static final DeferredHolder M_98B_RELOAD_EMPTY = REGISTRY.register("m_98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_reload_empty"))); - public static final DeferredHolder M_98B_BOLT = REGISTRY.register("m_98b_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_98b_bolt"))); + public static final DeferredHolder M_98B_FIRE_1P = REGISTRY.register("m_98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_fire_1p"))); + public static final DeferredHolder M_98B_FIRE_3P = REGISTRY.register("m_98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_fire_3p"))); + public static final DeferredHolder M_98B_FAR = REGISTRY.register("m_98b_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_far"))); + public static final DeferredHolder M_98B_VERYFAR = REGISTRY.register("m_98b_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_veryfar"))); + public static final DeferredHolder M_98B_RELOAD_NORMAL = REGISTRY.register("m_98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_reload_normal"))); + public static final DeferredHolder M_98B_RELOAD_EMPTY = REGISTRY.register("m_98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_reload_empty"))); + public static final DeferredHolder M_98B_BOLT = REGISTRY.register("m_98b_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_98b_bolt"))); - public static final DeferredHolder MARLIN_FIRE_1P = REGISTRY.register("marlin_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_fire_1p"))); - public static final DeferredHolder MARLIN_FIRE_3P = REGISTRY.register("marlin_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_fire_3p"))); - public static final DeferredHolder MARLIN_FAR = REGISTRY.register("marlin_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_far"))); - public static final DeferredHolder MARLIN_VERYFAR = REGISTRY.register("marlin_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_veryfar"))); - public static final DeferredHolder MARLIN_PREPARE = REGISTRY.register("marlin_prepare", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_prepare"))); - public static final DeferredHolder MARLIN_LOOP = REGISTRY.register("marlin_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_loop"))); - public static final DeferredHolder MARLIN_END = REGISTRY.register("marlin_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_end"))); - public static final DeferredHolder MARLIN_BOLT = REGISTRY.register("marlin_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("marlin_bolt"))); + public static final DeferredHolder MARLIN_FIRE_1P = REGISTRY.register("marlin_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_fire_1p"))); + public static final DeferredHolder MARLIN_FIRE_3P = REGISTRY.register("marlin_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_fire_3p"))); + public static final DeferredHolder MARLIN_FAR = REGISTRY.register("marlin_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_far"))); + public static final DeferredHolder MARLIN_VERYFAR = REGISTRY.register("marlin_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_veryfar"))); + public static final DeferredHolder MARLIN_PREPARE = REGISTRY.register("marlin_prepare", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_prepare"))); + public static final DeferredHolder MARLIN_LOOP = REGISTRY.register("marlin_loop", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_loop"))); + public static final DeferredHolder MARLIN_END = REGISTRY.register("marlin_end", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_end"))); + public static final DeferredHolder MARLIN_BOLT = REGISTRY.register("marlin_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("marlin_bolt"))); - public static final DeferredHolder M_870_FIRE_1P = REGISTRY.register("m_870_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_fire_1p"))); - public static final DeferredHolder M_870_FIRE_3P = REGISTRY.register("m_870_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_fire_3p"))); - public static final DeferredHolder M_870_FAR = REGISTRY.register("m_870_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_far"))); - public static final DeferredHolder M_870_VERYFAR = REGISTRY.register("m_870_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_veryfar"))); - public static final DeferredHolder M_870_PREPARE_LOAD = REGISTRY.register("m_870_prepare_load", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_prepare_load"))); - public static final DeferredHolder M_870_LOOP = REGISTRY.register("m_870_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_loop"))); - public static final DeferredHolder M_870_BOLT = REGISTRY.register("m_870_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_870_bolt"))); + public static final DeferredHolder M_870_FIRE_1P = REGISTRY.register("m_870_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_fire_1p"))); + public static final DeferredHolder M_870_FIRE_3P = REGISTRY.register("m_870_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_fire_3p"))); + public static final DeferredHolder M_870_FAR = REGISTRY.register("m_870_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_far"))); + public static final DeferredHolder M_870_VERYFAR = REGISTRY.register("m_870_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_veryfar"))); + public static final DeferredHolder M_870_PREPARE_LOAD = REGISTRY.register("m_870_prepare_load", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_prepare_load"))); + public static final DeferredHolder M_870_LOOP = REGISTRY.register("m_870_loop", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_loop"))); + public static final DeferredHolder M_870_BOLT = REGISTRY.register("m_870_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_870_bolt"))); - public static final DeferredHolder GLOCK_17_FIRE_1P = REGISTRY.register("glock_17_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_fire_1p"))); - public static final DeferredHolder GLOCK_17_FIRE_3P = REGISTRY.register("glock_17_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_fire_3p"))); - public static final DeferredHolder GLOCK_17_FAR = REGISTRY.register("glock_17_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_far"))); - public static final DeferredHolder GLOCK_17_VERYFAR = REGISTRY.register("glock_17_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_veryfar"))); - public static final DeferredHolder GLOCK_17_RELOAD_NORMAL = REGISTRY.register("glock_17_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_normal"))); - public static final DeferredHolder GLOCK_17_RELOAD_EMPTY = REGISTRY.register("glock_17_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_empty"))); + public static final DeferredHolder GLOCK_17_FIRE_1P = REGISTRY.register("glock_17_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_fire_1p"))); + public static final DeferredHolder GLOCK_17_FIRE_3P = REGISTRY.register("glock_17_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_fire_3p"))); + public static final DeferredHolder GLOCK_17_FAR = REGISTRY.register("glock_17_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_far"))); + public static final DeferredHolder GLOCK_17_VERYFAR = REGISTRY.register("glock_17_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_veryfar"))); + public static final DeferredHolder GLOCK_17_RELOAD_NORMAL = REGISTRY.register("glock_17_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_normal"))); + public static final DeferredHolder GLOCK_17_RELOAD_EMPTY = REGISTRY.register("glock_17_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_empty"))); - public static final DeferredHolder GLOCK_18_FIRE_1P = REGISTRY.register("glock_18_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_fire_1p"))); - public static final DeferredHolder GLOCK_18_FIRE_3P = REGISTRY.register("glock_18_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_fire_3p"))); - public static final DeferredHolder GLOCK_18_FAR = REGISTRY.register("glock_18_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_far"))); - public static final DeferredHolder GLOCK_18_VERYFAR = REGISTRY.register("glock_18_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_veryfar"))); - public static final DeferredHolder GLOCK_18_RELOAD_NORMAL = REGISTRY.register("glock_18_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_normal"))); - public static final DeferredHolder GLOCK_18_RELOAD_EMPTY = REGISTRY.register("glock_18_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_empty"))); + public static final DeferredHolder GLOCK_18_FIRE_1P = REGISTRY.register("glock_18_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_fire_1p"))); + public static final DeferredHolder GLOCK_18_FIRE_3P = REGISTRY.register("glock_18_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_fire_3p"))); + public static final DeferredHolder GLOCK_18_FAR = REGISTRY.register("glock_18_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_far"))); + public static final DeferredHolder GLOCK_18_VERYFAR = REGISTRY.register("glock_18_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_veryfar"))); + public static final DeferredHolder GLOCK_18_RELOAD_NORMAL = REGISTRY.register("glock_18_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_normal"))); + public static final DeferredHolder GLOCK_18_RELOAD_EMPTY = REGISTRY.register("glock_18_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_empty"))); - public static final DeferredHolder MP_443_FIRE_1P = REGISTRY.register("mp_443_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mp_443_fire_1p"))); - public static final DeferredHolder MP_443_FIRE_3P = REGISTRY.register("mp_443_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mp_443_fire_3p"))); - public static final DeferredHolder MP_443_FAR = REGISTRY.register("mp_443_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_far"))); - public static final DeferredHolder MP_443_VERYFAR = REGISTRY.register("mp_443_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_veryfar"))); - public static final DeferredHolder MP_443_RELOAD_NORMAL = REGISTRY.register("mp_443_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_normal"))); - public static final DeferredHolder MP_443_RELOAD_EMPTY = REGISTRY.register("mp_443_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_empty"))); + public static final DeferredHolder MP_443_FIRE_1P = REGISTRY.register("mp_443_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mp_443_fire_1p"))); + public static final DeferredHolder MP_443_FIRE_3P = REGISTRY.register("mp_443_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mp_443_fire_3p"))); + public static final DeferredHolder MP_443_FAR = REGISTRY.register("mp_443_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_far"))); + public static final DeferredHolder MP_443_VERYFAR = REGISTRY.register("mp_443_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_veryfar"))); + public static final DeferredHolder MP_443_RELOAD_NORMAL = REGISTRY.register("mp_443_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_normal"))); + public static final DeferredHolder MP_443_RELOAD_EMPTY = REGISTRY.register("mp_443_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_empty"))); - public static final DeferredHolder M_1911_FIRE_1P = REGISTRY.register("m_1911_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_1911_fire_1p"))); - public static final DeferredHolder M_1911_FIRE_3P = REGISTRY.register("m_1911_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_1911_fire_3p"))); - public static final DeferredHolder M_1911_FAR = REGISTRY.register("m_1911_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_1911_far"))); - public static final DeferredHolder M_1911_VERYFAR = REGISTRY.register("m_1911_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m_1911_veryfar"))); - public static final DeferredHolder M_1911_RELOAD_NORMAL = REGISTRY.register("m_1911_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_normal"))); - public static final DeferredHolder M_1911_RELOAD_EMPTY = REGISTRY.register("m_1911_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("glock_17_reload_empty"))); + public static final DeferredHolder M_1911_FIRE_1P = REGISTRY.register("m_1911_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_1911_fire_1p"))); + public static final DeferredHolder M_1911_FIRE_3P = REGISTRY.register("m_1911_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_1911_fire_3p"))); + public static final DeferredHolder M_1911_FAR = REGISTRY.register("m_1911_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_1911_far"))); + public static final DeferredHolder M_1911_VERYFAR = REGISTRY.register("m_1911_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m_1911_veryfar"))); + public static final DeferredHolder M_1911_RELOAD_NORMAL = REGISTRY.register("m_1911_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_normal"))); + public static final DeferredHolder M_1911_RELOAD_EMPTY = REGISTRY.register("m_1911_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("glock_17_reload_empty"))); - public static final DeferredHolder QBZ_95_FIRE_1P = REGISTRY.register("qbz_95_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_fire_1p"))); - public static final DeferredHolder QBZ_95_FIRE_3P = REGISTRY.register("qbz_95_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_fire_3p"))); - public static final DeferredHolder QBZ_95_FAR = REGISTRY.register("qbz_95_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_far"))); - public static final DeferredHolder QBZ_95_VERYFAR = REGISTRY.register("qbz_95_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_veryfar"))); - public static final DeferredHolder QBZ_95_RELOAD_NORMAL = REGISTRY.register("qbz_95_reload_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_reload_normal"))); - public static final DeferredHolder QBZ_95_RELOAD_EMPTY = REGISTRY.register("qbz_95_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_reload_empty"))); - public static final DeferredHolder QBZ_95_FIRE_1P_S = REGISTRY.register("qbz_95_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_fire_1p_s"))); - public static final DeferredHolder QBZ_95_FIRE_3P_S = REGISTRY.register("qbz_95_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("qbz_95_fire_3p_s"))); - public static final DeferredHolder QBZ_95_FAR_S = REGISTRY.register("qbz_95_far_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_far_s"))); - public static final DeferredHolder QBZ_95_VERYFAR_S = REGISTRY.register("qbz_95_veryfar_s", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("ak_12_veryfar_s"))); + public static final DeferredHolder QBZ_95_FIRE_1P = REGISTRY.register("qbz_95_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_fire_1p"))); + public static final DeferredHolder QBZ_95_FIRE_3P = REGISTRY.register("qbz_95_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_fire_3p"))); + public static final DeferredHolder QBZ_95_FAR = REGISTRY.register("qbz_95_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_far"))); + public static final DeferredHolder QBZ_95_VERYFAR = REGISTRY.register("qbz_95_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_veryfar"))); + public static final DeferredHolder QBZ_95_RELOAD_NORMAL = REGISTRY.register("qbz_95_reload_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_reload_normal"))); + public static final DeferredHolder QBZ_95_RELOAD_EMPTY = REGISTRY.register("qbz_95_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_reload_empty"))); + public static final DeferredHolder QBZ_95_FIRE_1P_S = REGISTRY.register("qbz_95_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_fire_1p_s"))); + public static final DeferredHolder QBZ_95_FIRE_3P_S = REGISTRY.register("qbz_95_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("qbz_95_fire_3p_s"))); + public static final DeferredHolder QBZ_95_FAR_S = REGISTRY.register("qbz_95_far_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_far_s"))); + public static final DeferredHolder QBZ_95_VERYFAR_S = REGISTRY.register("qbz_95_veryfar_s", () -> SoundEvent.createVariableRangeEvent(Mod.loc("ak_12_veryfar_s"))); - public static final DeferredHolder K_98_FIRE_1P = REGISTRY.register("k_98_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_fire_1p"))); - public static final DeferredHolder K_98_FIRE_3P = REGISTRY.register("k_98_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_fire_3p"))); - public static final DeferredHolder K_98_FAR = REGISTRY.register("k_98_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_far"))); - public static final DeferredHolder K_98_VERYFAR = REGISTRY.register("k_98_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_veryfar"))); - public static final DeferredHolder K_98_RELOAD_EMPTY = REGISTRY.register("k_98_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_reload_empty"))); - public static final DeferredHolder K_98_BOLT = REGISTRY.register("k_98_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_bolt"))); - public static final DeferredHolder K_98_PREPARE = REGISTRY.register("k_98_prepare", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_prepare"))); - public static final DeferredHolder K_98_LOOP = REGISTRY.register("k_98_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_loop"))); - public static final DeferredHolder K_98_END = REGISTRY.register("k_98_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("k_98_end"))); + public static final DeferredHolder K_98_FIRE_1P = REGISTRY.register("k_98_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_fire_1p"))); + public static final DeferredHolder K_98_FIRE_3P = REGISTRY.register("k_98_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_fire_3p"))); + public static final DeferredHolder K_98_FAR = REGISTRY.register("k_98_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_far"))); + public static final DeferredHolder K_98_VERYFAR = REGISTRY.register("k_98_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_veryfar"))); + public static final DeferredHolder K_98_RELOAD_EMPTY = REGISTRY.register("k_98_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_reload_empty"))); + public static final DeferredHolder K_98_BOLT = REGISTRY.register("k_98_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_bolt"))); + public static final DeferredHolder K_98_PREPARE = REGISTRY.register("k_98_prepare", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_prepare"))); + public static final DeferredHolder K_98_LOOP = REGISTRY.register("k_98_loop", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_loop"))); + public static final DeferredHolder K_98_END = REGISTRY.register("k_98_end", () -> SoundEvent.createVariableRangeEvent(Mod.loc("k_98_end"))); - public static final DeferredHolder MOSIN_NAGANT_FIRE_1P = REGISTRY.register("mosin_nagant_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_fire_1p"))); - public static final DeferredHolder MOSIN_NAGANT_FIRE_3P = REGISTRY.register("mosin_nagant_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_fire_3p"))); - public static final DeferredHolder MOSIN_NAGANT_FAR = REGISTRY.register("mosin_nagant_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_far"))); - public static final DeferredHolder MOSIN_NAGANT_VERYFAR = REGISTRY.register("mosin_nagant_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_veryfar"))); - public static final DeferredHolder MOSIN_NAGANT_BOLT = REGISTRY.register("mosin_nagant_bolt", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_bolt"))); - public static final DeferredHolder MOSIN_NAGANT_PREPARE = REGISTRY.register("mosin_nagant_prepare", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_prepare"))); - public static final DeferredHolder MOSIN_NAGANT_PREPARE_EMPTY = REGISTRY.register("mosin_nagant_prepare_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_prepare_empty"))); - public static final DeferredHolder MOSIN_NAGANT_LOOP = REGISTRY.register("mosin_nagant_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_loop"))); - public static final DeferredHolder MOSIN_NAGANT_END = REGISTRY.register("mosin_nagant_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mosin_nagant_end"))); + public static final DeferredHolder MOSIN_NAGANT_FIRE_1P = REGISTRY.register("mosin_nagant_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_fire_1p"))); + public static final DeferredHolder MOSIN_NAGANT_FIRE_3P = REGISTRY.register("mosin_nagant_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_fire_3p"))); + public static final DeferredHolder MOSIN_NAGANT_FAR = REGISTRY.register("mosin_nagant_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_far"))); + public static final DeferredHolder MOSIN_NAGANT_VERYFAR = REGISTRY.register("mosin_nagant_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_veryfar"))); + public static final DeferredHolder MOSIN_NAGANT_BOLT = REGISTRY.register("mosin_nagant_bolt", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_bolt"))); + public static final DeferredHolder MOSIN_NAGANT_PREPARE = REGISTRY.register("mosin_nagant_prepare", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_prepare"))); + public static final DeferredHolder MOSIN_NAGANT_PREPARE_EMPTY = REGISTRY.register("mosin_nagant_prepare_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_prepare_empty"))); + public static final DeferredHolder MOSIN_NAGANT_LOOP = REGISTRY.register("mosin_nagant_loop", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_loop"))); + public static final DeferredHolder MOSIN_NAGANT_END = REGISTRY.register("mosin_nagant_end", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mosin_nagant_end"))); - public static final DeferredHolder JAVELIN_FIRE_1P = REGISTRY.register("javelin_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_fire_1p"))); - public static final DeferredHolder JAVELIN_FIRE_3P = REGISTRY.register("javelin_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_fire_3p"))); - public static final DeferredHolder JAVELIN_FAR = REGISTRY.register("javelin_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_far"))); - public static final DeferredHolder JAVELIN_RELOAD_EMPTY = REGISTRY.register("javelin_reload_empty", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_reload_empty"))); + public static final DeferredHolder JAVELIN_FIRE_1P = REGISTRY.register("javelin_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_fire_1p"))); + public static final DeferredHolder JAVELIN_FIRE_3P = REGISTRY.register("javelin_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_fire_3p"))); + public static final DeferredHolder JAVELIN_FAR = REGISTRY.register("javelin_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_far"))); + public static final DeferredHolder JAVELIN_RELOAD_EMPTY = REGISTRY.register("javelin_reload_empty", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_reload_empty"))); - public static final DeferredHolder JAVELIN_LOCK = REGISTRY.register("javelin_lock", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_lock"))); - public static final DeferredHolder JAVELIN_LOCKON = REGISTRY.register("javelin_lockon", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("javelin_lockon"))); + public static final DeferredHolder JAVELIN_LOCK = REGISTRY.register("javelin_lock", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_lock"))); + public static final DeferredHolder JAVELIN_LOCKON = REGISTRY.register("javelin_lockon", () -> SoundEvent.createVariableRangeEvent(Mod.loc("javelin_lockon"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_1P = REGISTRY.register("secondary_cataclysm_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_fire_1p"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_3P = REGISTRY.register("secondary_cataclysm_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_fire_3p"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FAR = REGISTRY.register("secondary_cataclysm_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_far"))); - public static final DeferredHolder SECONDARY_CATACLYSM_VERYFAR = REGISTRY.register("secondary_cataclysm_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_veryfar"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_1P_CHARGE = REGISTRY.register("secondary_cataclysm_fire_1p_charge", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_fire_1p_charge"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_3P_CHARGE = REGISTRY.register("secondary_cataclysm_fire_3p_charge", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_fire_3p_charge"))); - public static final DeferredHolder SECONDARY_CATACLYSM_FAR_CHARGE = REGISTRY.register("secondary_cataclysm_far_charge", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_far_charge"))); - public static final DeferredHolder SECONDARY_CATACLYSM_VERYFAR_CHARGE = REGISTRY.register("secondary_cataclysm_veryfar_charge", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_veryfar_charge"))); - public static final DeferredHolder SECONDARY_CATACLYSM_PREPARE_LOAD = REGISTRY.register("secondary_cataclysm_prepare_load", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_prepare_load"))); - public static final DeferredHolder SECONDARY_CATACLYSM_LOOP = REGISTRY.register("secondary_cataclysm_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_loop"))); - public static final DeferredHolder SECONDARY_CATACLYSM_END = REGISTRY.register("secondary_cataclysm_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_end"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_1P = REGISTRY.register("secondary_cataclysm_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_fire_1p"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_3P = REGISTRY.register("secondary_cataclysm_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_fire_3p"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FAR = REGISTRY.register("secondary_cataclysm_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_far"))); + public static final DeferredHolder SECONDARY_CATACLYSM_VERYFAR = REGISTRY.register("secondary_cataclysm_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_veryfar"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_1P_CHARGE = REGISTRY.register("secondary_cataclysm_fire_1p_charge", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_fire_1p_charge"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FIRE_3P_CHARGE = REGISTRY.register("secondary_cataclysm_fire_3p_charge", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_fire_3p_charge"))); + public static final DeferredHolder SECONDARY_CATACLYSM_FAR_CHARGE = REGISTRY.register("secondary_cataclysm_far_charge", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_far_charge"))); + public static final DeferredHolder SECONDARY_CATACLYSM_VERYFAR_CHARGE = REGISTRY.register("secondary_cataclysm_veryfar_charge", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_veryfar_charge"))); + public static final DeferredHolder SECONDARY_CATACLYSM_PREPARE_LOAD = REGISTRY.register("secondary_cataclysm_prepare_load", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_prepare_load"))); + public static final DeferredHolder SECONDARY_CATACLYSM_LOOP = REGISTRY.register("secondary_cataclysm_loop", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_loop"))); + public static final DeferredHolder SECONDARY_CATACLYSM_END = REGISTRY.register("secondary_cataclysm_end", () -> SoundEvent.createVariableRangeEvent(Mod.loc("secondary_cataclysm_end"))); - public static final DeferredHolder M_2_FIRE_1P = REGISTRY.register("m2_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_fire_1p"))); - public static final DeferredHolder M_2_FIRE_3P = REGISTRY.register("m2_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_fire_3p"))); - public static final DeferredHolder M_2_FAR = REGISTRY.register("m2_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_far"))); - public static final DeferredHolder M_2_VERYFAR = REGISTRY.register("m2_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_veryfar"))); + public static final DeferredHolder M_2_FIRE_1P = REGISTRY.register("m2_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m2_fire_1p"))); + public static final DeferredHolder M_2_FIRE_3P = REGISTRY.register("m2_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m2_fire_3p"))); + public static final DeferredHolder M_2_FAR = REGISTRY.register("m2_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m2_far"))); + public static final DeferredHolder M_2_VERYFAR = REGISTRY.register("m2_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("m2_veryfar"))); - public static final DeferredHolder MK_42_FIRE_1P = REGISTRY.register("mk_42_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_42_fire_1p"))); - public static final DeferredHolder MK_42_FIRE_3P = REGISTRY.register("mk_42_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_42_fire_3p"))); - public static final DeferredHolder MK_42_FAR = REGISTRY.register("mk_42_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_42_far"))); - public static final DeferredHolder MK_42_VERYFAR = REGISTRY.register("mk_42_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("mk_42_veryfar"))); - public static final DeferredHolder CANNON_RELOAD = REGISTRY.register("cannon_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("cannon_reload"))); - public static final DeferredHolder CANNON_ZOOM_IN = REGISTRY.register("cannon_zoom_in", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("cannon_zoom_in"))); - public static final DeferredHolder CANNON_ZOOM_OUT = REGISTRY.register("cannon_zoom_out", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("cannon_zoom_out"))); + public static final DeferredHolder MK_42_FIRE_1P = REGISTRY.register("mk_42_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_42_fire_1p"))); + public static final DeferredHolder MK_42_FIRE_3P = REGISTRY.register("mk_42_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_42_fire_3p"))); + public static final DeferredHolder MK_42_FAR = REGISTRY.register("mk_42_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_42_far"))); + public static final DeferredHolder MK_42_VERYFAR = REGISTRY.register("mk_42_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("mk_42_veryfar"))); + public static final DeferredHolder CANNON_RELOAD = REGISTRY.register("cannon_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("cannon_reload"))); + public static final DeferredHolder CANNON_ZOOM_IN = REGISTRY.register("cannon_zoom_in", () -> SoundEvent.createVariableRangeEvent(Mod.loc("cannon_zoom_in"))); + public static final DeferredHolder CANNON_ZOOM_OUT = REGISTRY.register("cannon_zoom_out", () -> SoundEvent.createVariableRangeEvent(Mod.loc("cannon_zoom_out"))); - public static final DeferredHolder BULLET_SUPPLY = REGISTRY.register("bullet_supply", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bullet_supply"))); - public static final DeferredHolder ADJUST_FOV = REGISTRY.register("adjust_fov", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("adjust_fov"))); - public static final DeferredHolder DRONE_SOUND = REGISTRY.register("drone_sound", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("drone_sound"))); - public static final DeferredHolder GRENADE_PULL = REGISTRY.register("grenade_pull", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("grenade_pull"))); - public static final DeferredHolder GRENADE_THROW = REGISTRY.register("grenade_throw", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("grenade_throw"))); + public static final DeferredHolder BULLET_SUPPLY = REGISTRY.register("bullet_supply", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bullet_supply"))); + public static final DeferredHolder ADJUST_FOV = REGISTRY.register("adjust_fov", () -> SoundEvent.createVariableRangeEvent(Mod.loc("adjust_fov"))); + public static final DeferredHolder DRONE_SOUND = REGISTRY.register("drone_sound", () -> SoundEvent.createVariableRangeEvent(Mod.loc("drone_sound"))); + public static final DeferredHolder GRENADE_PULL = REGISTRY.register("grenade_pull", () -> SoundEvent.createVariableRangeEvent(Mod.loc("grenade_pull"))); + public static final DeferredHolder GRENADE_THROW = REGISTRY.register("grenade_throw", () -> SoundEvent.createVariableRangeEvent(Mod.loc("grenade_throw"))); - public static final DeferredHolder EDIT_MODE = REGISTRY.register("edit_mode", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("edit_mode"))); - public static final DeferredHolder EDIT = REGISTRY.register("edit", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("edit"))); - public static final DeferredHolder SHELL_CASING_NORMAL = REGISTRY.register("shell_casing_normal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("shell_casing_normal"))); - public static final DeferredHolder SHELL_CASING_SHOTGUN = REGISTRY.register("shell_casing_shotgun", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("shell_casing_shotgun"))); - public static final DeferredHolder SHELL_CASING_50CAL = REGISTRY.register("shell_casing_50cal", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("shell_casing_50cal"))); + public static final DeferredHolder EDIT_MODE = REGISTRY.register("edit_mode", () -> SoundEvent.createVariableRangeEvent(Mod.loc("edit_mode"))); + public static final DeferredHolder EDIT = REGISTRY.register("edit", () -> SoundEvent.createVariableRangeEvent(Mod.loc("edit"))); + public static final DeferredHolder SHELL_CASING_NORMAL = REGISTRY.register("shell_casing_normal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("shell_casing_normal"))); + public static final DeferredHolder SHELL_CASING_SHOTGUN = REGISTRY.register("shell_casing_shotgun", () -> SoundEvent.createVariableRangeEvent(Mod.loc("shell_casing_shotgun"))); + public static final DeferredHolder SHELL_CASING_50CAL = REGISTRY.register("shell_casing_50cal", () -> SoundEvent.createVariableRangeEvent(Mod.loc("shell_casing_50cal"))); - public static final DeferredHolder OPEN = REGISTRY.register("open", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("open"))); + public static final DeferredHolder OPEN = REGISTRY.register("open", () -> SoundEvent.createVariableRangeEvent(Mod.loc("open"))); - public static final DeferredHolder CHARGE_RIFLE_FIRE_1P = REGISTRY.register("charge_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("charge_rifle_fire_1p"))); - public static final DeferredHolder CHARGE_RIFLE_FIRE_3P = REGISTRY.register("charge_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("charge_rifle_fire_3p"))); - public static final DeferredHolder CHARGE_RIFLE_FIRE_BOOM_1P = REGISTRY.register("charge_rifle_fire_boom_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("charge_rifle_fire_boom_1p"))); - public static final DeferredHolder CHARGE_RIFLE_FIRE_BOOM_3P = REGISTRY.register("charge_rifle_fire_boom_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("charge_rifle_fire_boom_3p"))); + public static final DeferredHolder CHARGE_RIFLE_FIRE_1P = REGISTRY.register("charge_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("charge_rifle_fire_1p"))); + public static final DeferredHolder CHARGE_RIFLE_FIRE_3P = REGISTRY.register("charge_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("charge_rifle_fire_3p"))); + public static final DeferredHolder CHARGE_RIFLE_FIRE_BOOM_1P = REGISTRY.register("charge_rifle_fire_boom_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("charge_rifle_fire_boom_1p"))); + public static final DeferredHolder CHARGE_RIFLE_FIRE_BOOM_3P = REGISTRY.register("charge_rifle_fire_boom_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("charge_rifle_fire_boom_3p"))); - public static final DeferredHolder ANNIHILATOR_FIRE_1P = REGISTRY.register("annihilator_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("annihilator_fire_1p"))); - public static final DeferredHolder ANNIHILATOR_FIRE_3P = REGISTRY.register("annihilator_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("annihilator_fire_3p"))); - public static final DeferredHolder ANNIHILATOR_FAR = REGISTRY.register("annihilator_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("annihilator_far"))); - public static final DeferredHolder ANNIHILATOR_VERYFAR = REGISTRY.register("annihilator_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("annihilator_veryfar"))); - public static final DeferredHolder ANNIHILATOR_RELOAD = REGISTRY.register("annihilator_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("annihilator_reload"))); + public static final DeferredHolder ANNIHILATOR_FIRE_1P = REGISTRY.register("annihilator_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("annihilator_fire_1p"))); + public static final DeferredHolder ANNIHILATOR_FIRE_3P = REGISTRY.register("annihilator_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("annihilator_fire_3p"))); + public static final DeferredHolder ANNIHILATOR_FAR = REGISTRY.register("annihilator_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("annihilator_far"))); + public static final DeferredHolder ANNIHILATOR_VERYFAR = REGISTRY.register("annihilator_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("annihilator_veryfar"))); + public static final DeferredHolder ANNIHILATOR_RELOAD = REGISTRY.register("annihilator_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("annihilator_reload"))); - public static final DeferredHolder BOAT_ENGINE = REGISTRY.register("boat_engine", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("boat_engine"))); - public static final DeferredHolder VEHICLE_STRIKE = REGISTRY.register("vehicle_strike", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("vehicle_strike"))); - public static final DeferredHolder WHEEL_CHAIR_ENGINE = REGISTRY.register("wheel_chair_engine", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("wheel_chair_engine"))); - public static final DeferredHolder WHEEL_CHAIR_JUMP = REGISTRY.register("wheel_chair_jump", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("wheel_chair_jump"))); + public static final DeferredHolder BOAT_ENGINE = REGISTRY.register("boat_engine", () -> SoundEvent.createVariableRangeEvent(Mod.loc("boat_engine"))); + public static final DeferredHolder VEHICLE_STRIKE = REGISTRY.register("vehicle_strike", () -> SoundEvent.createVariableRangeEvent(Mod.loc("vehicle_strike"))); + public static final DeferredHolder WHEEL_CHAIR_ENGINE = REGISTRY.register("wheel_chair_engine", () -> SoundEvent.createVariableRangeEvent(Mod.loc("wheel_chair_engine"))); + public static final DeferredHolder WHEEL_CHAIR_JUMP = REGISTRY.register("wheel_chair_jump", () -> SoundEvent.createVariableRangeEvent(Mod.loc("wheel_chair_jump"))); - public static final DeferredHolder RADAR_SEARCH_START = REGISTRY.register("radar_search_start", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("radar_search_start"))); - public static final DeferredHolder RADAR_SEARCH_IDLE = REGISTRY.register("radar_search_idle", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("radar_search_idle"))); - public static final DeferredHolder RADAR_SEARCH_END = REGISTRY.register("radar_search_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("radar_search_end"))); + public static final DeferredHolder RADAR_SEARCH_START = REGISTRY.register("radar_search_start", () -> SoundEvent.createVariableRangeEvent(Mod.loc("radar_search_start"))); + public static final DeferredHolder RADAR_SEARCH_IDLE = REGISTRY.register("radar_search_idle", () -> SoundEvent.createVariableRangeEvent(Mod.loc("radar_search_idle"))); + public static final DeferredHolder RADAR_SEARCH_END = REGISTRY.register("radar_search_end", () -> SoundEvent.createVariableRangeEvent(Mod.loc("radar_search_end"))); - public static final DeferredHolder HELICOPTER_ENGINE_START = REGISTRY.register("helicopter_engine_start", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("helicopter_engine_start"))); - public static final DeferredHolder HELICOPTER_ENGINE = REGISTRY.register("helicopter_engine", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("helicopter_engine"))); - public static final DeferredHolder HELICOPTER_ENGINE_1P = REGISTRY.register("helicopter_engine_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("helicopter_engine_1p"))); - public static final DeferredHolder HELICOPTER_CANNON_FIRE_1P = REGISTRY.register("heli_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_cannon_fire_1p"))); - public static final DeferredHolder HELICOPTER_CANNON_FIRE_3P = REGISTRY.register("heli_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_cannon_fire_3p"))); - public static final DeferredHolder HELICOPTER_CANNON_FAR = REGISTRY.register("heli_cannon_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_cannon_far"))); - public static final DeferredHolder HELICOPTER_CANNON_VERYFAR = REGISTRY.register("heli_cannon_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_cannon_veryfar"))); - public static final DeferredHolder HELICOPTER_ROCKET_FIRE_1P = REGISTRY.register("heli_rocket_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_rocket_fire_1p"))); - public static final DeferredHolder HELICOPTER_ROCKET_FIRE_3P = REGISTRY.register("heli_rocket_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("heli_rocket_fire_3p"))); - public static final DeferredHolder INTO_CANNON = REGISTRY.register("into_cannon", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("into_cannon"))); - public static final DeferredHolder INTO_MISSILE = REGISTRY.register("into_missile", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("into_missile"))); - public static final DeferredHolder MISSILE_RELOAD = REGISTRY.register("missile_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("missile_reload"))); - public static final DeferredHolder LOW_HEALTH = REGISTRY.register("low_health", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("low_health"))); - public static final DeferredHolder NO_HEALTH = REGISTRY.register("no_health", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("no_health"))); - public static final DeferredHolder LOCKING_WARNING = REGISTRY.register("locking_warning", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("locking_warning"))); - public static final DeferredHolder LOCKED_WARNING = REGISTRY.register("locked_warning", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("locked_warning"))); - public static final DeferredHolder MISSILE_WARNING = REGISTRY.register("missile_warning", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("missile_warning"))); - public static final DeferredHolder DECOY_FIRE = REGISTRY.register("decoy_fire", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("decoy_fire"))); - public static final DeferredHolder DECOY_RELOAD = REGISTRY.register("decoy_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("decoy_reload"))); - public static final DeferredHolder LUNGE_MINE_GROWL = REGISTRY.register("lunge_mine_growl", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lunge_mine_growl"))); - public static final DeferredHolder LAV_CANNON_FIRE_1P = REGISTRY.register("lav_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_fire_1p"))); - public static final DeferredHolder LAV_CANNON_FIRE_3P = REGISTRY.register("lav_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_fire_3p"))); - public static final DeferredHolder LAV_CANNON_FAR = REGISTRY.register("lav_cannon_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_far"))); - public static final DeferredHolder LAV_CANNON_VERYFAR = REGISTRY.register("lav_cannon_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_veryfar"))); - public static final DeferredHolder LAV_ENGINE = REGISTRY.register("lav_engine", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_engine"))); - public static final DeferredHolder LAV_ENGINE_1P = REGISTRY.register("lav_engine_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("lav_engine_1p"))); - public static final DeferredHolder COAX_FIRE_1P = REGISTRY.register("coax_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("coax_fire_1p"))); - public static final DeferredHolder BMP_CANNON_FIRE_1P = REGISTRY.register("bmp_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_fire_1p"))); - public static final DeferredHolder BMP_CANNON_FIRE_3P = REGISTRY.register("bmp_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_fire_3p"))); - public static final DeferredHolder BMP_ENGINE = REGISTRY.register("bmp_engine", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_engine"))); - public static final DeferredHolder BMP_ENGINE_1P = REGISTRY.register("bmp_engine_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_engine_1p"))); - public static final DeferredHolder BMP_MISSILE_FIRE_1P = REGISTRY.register("bmp_missile_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_fire_1p"))); - public static final DeferredHolder BMP_MISSILE_FIRE_3P = REGISTRY.register("bmp_missile_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_fire_3p"))); - public static final DeferredHolder BMP_MISSILE_RELOAD = REGISTRY.register("bmp_missile_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_reload"))); - public static final DeferredHolder BMP_STEP = REGISTRY.register("bmp_step", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_step"))); - public static final DeferredHolder WHEEL_STEP = REGISTRY.register("wheel_step", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("wheel_step"))); - public static final DeferredHolder LASER_TOWER_SHOOT = REGISTRY.register("laser_tower_shoot", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("laser_tower_shoot"))); - public static final DeferredHolder YX_100_RELOAD = REGISTRY.register("yx_100_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("yx_100_reload"))); - public static final DeferredHolder YX_100_FIRE_1P = REGISTRY.register("yx_100_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("yx_100_fire_1p"))); - public static final DeferredHolder YX_100_FIRE_3P = REGISTRY.register("yx_100_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("yx_100_fire_3p"))); - public static final DeferredHolder YX_100_FAR = REGISTRY.register("yx_100_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("yx_100_far"))); - public static final DeferredHolder YX_100_VERYFAR = REGISTRY.register("yx_100_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("yx_100_veryfar"))); - public static final DeferredHolder TURRET_TURN = REGISTRY.register("turret_turn", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("turret_turn"))); - public static final DeferredHolder C4_BEEP = REGISTRY.register("c4_beep", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("c4_beep"))); - public static final DeferredHolder C4_FINAL = REGISTRY.register("c4_final", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("c4_final"))); - public static final DeferredHolder C4_THROW = REGISTRY.register("c4_throw", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("c4_throw"))); - public static final DeferredHolder C4_DETONATOR_CLICK = REGISTRY.register("c4_detonator_click", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("c4_detonator_click"))); + public static final DeferredHolder HELICOPTER_ENGINE_START = REGISTRY.register("helicopter_engine_start", () -> SoundEvent.createVariableRangeEvent(Mod.loc("helicopter_engine_start"))); + public static final DeferredHolder HELICOPTER_ENGINE = REGISTRY.register("helicopter_engine", () -> SoundEvent.createVariableRangeEvent(Mod.loc("helicopter_engine"))); + public static final DeferredHolder HELICOPTER_ENGINE_1P = REGISTRY.register("helicopter_engine_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("helicopter_engine_1p"))); + public static final DeferredHolder HELICOPTER_CANNON_FIRE_1P = REGISTRY.register("heli_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_cannon_fire_1p"))); + public static final DeferredHolder HELICOPTER_CANNON_FIRE_3P = REGISTRY.register("heli_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_cannon_fire_3p"))); + public static final DeferredHolder HELICOPTER_CANNON_FAR = REGISTRY.register("heli_cannon_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_cannon_far"))); + public static final DeferredHolder HELICOPTER_CANNON_VERYFAR = REGISTRY.register("heli_cannon_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_cannon_veryfar"))); + public static final DeferredHolder HELICOPTER_ROCKET_FIRE_1P = REGISTRY.register("heli_rocket_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_rocket_fire_1p"))); + public static final DeferredHolder HELICOPTER_ROCKET_FIRE_3P = REGISTRY.register("heli_rocket_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("heli_rocket_fire_3p"))); + public static final DeferredHolder INTO_CANNON = REGISTRY.register("into_cannon", () -> SoundEvent.createVariableRangeEvent(Mod.loc("into_cannon"))); + public static final DeferredHolder INTO_MISSILE = REGISTRY.register("into_missile", () -> SoundEvent.createVariableRangeEvent(Mod.loc("into_missile"))); + public static final DeferredHolder MISSILE_RELOAD = REGISTRY.register("missile_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("missile_reload"))); + public static final DeferredHolder LOW_HEALTH = REGISTRY.register("low_health", () -> SoundEvent.createVariableRangeEvent(Mod.loc("low_health"))); + public static final DeferredHolder NO_HEALTH = REGISTRY.register("no_health", () -> SoundEvent.createVariableRangeEvent(Mod.loc("no_health"))); + public static final DeferredHolder LOCKING_WARNING = REGISTRY.register("locking_warning", () -> SoundEvent.createVariableRangeEvent(Mod.loc("locking_warning"))); + public static final DeferredHolder LOCKED_WARNING = REGISTRY.register("locked_warning", () -> SoundEvent.createVariableRangeEvent(Mod.loc("locked_warning"))); + public static final DeferredHolder MISSILE_WARNING = REGISTRY.register("missile_warning", () -> SoundEvent.createVariableRangeEvent(Mod.loc("missile_warning"))); + public static final DeferredHolder DECOY_FIRE = REGISTRY.register("decoy_fire", () -> SoundEvent.createVariableRangeEvent(Mod.loc("decoy_fire"))); + public static final DeferredHolder DECOY_RELOAD = REGISTRY.register("decoy_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("decoy_reload"))); + public static final DeferredHolder LUNGE_MINE_GROWL = REGISTRY.register("lunge_mine_growl", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lunge_mine_growl"))); + public static final DeferredHolder LAV_CANNON_FIRE_1P = REGISTRY.register("lav_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_fire_1p"))); + public static final DeferredHolder LAV_CANNON_FIRE_3P = REGISTRY.register("lav_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_fire_3p"))); + public static final DeferredHolder LAV_CANNON_FAR = REGISTRY.register("lav_cannon_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_far"))); + public static final DeferredHolder LAV_CANNON_VERYFAR = REGISTRY.register("lav_cannon_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_veryfar"))); + public static final DeferredHolder LAV_ENGINE = REGISTRY.register("lav_engine", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_engine"))); + public static final DeferredHolder LAV_ENGINE_1P = REGISTRY.register("lav_engine_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("lav_engine_1p"))); + public static final DeferredHolder COAX_FIRE_1P = REGISTRY.register("coax_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("coax_fire_1p"))); + public static final DeferredHolder BMP_CANNON_FIRE_1P = REGISTRY.register("bmp_cannon_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_fire_1p"))); + public static final DeferredHolder BMP_CANNON_FIRE_3P = REGISTRY.register("bmp_cannon_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_fire_3p"))); + public static final DeferredHolder BMP_ENGINE = REGISTRY.register("bmp_engine", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_engine"))); + public static final DeferredHolder BMP_ENGINE_1P = REGISTRY.register("bmp_engine_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_engine_1p"))); + public static final DeferredHolder BMP_MISSILE_FIRE_1P = REGISTRY.register("bmp_missile_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_missile_fire_1p"))); + public static final DeferredHolder BMP_MISSILE_FIRE_3P = REGISTRY.register("bmp_missile_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_missile_fire_3p"))); + public static final DeferredHolder BMP_MISSILE_RELOAD = REGISTRY.register("bmp_missile_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_missile_reload"))); + public static final DeferredHolder BMP_STEP = REGISTRY.register("bmp_step", () -> SoundEvent.createVariableRangeEvent(Mod.loc("bmp_step"))); + public static final DeferredHolder WHEEL_STEP = REGISTRY.register("wheel_step", () -> SoundEvent.createVariableRangeEvent(Mod.loc("wheel_step"))); + public static final DeferredHolder LASER_TOWER_SHOOT = REGISTRY.register("laser_tower_shoot", () -> SoundEvent.createVariableRangeEvent(Mod.loc("laser_tower_shoot"))); + public static final DeferredHolder YX_100_RELOAD = REGISTRY.register("yx_100_reload", () -> SoundEvent.createVariableRangeEvent(Mod.loc("yx_100_reload"))); + public static final DeferredHolder YX_100_FIRE_1P = REGISTRY.register("yx_100_fire_1p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("yx_100_fire_1p"))); + public static final DeferredHolder YX_100_FIRE_3P = REGISTRY.register("yx_100_fire_3p", () -> SoundEvent.createVariableRangeEvent(Mod.loc("yx_100_fire_3p"))); + public static final DeferredHolder YX_100_FAR = REGISTRY.register("yx_100_far", () -> SoundEvent.createVariableRangeEvent(Mod.loc("yx_100_far"))); + public static final DeferredHolder YX_100_VERYFAR = REGISTRY.register("yx_100_veryfar", () -> SoundEvent.createVariableRangeEvent(Mod.loc("yx_100_veryfar"))); + public static final DeferredHolder TURRET_TURN = REGISTRY.register("turret_turn", () -> SoundEvent.createVariableRangeEvent(Mod.loc("turret_turn"))); + public static final DeferredHolder C4_BEEP = REGISTRY.register("c4_beep", () -> SoundEvent.createVariableRangeEvent(Mod.loc("c4_beep"))); + public static final DeferredHolder C4_FINAL = REGISTRY.register("c4_final", () -> SoundEvent.createVariableRangeEvent(Mod.loc("c4_final"))); + public static final DeferredHolder C4_THROW = REGISTRY.register("c4_throw", () -> SoundEvent.createVariableRangeEvent(Mod.loc("c4_throw"))); + public static final DeferredHolder C4_DETONATOR_CLICK = REGISTRY.register("c4_detonator_click", () -> SoundEvent.createVariableRangeEvent(Mod.loc("c4_detonator_click"))); } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java index add3e886a..48b618b54 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.ArmorPlate; import com.atsuishio.superbwarfare.item.BatteryItem; import com.atsuishio.superbwarfare.item.C4Bomb; @@ -23,7 +23,7 @@ import static com.atsuishio.superbwarfare.item.ContainerBlockItem.CONTAINER_ENTI @SuppressWarnings("unused") public class ModTabs { - public static final DeferredRegister TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ModUtils.MODID); + public static final DeferredRegister TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Mod.MODID); public static final DeferredHolder GUN_TAB = TABS.register("guns", () -> CreativeModeTab.builder() diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java index 75885a48a..8ab71e35b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.minecraft.core.registries.Registries; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -51,7 +51,7 @@ public class ModTags { public static final TagKey CANNON_BLUEPRINT = tag("blueprint/cannon"); private static TagKey tag(String name) { - return ItemTags.create(ModUtils.loc(name)); + return ItemTags.create(Mod.loc(name)); } } @@ -60,7 +60,7 @@ public class ModTags { public static final TagKey HARD_COLLISION = tag("hard_collision"); private static TagKey tag(String name) { - return BlockTags.create(ModUtils.loc(name)); + return BlockTags.create(Mod.loc(name)); } } @@ -69,7 +69,7 @@ public class ModTags { public static final TagKey PROJECTILE_ABSOLUTE = tag("projectile_absolute"); private static TagKey tag(String name) { - return TagKey.create(Registries.DAMAGE_TYPE, ModUtils.loc(name)); + return TagKey.create(Registries.DAMAGE_TYPE, Mod.loc(name)); } } } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java b/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java index 7f31755fd..b563bde94 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.init; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.item.SmallContainerBlockItem; import com.google.common.collect.ImmutableSet; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -23,11 +23,11 @@ import net.neoforged.neoforge.registries.DeferredRegister; import java.util.List; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class ModVillagers { - public static final DeferredRegister POI_TYPES = DeferredRegister.create(BuiltInRegistries.POINT_OF_INTEREST_TYPE, ModUtils.MODID); - public static final DeferredRegister VILLAGER_PROFESSIONS = DeferredRegister.create(BuiltInRegistries.VILLAGER_PROFESSION, ModUtils.MODID); + public static final DeferredRegister POI_TYPES = DeferredRegister.create(BuiltInRegistries.POINT_OF_INTEREST_TYPE, Mod.MODID); + public static final DeferredRegister VILLAGER_PROFESSIONS = DeferredRegister.create(BuiltInRegistries.VILLAGER_PROFESSION, Mod.MODID); public static final DeferredHolder ARMORY_POI = POI_TYPES.register("armory", () -> new PoiType(ImmutableSet.copyOf(ModBlocks.REFORGING_TABLE.get().getStateDefinition().getPossibleStates()), 1, 1)); @@ -251,13 +251,13 @@ public class ModVillagers { List rareTrades = event.getRareTrades(); rareTrades.add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - SmallContainerBlockItem.createInstance(ModUtils.loc("containers/blueprints")), 10, 0, 0.05f)); + SmallContainerBlockItem.createInstance(Mod.loc("containers/blueprints")), 10, 0, 0.05f)); } private static Holder getItemHolder(String name) { - var item = BuiltInRegistries.ITEM.getHolder(ModUtils.loc(name)); + var item = BuiltInRegistries.ITEM.getHolder(Mod.loc(name)); if (item.isEmpty()) { - ModUtils.LOGGER.error("Item {} not found", name); + Mod.LOGGER.error("Item {} not found", name); return Holder.direct(Items.AIR); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java b/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java index 575c9bbd0..f47ddd049 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.ContainerBlockItemRenderer; import com.atsuishio.superbwarfare.init.ModBlockEntities; import com.atsuishio.superbwarfare.init.ModBlocks; @@ -40,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.function.Supplier; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class ContainerBlockItem extends BlockItem implements GeoItem { /** diff --git a/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java b/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java index 6bf878350..1d6098e11 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.LungeMineRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -35,7 +35,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.ParametersAreNonnullByDefault; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class LungeMine extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/SmallContainerBlockItem.java b/src/main/java/com/atsuishio/superbwarfare/item/SmallContainerBlockItem.java index 3abc767c4..7f54c1341 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/SmallContainerBlockItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/SmallContainerBlockItem.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.SmallContainerBlockItemRenderer; import com.atsuishio.superbwarfare.init.ModBlockEntities; import com.atsuishio.superbwarfare.init.ModBlocks; @@ -26,11 +26,11 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.function.Supplier; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class SmallContainerBlockItem extends BlockItem implements GeoItem { public static final List> SMALL_CONTAINER_LOOT_TABLES = List.of( - () -> SmallContainerBlockItem.createInstance(ModUtils.loc("containers/blueprints")) + () -> SmallContainerBlockItem.createInstance(Mod.loc("containers/blueprints")) ); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java index db9d449dc..152704553 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.common.ammo; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.PoseTool; import com.atsuishio.superbwarfare.client.renderer.item.RocketItemRenderer; import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity; @@ -33,7 +33,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.ParametersAreNonnullByDefault; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class Rocket extends Item implements GeoItem, ProjectileItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; 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 098d4efca..5a31d6879 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunEvents.java @@ -1,13 +1,13 @@ package com.atsuishio.superbwarfare.item.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.tools.NBTTool; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.player.ItemEntityPickupEvent; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class GunEvents { @SubscribeEvent public static void onPickup(ItemEntityPickupEvent.Pre event) { 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 52b3c9377..41b5160f3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.PoseTool; import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; @@ -42,7 +42,7 @@ import java.util.Set; import static com.atsuishio.superbwarfare.tools.NBTTool.saveTag; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public abstract class GunItem extends Item implements CustomRendererItem { public GunItem(Properties properties) { @@ -154,7 +154,7 @@ public abstract class GunItem extends Item implements CustomRendererItem { } public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/default_icon.png"); + return Mod.loc("textures/gun_icon/default_icon.png"); } public String getGunDisplayName() { 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 aad5b0340..4019036c1 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.handgun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Glock17ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -109,7 +109,7 @@ public class Glock17Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/glock_icon.png"); + return Mod.loc("textures/gun_icon/glock_icon.png"); } @Override 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 0137fba8f..d7c213013 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.handgun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Glock18ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -112,7 +112,7 @@ public class Glock18Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/glock_icon.png"); + return Mod.loc("textures/gun_icon/glock_icon.png"); } @Override 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 6a36151c9..19d3ba4db 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.handgun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M1911ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -112,7 +112,7 @@ public class M1911Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m1911_icon.png"); + return Mod.loc("textures/gun_icon/m1911_icon.png"); } @Override 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 b9e1ff0ce..87501dfc1 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.handgun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.Mp443ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -109,7 +109,7 @@ public class Mp443Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/mp443_icon.png"); + return Mod.loc("textures/gun_icon/mp443_icon.png"); } @Override 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 704e485ba..859e91415 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.handgun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.TooltipTool; import com.atsuishio.superbwarfare.client.renderer.item.TracheliumItemRenderer; @@ -284,7 +284,7 @@ public class Trachelium extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/trachelium_icon.png"); + return Mod.loc("textures/gun_icon/trachelium_icon.png"); } @Override 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 73bac03a5..f69f41e9a 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.heavy; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.Ntw20Renderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -157,7 +157,7 @@ public class Ntw20Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/ntw_20_icon.png"); + return Mod.loc("textures/gun_icon/ntw_20_icon.png"); } @Override 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 9bd0f3335..3bb92e175 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.launcher; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.JavelinItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; @@ -212,7 +212,7 @@ public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/javelin_icon.png"); + return Mod.loc("textures/gun_icon/javelin_icon.png"); } @Override @@ -296,7 +296,7 @@ public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon { tag.putInt("SeekTime", 0); tag.putString("TargetEntity", "none"); if (player instanceof ServerPlayer serverPlayer) { - var clientboundstopsoundpacket = new ClientboundStopSoundPacket(ModUtils.loc("javelin_lock"), SoundSource.PLAYERS); + var clientboundstopsoundpacket = new ClientboundStopSoundPacket(Mod.loc("javelin_lock"), SoundSource.PLAYERS); serverPlayer.connection.send(clientboundstopsoundpacket); } } 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 4b02f4c72..e33b75b8b 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.launcher; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.M79ItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; @@ -134,7 +134,7 @@ public class M79Item extends GunItem implements GeoItem, SpecialFireWeapon { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m79_icon.png"); + return Mod.loc("textures/gun_icon/m79_icon.png"); } @Override 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 fa4e1c1dd..c18e61b75 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.launcher; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.RpgItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; @@ -148,7 +148,7 @@ public class RpgItem extends GunItem implements GeoItem, SpecialFireWeapon { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/rpg_icon.png"); + return Mod.loc("textures/gun_icon/rpg_icon.png"); } @Override 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 b32d39a3f..facc82dd7 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.launcher; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.SecondaryCataclysmRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmImageComponent; @@ -213,7 +213,7 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, SpecialFireW @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/secondary_cataclysm_icon.png"); + return Mod.loc("textures/gun_icon/secondary_cataclysm_icon.png"); } @Override 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 465a832f0..8cc7203f6 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.DevotionItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -95,7 +95,7 @@ public class DevotionItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/devotion_icon.png"); + return Mod.loc("textures/gun_icon/devotion_icon.png"); } @Override 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 f846b04f0..31464cdfb 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M60ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -126,7 +126,7 @@ public class M60Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m60_icon.png"); + return Mod.loc("textures/gun_icon/m60_icon.png"); } @Override 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 267dc6bd3..de1a62c79 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MinigunItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -159,7 +159,7 @@ public class MinigunItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/minigun_icon.png"); + return Mod.loc("textures/gun_icon/minigun_icon.png"); } @Override 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 2cf730dbe..250956e71 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.RpkItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -95,7 +95,7 @@ public class RpkItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/rpk_icon.png"); + return Mod.loc("textures/gun_icon/rpk_icon.png"); } @Override 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 d426b5a0d..a9824c605 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.AK12ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -166,7 +166,7 @@ public class AK12Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/ak12_icon.png"); + return Mod.loc("textures/gun_icon/ak12_icon.png"); } @Override 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 88c2cfe10..89df3e484 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.AK47ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -176,7 +176,7 @@ public class AK47Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/ak_47_icon.png"); + return Mod.loc("textures/gun_icon/ak_47_icon.png"); } @Override 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 06ff65d44..b75e915af 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.Hk416ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -176,7 +176,7 @@ public class Hk416Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/hk416_icon.png"); + return Mod.loc("textures/gun_icon/hk416_icon.png"); } @Override 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 584ac69d1..cc87670f9 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.M4ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -177,7 +177,7 @@ public class M4Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m4_icon.png"); + return Mod.loc("textures/gun_icon/m4_icon.png"); } @Override 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 350d84868..3d6811816 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MarlinItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -130,7 +130,7 @@ public class MarlinItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/marlin_icon.png"); + return Mod.loc("textures/gun_icon/marlin_icon.png"); } @Override 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 1d30a2c8b..c7187ac99 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.Mk14ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -174,7 +174,7 @@ public class Mk14Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/mk14ebr_icon.png"); + return Mod.loc("textures/gun_icon/mk14ebr_icon.png"); } @Override 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 e251cb92a..f34aa80b6 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.Qbz95ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -178,7 +178,7 @@ public class Qbz95Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/qbz95_icon.png"); + return Mod.loc("textures/gun_icon/qbz95_icon.png"); } @Override 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 31b1c84d1..c02db888c 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.rifle; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.SksItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -110,7 +110,7 @@ public class SksItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/sks_icon.png"); + return Mod.loc("textures/gun_icon/sks_icon.png"); } @Override 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 9d51c8ba3..d53721fdb 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; -import com.atsuishio.superbwarfare.ModUtils; +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.event.ClientEventHandler; @@ -123,7 +123,7 @@ public class Aa12Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/aa_12_icon.png"); + return Mod.loc("textures/gun_icon/aa_12_icon.png"); } @Override 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 5299692e3..3c986c8df 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; -import com.atsuishio.superbwarfare.ModUtils; +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.event.ClientEventHandler; @@ -98,7 +98,7 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/homemade_shotgun_icon.png"); + return Mod.loc("textures/gun_icon/homemade_shotgun_icon.png"); } @Override 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 352708f91..291638aa3 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; -import com.atsuishio.superbwarfare.ModUtils; +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.event.ClientEventHandler; @@ -132,7 +132,7 @@ public class M870Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m870_icon.png"); + return Mod.loc("textures/gun_icon/m870_icon.png"); } @Override 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 e8118a28f..952c17e09 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.smg; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.VectorItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -155,7 +155,7 @@ public class VectorItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/vector_icon.png"); + return Mod.loc("textures/gun_icon/vector_icon.png"); } @Override 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 1844a03e0..83359fa48 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.HuntingRifleItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -89,7 +89,7 @@ public class HuntingRifleItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/hunting_rifle_icon.png"); + return Mod.loc("textures/gun_icon/hunting_rifle_icon.png"); } @Override 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 a5bbd13d7..655f6a418 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.K98ItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -134,7 +134,7 @@ public class K98Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/k98_icon.png"); + return Mod.loc("textures/gun_icon/k98_icon.png"); } @Override 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 0a31e8438..b1610ab9e 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.M98bItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -111,7 +111,7 @@ public class M98bItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/m98b_icon.png"); + return Mod.loc("textures/gun_icon/m98b_icon.png"); } @Override 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 21e4f870b..f78486928 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.MosinNagantItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -134,7 +134,7 @@ public class MosinNagantItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/mosin_nagant_icon.png"); + return Mod.loc("textures/gun_icon/mosin_nagant_icon.png"); } @Override 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 92a2d1573..5fd33e0d4 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.SentinelItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.SentinelImageComponent; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -175,7 +175,7 @@ public class SentinelItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/sentinel_icon.png"); + return Mod.loc("textures/gun_icon/sentinel_icon.png"); } @Override 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 63e90f18f..c083aa4d4 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.sniper; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.SvdItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -138,7 +138,7 @@ public class SvdItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/svd_icon.png"); + return Mod.loc("textures/gun_icon/svd_icon.png"); } @Override 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 2aebd37b5..4b942e2d1 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.special; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.BocekItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.BocekImageComponent; @@ -132,7 +132,7 @@ public class BocekItem extends GunItem implements GeoItem, SpecialFireWeapon { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/bocek_icon.png"); + return Mod.loc("textures/gun_icon/bocek_icon.png"); } @Override 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 a82b2f587..f3792ef12 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.item.gun.special; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.client.renderer.item.TaserItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.EnergyImageComponent; @@ -201,7 +201,7 @@ public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon { @Override public ResourceLocation getGunIcon() { - return ModUtils.loc("textures/gun_icon/taser_icon.png"); + return Mod.loc("textures/gun_icon/taser_icon.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientIndicatorMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientIndicatorMessage.java index 7c28b3076..3bffd6453 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientIndicatorMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientIndicatorMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.network.ClientPacketHandler; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -10,7 +10,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record ClientIndicatorMessage(int messageType, int value) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("client_indicator")); + public static final Type TYPE = new Type<>(Mod.loc("client_indicator")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.INT, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientMotionSyncMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientMotionSyncMessage.java index 4f8d4a123..15c7063ea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientMotionSyncMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ClientMotionSyncMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.network.codec.ByteBufCodecs; @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public record ClientMotionSyncMessage(int id, float x, float y, float z) implements CustomPacketPayload { - public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(ModUtils.loc("client_motion_sync")); + public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(Mod.loc("client_motion_sync")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.INT, 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 00dbac917..d1524abd8 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,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.tools.GunsTool; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import java.util.HashMap; public record GunsDataMessage(HashMap> gunsData) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("set_guns_data")); + public static final Type TYPE = new Type<>(Mod.loc("set_guns_data")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerGunKillMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerGunKillMessage.java index 29b3dd139..64db2ac80 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerGunKillMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerGunKillMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.config.client.KillMessageConfig; import com.atsuishio.superbwarfare.event.KillMessageHandler; import com.atsuishio.superbwarfare.tools.PlayerKillRecord; @@ -62,7 +62,7 @@ public class PlayerGunKillMessage implements CustomPacketPayload { this.location = location; } - public static final Type TYPE = new Type<>(ModUtils.loc("player_gun_kill")); + public static final Type TYPE = new Type<>(Mod.loc("player_gun_kill")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.INT, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerVariablesSyncMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerVariablesSyncMessage.java index 00bba6924..7768e43ff 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerVariablesSyncMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/PlayerVariablesSyncMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.capability.player.PlayerVariable; import io.netty.buffer.ByteBuf; @@ -13,7 +13,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record PlayerVariablesSyncMessage(int target, CompoundTag data) implements CustomPacketPayload { - public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(ModUtils.loc("player_variable_sync")); + public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(Mod.loc("player_variable_sync")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.INT, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ShakeClientMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ShakeClientMessage.java index e12e70634..3fd8b68c4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ShakeClientMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/receive/ShakeClientMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.receive; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.event.ClientEventHandler; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -11,12 +11,12 @@ import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) public record ShakeClientMessage( double time, double radius, double amplitude, double x, double y, double z ) implements CustomPacketPayload { - public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(ModUtils.loc("shake_client")); + public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>(Mod.loc("shake_client")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.DOUBLE, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/BreathMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/BreathMessage.java index 5f4ad7cb1..37a9254e8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/BreathMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/BreathMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.send; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -11,7 +11,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record BreathMessage(boolean messageType) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("breath")); + public static final Type TYPE = new Type<>(Mod.loc("breath")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.BOOL, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/DoubleJumpMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/DoubleJumpMessage.java index 1d01bdfe0..84929fef3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/DoubleJumpMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/DoubleJumpMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.send; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.init.ModSounds; import io.netty.buffer.ByteBuf; @@ -15,7 +15,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record DoubleJumpMessage(boolean canDoubleJump) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("double_jump")); + public static final Type TYPE = new Type<>(Mod.loc("double_jump")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.BOOL, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/LaserShootMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/LaserShootMessage.java index ed95b06f0..afefc0184 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/LaserShootMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/LaserShootMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.send; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.network.message.receive.ClientIndicatorMessage; @@ -26,7 +26,7 @@ public record LaserShootMessage( UUID id, boolean headshot ) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("laser_shoot")); + public static final Type TYPE = new Type<>(Mod.loc("laser_shoot")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.DOUBLE, 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 084b2b980..cdc5eaf62 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 @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.send; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.event.GunEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -25,7 +25,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record ShootMessage(double spread) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("shoot")); + public static final Type TYPE = new Type<>(Mod.loc("shoot")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.DOUBLE, diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/VehicleMovementMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/VehicleMovementMessage.java index f90d8999a..12807e1af 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/VehicleMovementMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/VehicleMovementMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message.send; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.vehicle.base.ControllableVehicle; import com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; public record VehicleMovementMessage(short keys) implements CustomPacketPayload { - public static final Type TYPE = new Type<>(ModUtils.loc("vehicle_movement")); + public static final Type TYPE = new Type<>(Mod.loc("vehicle_movement")); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.SHORT, diff --git a/src/main/java/com/atsuishio/superbwarfare/procedures/WelcomeProcedure.java b/src/main/java/com/atsuishio/superbwarfare/procedures/WelcomeProcedure.java index 94c0df8cf..22c2a25ae 100644 --- a/src/main/java/com/atsuishio/superbwarfare/procedures/WelcomeProcedure.java +++ b/src/main/java/com/atsuishio/superbwarfare/procedures/WelcomeProcedure.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.procedures; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import net.neoforged.bus.api.Event; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.InterModComms; @@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import java.util.stream.Stream; -@EventBusSubscriber(modid = ModUtils.MODID, bus = EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) public class WelcomeProcedure { @SubscribeEvent public static void onFMLCommonSetup(FMLCommonSetupEvent event) { @@ -29,9 +29,9 @@ public class WelcomeProcedure { if (event == null) return; Logger logger = null; - if ((logger == null ? logger = ModUtils.LOGGER : LogManager.getLogger(ModUtils.class)) instanceof Logger) { + if ((logger == null ? logger = Mod.LOGGER : LogManager.getLogger(Mod.class)) instanceof Logger) { { - Logger _lgr = logger == null ? logger = ModUtils.LOGGER : LogManager.getLogger(ModUtils.class); + Logger _lgr = logger == null ? logger = Mod.LOGGER : LogManager.getLogger(Mod.class); _lgr.info("This Mod used to be made by MCreator!"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index ab7024a56..10e78c88c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.tools; -import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -26,7 +26,7 @@ import java.util.UUID; import static com.atsuishio.superbwarfare.tools.NBTTool.saveTag; -@EventBusSubscriber(modid = ModUtils.MODID) +@EventBusSubscriber(modid = Mod.MODID) public class GunsTool { public static HashMap> gunsData = new HashMap<>(); @@ -52,7 +52,7 @@ public class GunsTool { reader.endObject(); reader.close(); } catch (Exception e) { - ModUtils.LOGGER.error(e.getMessage()); + Mod.LOGGER.error(e.getMessage()); } } }