diff --git a/Changelog.md b/Changelog.md index c5d20d51a..04906f306 100644 --- a/Changelog.md +++ b/Changelog.md @@ -22,6 +22,8 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu - penetrableBlocks - knockbackOnHi - hipFireSpread + - ammoCounterX \ ammoCounterY + - ammoCounterSize \ ammoCounterBackgroundReverse - Add Small Gunpower(Reduce the cost of manufacturing bullets) - Durability to all vests as a temporary measure to resolve vest-related issues - Smelting of sulfur into gunpowder diff --git a/src/main/java/com/paneedah/mwc/CustomSpawnEggs.java b/src/main/java/com/paneedah/mwc/CustomSpawnEggs.java index 750de110a..fd19c58ea 100644 --- a/src/main/java/com/paneedah/mwc/CustomSpawnEggs.java +++ b/src/main/java/com/paneedah/mwc/CustomSpawnEggs.java @@ -16,7 +16,7 @@ public static void init(Object mod, CommonProxy proxy) { .withItemName("turret") .withEntitySpawnName("turret") .withBlockPredicate(b -> b.getRegistryName().toString().equals(ModReference.ID + ":turret_base")) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .build(); TURRETUPGRADED_EGG = new HighIQSpawnEgg.Builder() @@ -24,7 +24,7 @@ public static void init(Object mod, CommonProxy proxy) { .withItemName("turretupgraded") .withEntitySpawnName("turretupgraded") .withBlockPredicate(b -> b.getRegistryName().toString().equals(ModReference.ID + ":turret_base")) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .build(); TURRETSILENCED_EGG = new HighIQSpawnEgg.Builder() @@ -32,7 +32,7 @@ public static void init(Object mod, CommonProxy proxy) { .withItemName("turretsilenced") .withEntitySpawnName("turretsilenced") .withBlockPredicate(b -> b.getRegistryName().toString().equals(ModReference.ID + ":turret_base")) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .build(); } } diff --git a/src/main/java/com/paneedah/mwc/Electronics.java b/src/main/java/com/paneedah/mwc/Electronics.java index 26c5277f4..ef5e6725d 100644 --- a/src/main/java/com/paneedah/mwc/Electronics.java +++ b/src/main/java/com/paneedah/mwc/Electronics.java @@ -18,10 +18,10 @@ public static void init(Object mod) { Tablet = new ItemTablet.Builder<>() .withViewfinderPositioning((p, s) -> { float scale = 5.9f; - GL11.glScalef(scale, scale / ModernWarfareMod.MOD_CONTEXT.getAspectRatio(), scale); + GL11.glScalef(scale, scale / MWC.modContext.getAspectRatio(), scale); GL11.glTranslatef(-0.12f, 0.56f, 0.01f); }) - .withCreativeTab(ModernWarfareMod.GadgetsTab) + .withCreativeTab(MWC.GADGETS_TAB) .withCrosshair("HP") .withModel(new TabletModel(), "IPad.png") //.withModel(new com.paneedah.mwc.models.LPscope(), "HP2.png") @@ -76,12 +76,12 @@ public static void init(Object mod) { .withName("tablet") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemWirelessCamera.Builder() .withName("wcam") - .withCreativeTab(ModernWarfareMod.GadgetsTab) + .withCreativeTab(MWC.GADGETS_TAB) .withModel(new CameraModel(), "gun") .withFirstPersonPositioning((player, itemStack) -> { // GL11.glTranslatef(0.5F, -1.5F, -0.7F); @@ -134,17 +134,17 @@ public static void init(Object mod) { } ) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemHandheld.Builder<>() .withScreenPerspectiveType(GasDetectorScreenPerspective.class) .withScreenPositioning((p, s) -> { float scale = 1.9f; - GL11.glScalef(scale, scale / ModernWarfareMod.MOD_CONTEXT.getAspectRatio(), scale); + GL11.glScalef(scale, scale / MWC.modContext.getAspectRatio(), scale); GL11.glTranslatef(0.017f, 0.16f, 0.17f); }) - .withCreativeTab(ModernWarfareMod.GadgetsTab) + .withCreativeTab(MWC.GADGETS_TAB) .withCrosshair("HP") .withModel(new GasDetector(), "gasdetector.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -204,6 +204,6 @@ public static void init(Object mod) { .withName("gas-detector") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/Grenades.java b/src/main/java/com/paneedah/mwc/Grenades.java index 7cf37220b..2eb84eb68 100644 --- a/src/main/java/com/paneedah/mwc/Grenades.java +++ b/src/main/java/com/paneedah/mwc/Grenades.java @@ -19,7 +19,7 @@ public class Grenades { public static void init(Object mod, CommonProxy commonProxy) { - GrenadeSafetyPin = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA).withModel(new com.paneedah.mwc.models.Pin(), "gun.png").withName("GrenadeSafetyPin").withRenderablePart().withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + GrenadeSafetyPin = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA).withModel(new com.paneedah.mwc.models.Pin(), "gun.png").withName("GrenadeSafetyPin").withRenderablePart().withTextureName("Dummy.png").build(MWC.modContext); FuseGrenade = new FuseGrenadeFactory().createGrenade(commonProxy); ImpactGrenade = new ImpactGrenadeFactory().createGrenade(commonProxy); diff --git a/src/main/java/com/paneedah/mwc/MWC.java b/src/main/java/com/paneedah/mwc/MWC.java new file mode 100644 index 000000000..f569ac66f --- /dev/null +++ b/src/main/java/com/paneedah/mwc/MWC.java @@ -0,0 +1,83 @@ +package com.paneedah.mwc; + +import com.paneedah.mwc.creativetab.*; +import com.paneedah.mwc.init.MWCRecipes; +import com.paneedah.mwc.proxies.CommonProxy; +import com.paneedah.mwc.utils.ModReference; +import com.paneedah.mwc.utils.OptiNotFine; +import com.paneedah.weaponlib.ModContext; +import com.paneedah.weaponlib.command.BalancePackCommand; +import com.paneedah.weaponlib.command.CraftingFileCommand; +import com.paneedah.weaponlib.config.BalancePackManager; +import com.paneedah.weaponlib.crafting.CraftingFileManager; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; + +// /$$ /$$ /$$ /$$ /$$ /$$$$$$ /$$$$$$ /$$ /$$ +// | $$$ /$$$ | $$ | $$ /$ | $$ /$$__ $$ /$$__ $$ | $$ | $$ +// | $$$$ /$$$$ /$$$$$$ /$$$$$$$ /$$$$$$ /$$$$$$ /$$$$$$$ | $$ /$$$| $$ /$$$$$$ /$$$$$$ | $$ \__//$$$$$$ /$$$$$$ /$$$$$$ | $$ \__/ /$$ /$$| $$$$$$$ /$$$$$$ /$$$$$$$ +// | $$ $$/$$ $$ /$$__ $$ /$$__ $$ /$$__ $$ /$$__ $$| $$__ $$ | $$/$$ $$ $$ |____ $$ /$$__ $$| $$$$ |____ $$ /$$__ $$ /$$__ $$ | $$ | $$ | $$| $$__ $$ /$$__ $$ /$$__ $$ +// | $$ $$$| $$| $$ \ $$| $$ | $$| $$$$$$$$| $$ \__/| $$ \ $$ | $$$$_ $$$$ /$$$$$$$| $$ \__/| $$_/ /$$$$$$$| $$ \__/| $$$$$$$$ | $$ | $$ | $$| $$ \ $$| $$$$$$$$| $$ | $$ +// | $$\ $ | $$| $$ | $$| $$ | $$| $$_____/| $$ | $$ | $$ | $$$/ \ $$$ /$$__ $$| $$ | $$ /$$__ $$| $$ | $$_____/ | $$ $$| $$ | $$| $$ | $$| $$_____/| $$ | $$ +// | $$ \/ | $$| $$$$$$/| $$$$$$$| $$$$$$$| $$ | $$ | $$ | $$/ \ $$| $$$$$$$| $$ | $$ | $$$$$$$| $$ | $$$$$$$ | $$$$$$/| $$$$$$/| $$$$$$$/| $$$$$$$| $$$$$$$ +// |__/ |__/ \______/ \_______/ \_______/|__/ |__/ |__/ |__/ \__/ \_______/|__/ |__/ \_______/|__/ \_______/ \______/ \______/ |_______/ \_______/ \_______/ +@Mod(modid = ModReference.ID, name = ModReference.NAME, version = ModReference.VERSION, dependencies = "required-after:redcore@[0.2,);", guiFactory = "com.paneedah.weaponlib.config.ConfigGUIFactory", updateJSON = "https://raw.githubusercontent.com/Cubed-Development/Modern-Warfare-Cubed/master/update.json") +public final class MWC { + + public static final SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(ModReference.ID); + + public static final CreativeTabs ARMOR_TAB = new ArmorTab(CreativeTabs.getNextID(), "ArmorTab"); + public static final CreativeTabs ASSAULT_RIFLES_TAB = new AssaultRiflesTab(CreativeTabs.getNextID(), "AssaultRifles_tab"); + public static final CreativeTabs AMMO_TAB = new AmmoTab(CreativeTabs.getNextID(), "AmmoTab"); + public static final CreativeTabs ATTACHMENTS_TAB = new AttachmentsTab(CreativeTabs.getNextID(), "AttachmentsTab"); + public static final CreativeTabs GRENADES_TAB = new GrenadesTab(CreativeTabs.getNextID(), "GrenadesTab"); + public static final CreativeTabs GADGETS_TAB = new GadgetsTab(CreativeTabs.getNextID(), "GadgetsTab"); + public static final CreativeTabs PROPS_TAB = new PropsTab(CreativeTabs.getNextID(), "props_tab"); + public static final CreativeTabs BLOCKS_TAB = new BlocksTab(CreativeTabs.getNextID(), "BlocksTab"); + + // Todo: Make this configurable via the future YAML config system from FBP, or Valkyrie integration, the later would be best. + public static int bulletHitParticleMult = 6; + + @SidedProxy(serverSide = "com.paneedah.weaponlib.CommonModContext", clientSide = "com.paneedah.weaponlib.ClientModContext") + public static ModContext modContext; + + @SidedProxy(serverSide = "com.paneedah.mwc.proxies.CommonProxy", clientSide = "com.paneedah.mwc.proxies.ClientProxy") + public static CommonProxy commonProxy; + + @EventHandler + public void preInit(FMLPreInitializationEvent preInitializationEvent) { + commonProxy.preInit(this); + } + + @EventHandler + public void init(FMLInitializationEvent initializationEvent) { + if (initializationEvent.getSide() == Side.CLIENT && OptiNotFine.isOptiFineInstalled()) + MinecraftForge.EVENT_BUS.register(OptiNotFine.class); + + MWCRecipes.register(); + commonProxy.init(this); + } + + @EventHandler + public void postInit(FMLPostInitializationEvent postInitializationEvent) { + commonProxy.postInit(this, postInitializationEvent); + } + + @EventHandler + public void serverStarting(FMLServerStartingEvent serverStartingEvent) { + serverStartingEvent.registerServerCommand(new BalancePackCommand()); + serverStartingEvent.registerServerCommand(new CraftingFileCommand()); + BalancePackManager.loadDirectory(); + CraftingFileManager.getInstance().loadDirectory(); + } +} diff --git a/src/main/java/com/paneedah/mwc/ModernWarfareMod.java b/src/main/java/com/paneedah/mwc/ModernWarfareMod.java deleted file mode 100644 index 652bcc73d..000000000 --- a/src/main/java/com/paneedah/mwc/ModernWarfareMod.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.paneedah.mwc; - -import com.paneedah.mwc.creativetab.*; -import com.paneedah.mwc.init.MWCRecipes; -import com.paneedah.mwc.proxies.CommonProxy; -import com.paneedah.mwc.utils.ModReference; -import com.paneedah.mwc.utils.OptiNotFine; -import com.paneedah.weaponlib.ClientEventHandler; -import com.paneedah.weaponlib.ModContext; -import com.paneedah.weaponlib.command.BalancePackCommand; -import com.paneedah.weaponlib.command.CraftingFileCommand; -import com.paneedah.weaponlib.config.BalancePackManager; -import com.paneedah.weaponlib.crafting.CraftingFileManager; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@Mod(modid = ModReference.ID, name = ModReference.NAME, version = ModReference.VERSION, guiFactory = "com.paneedah.weaponlib.config.ConfigGUIFactory") -public class ModernWarfareMod { - - private static final String DEFAULT_CONFIG_RESOURCE = "/mwc.cfg"; - - @SidedProxy(serverSide = "com.paneedah.weaponlib.CommonModContext", clientSide = "com.paneedah.weaponlib.ClientModContext") - public static ModContext MOD_CONTEXT; - - // Todo: Make this configurable via the future YAML config system from FBP. - public static int bulletHitParticleMult = 6; - - public static final SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(ModReference.ID); - - public static final CreativeTabs ArmorTab = new ArmorTab(CreativeTabs.getNextID(), "ArmorTab"); - public static final CreativeTabs AssaultRiflesTab = new AssaultRiflesTab(CreativeTabs.getNextID(), "AssaultRifles_tab"); - public static final CreativeTabs AmmoTab = new AmmoTab(CreativeTabs.getNextID(), "AmmoTab"); - public static final CreativeTabs AttachmentsTab = new AttachmentsTab(CreativeTabs.getNextID(), "AttachmentsTab"); - public static final CreativeTabs GrenadesTab = new GrenadesTab(CreativeTabs.getNextID(), "GrenadesTab"); - public static final CreativeTabs GadgetsTab = new GadgetsTab(CreativeTabs.getNextID(), "GadgetsTab"); - public static final CreativeTabs PropsTab = new PropsTab(CreativeTabs.getNextID(), "props_tab"); - public static final CreativeTabs BlocksTab = new BlocksTab(CreativeTabs.getNextID(), "BlocksTab"); - - @SidedProxy(serverSide = "com.paneedah.mwc.proxies.CommonProxy", clientSide = "com.paneedah.mwc.proxies.ClientProxy") - public static CommonProxy proxy; - - @EventHandler - public void init(FMLPreInitializationEvent event) { - proxy.preInit(this); - } - - @EventHandler - public void init(FMLInitializationEvent event) { - if (event.getSide() == Side.CLIENT && OptiNotFine.isOptiFineInstalled()) - MinecraftForge.EVENT_BUS.register(OptiNotFine.class); - - // Recipes - MWCRecipes.register(); - proxy.init(this); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(this, event); - } - - @EventHandler - public void onServerStarting(FMLServerStartingEvent event) { - event.registerServerCommand(new BalancePackCommand()); - event.registerServerCommand(new CraftingFileCommand()); - BalancePackManager.loadDirectory(); - CraftingFileManager.getInstance().loadDirectory(); - } -} diff --git a/src/main/java/com/paneedah/mwc/PlayerAnimations.java b/src/main/java/com/paneedah/mwc/PlayerAnimations.java index 362554504..926e1668e 100644 --- a/src/main/java/com/paneedah/mwc/PlayerAnimations.java +++ b/src/main/java/com/paneedah/mwc/PlayerAnimations.java @@ -120,7 +120,7 @@ public static void init(Object mod) { .build(); - ModernWarfareMod.MOD_CONTEXT.setPlayerTransitionProvider(playerTransitionProvider); + MWC.modContext.setPlayerTransitionProvider(playerTransitionProvider); } } diff --git a/src/main/java/com/paneedah/mwc/bases/BlockBase.java b/src/main/java/com/paneedah/mwc/bases/BlockBase.java index 5d6f2eb1e..2f0a4ce53 100644 --- a/src/main/java/com/paneedah/mwc/bases/BlockBase.java +++ b/src/main/java/com/paneedah/mwc/bases/BlockBase.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.bases; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -18,7 +18,7 @@ public BlockBase(String registryName) { setHardness(6F); setResistance(15F); setHarvestLevel("pickaxe", 2); - setCreativeTab(ModernWarfareMod.BlocksTab); + setCreativeTab(MWC.BLOCKS_TAB); } @Override diff --git a/src/main/java/com/paneedah/mwc/bases/ItemBase.java b/src/main/java/com/paneedah/mwc/bases/ItemBase.java index 91a065a49..8c506af5b 100644 --- a/src/main/java/com/paneedah/mwc/bases/ItemBase.java +++ b/src/main/java/com/paneedah/mwc/bases/ItemBase.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.bases; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import net.minecraft.item.Item; import java.util.Arrays; @@ -16,7 +16,7 @@ public ItemBase(String registryName) { setMaxStackSize(stackSize); // Might want to change that? - setCreativeTab(ModernWarfareMod.BlocksTab); + setCreativeTab(MWC.BLOCKS_TAB); } public void setStackSize(int stackSize) { diff --git a/src/main/java/com/paneedah/mwc/bases/OreBase.java b/src/main/java/com/paneedah/mwc/bases/OreBase.java index 4de81d262..5487801cb 100644 --- a/src/main/java/com/paneedah/mwc/bases/OreBase.java +++ b/src/main/java/com/paneedah/mwc/bases/OreBase.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.bases; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.utils.ModReference; import net.minecraft.block.BlockOre; import net.minecraft.block.state.IBlockState; @@ -21,7 +21,7 @@ public OreBase(String registryName) { setHardness(6F); setResistance(15F); setHarvestLevel("pickaxe", harvestLevel); - setCreativeTab(ModernWarfareMod.BlocksTab); + setCreativeTab(MWC.BLOCKS_TAB); } @Override diff --git a/src/main/java/com/paneedah/mwc/entities/Entities.java b/src/main/java/com/paneedah/mwc/entities/Entities.java index 5a1c1e373..e015fa830 100644 --- a/src/main/java/com/paneedah/mwc/entities/Entities.java +++ b/src/main/java/com/paneedah/mwc/entities/Entities.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.entities; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Guns; import com.paneedah.mwc.weapons.Magazines; @@ -19,7 +19,7 @@ public class Entities { public static void init(CommonProxy commonProxy) { - new BanditEntityFactory().createEntity(ModernWarfareMod.MOD_CONTEXT); + new BanditEntityFactory().createEntity(MWC.modContext); new EntityConfiguration.Builder() .withName("soldier") @@ -70,7 +70,7 @@ public static void init(CommonProxy commonProxy) { .withAiTargetTask(3, e -> new EntityAINearestAttackableTarget<>((EntityCreature) e, EntityZombieVillager.class, true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "terrorist", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "tyke", true)) - .register(ModernWarfareMod.MOD_CONTEXT); + .register(MWC.modContext); new EntityConfiguration.Builder() .withName("turret") @@ -120,7 +120,7 @@ public static void init(CommonProxy commonProxy) { .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "soldier", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "terrorist", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "tyke", true)) - .register(ModernWarfareMod.MOD_CONTEXT); + .register(MWC.modContext); new EntityConfiguration.Builder() .withName("turretupgraded") .withBaseClass(EntityCustomMob.class) @@ -169,7 +169,7 @@ public static void init(CommonProxy commonProxy) { .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "soldier", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "terrorist", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "tyke", true)) - .register(ModernWarfareMod.MOD_CONTEXT); + .register(MWC.modContext); new EntityConfiguration.Builder() .withName("turretsilenced") @@ -219,6 +219,6 @@ public static void init(CommonProxy commonProxy) { .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "soldier", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "terrorist", true)) .withAiTargetTask(4, e -> new BetterAINearestAttackableTarget<>((EntityCreature) e, EntityCustomMob.class, "tyke", true)) - .register(ModernWarfareMod.MOD_CONTEXT); + .register(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/grenade/FlashGrenadeFactory.java b/src/main/java/com/paneedah/mwc/items/grenade/FlashGrenadeFactory.java index 0aaabc9f4..a8e2a8032 100644 --- a/src/main/java/com/paneedah/mwc/items/grenade/FlashGrenadeFactory.java +++ b/src/main/java/com/paneedah/mwc/items/grenade/FlashGrenadeFactory.java @@ -1,7 +1,7 @@ package com.paneedah.mwc.items.grenade; import com.paneedah.mwc.Grenades; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.FlashGrenade; import com.paneedah.mwc.proxies.CommonProxy; @@ -15,7 +15,6 @@ import com.paneedah.weaponlib.grenade.ItemGrenade.Type; import com.paneedah.weaponlib.grenade.RenderableState; import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; public class FlashGrenadeFactory implements GrenadeFactory { @@ -26,7 +25,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .withType(Type.FLASH) .withName("Flash") - .withCreativeTab(ModernWarfareMod.GrenadesTab) + .withCreativeTab(MWC.GRENADES_TAB) .withTextureNames("flashgrenade") .withExplosionStrength(0.1f) .withExplosionTimeout(5000) @@ -352,6 +351,6 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/grenade/FuseGrenadeFactory.java b/src/main/java/com/paneedah/mwc/items/grenade/FuseGrenadeFactory.java index 26112aecd..f9604ddda 100644 --- a/src/main/java/com/paneedah/mwc/items/grenade/FuseGrenadeFactory.java +++ b/src/main/java/com/paneedah/mwc/items/grenade/FuseGrenadeFactory.java @@ -1,7 +1,7 @@ package com.paneedah.mwc.items.grenade; import com.paneedah.mwc.Grenades; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.M67Frag; import com.paneedah.mwc.proxies.CommonProxy; @@ -23,7 +23,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { return new ItemGrenade.Builder() .withName("M67Frag") - .withCreativeTab(ModernWarfareMod.GrenadesTab) + .withCreativeTab(MWC.GRENADES_TAB) .withTextureNames("M67Frag") .withExplosionStrength(3f) .withExplosionTimeout(5000) @@ -350,6 +350,6 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/grenade/GasGrenadeFactory.java b/src/main/java/com/paneedah/mwc/items/grenade/GasGrenadeFactory.java index d1dcc381c..42cca5e84 100644 --- a/src/main/java/com/paneedah/mwc/items/grenade/GasGrenadeFactory.java +++ b/src/main/java/com/paneedah/mwc/items/grenade/GasGrenadeFactory.java @@ -1,20 +1,16 @@ package com.paneedah.mwc.items.grenade; import com.paneedah.mwc.Grenades; -import com.paneedah.mwc.ModernWarfareMod; -import com.paneedah.mwc.init.MWCItems; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.gasgrenade; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.weaponlib.Part; import com.paneedah.weaponlib.RenderContext; import com.paneedah.weaponlib.animation.Transition; -import com.paneedah.weaponlib.crafting.CraftingEntry; -import com.paneedah.weaponlib.crafting.CraftingGroup; import com.paneedah.weaponlib.grenade.GrenadeRenderer; import com.paneedah.weaponlib.grenade.ItemGrenade; import com.paneedah.weaponlib.grenade.ItemGrenade.Type; import com.paneedah.weaponlib.grenade.RenderableState; -import net.minecraft.init.Items; import org.lwjgl.opengl.GL11; public class GasGrenadeFactory implements GrenadeFactory { @@ -24,7 +20,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { return new ItemGrenade.Builder() .withName("GasGrenade") - .withCreativeTab(ModernWarfareMod.GrenadesTab) + .withCreativeTab(MWC.GRENADES_TAB) .withTextureNames("gasgrenade") .withExplosionStrength(0.4f) .withType(Type.GAS) @@ -351,6 +347,6 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/grenade/ImpactGrenadeFactory.java b/src/main/java/com/paneedah/mwc/items/grenade/ImpactGrenadeFactory.java index 476016fd6..f3f7f59d9 100644 --- a/src/main/java/com/paneedah/mwc/items/grenade/ImpactGrenadeFactory.java +++ b/src/main/java/com/paneedah/mwc/items/grenade/ImpactGrenadeFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.grenade; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.ImpactGrenade; import com.paneedah.mwc.proxies.CommonProxy; @@ -12,7 +12,6 @@ import com.paneedah.weaponlib.grenade.ItemGrenade; import com.paneedah.weaponlib.grenade.RenderableState; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import org.lwjgl.opengl.GL11; public class ImpactGrenadeFactory implements GrenadeFactory { @@ -22,7 +21,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { return new ItemGrenade.Builder() .withName("ImpactGrenade") - .withCreativeTab(ModernWarfareMod.GrenadesTab) + .withCreativeTab(MWC.GRENADES_TAB) .withTextureNames("ImpactGrenade") .withExplosionSound("grenadeexplosion") .withExplosionStrength(3f) @@ -189,6 +188,6 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/grenade/SmokeGrenadeFactory.java b/src/main/java/com/paneedah/mwc/items/grenade/SmokeGrenadeFactory.java index 320824a14..0a2d1d009 100644 --- a/src/main/java/com/paneedah/mwc/items/grenade/SmokeGrenadeFactory.java +++ b/src/main/java/com/paneedah/mwc/items/grenade/SmokeGrenadeFactory.java @@ -1,7 +1,7 @@ package com.paneedah.mwc.items.grenade; import com.paneedah.mwc.Grenades; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.M18; import com.paneedah.mwc.proxies.CommonProxy; @@ -25,7 +25,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { return new ItemGrenade.Builder() .withName("M18White") - .withCreativeTab(ModernWarfareMod.GrenadesTab) + .withCreativeTab(MWC.GRENADES_TAB) .withTextureNames("M18White") .withExplosionStrength(0.4f) .withType(Type.SMOKE) @@ -350,6 +350,6 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AACHoneyBadgerFactory.java b/src/main/java/com/paneedah/mwc/items/guns/AACHoneyBadgerFactory.java index 33af80a9f..b99f4ad21 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AACHoneyBadgerFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AACHoneyBadgerFactory.java @@ -3,7 +3,7 @@ // IMPORT LIST START -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { // .withShootSoundVolume(1f) .withShellCasingForwardOffset(0.1f) // Shell casing forward offset .withShellCasingVerticalOffset(-0.05f) // Shell casing vertical offset - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) // Creative tab + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) // Creative tab .useNewSystem() // Use new system .withRecoilParam(new RecoilParam( // Recoil param // The weapon power @@ -1012,6 +1012,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ACRFactory.java b/src/main/java/com/paneedah/mwc/items/guns/ACRFactory.java index c6bf6abab..71b90afe1 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ACRFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ACRFactory.java @@ -3,7 +3,7 @@ // IMPORT LIST START -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) // Flash scale .withFlashOffsetX(() -> 0.14f) // Flash offset X .withFlashOffsetY(() -> 0.16f) // Flash offset Y - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) // Creative tab + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) // Creative tab .useNewSystem() // Use new system .withRecoilParam(new RecoilParam( // Recoil param // The weapon power @@ -94,7 +94,7 @@ public Item createGun(CommonProxy commonProxy) { CraftingEntry(MWCItems.gunmetalPlate, 12), new CraftingEntry(MWCItems.steelIngot, 3)) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) // Creative tab + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) // Creative tab // Unremovable attachment categories .withUnremovableAttachmentCategories(AttachmentCategory.GUARD) @@ -1133,7 +1133,7 @@ else if(Weapon.isActiveAttachment(renderContext.getWeaponInstance(), Attachments .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK101Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AK101Factory.java index 248c7c2b6..eb102d74f 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK101Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK101Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -54,7 +54,7 @@ public Item createGun(CommonProxy commonProxy) { // .withSpawnEntityModel(ammoModel) // .withSpawnEntityModelTexture(ammoModelTextureName) .withShellCasingVerticalOffset(-0.05f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -950,7 +950,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AK12Factory.java index 412bf9852..575c8bc90 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingVerticalOffset(-0.05f) // .withShellCasingForwardOffset(-0.2f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -800,7 +800,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6.3f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK12_kalFactory.java b/src/main/java/com/paneedah/mwc/items/guns/AK12_kalFactory.java index c3bec28ae..bb7774934 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK12_kalFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK12_kalFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -899,7 +899,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6.6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK15Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AK15Factory.java index 6cb566d88..ece8405c9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK15Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK15Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -889,7 +889,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6.6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK47Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AK47Factory.java index 590b0de3b..3f63be0d1 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK47Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK47Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -975,7 +975,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6.6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AK74Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AK74Factory.java index d1933c06c..ccb55fcba 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AK74Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AK74Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -55,7 +55,7 @@ public Item createGun(CommonProxy commonProxy) { // .withSpawnEntityModel(ammoModel) // .withSpawnEntityModelTexture(ammoModelTextureName) .withShellCasingVerticalOffset(-0.05f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -960,7 +960,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/APC9Factory.java b/src/main/java/com/paneedah/mwc/items/guns/APC9Factory.java index bc1d8e535..bf74f4384 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/APC9Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/APC9Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -45,7 +45,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingVerticalOffset(-0.03f) .withInaccuracy(1f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Submachine Gun", "Damage: 5", @@ -1521,6 +1521,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/APSFactory.java b/src/main/java/com/paneedah/mwc/items/guns/APSFactory.java index e82862feb..55eb3f8d8 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/APSFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/APSFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.APS; import com.paneedah.mwc.models.APSrearsight; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.19f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -477,6 +477,6 @@ else if(model instanceof makarovfrontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AR10SuperSASSFactory.java b/src/main/java/com/paneedah/mwc/items/guns/AR10SuperSASSFactory.java index 9f7a18ff9..af770b8a5 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AR10SuperSASSFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AR10SuperSASSFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1045,6 +1045,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AR15Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AR15Factory.java index 69852c2be..46cdf70c7 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AR15Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AR15Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1162,6 +1162,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ARX160Factory.java b/src/main/java/com/paneedah/mwc/items/guns/ARX160Factory.java index f6045727d..867b2708c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ARX160Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ARX160Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -587,6 +587,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AS50Factory.java b/src/main/java/com/paneedah/mwc/items/guns/AS50Factory.java index d363eaa08..5bfea23a6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AS50Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AS50Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.11f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Anti-Materiel Sniper Rifle", "Damage: 25", @@ -2077,6 +2077,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/AUGFactory.java b/src/main/java/com/paneedah/mwc/items/guns/AUGFactory.java index f3162e252..6ed0ba1f4 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/AUGFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/AUGFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.16f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Bullpup Assault Rifle", "Damage: 6", @@ -2747,6 +2747,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Beowulf50CalFactory.java b/src/main/java/com/paneedah/mwc/items/guns/Beowulf50CalFactory.java index 1477ce9f7..00f01fe50 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Beowulf50CalFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Beowulf50CalFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1048,6 +1048,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/BrenMkIIFactory.java b/src/main/java/com/paneedah/mwc/items/guns/BrenMkIIFactory.java index 0975c9689..daf1cbd67 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/BrenMkIIFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/BrenMkIIFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Light Machine Gun", "Damage: 10", @@ -1007,7 +1007,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(10f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/BrowningAuto5Factory.java b/src/main/java/com/paneedah/mwc/items/guns/BrowningAuto5Factory.java index df34b34fa..bea7e700e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/BrowningAuto5Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/BrowningAuto5Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.BrowningAuto5; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Shotgun", "Damage per Pellet: 6", @@ -699,6 +699,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/BrowningHiPowerFactory.java b/src/main/java/com/paneedah/mwc/items/guns/BrowningHiPowerFactory.java index f0483e64f..0ec1468ea 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/BrowningHiPowerFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/BrowningHiPowerFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.BrowningHiPower; import com.paneedah.mwc.models.Emp1911Slide; import com.paneedah.mwc.models.M1911frontsight; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.12f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Single Action Semi-Automatic Pistol", "Damage: 5", @@ -1400,6 +1400,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/CZ805BrenFactory.java b/src/main/java/com/paneedah/mwc/items/guns/CZ805BrenFactory.java index 86b261655..a695fa486 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/CZ805BrenFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/CZ805BrenFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.18f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -776,6 +776,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ChainsawFactory.java b/src/main/java/com/paneedah/mwc/items/guns/ChainsawFactory.java index 1f1cedf69..2dd5a6a86 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ChainsawFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ChainsawFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Chainsaw; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -45,7 +45,7 @@ public Item createGun(CommonProxy commonProxy) { // .withShellCasingEjectDirection() .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) // .withCrafting(CraftingComplexity.MEDIUM, // Ores.PlasticPlate, // MwItems.gunmetalPlate) @@ -567,6 +567,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntitySpeed(1.9F) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ChiappaRhinoFactory.java b/src/main/java/com/paneedah/mwc/items/guns/ChiappaRhinoFactory.java index 0aeb5c022..9d5d73a11 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ChiappaRhinoFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ChiappaRhinoFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.ChiappaRhino; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withInaccuracy(3) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Revolver", @@ -1860,6 +1860,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.016f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/DP28Factory.java b/src/main/java/com/paneedah/mwc/items/guns/DP28Factory.java index 8f066b0a5..5aeaead37 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/DP28Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/DP28Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.09f) .withFlashOffsetY(() -> 0.14f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Light Machine Gun", "Damage: 14", @@ -953,7 +953,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(14f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/DSR1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/DSR1Factory.java index 485efb440..1016276bf 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/DSR1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/DSR1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.08f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sniper Rifle", "Damage: 14", @@ -2416,6 +2416,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/DesertEagleFactory.java b/src/main/java/com/paneedah/mwc/items/guns/DesertEagleFactory.java index fc545b155..1987c4534 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/DesertEagleFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/DesertEagleFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Glock18C; import com.paneedah.mwc.models.Reflex2; import com.paneedah.mwc.proxies.CommonProxy; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -261,6 +261,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/F2000Factory.java b/src/main/java/com/paneedah/mwc/items/guns/F2000Factory.java index e4bd1f610..8f72e84a7 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/F2000Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/F2000Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -819,7 +819,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/FMG9Factory.java b/src/main/java/com/paneedah/mwc/items/guns/FMG9Factory.java index 238a586c3..09beae49c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/FMG9Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/FMG9Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -55,7 +55,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -672,6 +672,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/FNFALFactory.java b/src/main/java/com/paneedah/mwc/items/guns/FNFALFactory.java index e038a32bb..4456a1b68 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/FNFALFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/FNFALFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.09f) .withFlashOffsetY(() -> 0.11f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -810,7 +810,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(10f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/FamasF1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/FamasF1Factory.java index b2ec512a2..b954cdada 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/FamasF1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/FamasF1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.09f) .withFlashOffsetY(() -> 0.2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -774,7 +774,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/FiveSevenFactory.java b/src/main/java/com/paneedah/mwc/items/guns/FiveSevenFactory.java index 60c513d1a..92c9d837c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/FiveSevenFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/FiveSevenFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.13f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -411,6 +411,6 @@ else if(model instanceof P226frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/G11Factory.java b/src/main/java/com/paneedah/mwc/items/guns/G11Factory.java index a9b7a68c6..ff4649f96 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/G11Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/G11Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.14f) .withFlashOffsetY(() -> 0.18f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -437,7 +437,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/G2ContenderFactory.java b/src/main/java/com/paneedah/mwc/items/guns/G2ContenderFactory.java index 314da5627..502afd113 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/G2ContenderFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/G2ContenderFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.09f) .withFlashOffsetY(() -> 0.09f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Break-Action", "Damage: 6.5", @@ -1673,6 +1673,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/G36CFactory.java b/src/main/java/com/paneedah/mwc/items/guns/G36CFactory.java index 79c355848..13ab0636c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/G36CFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/G36CFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.2f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -697,6 +697,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/G3Factory.java b/src/main/java/com/paneedah/mwc/items/guns/G3Factory.java index 2392e2f29..f529bc4ed 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/G3Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/G3Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.13f) .withFlashOffsetY(() -> 0.13f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -824,7 +824,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(10f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/G43GewehrFactory.java b/src/main/java/com/paneedah/mwc/items/guns/G43GewehrFactory.java index 46f9d9e1a..7ecdf72a9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/G43GewehrFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/G43GewehrFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.13f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Rifle", "Damage: 13.5", @@ -976,7 +976,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(13.5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/GL06Factory.java b/src/main/java/com/paneedah/mwc/items/guns/GL06Factory.java index f7c5fb76c..5489788a6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/GL06Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/GL06Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { 3f, // y 2f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList("Type: Grenade Launcher", "Damage: 70", "Cartridge: 40mm Grenade", "Fire Rate: Semi")) .withCompatibleAttachment(Bullets.Grenade40mm, (model) -> {}) @@ -1081,6 +1081,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.3f) .withSpawnEntitySpeed(5f) .withSpawnEntityExplosionRadius(4f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Glock18CFactory.java b/src/main/java/com/paneedah/mwc/items/guns/Glock18CFactory.java index 1c8fa1a7d..39aaf4f9a 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Glock18CFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Glock18CFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -557,6 +557,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Glock19Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Glock19Factory.java index 6b1a553eb..121057a3f 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Glock19Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Glock19Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.18f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -686,7 +686,7 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } @SubscribeEvent diff --git a/src/main/java/com/paneedah/mwc/items/guns/HK417Factory.java b/src/main/java/com/paneedah/mwc/items/guns/HK417Factory.java index 782c7bf10..cf4f66656 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/HK417Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/HK417Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1027,6 +1027,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/HK_P12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/HK_P12Factory.java index e0716a122..8bb7707b7 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/HK_P12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/HK_P12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.17f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -535,6 +535,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityDamage(5.3f) .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/HS12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/HS12Factory.java index 5a40b6d5a..4ad85dd53 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/HS12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/HS12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { 1f, // y 10f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Double-Barrel Shotgun", "Damage per Pellet: 6", @@ -1576,6 +1576,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/K2C1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/K2C1Factory.java index 5618af12e..76186c163 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/K2C1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/K2C1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -54,7 +54,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -807,6 +807,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/KBP9A91Factory.java b/src/main/java/com/paneedah/mwc/items/guns/KBP9A91Factory.java index 03b3441fd..85881a0c5 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/KBP9A91Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/KBP9A91Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.15f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -541,7 +541,7 @@ else if(model instanceof PSO12) { .withSpawnEntityDamage(7f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/KS23Factory.java b/src/main/java/com/paneedah/mwc/items/guns/KS23Factory.java index fd8403a53..95f358004 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/KS23Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/KS23Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.05f) .withFlashOffsetY(() -> 0.09f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Carbine/Shotgun", "Damage per Pellet: 7.5", @@ -1442,6 +1442,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Kar98KFactory.java b/src/main/java/com/paneedah/mwc/items/guns/Kar98KFactory.java index f2d2199e7..ce3517e80 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Kar98KFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Kar98KFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.16f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Bolt-action rifle", "Damage: 13.5", @@ -2263,6 +2263,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/KedrFactory.java b/src/main/java/com/paneedah/mwc/items/guns/KedrFactory.java index 84563c859..ad9a3d4d9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/KedrFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/KedrFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Kedr; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.18f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Submachine Gun", "Damage: 5", @@ -1271,7 +1271,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/KragJorgensenFactory.java b/src/main/java/com/paneedah/mwc/items/guns/KragJorgensenFactory.java index 9eef418fc..a2fce771d 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/KragJorgensenFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/KragJorgensenFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -56,7 +56,7 @@ public Item createGun(CommonProxy commonProxy) { 2f, // y 7f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Repeating Bolt-action rifle", "Damage: 13.8", @@ -1723,6 +1723,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/KrissVectorFactory.java b/src/main/java/com/paneedah/mwc/items/guns/KrissVectorFactory.java index a40498890..38cfa0498 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/KrissVectorFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/KrissVectorFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.22f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1084,7 +1084,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5.3f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/L96A1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/L96A1Factory.java index 36bded57f..b27584262 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/L96A1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/L96A1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.08f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sniper Rifle", "Damage: 14", @@ -2241,6 +2241,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1014Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M1014Factory.java index c5eb93361..cbd52e280 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1014Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1014Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -55,7 +55,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.11f) .withShellCasingModel(new com.paneedah.mwc.models.Shotgun12Gauge()) .withShellCasingModelTexture("shotgun12gauge") - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -1435,6 +1435,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M110Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M110Factory.java index 981f58c99..e31c62d67 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M110Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M110Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -808,6 +808,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M134Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M134Factory.java index f7251c309..e74a46d02 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M134Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M134Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.M134; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -45,7 +45,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(-0.02f) .withShellCasingVerticalOffset(-0.05f) .withBleedingCoefficient(7f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Minigun", "Damage: 10", @@ -1021,6 +1021,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M16A1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M16A1Factory.java index eb117b446..bac02cc8d 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M16A1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M16A1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -823,6 +823,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M16A4Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M16A4Factory.java index d7616e6b3..8daf57885 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M16A4Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M16A4Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1017,6 +1017,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M17Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M17Factory.java index 61f8931e7..26c006e52 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M17Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M17Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.18f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -265,6 +265,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1873Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M1873Factory.java index c2dc803dc..f45b3dc68 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1873Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1873Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.06f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Lever Action Rifle", "Damage: 5.5", @@ -936,6 +936,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(5.5f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1897Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M1897Factory.java index a0bceb3af..74c666620 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1897Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1897Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -53,14 +53,14 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.8f) .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.13f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withScreenShaking(RenderableState.SHOOTING, 5f, // x 1f, // y 10f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -1409,6 +1409,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1911Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M1911Factory.java index b489473f4..18dcc5bb9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1911Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1911Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.12f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Pistol", "Damage: 5.3", @@ -1650,6 +1650,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1928ThompsonFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M1928ThompsonFactory.java index 85e066be8..a122c795d 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1928ThompsonFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1928ThompsonFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.12f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sub Machine Gun", "Damage: 5.3", @@ -1298,7 +1298,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(5.3f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonFactory.java index 570da4c3d..1c59e3fe6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.JohnsonLMG; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) // .withShellCasingSideOffset(0f) .withShellCasingVerticalOffset(-0.1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Light Machine Gun", "Damage: 15", @@ -1053,7 +1053,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(15f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonRifleFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonRifleFactory.java index 97c137ca7..e0da3f3ec 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonRifleFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1941JohnsonRifleFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -45,7 +45,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.12f) // .withShellCasingSideOffset(0f) .withShellCasingVerticalOffset(-0.1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Rifle", "Damage: 15", @@ -1037,7 +1037,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(15f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1CarbineFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M1CarbineFactory.java index eaf8e1b87..2a14f907c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1CarbineFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1CarbineFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -40,7 +40,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.1f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Rifle", "Damage: 6", @@ -1343,7 +1343,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M1GarandFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M1GarandFactory.java index ef4d630ac..e8ae7662f 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M1GarandFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M1GarandFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.1f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Semi-Automatic Rifle", "Damage: 15", @@ -727,6 +727,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M200InterventionFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M200InterventionFactory.java index e36241784..fd340b1c0 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M200InterventionFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M200InterventionFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.11f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sniper Rifle", "Damage: 20", @@ -2397,6 +2397,6 @@ else if(model instanceof AcogReticle) { // .withSpawnEntitySpeed(80f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M202Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M202Factory.java index 2ecf628d6..08235ef9e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M202Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M202Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.M202; import com.paneedah.mwc.models.M202RocketPROJECTILE; import com.paneedah.mwc.proxies.CommonProxy; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) .withShellCasingEjectEnabled(false) .withDestroyingBlocks(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withScreenShaking(RenderableState.SHOOTING, 1f, // x @@ -680,6 +680,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityParticleAgeCoefficient(0.2F) .withSpawnEntityModel(new M202RocketPROJECTILE()) .withSpawnEntityModelTexture("gun") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M249Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M249Factory.java index 9e62704f7..6042bc03c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M249Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M249Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.15f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -548,7 +548,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M32MGLFactory.java b/src/main/java/com/paneedah/mwc/items/guns/M32MGLFactory.java index bb9fb5530..a6469f7b9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M32MGLFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M32MGLFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { 3f, // y 2f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList("Type: Multiple Grenade Launcher", "Cartridge: 40mm Grenade", "Fire Rate: Semi")) .withCompatibleAttachment(Bullets.Grenade40mm, (model) -> {}) @@ -1674,6 +1674,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.3f) .withSpawnEntitySpeed(5f) .withSpawnEntityExplosionRadius(3f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M38Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M38Factory.java index f3c1cd3a3..44eee1339 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M38Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M38Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -968,6 +968,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M40A6Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M40A6Factory.java index 3e41e9447..cf3ee87fc 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M40A6Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M40A6Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.10f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -490,6 +490,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M4A1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M4A1Factory.java index 242d8c4f9..01ad4049f 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M4A1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M4A1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -1522,6 +1522,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M60E4Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M60E4Factory.java index 70821d72a..25911a336 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M60E4Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M60E4Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.16f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: General-Purpose Machine Gun", "Damage: 10", @@ -5290,7 +5290,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(10f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M712Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M712Factory.java index f9774ca29..46140f861 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M712Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M712Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.18f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(1) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Machine Pistol", "Damage: 5.4", @@ -1333,6 +1333,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M79Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M79Factory.java index c5fce7e6a..f024abf11 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M79Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M79Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.M79; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -40,7 +40,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.101f) .withShellCasingEjectEnabled(false) .withDestroyingBlocks(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withScreenShaking(RenderableState.SHOOTING, 4f, // x @@ -616,6 +616,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.3f) .withSpawnEntitySpeed(5f) .withSpawnEntityExplosionRadius(4f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M82Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M82Factory.java index 281e87e5e..d9b7ab9c7 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M82Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M82Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.08f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -733,6 +733,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/M9A1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/M9A1Factory.java index a7f460357..75a55bed8 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/M9A1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/M9A1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -606,6 +606,6 @@ else if(Weapon.isActiveAttachment(renderContext.getWeaponInstance(), Attachments .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MAC10Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MAC10Factory.java index a7791e9df..c3182ffaf 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MAC10Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MAC10Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.16f) .withFlashOffsetY(() -> 0.16f) .withInaccuracy(3f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -738,7 +738,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5.3f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MAS21Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MAS21Factory.java index fe7650c45..9fee81400 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MAS21Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MAS21Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -41,7 +41,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Experimental Handgun", "Damage: 5.5", @@ -2486,6 +2486,6 @@ else if(Weapon.isActiveAttachment(renderContext.getWeaponInstance(), Attachments .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MG34Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MG34Factory.java index 48b93a146..ee24715e3 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MG34Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MG34Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.14f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: General-Purpose Machine Gun", "Damage: 13.5", @@ -1704,7 +1704,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(13.5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MG42Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MG42Factory.java index 23bbbc276..011872237 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MG42Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MG42Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.15f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: General-Purpose Machine Gun", "Damage: 13.5", @@ -1708,7 +1708,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(13.5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MP40Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MP40Factory.java index e56c86491..ffa68e95e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MP40Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MP40Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.13f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sub Machine Gun", "Damage: 5", @@ -1522,7 +1522,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MP43EFactory.java b/src/main/java/com/paneedah/mwc/items/guns/MP43EFactory.java index 94987b140..3959eb985 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MP43EFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MP43EFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.MP43E; import com.paneedah.mwc.models.Shotgun12Gauge; import com.paneedah.mwc.models.Shotgun12Gauge2; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.09f) .withFlashOffsetY(() -> 0.09f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -1346,6 +1346,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MP443Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MP443Factory.java index b6159b964..3ac34f8b6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MP443Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MP443Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.MP443; import com.paneedah.mwc.proxies.CommonProxy; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.13f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -462,6 +462,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MP5A5Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MP5A5Factory.java index 50162647c..968703f44 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MP5A5Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MP5A5Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.13f) .withFlashOffsetY(() -> 0.17f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -892,7 +892,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MP7Factory.java b/src/main/java/com/paneedah/mwc/items/guns/MP7Factory.java index dfae32947..e49d6fd9a 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MP7Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MP7Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.16f) .withFlashOffsetY(() -> 0.23f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -769,7 +769,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5.5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MPXFactory.java b/src/main/java/com/paneedah/mwc/items/guns/MPXFactory.java index 7fee2cafb..8729934d6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MPXFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MPXFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -779,6 +779,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MakarovPMFactory.java b/src/main/java/com/paneedah/mwc/items/guns/MakarovPMFactory.java index ee35a32d4..510fa6d78 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MakarovPMFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MakarovPMFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.19f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -493,6 +493,6 @@ else if(model instanceof makarovrearsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MalyukFactory.java b/src/main/java/com/paneedah/mwc/items/guns/MalyukFactory.java index 6fe657129..c59248ec2 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MalyukFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MalyukFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -793,7 +793,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6.6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/MaresLegFactory.java b/src/main/java/com/paneedah/mwc/items/guns/MaresLegFactory.java index 1a4a8da76..9ec7a84b8 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/MaresLegFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/MaresLegFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.13f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Lever Action Rifle", "Damage: 5.5", @@ -939,6 +939,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(5.5f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Mk14EBRFactory.java b/src/main/java/com/paneedah/mwc/items/guns/Mk14EBRFactory.java index ed462e536..2e7b6b020 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Mk14EBRFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Mk14EBRFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.08f) .withFlashOffsetY(() -> 0.10f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -924,7 +924,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(10f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/NGSWRFactory.java b/src/main/java/com/paneedah/mwc/items/guns/NGSWRFactory.java index 29d187216..2127cf261 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/NGSWRFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/NGSWRFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -835,6 +835,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/NTW20Factory.java b/src/main/java/com/paneedah/mwc/items/guns/NTW20Factory.java index 23361e998..be11aa3f6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/NTW20Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/NTW20Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.AKRail; import com.paneedah.mwc.models.JPUreticle; import com.paneedah.mwc.models.NTW20; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.8f) .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.13f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Anti-Materiel Sniper Rifle", "Damage: 35", @@ -1750,6 +1750,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/NinthSinFactory.java b/src/main/java/com/paneedah/mwc/items/guns/NinthSinFactory.java index 97789f426..adc0bd858 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/NinthSinFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/NinthSinFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.NinthSin; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -45,7 +45,7 @@ public Item createGun(CommonProxy commonProxy) { // .withBleedingCoefficient(10f) .withShellCasingEjectEnabled(false) .withPellets(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Vacuum Combat Sidearm", "Damage: 4", @@ -2457,6 +2457,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Origin12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Origin12Factory.java index e2e276b21..4dcac423b 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Origin12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Origin12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingModelTexture("shotgun12gauge") .withInaccuracy(12f) .withPellets(10) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -835,7 +835,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/P226Factory.java b/src/main/java/com/paneedah/mwc/items/guns/P226Factory.java index a125c9c1e..cdb31227d 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/P226Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/P226Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.13f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -387,6 +387,6 @@ else if(model instanceof P226frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/P90Factory.java b/src/main/java/com/paneedah/mwc/items/guns/P90Factory.java index 45c40e095..e2254dad2 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/P90Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/P90Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.27f) .withShellCasingEjectEnabled(false) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -799,7 +799,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5.5f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/PythonFactory.java b/src/main/java/com/paneedah/mwc/items/guns/PythonFactory.java index 5355d0e85..6393cf6cc 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/PythonFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/PythonFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Python; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -42,7 +42,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withInaccuracy(2) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -219,6 +219,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.016f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/RPG7Factory.java b/src/main/java/com/paneedah/mwc/items/guns/RPG7Factory.java index ce48050cf..2dc32acab 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/RPG7Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/RPG7Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.RPG7; import com.paneedah.mwc.models.RPG7rocketPROJECTILE; import com.paneedah.mwc.proxies.CommonProxy; @@ -41,7 +41,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) .withShellCasingEjectEnabled(false) .withDestroyingBlocks(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withScreenShaking(RenderableState.SHOOTING, 1f, // x @@ -966,6 +966,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityExplosionRadius(4f) .withSpawnEntityModel(new RPG7rocketPROJECTILE()) .withSpawnEntityModelTexture("rpg7") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Remington700Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Remington700Factory.java index 58c07a2e6..d25a2fd8e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Remington700Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Remington700Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.14f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Precision Sniper Rifle", "Damage: 14", @@ -2149,6 +2149,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Remington870Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Remington870Factory.java index 9cc2081bb..71a930304 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Remington870Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Remington870Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -57,7 +57,7 @@ public Item createGun(CommonProxy commonProxy) { 1f, // y 10f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -2406,6 +2406,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/S710TricunFactory.java b/src/main/java/com/paneedah/mwc/items/guns/S710TricunFactory.java index 2fbb91065..afddb2151 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/S710TricunFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/S710TricunFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Submachine Gun", "Damage: 5.4", @@ -2004,6 +2004,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SCCYCPX2Factory.java b/src/main/java/com/paneedah/mwc/items/guns/SCCYCPX2Factory.java index 64e3dd5fb..598b76195 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SCCYCPX2Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SCCYCPX2Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.Glock18C; import com.paneedah.mwc.models.M9A1frontsight; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.18f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -514,6 +514,6 @@ else if(model instanceof M9A1frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SIG556Factory.java b/src/main/java/com/paneedah/mwc/items/guns/SIG556Factory.java index bd207eb74..2e9da8c78 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SIG556Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SIG556Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -919,6 +919,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SIGMCXFactory.java b/src/main/java/com/paneedah/mwc/items/guns/SIGMCXFactory.java index 867793edc..da11c172e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SIGMCXFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SIGMCXFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -979,6 +979,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SSG08Factory.java b/src/main/java/com/paneedah/mwc/items/guns/SSG08Factory.java index 63ff44532..4b6ec9666 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SSG08Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SSG08Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.08f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Precision Sniper Rifle", "Damage: 27", @@ -2329,6 +2329,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/STG44Factory.java b/src/main/java/com/paneedah/mwc/items/guns/STG44Factory.java index fd8908f1b..6629cac14 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/STG44Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/STG44Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -43,7 +43,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.14f) .withInaccuracy(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Assault rifle", "Damage: 7.7", @@ -1458,7 +1458,7 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityDamage(7.7f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SV98Factory.java b/src/main/java/com/paneedah/mwc/items/guns/SV98Factory.java index 0c8dd96bf..6648c21ab 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SV98Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SV98Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.09f) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Sniper Rifle", "Damage: 14", @@ -1845,6 +1845,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SVDDragunovFactory.java b/src/main/java/com/paneedah/mwc/items/guns/SVDDragunovFactory.java index ea6ff5ea8..640d7e975 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SVDDragunovFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SVDDragunovFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.5f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -813,7 +813,7 @@ else if(model instanceof PSO12) { .withSpawnEntityDamage(14f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SW500MagnumFactory.java b/src/main/java/com/paneedah/mwc/items/guns/SW500MagnumFactory.java index ad130b45a..34b704c22 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SW500MagnumFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SW500MagnumFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Reflex2; import com.paneedah.mwc.models.SW500Magnum; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.2f) .withInaccuracy(2) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Revolver", "Damage: 7", @@ -1657,6 +1657,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.016f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Saiga12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Saiga12Factory.java index 3eb3453cf..8cd82ded6 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Saiga12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Saiga12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -53,7 +53,7 @@ public Item createGun(CommonProxy commonProxy) { 1f, // y 10f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Carbine/Shotgun", "Damage per Pellet: 6", @@ -1287,7 +1287,7 @@ else if(model instanceof PSO12) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ScarHFactory.java b/src/main/java/com/paneedah/mwc/items/guns/ScarHFactory.java index 62018860a..e28325839 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ScarHFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ScarHFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.17f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -831,6 +831,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ScarLFactory.java b/src/main/java/com/paneedah/mwc/items/guns/ScarLFactory.java index 5a30bcf9c..4366e9941 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ScarLFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ScarLFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.17f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -853,6 +853,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ScorpionEVO3A1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/ScorpionEVO3A1Factory.java index 433fa5e7e..c1122e8f9 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ScorpionEVO3A1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ScorpionEVO3A1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withShellCasingVerticalOffset(-0.03f) // .withShellCasingEjectEnabled(false) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -771,6 +771,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Spas12Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Spas12Factory.java index f2fee6e32..606dde5e2 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Spas12Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Spas12Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.12f) .withFlashOffsetY(() -> 0.12f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -1211,6 +1211,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SpringfieldFactory.java b/src/main/java/com/paneedah/mwc/items/guns/SpringfieldFactory.java index 1877955bd..9cec4413c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SpringfieldFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SpringfieldFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -56,7 +56,7 @@ public Item createGun(CommonProxy commonProxy) { 2f, // y 7f) // z - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Bolt-action rifle", "Damage: 15", @@ -1854,6 +1854,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/StonerA1Factory.java b/src/main/java/com/paneedah/mwc/items/guns/StonerA1Factory.java index 1df560522..448a9eb8a 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/StonerA1Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/StonerA1Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.11f) .withFlashOffsetY(() -> 0.15f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Light Machine Gun", "Damage: 6", @@ -2698,7 +2698,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(6f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/SupernovaFactory.java b/src/main/java/com/paneedah/mwc/items/guns/SupernovaFactory.java index 463b2b87f..a1e16ac5e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/SupernovaFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/SupernovaFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -51,7 +51,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.05f) .withFlashOffsetY(() -> 0.12f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withInformationProvider(stack -> Arrays.asList( "Type: Shotgun", "Damage per Pellet: 6", @@ -1888,6 +1888,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.8f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/TaurusRagingHunterFactory.java b/src/main/java/com/paneedah/mwc/items/guns/TaurusRagingHunterFactory.java index 8522d584f..35435527e 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/TaurusRagingHunterFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/TaurusRagingHunterFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Reflex2; import com.paneedah.mwc.models.TaurusRagingHunter; import com.paneedah.mwc.proxies.CommonProxy; @@ -44,7 +44,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withInaccuracy(2) .withShellCasingEjectEnabled(false) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -243,6 +243,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.016f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java index b052417b0..9e11d1c12 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -46,7 +46,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashScale(() -> 0.6f) .withFlashOffsetX(() -> 0.14f) .withFlashOffsetY(() -> 0.16f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -89,7 +89,7 @@ public Item createGun(CommonProxy commonProxy) { CraftingEntry(MWCItems.gunmetalPlate, 12), new CraftingEntry(MWCItems.steelIngot, 3)) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withUnremovableAttachmentCategories(AttachmentCategory.GUARD) .withUnremovableAttachmentCategories(AttachmentCategory.RECEIVER) .withUnremovableAttachmentCategories(AttachmentCategory.RAILING) @@ -775,6 +775,6 @@ else if(Weapon.isActiveAttachment(renderContext.getWeaponInstance(), Attachments .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/UMP45Factory.java b/src/main/java/com/paneedah/mwc/items/guns/UMP45Factory.java index 639372b97..105560ab7 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/UMP45Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/UMP45Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.13f) .withFlashOffsetY(() -> 0.17f) .withInaccuracy(2f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -732,7 +732,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(5.3f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/UziFactory.java b/src/main/java/com/paneedah/mwc/items/guns/UziFactory.java index e96b3ae61..beaa60ae0 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/UziFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/UziFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Attachments; @@ -49,7 +49,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.23f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -507,6 +507,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/VP70Factory.java b/src/main/java/com/paneedah/mwc/items/guns/VP70Factory.java index 059f1ed24..1be9dedf5 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/VP70Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/VP70Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.GlockRearSight; import com.paneedah.mwc.models.M1911frontsight; import com.paneedah.mwc.models.VP70; @@ -52,7 +52,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.14f) // .withShellCasingForwardOffset(0.001f) .withInaccuracy(3) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -464,6 +464,6 @@ else if(model instanceof M1911frontsight) { .withSpawnEntityGravityVelocity(0.02f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/VSSVintorezFactory.java b/src/main/java/com/paneedah/mwc/items/guns/VSSVintorezFactory.java index 0ec3a186f..4b7d25506 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/VSSVintorezFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/VSSVintorezFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -50,7 +50,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetX(() -> 0.1f) .withFlashOffsetY(() -> 0.11f) .withShootSoundVolume(1f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -846,7 +846,7 @@ else if(model instanceof AcogReticle) { .withSpawnEntityDamage(13f) .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/ZbroyarZ10Factory.java b/src/main/java/com/paneedah/mwc/items/guns/ZbroyarZ10Factory.java index 49cb3d129..d3e6af30c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/ZbroyarZ10Factory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/ZbroyarZ10Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.mwc.proxies.CommonProxy; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.15f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .useNewSystem() .withRecoilParam(new RecoilParam( // The weapon power @@ -937,6 +937,6 @@ else if(model instanceof AcogReticle) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/turretgunFactory.java b/src/main/java/com/paneedah/mwc/items/guns/turretgunFactory.java index ed1a72338..a93d8f708 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/turretgunFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/turretgunFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Glock18C; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.AuxiliaryAttachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.17f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) -// .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) +// .withCreativeTab(MWC.AssaultRiflesTab) .withInformationProvider(stack -> Arrays.asList( "Type: Carbine", "Damage: 6", @@ -321,6 +321,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/turretgunsilencedFactory.java b/src/main/java/com/paneedah/mwc/items/guns/turretgunsilencedFactory.java index a5d98acc0..db09d6eee 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/turretgunsilencedFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/turretgunsilencedFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Glock18C; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.AuxiliaryAttachments; @@ -48,7 +48,7 @@ public Item createGun(CommonProxy commonProxy) { .withShootSoundVolume(0.2f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) -// .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) +// .withCreativeTab(MWC.AssaultRiflesTab) .withInformationProvider(stack -> Arrays.asList( "Type: Carbine", "Damage: 6", @@ -322,6 +322,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/guns/turretgunupgradedFactory.java b/src/main/java/com/paneedah/mwc/items/guns/turretgunupgradedFactory.java index 23ad650d2..143a4bc6c 100644 --- a/src/main/java/com/paneedah/mwc/items/guns/turretgunupgradedFactory.java +++ b/src/main/java/com/paneedah/mwc/items/guns/turretgunupgradedFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.guns; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.Glock18C; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.AuxiliaryAttachments; @@ -47,7 +47,7 @@ public Item createGun(CommonProxy commonProxy) { .withFlashOffsetY(() -> 0.17f) .withShellCasingForwardOffset(0.05f) .withShellCasingVerticalOffset(-0.03f) -// .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) +// .withCreativeTab(MWC.AssaultRiflesTab) .withInformationProvider(stack -> Arrays.asList( "Type: Carbine", "Damage: 6", @@ -321,6 +321,6 @@ public Item createGun(CommonProxy commonProxy) { .withSpawnEntityGravityVelocity(0.0118f) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/melee/BaseballBatFactory.java b/src/main/java/com/paneedah/mwc/items/melee/BaseballBatFactory.java index f406ac850..e21d8ea85 100644 --- a/src/main/java/com/paneedah/mwc/items/melee/BaseballBatFactory.java +++ b/src/main/java/com/paneedah/mwc/items/melee/BaseballBatFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.melee; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.weaponlib.RenderContext; import com.paneedah.weaponlib.animation.Transition; @@ -17,7 +17,7 @@ public Item createMelee(CommonProxy commonProxy) { return new ItemMelee.Builder() .withName("baseball_bat") - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withTextureNames("bat") .withAttackDamage(3f) .withHeavyAttackDamage(7f) @@ -166,6 +166,6 @@ public Item createMelee(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/melee/BaseballBatNailsFactory.java b/src/main/java/com/paneedah/mwc/items/melee/BaseballBatNailsFactory.java index eda19ba07..baca17fad 100644 --- a/src/main/java/com/paneedah/mwc/items/melee/BaseballBatNailsFactory.java +++ b/src/main/java/com/paneedah/mwc/items/melee/BaseballBatNailsFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.melee; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.weaponlib.RenderContext; import com.paneedah.weaponlib.animation.Transition; @@ -17,7 +17,7 @@ public Item createMelee(CommonProxy commonProxy) { return new ItemMelee.Builder() .withName("baseball_bat_nails") - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withTextureNames("bat_nails") .withAttackDamage(4f) .withHeavyAttackDamage(12f) @@ -166,6 +166,6 @@ public Item createMelee(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/melee/NightStickFactory.java b/src/main/java/com/paneedah/mwc/items/melee/NightStickFactory.java index 90179243f..88d55150c 100644 --- a/src/main/java/com/paneedah/mwc/items/melee/NightStickFactory.java +++ b/src/main/java/com/paneedah/mwc/items/melee/NightStickFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.melee; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.weaponlib.RenderContext; import com.paneedah.weaponlib.animation.Transition; @@ -17,7 +17,7 @@ public Item createMelee(CommonProxy commonProxy) { return new ItemMelee.Builder() .withName("night_stick") - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withTextureNames("gun") .withAttackDamage(1f) .withHeavyAttackDamage(3f) @@ -187,6 +187,6 @@ public Item createMelee(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/items/melee/TacticalTomahawkFactory.java b/src/main/java/com/paneedah/mwc/items/melee/TacticalTomahawkFactory.java index b1ca5e02a..b27ff08b1 100644 --- a/src/main/java/com/paneedah/mwc/items/melee/TacticalTomahawkFactory.java +++ b/src/main/java/com/paneedah/mwc/items/melee/TacticalTomahawkFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.items.melee; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.weaponlib.RenderContext; import com.paneedah.weaponlib.animation.Transition; @@ -17,7 +17,7 @@ public Item createMelee(CommonProxy commonProxy) { return new ItemMelee.Builder() .withName("tactical_tomahawk") - .withCreativeTab(ModernWarfareMod.AssaultRiflesTab) + .withCreativeTab(MWC.ASSAULT_RIFLES_TAB) .withTextureNames("tacticaltomahawk") .withAttackDamage(5f) .withHeavyAttackDamage(10f) @@ -233,6 +233,6 @@ public Item createMelee(CommonProxy commonProxy) { .build()) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/proxies/ClientProxy.java b/src/main/java/com/paneedah/mwc/proxies/ClientProxy.java index 39a7e57d5..1312f5c52 100644 --- a/src/main/java/com/paneedah/mwc/proxies/ClientProxy.java +++ b/src/main/java/com/paneedah/mwc/proxies/ClientProxy.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.proxies; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.PlayerAnimations; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.Workbench; @@ -37,21 +37,21 @@ protected boolean isClient() { } @Override - public void preInit(final ModernWarfareMod mod) { + public void preInit(final MWC mod) { super.preInit(mod); final InventoryTabs inventoryTabs = InventoryTabs.getInstance(); inventoryTabs.registerTab(new StandardPlayerInventoryTab()); - inventoryTabs.registerTab(new CustomPlayerInventoryTab(ModernWarfareMod.MOD_CONTEXT, MWCItems.vestRender)); - inventoryTabs.registerTab(new BackpackInventoryTab(ModernWarfareMod.MOD_CONTEXT)); + inventoryTabs.registerTab(new CustomPlayerInventoryTab(MWC.modContext, MWCItems.vestRender)); + inventoryTabs.registerTab(new BackpackInventoryTab(MWC.modContext)); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWorkbench.class, new TESRWorkbench(new Workbench(), new ResourceLocation(ModReference.ID + ":textures/blocks/workbench.png"))); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAmmoPress.class, new TESRAmmoPress(new AmmoPress(), new ResourceLocation(ModReference.ID + ":textures/blocks/ammo_press.png"))); } @Override - public void init(final ModernWarfareMod mod) { + public void init(final MWC mod) { super.init(mod); PlayerAnimations.init(mod); @@ -113,7 +113,7 @@ public void init(final ModernWarfareMod mod) { } @Override - public void postInit(final ModernWarfareMod mod, final FMLPostInitializationEvent initializationEvent) { + public void postInit(final MWC mod, final FMLPostInitializationEvent initializationEvent) { mc.getRenderManager().getSkinMap().forEach((p, r) -> r.addLayer(new CustomArmorLayer(r))); } } diff --git a/src/main/java/com/paneedah/mwc/proxies/CommonProxy.java b/src/main/java/com/paneedah/mwc/proxies/CommonProxy.java index be4913b35..aaa34ef5a 100644 --- a/src/main/java/com/paneedah/mwc/proxies/CommonProxy.java +++ b/src/main/java/com/paneedah/mwc/proxies/CommonProxy.java @@ -63,27 +63,27 @@ protected boolean isClient() { // I cannot figure out for the life of me why moving the init classes to the init() instead of the preInit() makes the game die, but I have no choice but to leave it here for now. - public void preInit(final ModernWarfareMod mod) { - ModernWarfareMod.MOD_CONTEXT.preInit(mod, ModernWarfareMod.CHANNEL); + public void preInit(final MWC mod) { + MWC.modContext.preInit(mod, MWC.CHANNEL); // Sounds - ModernWarfareMod.MOD_CONTEXT.setChangeZoomSound("OpticZoom"); - ModernWarfareMod.MOD_CONTEXT.setNightVisionOnSound("nightvision_on"); - ModernWarfareMod.MOD_CONTEXT.setNightVisionOffSound("nightvision_off"); - ModernWarfareMod.MOD_CONTEXT.setChangeFireModeSound("firerate_toggle"); - ModernWarfareMod.MOD_CONTEXT.setNoAmmoSound("dry_fire"); - ModernWarfareMod.MOD_CONTEXT.setExplosionSound("grenadeexplosion"); - ModernWarfareMod.MOD_CONTEXT.setFlashExplosionSound("flashbang"); - - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.ROCK, 1.5f, "bullet_3_rock", "bullet_2_rock", "bullet_4_rock", "bullet_12_stone"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.WOOD, 1.5f, "bullet_3_rock", "bullet_2_rock", "bullet_4_rock", "bullet_12_stone", "bullet_10_snap"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.GRASS, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.GROUND, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.SAND, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.SNOW, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); - ModernWarfareMod.MOD_CONTEXT.setMaterialImpactSounds(Material.IRON, 1.5f, "bullet_6_iron", "bullet_7_iron", "bullet_8_iron"); + MWC.modContext.setChangeZoomSound("OpticZoom"); + MWC.modContext.setNightVisionOnSound("nightvision_on"); + MWC.modContext.setNightVisionOffSound("nightvision_off"); + MWC.modContext.setChangeFireModeSound("firerate_toggle"); + MWC.modContext.setNoAmmoSound("dry_fire"); + MWC.modContext.setExplosionSound("grenadeexplosion"); + MWC.modContext.setFlashExplosionSound("flashbang"); + + MWC.modContext.setMaterialImpactSounds(Material.ROCK, 1.5f, "bullet_3_rock", "bullet_2_rock", "bullet_4_rock", "bullet_12_stone"); + MWC.modContext.setMaterialImpactSounds(Material.WOOD, 1.5f, "bullet_3_rock", "bullet_2_rock", "bullet_4_rock", "bullet_12_stone", "bullet_10_snap"); + MWC.modContext.setMaterialImpactSounds(Material.GRASS, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); + MWC.modContext.setMaterialImpactSounds(Material.GROUND, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); + MWC.modContext.setMaterialImpactSounds(Material.SAND, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); + MWC.modContext.setMaterialImpactSounds(Material.SNOW, 1.5f, "bullet_5_grass", "bullet_9_grass", "bullet_11_grass", "bullet_10_snap", "bullet_13_snap"); + MWC.modContext.setMaterialImpactSounds(Material.IRON, 1.5f, "bullet_6_iron", "bullet_7_iron", "bullet_8_iron"); UniversalSoundRegistry.init(); - UniversalSoundLookup.initialize(ModernWarfareMod.MOD_CONTEXT); + UniversalSoundLookup.initialize(MWC.modContext); // Forcing Item Initialization here, at the very least the variables, before they get registered normally on the init() (@SubscribeEvent) phase. MWCItems.init(); @@ -93,10 +93,10 @@ public void preInit(final ModernWarfareMod mod) { DataSerializers.registerSerializer(VehiclePhysSerializer.SERIALIZER); // Special object initialization - SpecialAttachments.init(mod, ModernWarfareMod.MOD_CONTEXT); + SpecialAttachments.init(mod, MWC.modContext); Backpacks.init(mod); Vests.init(mod); - Armors.init(mod, ModernWarfareMod.MOD_CONTEXT); + Armors.init(mod, MWC.modContext); Attachments.init(mod); AuxiliaryAttachments.init(mod); GunSkins.init(mod); @@ -113,11 +113,11 @@ public void preInit(final ModernWarfareMod mod) { new BaseballBatNailsFactory().createMelee(this); new NightStickFactory().createMelee(this); - ModernWarfareMod.MOD_CONTEXT.preInitEnd(mod, ModernWarfareMod.MOD_CONTEXT.getChannel()); + MWC.modContext.preInitEnd(mod, MWC.modContext.getChannel()); } - public void init(final ModernWarfareMod mod) { - ModernWarfareMod.MOD_CONTEXT.init(mod); + public void init(final MWC mod) { + MWC.modContext.init(mod); Entities.init(this); Vehicles.init(this); @@ -125,6 +125,6 @@ public void init(final ModernWarfareMod mod) { GameRegistry.registerWorldGenerator(new WorldGeneratorEventHandler(), 0); } - public void postInit(final ModernWarfareMod mod, final FMLPostInitializationEvent initializationEvent) { + public void postInit(final MWC mod, final FMLPostInitializationEvent initializationEvent) { } } diff --git a/src/main/java/com/paneedah/mwc/skins/GunSkins.java b/src/main/java/com/paneedah/mwc/skins/GunSkins.java index 776ca9582..c2251bdbb 100644 --- a/src/main/java/com/paneedah/mwc/skins/GunSkins.java +++ b/src/main/java/com/paneedah/mwc/skins/GunSkins.java @@ -4,7 +4,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.stream.JsonReader; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.utils.ModReference; import com.paneedah.weaponlib.CommonRegistry; import com.paneedah.weaponlib.ItemSkin; @@ -35,58 +35,58 @@ public class GunSkins { public static void init(Object mod) { GunSkins.WoodlandCamo = new ItemSkin.Builder() .withTextureVariant("woodlandcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("WoodlandCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.WoodlandCamo); GunSkins.PinkCamo = new ItemSkin.Builder() .withTextureVariant("pinkcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("PinkCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.PinkCamo); GunSkins.ArcticCamo = new ItemSkin.Builder() .withTextureVariant("arcticcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("ArcticCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.ArcticCamo); GunSkins.BlueCamo = new ItemSkin.Builder() .withTextureVariant("bluecamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("BlueCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.BlueCamo); GunSkins.Unit01Camo = new ItemSkin.Builder() .withTextureVariant("unit01camo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("Unit01Camo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.Unit01Camo); GunSkins.BloodForestCamo = new ItemSkin.Builder() .withTextureVariant("bloodforestcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("BloodForestCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.BloodForestCamo); GunSkins.DiamondCamo = new ItemSkin.Builder() .withTextureVariant("diamondcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("DiamondCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.DiamondCamo); GunSkins.GoldCamo = new ItemSkin.Builder() .withTextureVariant("goldcamo") - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName("GoldCamo") - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(GunSkins.GoldCamo); File customSkinsDir = new File("./config/mwc/skins"); @@ -111,9 +111,9 @@ public static void init(Object mod) { String skinName = element.getAsString(); ItemSkin skin = new ItemSkin.Builder() .withTextureVariant("customskin_" + skinName.toLowerCase()) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName(skinName) - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(skin); ModReference.LOG.info("Registered custom gun skin: " + skinName); } @@ -144,9 +144,9 @@ public static void init(Object mod) { ItemSkin skin = new ItemSkin.Builder() .withTextureVariant("customskin_" + name.toLowerCase().replace(".png", "")) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withName(name.replace(".png", "")) - .build(ModernWarfareMod.MOD_CONTEXT, ItemSkin.class); + .build(MWC.modContext, ItemSkin.class); CommonRegistry.gunSkins.add(skin); ModReference.LOG.info("Registered custom gun skin: " + name); } diff --git a/src/main/java/com/paneedah/mwc/tileentities/TileEntities.java b/src/main/java/com/paneedah/mwc/tileentities/TileEntities.java index e014058b2..240628c82 100644 --- a/src/main/java/com/paneedah/mwc/tileentities/TileEntities.java +++ b/src/main/java/com/paneedah/mwc/tileentities/TileEntities.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.tileentities; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.proxies.CommonProxy; import com.paneedah.mwc.weapons.Guns; import com.paneedah.weaponlib.tile.CustomTileEntityBlock; @@ -14,14 +14,14 @@ public class TileEntities { public static void init(CommonProxy commonProxy) { - new TurretBaseFactory().createTileEntity(ModernWarfareMod.MOD_CONTEXT); + new TurretBaseFactory().createTileEntity(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("weapons_case") .withModelClassName("com.paneedah.mwc.models.GunCase") .withTextureName("textures/models/gun_case.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox( blockState -> { AxisAlignedBB boundingBox = null; @@ -51,7 +51,7 @@ public static void init(CommonProxy commonProxy) { // .withEquipmentOption(Guns.M4A1, EnumDifficulty.EASY, 1f) // .withEquipmentOption(null, EnumDifficulty.EASY, 25f, 1) .withEquipmentDispenseTimeout(10) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) @@ -59,7 +59,7 @@ public static void init(CommonProxy commonProxy) { .withModelClassName("com.paneedah.mwc.models.GunCaseSmall") .withTextureName("textures/models/gun_case_small.png") // .withEquipementDispenseSound(sound) - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox( blockState -> { AxisAlignedBB boundingBox = null; @@ -86,14 +86,14 @@ public static void init(CommonProxy commonProxy) { GL11.glScalef(0.6f, 0.6f, 0.6f); GL11.glTranslatef(0.8f, 1.1f, 0.8f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("russian_weapons_case") .withModelClassName("com.paneedah.mwc.models.MilitaryCrate") .withTextureName("textures/models/militarycrate.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox( blockState -> { AxisAlignedBB boundingBox = null; @@ -120,14 +120,14 @@ public static void init(CommonProxy commonProxy) { GL11.glScalef(0.6f, 0.6f, 0.6f); GL11.glTranslatef(0.8f, 1.15f, 0.75f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("ammo_box") .withModelClassName("com.paneedah.mwc.models.Ammobox1") .withTextureName("textures/models/ammobox.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox( blockState -> { AxisAlignedBB boundingBox = null; @@ -154,19 +154,19 @@ public static void init(CommonProxy commonProxy) { GL11.glScalef(0.4f, 0.4f, 0.4f); GL11.glTranslatef(1.2f, 2.5f, 1.1f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("weapons_locker") .withModelClassName("com.paneedah.mwc.models.GunRack") .withTextureName("textures/models/gunrack.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.6f, 0.6f, 0.6f); GL11.glTranslatef(0.4f, 1.15f, 0.6f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() @@ -174,44 +174,44 @@ public static void init(CommonProxy commonProxy) { .withName("fridge_open") .withModelClassName("com.paneedah.mwc.models.FridgeOpen") .withTextureName("textures/models/fridge.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glTranslatef(0.55f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("fridge_closed") .withModelClassName("com.paneedah.mwc.models.FridgeClosed") .withTextureName("textures/models/fridge.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glTranslatef(0.55f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("artillery_PROP") .withModelClassName("com.paneedah.mwc.models.ArtilleryProp20") .withTextureName("textures/models/artilleryprop.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.8f, 0.8f, 0.8f); GL11.glTranslatef(0.55f, 0.6f, 0.55f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("supply_drop") .withModelClassName("com.paneedah.mwc.models.SupplyDrop") .withTextureName("textures/models/supplydrop.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.5f, 0.5f, 0.5f); GL11.glTranslatef(0.2f, 1.63f, 1.7f); @@ -221,20 +221,20 @@ public static void init(CommonProxy commonProxy) { .withEquipmentOption(Guns.M38, EnumDifficulty.EASY, 2f) .withEquipmentOption(Guns.APS, EnumDifficulty.EASY, 4f) .withEquipmentDispenseTimeout(10) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("medical_crate") .withModelClassName("com.paneedah.mwc.models.MedicalCrate") .withTextureName("textures/models/medicalcrate.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.6f, 0.6f, 0.6f); GL11.glTranslatef(0.7f, 1.13f, 0.5f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) @@ -242,7 +242,7 @@ public static void init(CommonProxy commonProxy) { .withModelClassName("com.paneedah.mwc.models.Locker") .withTextureName("textures/models/locker.png") // .withEquipementDispenseSound(sound) - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.5f, 0.5f, 0.5f); GL11.glTranslatef(0.7f, 1.85f, 1f); @@ -252,7 +252,7 @@ public static void init(CommonProxy commonProxy) { // .withEquipmentOption(Guns.M45A1, EnumDifficulty.EASY, 3f) // .withEquipmentOption(Items.air, EnumDifficulty.EASY, 150f, 1) .withEquipmentDispenseTimeout(10) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) @@ -260,7 +260,7 @@ public static void init(CommonProxy commonProxy) { .withModelClassName("com.paneedah.mwc.models.SCPLocker") .withTextureName("textures/models/scplocker.png") // .withEquipementDispenseSound(sound) - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.8f, 0.8f, 0.8f); GL11.glTranslatef(0.5f, 0.45f, 0.6f); @@ -270,7 +270,7 @@ public static void init(CommonProxy commonProxy) { // .withEquipmentOption(Guns.M45A1, EnumDifficulty.EASY, 3f) // .withEquipmentOption(Items.air, EnumDifficulty.EASY, 150f, 1) .withEquipmentDispenseTimeout(10) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() @@ -278,208 +278,208 @@ public static void init(CommonProxy commonProxy) { .withName("barrel") .withModelClassName("com.paneedah.mwc.models.Barrel") .withTextureName("textures/models/barrel.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.8f, 0.9f); GL11.glTranslatef(0.55f, 0.4f, 0.55f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("explosive_barrel") .withModelClassName("com.paneedah.mwc.models.Barrel") .withTextureName("textures/models/barrel_explosive.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.8f, 0.9f); GL11.glTranslatef(0.55f, 0.4f, 0.55f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("pc") .withModelClassName("com.paneedah.mwc.models.PC") .withTextureName("textures/models/pc.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.7f, 0.25f, 0.6f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("laptop") .withModelClassName("com.paneedah.mwc.models.Laptop") .withTextureName("textures/models/pc.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.7f, 0.7f, 0.7f); GL11.glTranslatef(0.5f, 0.71f, 0.6f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("monitor") .withModelClassName("com.paneedah.mwc.models.Monitor") .withTextureName("textures/models/pc.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.7f, 0.25f, 0.6f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("filingcabinet") .withModelClassName("com.paneedah.mwc.models.FilingCabinet") .withTextureName("textures/models/filingcabinetopened.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("filingcabinet_opened") .withModelClassName("com.paneedah.mwc.models.FilingCabinetOpened") .withTextureName("textures/models/filingcabinetopened.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("shelf_right") .withModelClassName("com.paneedah.mwc.models.ShelfRight") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("shelf_left") .withModelClassName("com.paneedah.mwc.models.ShelfLeft") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("shelf_top") .withModelClassName("com.paneedah.mwc.models.ShelfTop") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("tv") .withModelClassName("com.paneedah.mwc.models.TV") .withTextureName("textures/models/tv.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("ceiling_tv") .withModelClassName("com.paneedah.mwc.models.CeilingTV") .withTextureName("textures/models/ceilingtv.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0.4f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("ceiling_tv_rotated") .withModelClassName("com.paneedah.mwc.models.CeilingTV") .withTextureName("textures/models/ceilingtv.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.6f, 0.4f, 0.7f); GL11.glRotatef(-135F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("office_chair") .withModelClassName("com.paneedah.mwc.models.OfficeChair") .withTextureName("textures/models/officechair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("office_chair_2") .withModelClassName("com.paneedah.mwc.models.OfficeChair2") .withTextureName("textures/models/officechair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_corner") .withModelClassName("com.paneedah.mwc.models.DeskCorner") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.07f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) @@ -487,208 +487,208 @@ public static void init(CommonProxy commonProxy) { .withModelClassName("com.paneedah.mwc.models.DeskCornerAlt1") .withTextureName("textures/models/desk.png") // .withEquipementDispenseSound(sound) - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.07f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_left") .withModelClassName("com.paneedah.mwc.models.DeskLeft") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_left_alt1") .withModelClassName("com.paneedah.mwc.models.DeskLeftAlt1") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_middle") .withModelClassName("com.paneedah.mwc.models.DeskMiddle") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_middle_alt1") .withModelClassName("com.paneedah.mwc.models.DeskMiddleAlt1") .withTextureName("textures/models/deskmiddlealt1.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_right") .withModelClassName("com.paneedah.mwc.models.DeskRight") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_right_alt1") .withModelClassName("com.paneedah.mwc.models.DeskRightAlt1") .withTextureName("textures/models/desk.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_shelf") .withModelClassName("com.paneedah.mwc.models.DeskShelf") .withTextureName("textures/models/deskshelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_shelf_alt1") .withModelClassName("com.paneedah.mwc.models.DeskShelfAlt1") .withTextureName("textures/models/deskshelfalt1.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_shelf_alt2") .withModelClassName("com.paneedah.mwc.models.DeskShelfAlt2") .withTextureName("textures/models/deskshelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("desk_shelf_alt3") .withModelClassName("com.paneedah.mwc.models.DeskShelfAlt4") .withTextureName("textures/models/deskshelfalt4.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("barrier") .withModelClassName("com.paneedah.mwc.models.Barrier") .withTextureName("textures/models/barrier.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.1f, 1.2f, 1f); GL11.glTranslatef(0.42f, -0.25f, 0.5f); // GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("barrier_rotated") .withModelClassName("com.paneedah.mwc.models.Barrier") .withTextureName("textures/models/barrier.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.1f, 1.2f, 1.1f); GL11.glTranslatef(0.42f, -0.25f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("body_bag") .withModelClassName("com.paneedah.mwc.models.BodyBag") .withTextureName("textures/models/bodybag.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.5f, -0.9f, 0.55f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("hanging_body") .withModelClassName("com.paneedah.mwc.models.HangingBody") .withTextureName("textures/models/hangingbody.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.5f, 1.8f, 0.55f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("impaled_body") .withModelClassName("com.paneedah.mwc.models.ImpaledBody") .withTextureName("textures/models/impaledbody.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.5f, 0.2f, 0.55f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); // new LootBoxConfiguration() // .withMaterial(Material.WOOD) @@ -696,7 +696,7 @@ public static void init(CommonProxy commonProxy) { // .withModelClassName("com.paneedah.mwc.models.Black") // .withTextureName("textures/models/bodybag.png") //// .withEquipementDispenseSound(sound) -// .withCreativeTab(ModernWarfareMod.PropsTab) +// .withCreativeTab(MWC.PropsTab) // .withPositioning(tileEntity -> { // GL11.glScalef(0.9f, 0.9f, 0.9f); // GL11.glTranslatef(0.5f, -0.9f, 0.55f); @@ -706,137 +706,137 @@ public static void init(CommonProxy commonProxy) { //// .withEquipmentOption(Guns.M45A1, EnumDifficulty.EASY, 3f) //// .withEquipmentOption(Items.air, EnumDifficulty.EASY, 150f, 1) // .withEquipmentDispenseTimeout(10) -// .build(ModernWarfareMod.MOD_CONTEXT); +// .build(MWC.MOD_CONTEXT); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("dumpster") .withModelClassName("com.paneedah.mwc.models.Dumpster") .withTextureName("textures/models/dumpster.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.6f, 0.2f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("wooden_crate") .withModelClassName("com.paneedah.mwc.models.WoodenCrate") .withTextureName("textures/models/woodencrate.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 0.95f, 1f); GL11.glTranslatef(0.5f, 0.085f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("wooden_crate_opened") .withModelClassName("com.paneedah.mwc.models.WoodenCrateOpened") .withTextureName("textures/models/woodencrateopened.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("operating_table") .withModelClassName("com.paneedah.mwc.models.OperatingTable") .withTextureName("textures/models/operatingtable.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("operating_table_alt") .withModelClassName("com.paneedah.mwc.models.OperatingTableAlt") .withTextureName("textures/models/operatingtable.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("forklift") .withModelClassName("com.paneedah.mwc.models.Forklift") .withTextureName("textures/models/forklift.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.5f, 1.5f, 1.5f); GL11.glTranslatef(0.5f, -0.5f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("forklift_alt") .withModelClassName("com.paneedah.mwc.models.ForkLiftAlt") .withTextureName("textures/models/forkliftalt.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("trusses") .withModelClassName("com.paneedah.mwc.models.Trusses") .withTextureName("textures/models/trusses.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ceiling_lamp") .withModelClassName("com.paneedah.mwc.models.CeilingLamp") .withTextureName("textures/models/ceilinglamp.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1.8f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ceiling_lamp_alt") .withModelClassName("com.paneedah.mwc.models.CeilingLampAlt") .withTextureName("textures/models/ceilinglampalt.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, -0.2f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) @@ -844,651 +844,651 @@ public static void init(CommonProxy commonProxy) { .withModelClassName("com.paneedah.mwc.models.Vent") .withTextureName("textures/models/vent.png") // .withEquipementDispenseSound(sound) - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_rotated") .withModelClassName("com.paneedah.mwc.models.Vent") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1f, 1.5f); GL11.glRotatef(-90F, 1f, 0f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_corner") .withModelClassName("com.paneedah.mwc.models.VentCorner") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_corner_rotated") .withModelClassName("com.paneedah.mwc.models.VentCorner") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1f, 1.5f); GL11.glRotatef(-90F, 1f, 0f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_corner_rotated_alt") .withModelClassName("com.paneedah.mwc.models.VentCorner") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1f, -0.5f); GL11.glRotatef(90F, 1f, 0f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_intersection") .withModelClassName("com.paneedah.mwc.models.VentIntersection") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vent_end") .withModelClassName("com.paneedah.mwc.models.VentEnd") .withTextureName("textures/models/vent.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("white_desk_left") .withModelClassName("com.paneedah.mwc.models.WhiteDeskLeft") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("white_desk_middle") .withModelClassName("com.paneedah.mwc.models.WhiteDeskMiddle") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("white_desk_right") .withModelClassName("com.paneedah.mwc.models.WhiteDeskRight") .withTextureName("textures/models/shelf.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("trash_bin") .withModelClassName("com.paneedah.mwc.models.TrashBin") .withTextureName("textures/models/trashbin.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("caution_sign") .withModelClassName("com.paneedah.mwc.models.CautionSign") .withTextureName("textures/models/cautionsign.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.8f, 0.8f, 0.8f); GL11.glTranslatef(0.6f, 0.45f, 0.6f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("electric_box") .withModelClassName("com.paneedah.mwc.models.ElectricBox") .withTextureName("textures/models/electricbox.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0.8f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("electric_box_opened") .withModelClassName("com.paneedah.mwc.models.ElectricBoxOpened") .withTextureName("textures/models/electricboxopened.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0.8f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("home_chair") .withModelClassName("com.paneedah.mwc.models.HomeChair") .withTextureName("textures/models/homechair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("outdoor_chair") .withModelClassName("com.paneedah.mwc.models.OutdoorChair") .withTextureName("textures/models/outdoorchair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("home_chair_rotated") .withModelClassName("com.paneedah.mwc.models.HomeChair") .withTextureName("textures/models/homechair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("outdoor_chair_rotated") .withModelClassName("com.paneedah.mwc.models.OutdoorChair") .withTextureName("textures/models/outdoorchair.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("vending_machine") .withModelClassName("com.paneedah.mwc.models.VendingMachine") .withTextureName("textures/models/vendingmachine.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.8f, 0.8f, 0.8f); GL11.glTranslatef(0.55f, 0.4f, 0.62f); GL11.glRotatef(180F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackLeft") .withModelClassName("com.paneedah.mwc.models.ServerRackLeft") .withTextureName("textures/models/serverrackleft.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackEmptyLeft") .withModelClassName("com.paneedah.mwc.models.ServerRackEmptyLeft") .withTextureName("textures/models/serverrackemptyright.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackLeftAlt") .withModelClassName("com.paneedah.mwc.models.ServerRackLeftAlt") .withTextureName("textures/models/serverrackleftalt.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackLeftAlt2") .withModelClassName("com.paneedah.mwc.models.ServerRackLeftAlt2") .withTextureName("textures/models/serverrackleftalt2.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackLeftAlt3") .withModelClassName("com.paneedah.mwc.models.ServerRackLeftAlt3") .withTextureName("textures/models/serverrackleftalt3.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackEmptyRight") .withModelClassName("com.paneedah.mwc.models.ServerRackEmptyRight") .withTextureName("textures/models/serverrackemptyright.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackRight") .withModelClassName("com.paneedah.mwc.models.ServerRackRight") .withTextureName("textures/models/serverrackright.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackRightAlt") .withModelClassName("com.paneedah.mwc.models.ServerRackRightAlt") .withTextureName("textures/models/serverrackrightalt.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackTopLeft") .withModelClassName("com.paneedah.mwc.models.ServerRackTop") .withTextureName("textures/models/serverrackleft.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("ServerRackTopRight") .withModelClassName("com.paneedah.mwc.models.ServerRackTopRight") .withTextureName("textures/models/serverrackleft.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("DuelFloodLight") .withModelClassName("com.paneedah.mwc.models.DuelFloodLight") .withTextureName("textures/models/duelfloodlight.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.8f, 0.8f, 0.8f); GL11.glTranslatef(0.6f, 0.35f, 0.6f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("FloodLight") .withModelClassName("com.paneedah.mwc.models.Floodlight") .withTextureName("textures/models/floodlight.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.9f, 0.9f, 0.9f); GL11.glTranslatef(0.6f, 0.175f, 0.6f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("Radio_rotated") .withModelClassName("com.paneedah.mwc.models.Radio") .withTextureName("textures/models/radio.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.7f, 0.7f, 0.7f); GL11.glTranslatef(0.65f, 0.58f, 0.7f); GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("Radio") .withModelClassName("com.paneedah.mwc.models.Radio") .withTextureName("textures/models/radio.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.7f, 0.7f, 0.7f); GL11.glTranslatef(0.65f, 0.58f, 0.6f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("camera_rotated") .withModelClassName("com.paneedah.mwc.models.Camera") .withTextureName("textures/models/camera.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0.05f, 0.6f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("propanetank") .withModelClassName("com.paneedah.mwc.models.PropaneTank") .withTextureName("textures/models/propanetank.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(0.6f, 0.6f, 0.6f); GL11.glTranslatef(0.85f, 1f, 0.85f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("towablefloodlight") .withModelClassName("com.paneedah.mwc.models.TowableFloodLight") .withTextureName("textures/models/towablefloodlight.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.3f, 0f, 0.5f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.SAND) .withName("hescobastion") .withModelClassName("com.paneedah.mwc.models.HescoBastion") .withTextureName("textures/models/hescobastion.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); // GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.SAND) .withName("sandbag") .withModelClassName("com.paneedah.mwc.models.Sandbag") .withTextureName("textures/models/sandbag.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.SAND) .withName("sandbagwall") .withModelClassName("com.paneedah.mwc.models.SandbagWall") .withTextureName("textures/models/sandbag.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("crossgravestone") .withModelClassName("com.paneedah.mwc.models.CrossGravestone") .withTextureName("textures/models/crossgravestone.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("crossgravestone2") .withModelClassName("com.paneedah.mwc.models.CrossGravestone2") .withTextureName("textures/models/crossgravestone2.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("crossgravestone3") .withModelClassName("com.paneedah.mwc.models.CrossGravestone3") .withTextureName("textures/models/crossgravestone3.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("gravestoneskull") .withModelClassName("com.paneedah.mwc.models.GravestoneSkull") .withTextureName("textures/models/gravestoneskull.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("gravestone") .withModelClassName("com.paneedah.mwc.models.Gravestone") .withTextureName("textures/models/gravestone.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.WOOD) .withName("scarecrow") .withModelClassName("com.paneedah.mwc.models.Scarecrow") .withTextureName("textures/models/scarecrow.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox(0.3, 0, 0.3, 0.7, 3.5, 0.7) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 0f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.CLOTH) .withName("spookyghost") .withModelClassName("com.paneedah.mwc.models.SpookyGhost") .withTextureName("textures/models/spookyghost.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1.05f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.CLOTH) .withName("spookyghost2") .withModelClassName("com.paneedah.mwc.models.SpookyGhost") .withTextureName("textures/models/spookyghost2.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1.05f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.CLOTH) .withName("spookyghost3") .withModelClassName("com.paneedah.mwc.models.SpookyGhost") .withTextureName("textures/models/spookyghost3.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1f, 1f, 1f); GL11.glTranslatef(0.5f, 1.05f, 0.5f); GL11.glRotatef(-90F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.IRON) .withName("swat_truck") .withModelClassName("com.paneedah.mwc.models.SwatTruck") .withTextureName("textures/models/swattruck.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withPositioning(tileEntity -> { GL11.glScalef(1.5f, 1.5f, 1.5f); GL11.glTranslatef(0.3f, -0.45f, -1f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new LootBoxConfiguration() .withMaterial(Material.ROCK) .withName("ump45_gfl") .withModelClassName("com.paneedah.mwc.models.UMP45GFL") .withTextureName("textures/models/ump45gfl.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox(0.3, 0, 0.3, 0.7, 1, 0.7) .withPositioning(tileEntity -> { GL11.glScalef(0.5f, 0.5f, 0.5f); GL11.glTranslatef(1f, 1.5f, 1f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/tileentities/TurretBaseFactory.java b/src/main/java/com/paneedah/mwc/tileentities/TurretBaseFactory.java index fc35ce8c6..ecb9d4569 100644 --- a/src/main/java/com/paneedah/mwc/tileentities/TurretBaseFactory.java +++ b/src/main/java/com/paneedah/mwc/tileentities/TurretBaseFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.tileentities; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.weaponlib.ModContext; import com.paneedah.weaponlib.tile.LootBoxConfiguration; import net.minecraft.block.material.Material; @@ -17,14 +17,14 @@ public void createTileEntity(ModContext modContext) { .withName("turret_base") .withModelClassName("com.paneedah.mwc.models.TurretBase") .withTextureName("textures/models/turretbase.png") - .withCreativeTab(ModernWarfareMod.PropsTab) + .withCreativeTab(MWC.PROPS_TAB) .withBoundingBox(0.0, 0, 0.0, 1, 0.2, 1) .withPositioning(tileEntity -> { // GL11.glScalef(0.5f, 0.5f, 0.5f); GL11.glTranslatef(0.5f, 0f, 0.5f); // GL11.glRotatef(-45F, 0f, 1f, 0f); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } @SubscribeEvent diff --git a/src/main/java/com/paneedah/mwc/vehicle/AE86TruenoFactory.java b/src/main/java/com/paneedah/mwc/vehicle/AE86TruenoFactory.java index bba84c461..b8328ebab 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/AE86TruenoFactory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/AE86TruenoFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.vehicle.engines.AE86TruenoEngine; import com.paneedah.weaponlib.ModContext; @@ -287,7 +287,7 @@ public void createVehicle(ModContext modContext) { .withOBBDimensions(3.3, 2.5, 1.75) .withSeat(new Vec3d(-0.89, -0.2, 0.0)) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/ATVFactory.java b/src/main/java/com/paneedah/mwc/vehicle/ATVFactory.java index 306c55520..b7b61ba7b 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/ATVFactory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/ATVFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.ATV; import com.paneedah.mwc.models.ATVSteering; import com.paneedah.mwc.models.ATVWheel; @@ -268,7 +268,7 @@ public void createVehicle(ModContext modContext) { .withOBBDimensions(1, 1, 1) .withSeat(new Vec3d(-0.5, 0.2, -0.3)) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/AudiS4Factory.java b/src/main/java/com/paneedah/mwc/vehicle/AudiS4Factory.java index fe0a4a69f..1d2f4dd04 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/AudiS4Factory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/AudiS4Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.vehicle.engines.AudiS4Engine; import com.paneedah.weaponlib.ModContext; @@ -244,7 +244,7 @@ public void createVehicle(ModContext modContext) { .withSeat(new Vec3d(0.0, -0.2, 0.0)) .withSeat(new Vec3d(0.5, -0.2, 0.0)) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/JLTVM1280Factory.java b/src/main/java/com/paneedah/mwc/vehicle/JLTVM1280Factory.java index 19ca5ade9..2f9d9f008 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/JLTVM1280Factory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/JLTVM1280Factory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.JLTVM1280; import com.paneedah.mwc.models.JLTVM1280wheel; import com.paneedah.mwc.models.SampleVehicleControlArm; @@ -204,7 +204,7 @@ public void createVehicle(ModContext modContext) { // .withAccelerationIncrement(0.015) // .withForwardDeccelerationFactor(0.97) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/McLarenSennaFactory.java b/src/main/java/com/paneedah/mwc/vehicle/McLarenSennaFactory.java index 39c3caaa7..341182147 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/McLarenSennaFactory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/McLarenSennaFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.mwc.vehicle.engines.McLarenSennaEngine; import com.paneedah.weaponlib.ModContext; @@ -235,7 +235,7 @@ public void createVehicle(ModContext modContext) { .withOBBDimensions(3.5, 2.5, 1.75) .withSeat(new Vec3d(-0.15, -0.4, 0.5)) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/SampleVehicleFactory.java b/src/main/java/com/paneedah/mwc/vehicle/SampleVehicleFactory.java index 8f3c092e7..be331cf9d 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/SampleVehicleFactory.java +++ b/src/main/java/com/paneedah/mwc/vehicle/SampleVehicleFactory.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.ATV; import com.paneedah.mwc.models.SampleVehicleControlArm; import com.paneedah.mwc.models.SampleVehicleSteeringWheel; @@ -208,7 +208,7 @@ public void createVehicle(ModContext modContext) { // .withAccelerationIncrement(0.015) // .withForwardDeccelerationFactor(0.97) .withRenderer(renderer) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/vehicle/Vehicles.java b/src/main/java/com/paneedah/mwc/vehicle/Vehicles.java index 027c3c94e..e6d91c5bb 100644 --- a/src/main/java/com/paneedah/mwc/vehicle/Vehicles.java +++ b/src/main/java/com/paneedah/mwc/vehicle/Vehicles.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.vehicle; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.VehicleKey; import com.paneedah.mwc.models.VehicleLock; import com.paneedah.mwc.proxies.CommonProxy; @@ -16,14 +16,14 @@ public static void init(CommonProxy commonProxy) { // due to the fact that advanced warfare cannot be accessed from // weaponlib, here are things that need to be set from this end. - GeneralVehicleSounds.setup(ModernWarfareMod.MOD_CONTEXT); + GeneralVehicleSounds.setup(MWC.modContext); AccessibleVehicleGUI.remotelySetModels(new VehicleKey(), new VehicleLock(), QRL.quickLoc("gui", "vehiclekey"), QRL.quickLoc("gui", "keylock")); - //new SampleVehicleFactory().createVehicle(ModernWarfareMod.MOD_CONTEXT); - new AudiS4Factory().createVehicle(ModernWarfareMod.MOD_CONTEXT); - new McLarenSennaFactory().createVehicle(ModernWarfareMod.MOD_CONTEXT); - new AE86TruenoFactory().createVehicle(ModernWarfareMod.MOD_CONTEXT); - new ATVFactory().createVehicle(ModernWarfareMod.MOD_CONTEXT); + //new SampleVehicleFactory().createVehicle(MWC.MOD_CONTEXT); + new AudiS4Factory().createVehicle(MWC.modContext); + new McLarenSennaFactory().createVehicle(MWC.modContext); + new AE86TruenoFactory().createVehicle(MWC.modContext); + new ATVFactory().createVehicle(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/weapons/Attachments.java b/src/main/java/com/paneedah/mwc/weapons/Attachments.java index 7660cef25..c72010f31 100644 --- a/src/main/java/com/paneedah/mwc/weapons/Attachments.java +++ b/src/main/java/com/paneedah/mwc/weapons/Attachments.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.weapons; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.*; import com.paneedah.weaponlib.*; @@ -551,7 +551,7 @@ public class Attachments { public static void init(Object mod) { G11HandguardK1 = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G11HandguardK1(), "g11.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.G11HandguardK1) { @@ -583,10 +583,10 @@ public static void init(Object mod) { } }) .withName("G11HandguardK1").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G11HandguardK2 = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G11HandguardK2(), "g11.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.G11HandguardK2) { @@ -618,11 +618,11 @@ public static void init(Object mod) { } }) .withName("G11HandguardK2").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FABDefenseMount = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FABDefenseMount(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -657,10 +657,10 @@ public static void init(Object mod) { } }) .withName("FABDefenseMount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAS21Mount = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MAS21Mount(), "gun.png") .withPostRender(new LaserBeamRenderer((p, s) -> { GL11.glTranslatef(-0.62F, 1F, 0.5F); @@ -697,10 +697,10 @@ public static void init(Object mod) { } }) .withName("MAS21Mount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P90Swordfish = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.P90Swordfish(), "p90.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -740,10 +740,10 @@ public static void init(Object mod) { } }) .withName("P90swordfish").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P90DefaultKit = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.P90DefaultKit(), "p90.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.P90DefaultKit) { @@ -775,10 +775,10 @@ public static void init(Object mod) { } }) .withName("P90DefaultKit").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P90Terminator = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.P90Terminator(), "p90.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.P90Terminator) { @@ -810,10 +810,10 @@ public static void init(Object mod) { } }) .withName("P90Terminator").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarLHandguard(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -848,10 +848,10 @@ public static void init(Object mod) { } }) .withName("ScarHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarHHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarHHandguard(), "scarh.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -886,10 +886,10 @@ public static void init(Object mod) { } }) .withName("ScarHHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarMidWestIndustriesHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarMidWestIndustriesHandguard(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -927,10 +927,10 @@ public static void init(Object mod) { .withName("ScarMidWestIndustriesHandGuard") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarMLOKHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarMLOKHandguard(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -967,11 +967,11 @@ public static void init(Object mod) { .withName("ScarMLOKHandguard") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIG556Handguard = new AttachmentBuilder() .withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIG556Handguard(), "sig556.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1008,11 +1008,11 @@ public static void init(Object mod) { .withName("SIG556Handguard") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIG556HandguardRailed = new AttachmentBuilder() .withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIG556HandguardRailed(), "sig556.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1050,11 +1050,11 @@ public static void init(Object mod) { .withName("SIG556HandguardRailed") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIG556HandguardKA = new AttachmentBuilder() .withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIG556HandguardKA(), "sig556.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1092,11 +1092,11 @@ public static void init(Object mod) { .withName("SIG556HandguardKA") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIG556Grip = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIG556Grip(), "sig556.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1133,10 +1133,10 @@ public static void init(Object mod) { .withName("SIG556Grip") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarLReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarReceiver(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1171,10 +1171,10 @@ public static void init(Object mod) { } }) .withName("ScarLReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KrissVectorReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorReceiver(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1209,10 +1209,10 @@ public static void init(Object mod) { } }) .withName("KrissVectorReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Vector556Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorModified(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1250,10 +1250,10 @@ public static void init(Object mod) { } }) .withName("KrissVector556Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VectorMk1ModularHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorMk1ModularGuard(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1289,10 +1289,10 @@ public static void init(Object mod) { } }) .withName("VectorMk1ModularHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VectorCarbineHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorCarbineGuard(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1328,10 +1328,10 @@ public static void init(Object mod) { } }) .withName("VectorCarbineHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VectorTapedGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorTapedGrip(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1368,10 +1368,10 @@ public static void init(Object mod) { } }) .withName("VectorTapedGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Origin12Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Origin12Handguard(), "origin12.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -1409,10 +1409,10 @@ public static void init(Object mod) { } }) .withName("Origin12Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HKS20Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HKS20Handguard(), "hks20.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -1446,10 +1446,10 @@ public static void init(Object mod) { } }) .withName("HKS20Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington700Chassis = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington700Chassis(), "remington700.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.Remington700Chassis) { @@ -1481,10 +1481,10 @@ public static void init(Object mod) { } }) .withName("Remington700Chassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington700APACChassis = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington700ChassisAPAC(), "remington700.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.Remington700ChassisAPAC) { @@ -1516,10 +1516,10 @@ public static void init(Object mod) { } }) .withName("Remington700APACChassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington700MDTXRSChassis = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington700ChassisMDTXRS(), "remington700.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.Remington700ChassisMDTXRS) { @@ -1551,10 +1551,10 @@ public static void init(Object mod) { } }) .withName("Remington700MDTXRSChassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SSG08Chassis = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SSG08Chassis(), "SSG08_2.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -1587,10 +1587,10 @@ public static void init(Object mod) { } }) .withName("SSG08Chassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ARX160Chassis = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ARX160(), "arx160.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1626,10 +1626,10 @@ public static void init(Object mod) { } }) .withName("ARX160Chassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G2ContenderBarrelShort = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G2ContenderBarrelShort(), "g2contender.png") .withModel(new AK47iron(), "gun.png") .withModel(new FALIron(), "gun.png") @@ -1664,10 +1664,10 @@ public static void init(Object mod) { } }) .withName("G2ContenderBarrelShort").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G2ContenderBarrelLong = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G2ContenderBarrelLong(), "g2contender.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new AK47iron(), "gun.png") @@ -1703,10 +1703,10 @@ public static void init(Object mod) { } }) .withName("G2ContenderBarrelLong").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G2ContenderGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G2ContenderGrip(), "g2contender.png") .withRenderablePart() .withInventoryModelPositioning((model, s) -> { @@ -1739,10 +1739,10 @@ public static void init(Object mod) { } }) .withName("G2ContenderGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G2ContenderStock = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G2ContenderStock(), "g2contender.png") .withRenderablePart() .withInventoryModelPositioning((model, s) -> { @@ -1775,10 +1775,10 @@ public static void init(Object mod) { } }) .withName("G2ContenderStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Origin12Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Origin12Grip(), "origin12.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1814,10 +1814,10 @@ public static void init(Object mod) { } }) .withName("Origin12Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HKS20Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HKS20Grip(), "HKS20.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.HKS20Grip) { @@ -1849,10 +1849,10 @@ public static void init(Object mod) { } }) .withName("HKS20Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Origin12Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Origin12Stock(), "origin12.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -1889,10 +1889,10 @@ public static void init(Object mod) { } }) .withName("Origin12Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HKS20Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HKS20Stock(), "HKS20.png") .withRequiredAttachments(HKS20Grip) .withInventoryModelPositioning((model, s) -> { @@ -1925,10 +1925,10 @@ public static void init(Object mod) { } }) .withName("HKS20Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRHandGuard(), "acr.png") .withModel(new com.paneedah.mwc.models.AKRail(), "acrsbrhandguardtan.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "acrsbrhandguardtan.png") @@ -1966,10 +1966,10 @@ public static void init(Object mod) { } }) .withName("ACRHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRHandGuardBlack = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRHandGuard(), "acrblack.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -2008,10 +2008,10 @@ public static void init(Object mod) { } }) .withName("ACRHandGuardBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRWEMSKHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRWEMSKHandguard(), "ACRWEMSKHandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -2048,10 +2048,10 @@ public static void init(Object mod) { } }) .withName("ACRWEMSKHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRWEMSKHandGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRWEMSKHandguard(), "ACRWEMSKHandguardtan.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -2087,10 +2087,10 @@ public static void init(Object mod) { } }) .withName("ACRWEMSKHandguardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPrecisionHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPrecisionHandguard(), "ACRPrecisionHandGuard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2125,10 +2125,10 @@ public static void init(Object mod) { } }) .withName("ACRPrecisionHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPrecisionHandGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPrecisionHandguard(), "ACRPrecisionHandGuardTan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2163,10 +2163,10 @@ public static void init(Object mod) { } }) .withName("ACRPrecisionHandGuardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRSBRHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRSBRHandguard(), "acrsbrhandguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2201,10 +2201,10 @@ public static void init(Object mod) { } }) .withName("ACRSBRHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRSBRHandGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRSBRHandguard(), "ACRSBRHandGuardtan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2239,10 +2239,10 @@ public static void init(Object mod) { } }) .withName("ACRSBRHandGuardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPolymerHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPolymerHandguard(), "acrpolymerhandguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2277,10 +2277,10 @@ public static void init(Object mod) { } }) .withName("ACRPolymerHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPolymerHandGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPolymerHandguard(), "acrpolymerhandguardtan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2315,10 +2315,10 @@ public static void init(Object mod) { } }) .withName("ACRPolymerHandguardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRSquareDropHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRSquareDropHandguard(), "ACRSBRHandguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2353,10 +2353,10 @@ public static void init(Object mod) { } }) .withName("ACRSquareDropHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRSquareDropHandguardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRSquareDropHandguard(), "ACRSBRHandguardtan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2391,10 +2391,10 @@ public static void init(Object mod) { } }) .withName("ACRSquareDropHandguardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Type20Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Type20Handguard(), "type20.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -2429,10 +2429,10 @@ public static void init(Object mod) { } }) .withName("Type20Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACHoneyBadgerHandguard(), "AACHoneyBadger.png") .withModel(new com.paneedah.mwc.models.AKRail(), "aacrail_gray.png") // .withModel(new com.paneedah.mwc.models.AKRail2(), "acrrail.png") @@ -2467,10 +2467,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerMatrixArmsHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACMatrixArmsHandguard(), "aacMatrixArmsHandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -2505,10 +2505,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerMatrixArmsHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M60HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M60HandGuard(), "m60.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M60HandGuard) { @@ -2540,10 +2540,10 @@ public static void init(Object mod) { } }) .withName("M60HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M60E4HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M60E4Guard(), "m60.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -2578,10 +2578,10 @@ public static void init(Object mod) { } }) .withName("M60E4Guard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249HandGuard(), "m249.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M249HandGuard) { @@ -2613,10 +2613,10 @@ public static void init(Object mod) { } }) .withName("M249HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk48HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk48HandGuard(), "m249.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -2649,10 +2649,10 @@ public static void init(Object mod) { } }) .withName("Mk48HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249UpperHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249UpperHandGuard(), "m249.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M249UpperHandGuard) { @@ -2684,10 +2684,10 @@ public static void init(Object mod) { } }) .withName("M249UpperHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk48UpperHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk48UpperHandGuard(), "m249.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -2722,10 +2722,10 @@ public static void init(Object mod) { } }) .withName("Mk48UpperHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); StonerHANDGUARD = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.StonerHANDGUARD(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -2759,10 +2759,10 @@ public static void init(Object mod) { } }) .withName("StonerHANDGUARD").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGA1handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUGA1(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.AUGA1) { @@ -2794,10 +2794,10 @@ public static void init(Object mod) { } }) .withName("AUGA1").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGA2handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUGA2(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -2830,10 +2830,10 @@ public static void init(Object mod) { } }) .withName("AUGA2handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGA3handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUGA3M1(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -2866,10 +2866,10 @@ public static void init(Object mod) { } }) .withName("AUGA3handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); EF88Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.EF88(), "aug.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -2902,10 +2902,10 @@ public static void init(Object mod) { } }) .withName("EF88Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGDefaultKit = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUG9mmCONVERSIONkit(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.AUG9mmCONVERSIONkit) { @@ -2937,10 +2937,10 @@ public static void init(Object mod) { } }) .withName("AUGDefaultKit").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGParaConversion = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUG9mmCONVERSIONkit(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.AUG9mmCONVERSIONkit) { @@ -2972,10 +2972,10 @@ public static void init(Object mod) { } }) .withName("AUGParaConversion").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGA3extGuard = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUGA3M1_Ext(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3012,10 +3012,10 @@ public static void init(Object mod) { } }) .withName("AUGA3extGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1CarbineBody = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1CarbineBody(), "m1carbine.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1CarbineBody) { @@ -3047,10 +3047,10 @@ public static void init(Object mod) { } }) .withName("M1CarbineBody").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1A1CarbineBody = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1A1CarbineStock(), "m1carbine.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1A1CarbineStock) { @@ -3082,10 +3082,10 @@ public static void init(Object mod) { } }) .withName("M1A1CarbineBody").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1CarbineHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1CarbineHandguard(), "m1carbine.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1CarbineHandguard) { @@ -3117,10 +3117,10 @@ public static void init(Object mod) { } }) .withName("M1CarbineHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1CarbineVentilatedHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1CarbineVentilatedHandguard(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1CarbineVentilatedHandguard) { @@ -3152,10 +3152,10 @@ public static void init(Object mod) { } }) .withName("M1CarbineVentilatedHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1CarbineScoutHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1ScoutCarbineHandguard(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -3188,10 +3188,10 @@ public static void init(Object mod) { } }) .withName("M1ScoutCarbineHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G3A1Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G3A1Handguard(), "g3.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3227,10 +3227,10 @@ public static void init(Object mod) { } }) .withName("G3A1Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G3HandguardRailed = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G3HandguardRailed(), "g3.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3269,10 +3269,10 @@ public static void init(Object mod) { } }) .withName("G3HandguardRailed").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DSR1Handguard(), "dsr1.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DSR1Handguard) { @@ -3304,10 +3304,10 @@ public static void init(Object mod) { } }) .withName("DSR1Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1HandguardRailed = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DSR1HandguardRailed(), "dsr1.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DSR1HandguardRailed) { @@ -3339,10 +3339,10 @@ public static void init(Object mod) { } }) .withName("DSR1HandguardRailed").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1Barrel = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DSR1Barrel(), "dsr1.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DSR1Barrel) { @@ -3374,10 +3374,10 @@ public static void init(Object mod) { } }) .withName("DSR1Barrel").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1BarrelLong = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DSR1BarrelLong(), "dsr1.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DSR1BarrelLong) { @@ -3409,10 +3409,10 @@ public static void init(Object mod) { } }) .withName("DSR1BarrelLong").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M14Body = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M14Body(), "m14dmr.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3449,10 +3449,10 @@ public static void init(Object mod) { } }) .withName("M14Body").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M14SOCOMChassis = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M14DMRSocomChassis(), "m14dmr.png") .withModel(new FALIron(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -3490,10 +3490,10 @@ public static void init(Object mod) { } }) .withName("M14DMRSocomChassis").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk14TanBody = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk14Body(), "mk14ebrtan.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3531,10 +3531,10 @@ public static void init(Object mod) { } }) .withName("Mk14TanBody").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk14SnowBody = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk14Body(), "mk14ebrsnow.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3572,10 +3572,10 @@ public static void init(Object mod) { } }) .withName("Mk14SnowBody").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk14BlackBody = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk14Body(), "mk14ebr.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3613,10 +3613,10 @@ public static void init(Object mod) { } }) .withName("Mk14BlackBody").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M14Cover = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M14Cover(), "m14dmr.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3653,10 +3653,10 @@ public static void init(Object mod) { } }) .withName("M14Cover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M14TriRailCover = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M14TriRailCover(), "m14dmr.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -3696,10 +3696,10 @@ public static void init(Object mod) { } }) .withName("M14TriRailCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M14Rail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(M14Body, Mk14TanBody, Mk14SnowBody, Mk14BlackBody, M14SOCOMChassis) .withModel(new com.paneedah.mwc.models.M14DMRRail(), "gun.png") .withModernRecipe( @@ -3735,10 +3735,10 @@ public static void init(Object mod) { } }) .withName("M14Rail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarStock(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3773,10 +3773,10 @@ public static void init(Object mod) { } }) .withName("ScarStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarRetractableStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarShortStock(), "scarl.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3811,10 +3811,10 @@ public static void init(Object mod) { } }) .withName("ScarRetractableStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarAdapterStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarAdapterStock(), "scarl.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withModernRecipe( @@ -3853,10 +3853,10 @@ public static void init(Object mod) { } }) .withName("ScarAdapterStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScarHStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScarStock(), "scar_stock_h.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3891,10 +3891,10 @@ public static void init(Object mod) { } }) .withName("ScarHStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VectorStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorStock(), "krissvector.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -3930,10 +3930,10 @@ public static void init(Object mod) { } }) .withName("VectorStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VectorStockAdapter = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorStockAdapter(), "krissvector.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withModernRecipe( @@ -3970,10 +3970,10 @@ public static void init(Object mod) { } }) .withName("VectorStockAdapter").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UMP45Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.UMP45Receiver(), "ump45.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.UMP45Receiver) { @@ -4005,10 +4005,10 @@ public static void init(Object mod) { } }) .withName("UMP45Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UMP9Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.UMP45Receiver(), "ump45.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.UMP45Receiver) { @@ -4040,10 +4040,10 @@ public static void init(Object mod) { } }) .withName("UMP9Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UMP45Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.UMP45Stock(), "ump45.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.UMP45Stock) { @@ -4075,10 +4075,10 @@ public static void init(Object mod) { } }) .withName("UMP45Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAC10Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MAC10Stock(), "mac10.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4113,10 +4113,10 @@ public static void init(Object mod) { } }) .withName("MAC10Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAC21Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mac10stockwithrail(), "Mac10stockwithrail.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4152,10 +4152,10 @@ public static void init(Object mod) { } }) .withName("MAC21Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRStock(), "acr.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4190,10 +4190,10 @@ public static void init(Object mod) { } }) .withName("ACRStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRStockBlack = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRStock(), "acrblack.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4228,10 +4228,10 @@ public static void init(Object mod) { } }) .withName("ACRStockBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRFixedStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRFixedStock(), "acrfixedstock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4266,10 +4266,10 @@ public static void init(Object mod) { } }) .withName("ACRFixedStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRFixedStockTan = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRFixedStock(), "acrfixedstocktan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4304,10 +4304,10 @@ public static void init(Object mod) { } }) .withName("ACRFixedStockTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPRSStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPRSStock(), "acrprsstock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4342,10 +4342,10 @@ public static void init(Object mod) { } }) .withName("ACRPRSStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPRSStockTan = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPRSStock(), "acrprsstocktan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4380,10 +4380,10 @@ public static void init(Object mod) { } }) .withName("ACRPRSStockTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRLongRangeStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRLongRangeStock(), "ACRLongRangeStock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4419,10 +4419,10 @@ public static void init(Object mod) { } }) .withName("ACRLongRangeStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRPDWStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACRPDWStock(), "ACRPDWStock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4457,10 +4457,10 @@ public static void init(Object mod) { } }) .withName("ACRPDWStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1014Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1014stock(), "m1014.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1014stock) { @@ -4492,10 +4492,10 @@ public static void init(Object mod) { } }) .withName("M1014Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1014Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1014grip(), "m1014.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1014grip) { @@ -4527,10 +4527,10 @@ public static void init(Object mod) { } }) .withName("M1014Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4BenelliStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4BenelliStock(), "supernova.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M4BenelliStock) { @@ -4562,10 +4562,10 @@ public static void init(Object mod) { } }) .withName("M4BenelliStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Spas12Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Spas12Stock(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.Spas12Stock) { @@ -4597,10 +4597,10 @@ public static void init(Object mod) { } }) .withName("Spas12Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249Stock(), "m249.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M249Stock) { @@ -4632,10 +4632,10 @@ public static void init(Object mod) { } }) .withName("M249Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249ParaStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249ParaStock(), "m249.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M249ParaStock) { @@ -4667,10 +4667,10 @@ public static void init(Object mod) { } }) .withName("M249ParaStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249MilspecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249StockAdapter(), "m249.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withInventoryModelPositioning((model, s) -> { @@ -4705,10 +4705,10 @@ public static void init(Object mod) { } }) .withName("M249MilspecStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M249HK416Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M249StockAdapter(), "m249.png") .withModel(new com.paneedah.mwc.models.HK416Stock(), "HK416Stock.png") .withInventoryModelPositioning((model, s) -> { @@ -4743,10 +4743,10 @@ public static void init(Object mod) { } }) .withName("M249Hk416Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UTGTriRailHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.UTGTriRailHandGuard(), "mp5.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -4785,10 +4785,10 @@ public static void init(Object mod) { } }) .withName("UTGTriRailHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5BMHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5BMHandGuard(), "mp5.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -4827,10 +4827,10 @@ public static void init(Object mod) { } }) .withName("MP5BMHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MIMP5MHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MIMP5MHandGuard(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -4865,10 +4865,10 @@ public static void init(Object mod) { } }) .withName("MIMP5MHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScorpionHandguardShort = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScorpionEVO3A1HandguardShort(), "ScorpionEVO3A1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -4907,10 +4907,10 @@ public static void init(Object mod) { } }) .withName("ScorpionEVO3A1HandguardShort").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScorpionHandguardLong = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScorpionEVO3A1HandguardLong(), "ScorpionEVO3A1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -4946,10 +4946,10 @@ public static void init(Object mod) { } }) .withName("ScorpionEVO3A1HandguardLong").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MIMP5TRRail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MIMP5TRRail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -4985,10 +4985,10 @@ public static void init(Object mod) { } }) .withName("MIMP5TRRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MIMP5MRail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MIMP5MRail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -5024,10 +5024,10 @@ public static void init(Object mod) { } }) .withName("MIMP5MRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ShotgunRail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SupernovaRail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -5060,10 +5060,10 @@ public static void init(Object mod) { } }) .withName("ShotgunRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Kar98Krail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Kar98Krail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -5096,10 +5096,10 @@ public static void init(Object mod) { } }) .withName("Kar98Krail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M60Rail = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -5132,10 +5132,10 @@ public static void init(Object mod) { } }) .withName("M60Rail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16A1ScopeMount = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.M16A1ScopeMount(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -5172,10 +5172,10 @@ public static void init(Object mod) { } }) .withName("M16A1ScopeMount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FamasF1ScopeMount = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.FamasF1ScopeRail(), "famasf1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -5212,10 +5212,10 @@ public static void init(Object mod) { } }) .withName("FamasF1ScopeMount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16A1PicatinnyRail = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.M16A1PicatinnyRail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -5252,10 +5252,10 @@ public static void init(Object mod) { } }) .withName("M16A1PicatinnyRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FamasF1PicatinnyRail = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.FamasF1GripRail(), "famasf1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -5294,10 +5294,10 @@ public static void init(Object mod) { } }) .withName("FamasF1PicatinnyRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); NGSWRRail = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.NGSWRRails(), "ngswr.png") .withInventoryModelPositioning((model, s) -> { @@ -5330,10 +5330,10 @@ public static void init(Object mod) { } }) .withName("NGSWRRail").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RailRiser = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.KrissVectorRailRiser(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -5367,11 +5367,11 @@ public static void init(Object mod) { } }) .withName("RailRiser").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1911Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1911Slide(), "m1911.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "gun") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun") @@ -5406,11 +5406,11 @@ public static void init(Object mod) { }) .withName("M1911Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1911Body = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M1911Body(), "m1911.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M1911Body) { @@ -5443,11 +5443,11 @@ public static void init(Object mod) { }) .withName("M1911Body") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M191144MagSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M191144MagSlide(), "M191144MagSlide.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "gun") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun") @@ -5482,11 +5482,11 @@ public static void init(Object mod) { }) .withName("M191144MagSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M191144MagBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M191144MagBody(), "M191144Mag.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M191144MagBody) { @@ -5519,11 +5519,11 @@ public static void init(Object mod) { }) .withName("M191144MagBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M9A1Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M9slide(), "m9a1.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") @@ -5561,11 +5561,11 @@ public static void init(Object mod) { }) .withName("M9A1Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M9A1Body = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M9(), "m9a1.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -5601,11 +5601,11 @@ public static void init(Object mod) { }) .withName("M9A1Body") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SamuraiEdgeSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SamuraiEdgeSlide(), "samuraiedge.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") @@ -5644,11 +5644,11 @@ public static void init(Object mod) { }) .withName("SamuraiEdgeSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SamuraiEdgeBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SamuraiEdge(), "samuraiedge.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -5685,11 +5685,11 @@ public static void init(Object mod) { }) .withName("SamuraiEdgeBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SamuraiEdgeMount = new AttachmentBuilder() .withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(SamuraiEdgeBody) .withModel(new com.paneedah.mwc.models.SamuraiEdgeMount(), "samuraiedge.png") .withInventoryModelPositioning((model, s) -> { @@ -5723,7 +5723,7 @@ public static void init(Object mod) { }) .withName("SamuraiEdgeMount") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DesertEagleSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) @@ -5759,11 +5759,11 @@ public static void init(Object mod) { }) .withName("DesertEagleSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DesertEagleBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DesertEagle(), "deagle.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DesertEagle) { @@ -5796,11 +5796,11 @@ public static void init(Object mod) { }) .withName("DesertEagleBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DesertEagleLongBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DesertEagleLong(), "DesertEagle.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.DesertEagleLong) { @@ -5833,11 +5833,11 @@ public static void init(Object mod) { }) .withName("DesertEagleLongBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19Body = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19(), "glock19.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -5873,11 +5873,11 @@ public static void init(Object mod) { }) .withName("Glock19Body") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); // Glock18CBody = new AttachmentBuilder() // .withCategory(AttachmentCategory.BACKGRIP) -// .withCreativeTab(ModernWarfareMod.AttachmentsTab) +// .withCreativeTab(MWC.AttachmentsTab) // .withModel(new com.paneedah.mwc.models.Glock19(), "glock18c.png") // .withInventoryModelPositioning((model, s) -> { // if (model instanceof com.paneedah.mwc.models.Glock19) { @@ -5910,11 +5910,11 @@ public static void init(Object mod) { // }) // .withName("Glock18CBody") // .withRenderablePart().withTextureName("Dummy.png") -// .build(ModernWarfareMod.MOD_CONTEXT); +// .build(MWC.MOD_CONTEXT); Glock19XBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19XBody(), "glock19.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -5950,11 +5950,11 @@ public static void init(Object mod) { }) .withName("Glock19XBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19RazorbackBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.GlockRazorback(), "glock19.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -5990,11 +5990,11 @@ public static void init(Object mod) { }) .withName("GlockRazorbackBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19Slide(), "glock19.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6032,11 +6032,11 @@ public static void init(Object mod) { }) .withName("Glock19Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock18CSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock18Cslide(), "glock18c.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6074,11 +6074,11 @@ public static void init(Object mod) { }) .withName("Glock18CSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock18CCNCSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock18CCNCslide(), "glock18c.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6116,11 +6116,11 @@ public static void init(Object mod) { }) .withName("Glock18CCNCslide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19XSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19XSlide(), "glock19.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6158,11 +6158,11 @@ public static void init(Object mod) { }) .withName("Glock19XSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19RazorbackSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.GlockRazorbackSlide(), "glock19.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6200,11 +6200,11 @@ public static void init(Object mod) { }) .withName("GlockRazorbackSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19RockSlideOlive = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19Rockslide(), "glock19.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6242,11 +6242,11 @@ public static void init(Object mod) { }) .withName("Glock19RockslideOlive") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Glock19GhostPrecisionSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Glock19GhostPrecisionSlide(), "glock19.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") @@ -6284,11 +6284,11 @@ public static void init(Object mod) { }) .withName("Glock19GhostPrecisionSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2Body = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2(), "sccycpx2.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6324,11 +6324,11 @@ public static void init(Object mod) { }) .withName("SCCYCPX2Body") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2BodyTan = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2BodyTan(), "sccycpx2.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6364,11 +6364,11 @@ public static void init(Object mod) { }) .withName("SCCYCPX2BodyTan") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2GripTape = new AttachmentBuilder() .withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2GripTape(), "sccycpx2.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6405,11 +6405,11 @@ public static void init(Object mod) { }) .withName("SCCYCPX2GripTape") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2Slide(), "sccycpx2.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") @@ -6447,11 +6447,11 @@ public static void init(Object mod) { }) .withName("SCCYCPX2Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2BSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2BSlide(), "sccycpx2.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") @@ -6489,11 +6489,11 @@ public static void init(Object mod) { }) .withName("SCCYCPX2BSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P226Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.P226Slide(), "P226.png") .withModel(new com.paneedah.mwc.models.P226rearsight(), "p226rearsight.png") .withModel(new com.paneedah.mwc.models.P226frontsight(), "p226frontsight.png") @@ -6531,11 +6531,11 @@ public static void init(Object mod) { }) .withName("P226Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FiveSevenSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FiveSevenSlide(), "fiveseven.png") .withModel(new com.paneedah.mwc.models.P226rearsight(), "p226rearsight.png") .withModel(new com.paneedah.mwc.models.P226frontsight(), "p226frontsight.png") @@ -6570,11 +6570,11 @@ public static void init(Object mod) { }) .withName("FiveSevenSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MakarovBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MakarovPM(), "makarovpm.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6610,11 +6610,11 @@ public static void init(Object mod) { }) .withName("MakarovBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MakarovSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MakarovPMSlide(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun.png") @@ -6652,11 +6652,11 @@ public static void init(Object mod) { }) .withName("MakarovPMSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MakarovPBSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MakarovPBSSlide(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun.png") .withModernRecipe( @@ -6694,11 +6694,11 @@ public static void init(Object mod) { }) .withName("MakarovPBSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP443Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP443Slide(), "mp443.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6734,12 +6734,12 @@ public static void init(Object mod) { }) .withName("MP443Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MakarovPBBody = new AttachmentBuilder() .withCategory(AttachmentCategory.BACKGRIP) .withRequiredAttachments(Attachments.MakarovPBSlide) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MakarovPBBody(), "makarovpm.png") .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun.png") .withModernRecipe( @@ -6777,10 +6777,10 @@ public static void init(Object mod) { }) .withName("MakarovPBBody") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAC10Body = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MAC10Body(), "mac10.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6815,11 +6815,11 @@ public static void init(Object mod) { } }) .withName("MAC10Body").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAC10Action = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MAC10Action(), "mac10.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6856,10 +6856,10 @@ public static void init(Object mod) { }) .withName("MAC10Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5NavyHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5NavyHandGuard(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6894,10 +6894,10 @@ public static void init(Object mod) { } }) .withName("MP5NavyHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5A5HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5A5HandGuard(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6932,10 +6932,10 @@ public static void init(Object mod) { } }) .withName("MP5A5HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5SDHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5SDHandGuard(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -6971,10 +6971,10 @@ public static void init(Object mod) { } }) .withName("MP5SDHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5HOGUEGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5HOGUEGrip(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7009,10 +7009,10 @@ public static void init(Object mod) { } }) .withName("MP5HOGUEGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); GlockHOGUEGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.GlockHogueGrip(), "gun2.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.GlockHogueGrip) { @@ -7044,10 +7044,10 @@ public static void init(Object mod) { } }) .withName("GlockHogueGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); GlockHOGUEGripTan = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.GlockHogueGrip(), "tan.png") // .withModernRecipe( // CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7082,10 +7082,10 @@ public static void init(Object mod) { } }) .withName("GlockHogueGripTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); APSGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.APSgrip(), "aps.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7121,10 +7121,10 @@ public static void init(Object mod) { } }) .withName("APSGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); APSStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.APSstock(), "aps.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7160,10 +7160,10 @@ public static void init(Object mod) { } }) .withName("APSStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAC10Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MAC10Grip(), "mac10.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7198,10 +7198,10 @@ public static void init(Object mod) { } }) .withName("MAC10Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5Stock(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7236,10 +7236,10 @@ public static void init(Object mod) { } }) .withName("MP5Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5A3Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5A3RetractableStock(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7274,10 +7274,10 @@ public static void init(Object mod) { } }) .withName("MP5A3Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5A4Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5A4Stock(), "mp5.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7312,10 +7312,10 @@ public static void init(Object mod) { } }) .withName("MP5A4Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP5MilspecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP5StockAdapter(), "mp5.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withModernRecipe( @@ -7356,10 +7356,10 @@ public static void init(Object mod) { } }) .withName("MP5StockAdapter").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); LVOAVHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.LVOAVHandGuard(), "lvoavhandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7398,10 +7398,10 @@ public static void init(Object mod) { } }) .withName("LVOAVHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AR15HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AR15FN15Handguard(), "ar15.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7438,10 +7438,10 @@ public static void init(Object mod) { } }) .withName("AR15FN15Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M38HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M38HandGuard(), "hk416.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7480,10 +7480,10 @@ public static void init(Object mod) { } }) .withName("M38HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416HandGuardBlackAndTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M38HandGuard(), "hk416.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrailblackandtan.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrailblackandtan.png") @@ -7522,10 +7522,10 @@ public static void init(Object mod) { } }) .withName("HK416HandGuardBlackAndTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK417Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HK417Handguard(), "HK417.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7561,10 +7561,10 @@ public static void init(Object mod) { } }) .withName("HK417Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK417HandguardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HK417Handguard(), "HK417tan.png") .withModel(new com.paneedah.mwc.models.AKRail(), "guntandark.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "guntandark.png") @@ -7600,10 +7600,10 @@ public static void init(Object mod) { } }) .withName("HK417HandguardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk18HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk18HandGuard(), "mk18handguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "mk18rail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "mk18rail.png") @@ -7642,10 +7642,10 @@ public static void init(Object mod) { } }) .withName("Mk18HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Mk18HandGuardBlack = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Mk18HandGuard(), "mk18handguardblack.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7684,10 +7684,10 @@ public static void init(Object mod) { } }) .withName("Mk18HandGuardBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Block2SOCOMHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Block2SOCOMHandguard(), "block2socomhandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7727,10 +7727,10 @@ public static void init(Object mod) { } }) .withName("Block2SOCOMHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FSSTacLiteHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FSSTacLiteHandguard(), "FSSTacLiteHandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -7769,10 +7769,10 @@ public static void init(Object mod) { } }) .withName("FSSTacLiteHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4MagpulHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4MagpulHandGuard(), "m4magpulhandleguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7807,10 +7807,10 @@ public static void init(Object mod) { } }) .withName("M4MagpulHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4MagpulHandGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4MagpulHandGuard(), "m4magpulhandleguardtan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -7845,10 +7845,10 @@ public static void init(Object mod) { } }) .withName("M4MagpulHandGuardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4Receiver(), "m4a1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -7884,10 +7884,10 @@ public static void init(Object mod) { } }) .withName("M4Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HK416Receiver(), "HK416Receiver.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -7923,10 +7923,10 @@ public static void init(Object mod) { } }) .withName("HK416Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); C8SFWReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4Receiver(), "C8SFW_gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "C8SFW_gun.png") .withInventoryModelPositioning((model, s) -> { @@ -7959,10 +7959,10 @@ public static void init(Object mod) { } }) .withName("C8SFWReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VLTORReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VLTORReceiver(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -7998,10 +7998,10 @@ public static void init(Object mod) { } }) .withName("VLTORReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AR57Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AR57Receiver(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -8034,10 +8034,10 @@ public static void init(Object mod) { } }) .withName("AR57Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK417Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HK417Receiver(), "HK417.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -8070,10 +8070,10 @@ public static void init(Object mod) { } }) .withName("HK417Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK417ReceiverTan = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HK417Receiver(), "HK417tan.png") .withModel(new com.paneedah.mwc.models.AKRail(), "guntan.png") .withInventoryModelPositioning((model, s) -> { @@ -8106,10 +8106,10 @@ public static void init(Object mod) { } }) .withName("HK417ReceiverTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M110Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M110Receiver(), "M110.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrailm110.png") .withModernRecipe( @@ -8145,7 +8145,7 @@ public static void init(Object mod) { } }) .withName("M110Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Z10Receiver = new AttachmentBuilder() .withCategory(AttachmentCategory.RECEIVER) @@ -8183,10 +8183,10 @@ public static void init(Object mod) { } }) .withName("Z10Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Beowulf50CalReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Beowulf50CalReceiver(), "beowulf50cal.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -8223,10 +8223,10 @@ public static void init(Object mod) { } }) .withName("Beowulf50CalReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); S710Receiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.S710Tricun10mmReceiver(), "s710tricun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.S710Tricun10mmReceiver) { @@ -8258,10 +8258,10 @@ public static void init(Object mod) { } }) .withName("S710Receiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CZ805BrenReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.CZ805BrenReceiver(), "CZ805Bren.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -8296,10 +8296,10 @@ public static void init(Object mod) { } }) .withName("CZ805BrenReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACHoneyBadgerReceiver(), "AACHoneyBadger.png") .withModel(new com.paneedah.mwc.models.AKRail(), "aacrail_main.png") .withInventoryModelPositioning((model, s) -> { @@ -8332,10 +8332,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerReceiverBlack = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACHoneyBadgerReceiver(), "AACHoneyBadgerBlack.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -8368,10 +8368,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerReceiverBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerKnightsReceiver = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACKnightsArmamentReceiver(), "AACKnightsArmamentReceiver.png") .withModel(new com.paneedah.mwc.models.AKRail(), "aacrail_knights.png") .withInventoryModelPositioning((model, s) -> { @@ -8404,10 +8404,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerKnightsReceiver").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerKnightsReceiverBlack = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AACKnightsArmamentReceiver(), "AACKnightsArmamentReceiverblack.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -8440,7 +8440,7 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerKnightsReceiverBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Placeholder = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8462,7 +8462,7 @@ public static void init(Object mod) { } }) .withName("Placeholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FamasPlaceholder = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8484,7 +8484,7 @@ public static void init(Object mod) { } }) .withName("FamasPlaceholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); APC9Placeholder = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8506,7 +8506,7 @@ public static void init(Object mod) { } }) .withName("APC9Placeholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P90Placeholder = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8528,7 +8528,7 @@ public static void init(Object mod) { } }) .withName("P90Placeholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); PistolPlaceholder = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8550,7 +8550,7 @@ public static void init(Object mod) { } }) .withName("PistolPlaceholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); GripPlaceholder = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8572,7 +8572,7 @@ public static void init(Object mod) { } }) .withName("GripPlaceholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M40A6GripPlaceholder = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8594,7 +8594,7 @@ public static void init(Object mod) { } }) .withName("M40A6GripPlaceholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); LaserPlaceholder = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) .withModel(new com.paneedah.mwc.models.M4Receiver(), "gun.png") @@ -8616,10 +8616,10 @@ public static void init(Object mod) { } }) .withName("LaserPlaceholder").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4HandGuard(), "m4a1.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -8654,10 +8654,10 @@ public static void init(Object mod) { } }) .withName("M4HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AR57Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AR57Handguard(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -8693,10 +8693,10 @@ public static void init(Object mod) { } }) .withName("AR57Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); NTW20HandguardRAIL = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.NTW20Guard(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -8729,10 +8729,10 @@ public static void init(Object mod) { } }) .withName("NTW20Guard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M16HandGuard(), "m16a4.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -8767,10 +8767,10 @@ public static void init(Object mod) { } }) .withName("M16HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16A1Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M16A1Handguard(), "m16a1.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -8805,10 +8805,10 @@ public static void init(Object mod) { } }) .withName("M16A1Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4CarbineHandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4CarbineHandGuard(), "m4carbinehandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -8847,10 +8847,10 @@ public static void init(Object mod) { } }) .withName("M4CarbineHandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16A4HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M16A4Handguard(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -8889,10 +8889,10 @@ public static void init(Object mod) { } }) .withName("M16A4HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M110Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M110Handguard(), "M110.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrailm110.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrailm110.png") @@ -8931,10 +8931,10 @@ public static void init(Object mod) { } }) .withName("M110Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Z10Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Z10Handguard(), "z10.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -8971,10 +8971,10 @@ public static void init(Object mod) { } }) .withName("Z10Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AR10SuperSASSHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AR10SuperSASSHandguard(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -9013,10 +9013,10 @@ public static void init(Object mod) { } }) .withName("AR10SuperSASSHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); S710Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.S710TricunHandguard(), "s710tricun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.S710TricunHandguard) { @@ -9048,9 +9048,9 @@ public static void init(Object mod) { } }) .withName("S710Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIGMCXHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIGMCXHandguard(), "sigmcx.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -9088,10 +9088,10 @@ public static void init(Object mod) { } }) .withName("SIGMCXHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIGMCXHandguardShort = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SIGMCXHandguardShort(), "sigmcx.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -9126,10 +9126,10 @@ public static void init(Object mod) { } }) .withName("SIGMCXHandguardShort").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MPXHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MPXHandguard(), "mpx.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9165,10 +9165,10 @@ public static void init(Object mod) { } }) .withName("MPXHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MPXHandguardExtended = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MPXHandguardExtended(), "mpx.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9204,10 +9204,10 @@ public static void init(Object mod) { } }) .withName("MPXHandguardExtended").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MPXHandguardRailed = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MPXHandguardRailed(), "mpx.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9243,10 +9243,10 @@ public static void init(Object mod) { } }) .withName("MPXHandguardRailed").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); K2C1Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.K2C1Handguard(), "k2c1.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -9283,10 +9283,10 @@ public static void init(Object mod) { } }) .withName("K2C1Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HeraArmsGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HeraArmsGrip(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9321,10 +9321,10 @@ public static void init(Object mod) { } }) .withName("HeraArmsGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4Grip(), "m4a1.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9359,10 +9359,10 @@ public static void init(Object mod) { } }) .withName("M4Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4GripTan = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4GripTan(), "m4griptan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9397,10 +9397,10 @@ public static void init(Object mod) { } }) .withName("M4GripTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SOCOM_Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) -// .withCreativeTab(ModernWarfareMod.AttachmentsTab) +// .withCreativeTab(MWC.AttachmentsTab) .withModel(new com.paneedah.mwc.models.M4Grip(), "socom_grip.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M4Grip) { @@ -9432,10 +9432,10 @@ public static void init(Object mod) { } }) .withName("SOCOM_Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4GripGray = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4Grip(), "gun2.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9470,10 +9470,10 @@ public static void init(Object mod) { } }) .withName("M4GripGray").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HKgrip(), "hkgrip.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9508,10 +9508,10 @@ public static void init(Object mod) { } }) .withName("HK416Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416GripTan = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HKgrip(), "hkgriptan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9546,10 +9546,10 @@ public static void init(Object mod) { } }) .withName("HK416GripTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M110Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M110Grip(), "M110.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9584,10 +9584,10 @@ public static void init(Object mod) { } }) .withName("M110Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); S710TricunGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.S710TricunGrip(), "S710Tricun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.S710TricunGrip) { @@ -9619,10 +9619,10 @@ public static void init(Object mod) { } }) .withName("S710TricunGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); K2C1Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.K2C1Grip(), "k2c1.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9657,10 +9657,10 @@ public static void init(Object mod) { } }) .withName("K2C1Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK47Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKGrip(), "ak47.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9696,10 +9696,10 @@ public static void init(Object mod) { } }) .withName("AK47Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK101Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK101Grip(), "AK101Grip.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9734,10 +9734,10 @@ public static void init(Object mod) { } }) .withName("AK101Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKErgoGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKErgoGrip(), "akergogrip.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9772,10 +9772,10 @@ public static void init(Object mod) { } }) .withName("AKErgoGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKErgoGripGreen = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKErgoGrip(), "ak12grip.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9810,10 +9810,10 @@ public static void init(Object mod) { } }) .withName("AKErgoGripGreen").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKErgoGripTan = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKErgoGrip(), "akergogriptan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9848,10 +9848,10 @@ public static void init(Object mod) { } }) .withName("AKErgoGripTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12Grip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12Grip(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9886,10 +9886,10 @@ public static void init(Object mod) { } }) .withName("AK12Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12ErgoGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12ErgoGrip(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -9924,10 +9924,10 @@ public static void init(Object mod) { } }) .withName("AK12ErgoGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.AACHoneyBadgerStock(), "AACHoneyBadger.png") .withInventoryModelPositioning((model, s) -> { @@ -9960,10 +9960,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerStockBlack = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.AACHoneyBadgerStock(), "AACHoneyBadgerblack.png") .withInventoryModelPositioning((model, s) -> { @@ -9996,10 +9996,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerStockBlack").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G3Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.G3Stock(), "g3.png") .withModernRecipe( @@ -10036,10 +10036,10 @@ public static void init(Object mod) { } }) .withName("G3Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP7Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MP7Stock(), "mp7.png") .withModernRecipe( @@ -10076,10 +10076,10 @@ public static void init(Object mod) { } }) .withName("MP7Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP7MilSpecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MP7MilSpecStock(), "mp7.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") @@ -10121,11 +10121,11 @@ public static void init(Object mod) { } }) .withName("MP7MilSpecStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK47Stock = new AttachmentBuilder() .withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK47stock(), "ak47.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10165,11 +10165,11 @@ public static void init(Object mod) { } }) .withName("AK47stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DragunovGripStock = new AttachmentBuilder() .withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DragunovStock(), "dragunov.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10209,11 +10209,11 @@ public static void init(Object mod) { } }) .withName("DragunovGripStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Dragunov98Stock = new AttachmentBuilder() .withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Dragunov98Stock(), "dragunov98.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10252,10 +10252,10 @@ public static void init(Object mod) { } }) .withName("Dragunov98Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RPKStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.RPKstock(), "rpkstock.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.RPKstock) { @@ -10287,10 +10287,10 @@ public static void init(Object mod) { } }) .withName("RPKstock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK101Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK101Stock(), "ak101stock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10325,10 +10325,10 @@ public static void init(Object mod) { } }) .withName("AK101Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK74Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK74Stock(), "AK74Stock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10363,10 +10363,10 @@ public static void init(Object mod) { } }) .withName("AK74Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12Stock(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10401,10 +10401,10 @@ public static void init(Object mod) { } }) .withName("AK12Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12ZenitcoStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12ZenitcoStock(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10439,10 +10439,10 @@ public static void init(Object mod) { } }) .withName("AK12ZenitcoStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezStock(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10478,10 +10478,10 @@ public static void init(Object mod) { } }) .withName("VSSVintorezStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ASValStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ASValStock(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10517,10 +10517,10 @@ public static void init(Object mod) { } }) .withName("ASValStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezMilspecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezKulaTacStock(), "vssvintorez.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withModernRecipe( @@ -10561,12 +10561,12 @@ public static void init(Object mod) { } }) .withName("VSSVintorezMilspecStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CollapsableMOEStock = new AttachmentBuilder() .withRenderablePart() .withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.CollapsableMOEStock(), "CollapsableMOEStock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10601,12 +10601,12 @@ public static void init(Object mod) { } }) .withName("CollapsableMOEStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CollapsableMOEStockGreen = new AttachmentBuilder() .withRenderablePart() .withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.CollapsableMOEStock(), "ak12stock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10641,10 +10641,10 @@ public static void init(Object mod) { } }) .withName("CollapsableMOEStockGreen").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MagpulCTRStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MagpulCTRStock(), "MagpulCTRStock.png") .withModernRecipe( @@ -10680,10 +10680,10 @@ public static void init(Object mod) { } }) .withName("MagpulCTRStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MagpulCTRStockTan = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MagpulCTRStock(), "MagpulCTRStocktan.png") .withModernRecipe( @@ -10719,10 +10719,10 @@ public static void init(Object mod) { } }) .withName("MagpulCTRStockTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MilSpecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStock.png") .withModernRecipe( @@ -10758,10 +10758,10 @@ public static void init(Object mod) { } }) .withName("MilSpecStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CZ805BrenStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.CZ805BrenStock(), "CZ805Bren.png") .withModernRecipe( @@ -10797,10 +10797,10 @@ public static void init(Object mod) { } }) .withName("CZ805BrenStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SIGMCXStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.SIGMCXStock(), "sigmcx.png") .withModernRecipe( @@ -10836,10 +10836,10 @@ public static void init(Object mod) { } }) .withName("SIGMCXStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); C8Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) -// .withCreativeTab(ModernWarfareMod.AttachmentsTab) +// .withCreativeTab(MWC.AttachmentsTab) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MilSpecStock(), "C8Stock.png") .withInventoryModelPositioning((model, s) -> { @@ -10872,10 +10872,10 @@ public static void init(Object mod) { } }) .withName("C8Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MilSpecStockTan = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MilSpecStock(), "MilSpecStocktan.png") .withModernRecipe( @@ -10911,10 +10911,10 @@ public static void init(Object mod) { } }) .withName("MilSpecStockTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HeraArmsStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.HeraArmsStock(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -10950,10 +10950,10 @@ public static void init(Object mod) { } }) .withName("HeraArmsStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.HK416Stock(), "HK416Stock.png") .withModernRecipe( @@ -10989,10 +10989,10 @@ public static void init(Object mod) { } }) .withName("HK416Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SOCOM_Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) -// .withCreativeTab(ModernWarfareMod.AttachmentsTab) +// .withCreativeTab(MWC.AttachmentsTab) .withRenderablePart() .withModel(new com.paneedah.mwc.models.SOCOM_Stock(), "Socom_stock.png") .withInventoryModelPositioning((model, s) -> { @@ -11025,10 +11025,10 @@ public static void init(Object mod) { } }) .withName("SOCOM_Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M16Stock(), "m16stock.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11063,10 +11063,10 @@ public static void init(Object mod) { } }) .withName("M16Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416StockTan = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.HK416Stock(), "HK416Stocktan.png") .withModernRecipe( @@ -11102,10 +11102,10 @@ public static void init(Object mod) { } }) .withName("HK416StockTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M110Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M110Stock(), "m110.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11141,10 +11141,10 @@ public static void init(Object mod) { } }) .withName("M110Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); PRSPrecisionStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ARPRSPrecisionStock(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11180,10 +11180,10 @@ public static void init(Object mod) { } }) .withName("ARPRSPrecisionStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK47HandleGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK47HandleGuard(), "ak47.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11219,10 +11219,10 @@ public static void init(Object mod) { } }) .withName("AK47HandleGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DragunovHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DragunovHandguard(), "dragunov.png") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun.png") .withModel(new com.paneedah.mwc.models.AK47iron(), "gun.png") @@ -11260,10 +11260,10 @@ public static void init(Object mod) { } }) .withName("DragunovHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Dragunov98Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Dragunov98Handguard(), "dragunov98.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11299,10 +11299,10 @@ public static void init(Object mod) { } }) .withName("Dragunov98Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK101HandGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK101HandGuard(), "ak101handguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11337,10 +11337,10 @@ public static void init(Object mod) { } }) .withName("AK101HandGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK74Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK74Handguard(), "AK74Handguard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11375,10 +11375,10 @@ public static void init(Object mod) { } }) .withName("AK74Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKMagpulHandleGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MagpulHandleGuard(), "MagpulHandleGuard.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11413,10 +11413,10 @@ public static void init(Object mod) { } }) .withName("AKMagpulHandleGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKMagpulHandleGuardTan = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MagpulHandleGuard(), "MagpulHandleGuardTan.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11451,10 +11451,10 @@ public static void init(Object mod) { } }) .withName("AKMagpulHandleGuardTan").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MLOKHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MLOKHandguard(), "mlokhandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -11491,10 +11491,10 @@ public static void init(Object mod) { } }) .withName("MLOKHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MLOKExtendedHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MLOKExtendedHandguard(), "MLOKExtendedHandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "akrail.png") @@ -11531,10 +11531,10 @@ public static void init(Object mod) { } }) .withName("MLOKExtendedHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK15HandleGuard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK15HandleGuard(), "AK15HandleGuard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "AKRailgrey.png") .withModernRecipe( @@ -11570,10 +11570,10 @@ public static void init(Object mod) { } }) .withName("AK15HandleGuard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12kalHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK15HandleGuard(), "ak12handguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "AKRailgrey.png") .withModernRecipe( @@ -11609,10 +11609,10 @@ public static void init(Object mod) { } }) .withName("AK12kalHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RPK16Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.RPK16handguard(), "rpk16handguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrailgrey.png") .withModernRecipe( @@ -11648,10 +11648,10 @@ public static void init(Object mod) { } }) .withName("RPK16handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12Handguard(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11686,10 +11686,10 @@ public static void init(Object mod) { } }) .withName("AK12Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12BHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12BHandguard(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11724,10 +11724,10 @@ public static void init(Object mod) { } }) .withName("AK12BHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KBP9A91Handguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KBP9A91Handguard(), "kbp9a91.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11762,10 +11762,10 @@ public static void init(Object mod) { } }) .withName("KBP9A91Handguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KBP9A91CompactHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KBP9A91CompactHandguard(), "kbp9a91.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11800,10 +11800,10 @@ public static void init(Object mod) { } }) .withName("KBP9A91CompactHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KBP9A91KulaTacHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KBP9A91KulaTacHandguard(), "kbp9a91.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11838,10 +11838,10 @@ public static void init(Object mod) { } }) .withName("KBP9A91KulaTacHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezHandguard(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11877,10 +11877,10 @@ public static void init(Object mod) { } }) .withName("VSSVintorezHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ASValHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ASValHandguard(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11915,10 +11915,10 @@ public static void init(Object mod) { } }) .withName("ASValHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezTriRailMount = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezTriRailMount(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11953,10 +11953,10 @@ public static void init(Object mod) { } }) .withName("VSSVintorezTriRailMount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK47DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK47DustCover(), "ak47.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -11991,10 +11991,10 @@ public static void init(Object mod) { } }) .withName("AK47Dustcover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DragunovDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DragunovDustCover(), "dragunov.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12029,10 +12029,10 @@ public static void init(Object mod) { } }) .withName("DragunovDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Dragunov98DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Dragunov98(), "dragunov98.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12067,10 +12067,10 @@ public static void init(Object mod) { } }) .withName("Dragunov98DustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKMDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKMDustCover(), "AKMDustCover.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12105,10 +12105,10 @@ public static void init(Object mod) { } }) .withName("AKMDustcover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK101DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK101DustCover(), "ak101dustcover.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12143,10 +12143,10 @@ public static void init(Object mod) { } }) .withName("AK101DustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VeprDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VeprDustCover(), "veprdustcover.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -12182,10 +12182,10 @@ public static void init(Object mod) { } }) .withName("VeprDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK15DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK15DustCover(), "ak15dustcover.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModernRecipe( @@ -12221,10 +12221,10 @@ public static void init(Object mod) { } }) .withName("AK15DustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12DustCover(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12259,10 +12259,10 @@ public static void init(Object mod) { } }) .withName("AK12DustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12BDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK12BDustCover(), "ak12kal.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12297,10 +12297,10 @@ public static void init(Object mod) { } }) .withName("AK12BDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezDustCover(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12335,10 +12335,10 @@ public static void init(Object mod) { } }) .withName("VSSVintorezDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSMDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezVSSMDustCover(), "vssvintorez.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12373,10 +12373,10 @@ public static void init(Object mod) { } }) .withName("VSSMDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALDustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALDustCover(), "fnfal.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.FNFALDustCover) { @@ -12408,10 +12408,10 @@ public static void init(Object mod) { } }) .withName("FNFALDustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SA58DustCover = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SA58DustCover(), "SA58DustCover.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -12444,10 +12444,10 @@ public static void init(Object mod) { } }) .withName("SA58DustCover").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALGrip = new AttachmentBuilder().withCategory(AttachmentCategory.BACKGRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALGrip(), "fnfal.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.FNFALGrip) { @@ -12479,10 +12479,10 @@ public static void init(Object mod) { } }) .withName("FNFALGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALStock(), "fnfal.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.FNFALStock) { @@ -12514,10 +12514,10 @@ public static void init(Object mod) { } }) .withName("FNFALStock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALHandguard(), "fnfal.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.FNFALHandguard) { @@ -12549,10 +12549,10 @@ public static void init(Object mod) { } }) .withName("FNFALHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALPARAHandguard = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALPARAHandguard(), "fnfalparahandguard.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withInventoryModelPositioning((model, s) -> { @@ -12585,10 +12585,10 @@ public static void init(Object mod) { } }) .withName("FNFALPARAHandguard").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M4FrontSight = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M4Iron2(), "gun.png") .withModel(new com.paneedah.mwc.models.FALIron(), "gun.png") .withModernRecipe( @@ -12627,10 +12627,10 @@ public static void init(Object mod) { } }) .withName("M4FrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M60FrontSight = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.M60FrontSight(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.M60FrontSight) { @@ -12662,10 +12662,10 @@ public static void init(Object mod) { } }) .withName("M60FrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M38FrontSight = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FALIron(), "gun.png") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun.png") .withModel(new com.paneedah.mwc.models.AK47iron(), "gun.png") @@ -12702,10 +12702,10 @@ public static void init(Object mod) { } }) .withName("M38FrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416FrontSight = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G95_upright_frontsights(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12750,10 +12750,10 @@ public static void init(Object mod) { } }) .withName("HK416FrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MBUSFrontSight = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MBUSFrontSight(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_MODIFICATION, @@ -12799,7 +12799,7 @@ public static void init(Object mod) { } }) .withName("MBUSFrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); LeupoldScope = new ItemScope.Builder() .withOpticalZoom() @@ -12809,7 +12809,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.085f, 0.33f, 1.75f); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, MIMP5TRRail, MIMP5MRail, ShotgunRail, Kar98Krail, M60Rail, P90Placeholder, AUGA2handguard, AUGA3handguard, @@ -12858,7 +12858,7 @@ public static void init(Object mod) { } }) .withName("Leupold") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); PSO1 = new ItemScope.Builder() .withSniperReticle(Reticles.RETICLE_PSO1) @@ -12867,7 +12867,7 @@ public static void init(Object mod) { .withViewfinderPositioning((p, s) -> { GL11.glScalef(1.15f, 1.15f, 1.1f); GL11.glTranslatef(-0.299f, 0.215f, 1.15f); - }).withCategory(AttachmentCategory.SCOPE).withCreativeTab(ModernWarfareMod.AttachmentsTab).withCrosshair("LP") + }).withCategory(AttachmentCategory.SCOPE).withCreativeTab(MWC.ATTACHMENTS_TAB).withCrosshair("LP") .withModel(new com.paneedah.mwc.models.PSO1(), "gun.png") .withModel(new com.paneedah.mwc.models.PSO12(), "gun.png") .withModernRecipe( @@ -12921,7 +12921,7 @@ public static void init(Object mod) { } }) .withName("PSO1") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); OKP7 = new ItemScope.Builder() .withHolographicReticles(Reticles.OKP) @@ -12931,7 +12931,7 @@ public static void init(Object mod) { GlStateManager.scale(2.05, 2.05, 2.05); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.OKP7(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -12977,11 +12977,11 @@ public static void init(Object mod) { } }) .withName("okp7").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FMG9Sight = new ItemScope.Builder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.FMG9Carryhandle(), "fmg9.png") .withModernRecipe( @@ -13027,7 +13027,7 @@ public static void init(Object mod) { } }) .withName("fmg9carryhandle").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Reflex = new ItemScope.Builder() .withHolographicReticles(Reticles.REFLEX) @@ -13036,7 +13036,7 @@ public static void init(Object mod) { GlStateManager.scale(1.4, 1.4, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Reflex(), "Reflex.png") .withModernRecipe( @@ -13096,7 +13096,7 @@ public static void init(Object mod) { } }) .withName("Reflex").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); BijiaReflex = new ItemScope.Builder() .withHolographicReticles(Reticles.BIJIA) @@ -13105,7 +13105,7 @@ public static void init(Object mod) { GlStateManager.scale(1.4, 1.4, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.BijiaReflex(), "gun.png") .withModernRecipe( @@ -13164,7 +13164,7 @@ public static void init(Object mod) { } }) .withName("BijiaReflex").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MicroReflex = new ItemScope.Builder() .withHolographicReticles(Reticles.MICROREFLEX) @@ -13173,7 +13173,7 @@ public static void init(Object mod) { GlStateManager.scale(1.6, 1.6, 1.6); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MicroReflexSight(), "gun.png") .withModel(new com.paneedah.mwc.models.SightMount(), "gun.png") @@ -13239,7 +13239,7 @@ public static void init(Object mod) { } }) .withName("MicroReflex").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACOG = new ItemScope.Builder() .withSniperReticle(Reticles.RETICLE_ACOG) @@ -13250,7 +13250,7 @@ public static void init(Object mod) { GL11.glTranslatef(0.038f, 0.485f, 0.37f); }) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ACOG(), "Acog.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -13325,7 +13325,7 @@ public static void init(Object mod) { .withRotationPoint(-0.12079999459981924, -1.4240000168085098, -2.392400065904859) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Specter = new ItemScope.Builder() .withSniperReticle(Reticles.RETICLE_SPECTRE) @@ -13336,7 +13336,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.075f, 0.38f, 0.42f); }) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SpecterSight(), "SpecterSight.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -13396,7 +13396,7 @@ public static void init(Object mod) { }) .withName("Specter").withTextureName("Dummy.png") .withRotationPoint(-0.12079999459981924, -1.4240000168085098, -2.392400065904859) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Holographic = new ItemScope.Builder() .withHolographicReticles(Reticles.HOLO_ONE) @@ -13405,7 +13405,7 @@ public static void init(Object mod) { GlStateManager.scale(1.4, 1.4, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Holographic2(), "Holographic2.png") .withModernRecipe( @@ -13467,7 +13467,7 @@ public static void init(Object mod) { }) .withName("Holographic2").withTextureName("Dummy.png") .withRotationPoint(-0.12079999459981924, -1.4240000168085098, -2.392400065904859) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HolographicAlt = new ItemScope.Builder() .withHolographicReticles(Reticles.HOLO_ONE) @@ -13476,7 +13476,7 @@ public static void init(Object mod) { GlStateManager.scale(1.4, 1.4, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Holographic(), "Holographic.png") .withModernRecipe( @@ -13537,7 +13537,7 @@ public static void init(Object mod) { } }) .withName("HolographicAlt").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); EotechHybrid2 = new ItemScope.Builder() .withSniperReticle(Reticles.RETICLE_HOLO) @@ -13548,7 +13548,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.204f, 0.28f, 1.35f); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.EotechHybrid2(), "gun.png") .withModel(new com.paneedah.mwc.models.EotechScopeRing(), "gun.png") @@ -13615,7 +13615,7 @@ public static void init(Object mod) { } }) .withName("EotechHybrid2").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VortexRedux = new ItemScope.Builder() .withHolographicReticles(Reticles.VORTEX) @@ -13624,7 +13624,7 @@ public static void init(Object mod) { GlStateManager.scale(1.73, 1.73, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.VortexSight(), "vortexsight.png") .withModernRecipe( @@ -13684,7 +13684,7 @@ public static void init(Object mod) { } }) .withName("VortexSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MicroT1 = new ItemScope.Builder() .withHolographicReticles(Reticles.REFLEX) @@ -13694,7 +13694,7 @@ public static void init(Object mod) { GlStateManager.scale(3.5, 3.5, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.MicroT1(), "gun.png") .withModernRecipe( @@ -13754,7 +13754,7 @@ public static void init(Object mod) { } }) .withName("MicroT1").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AimpointCompM2 = new ItemScope.Builder() .withHolographicReticles(Reticles.REFLEX) @@ -13764,7 +13764,7 @@ public static void init(Object mod) { GlStateManager.scale(1.8, 1.8, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.AimpointCompM2(), "AimpointCompM2.png") .withModernRecipe( @@ -13825,7 +13825,7 @@ public static void init(Object mod) { }) .withName("AimpointCompM2").withTextureName("Dummy.png") .withRotationPoint(-0.12079999459981924, -1.4240000168085098, -2.392400065904859) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AimpointCompM5 = new ItemScope.Builder() .withHolographicReticles(Reticles.REFLEX) @@ -13835,7 +13835,7 @@ public static void init(Object mod) { GlStateManager.scale(3.5, 3.5, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.AimpointCompM5(), "aimpointcompm5.png") .withModernRecipe( @@ -13895,7 +13895,7 @@ public static void init(Object mod) { } }) .withName("AimpointCompM5").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RMR = new ItemScope.Builder() .withHolographicReticles(Reticles.RMR) @@ -13904,7 +13904,7 @@ public static void init(Object mod) { GlStateManager.scale(1.7, 1.6, 1.6); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.RMRsight(), "RMRsight.png") .withModernRecipe( @@ -13959,7 +13959,7 @@ public static void init(Object mod) { } }) .withName("RMRsight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Kobra = new ItemScope.Builder() .withHolographicReticles(Reticles.KOBRA) @@ -13969,7 +13969,7 @@ public static void init(Object mod) { GlStateManager.scale(1.8, 1.8, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Kobra(), "gunmetaltexture.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14029,7 +14029,7 @@ public static void init(Object mod) { } }) .withName("Kobra").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KobraGen3 = new ItemScope.Builder() .withHolographicReticles(Reticles.KOBRA) @@ -14039,7 +14039,7 @@ public static void init(Object mod) { GlStateManager.scale(1.8, 1.8, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KobraGen3(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14099,7 +14099,7 @@ public static void init(Object mod) { } }) .withName("KobraGen3").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KobraMount = new ItemScope.Builder() .withHolographicReticles(Reticles.KOBRA) @@ -14109,7 +14109,7 @@ public static void init(Object mod) { GlStateManager.scale(1.8, 1.8, 1.4); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KobraMount(), "kobramount.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14155,7 +14155,7 @@ public static void init(Object mod) { } }) .withName("KobraMount").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HP = new ItemScope.Builder() // .withNightVision() @@ -14165,7 +14165,7 @@ public static void init(Object mod) { GL11.glScalef(1.65f, 1.65f, 1.65f); GL11.glTranslatef(0.0285f, 0.492f, 0.7f); }) - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withCrosshair("HP") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withCrosshair("HP") .withModel(new com.paneedah.mwc.models.HP(), "gun.png") .withModel(new com.paneedah.mwc.models.JPUreticle(), "black.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, Kar98Krail, @@ -14208,7 +14208,7 @@ public static void init(Object mod) { } }) .withName("HPScope").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); LeupoldRailScope = new ItemScope.Builder() .withSniperReticle(Reticles.RETICLE_1) @@ -14219,7 +14219,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.09f, 0.405f, 1.43f); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, Kar98Krail, M4Receiver, VLTORReceiver, AR57Receiver, NTW20HandguardRAIL, HoneyBadgerKnightsReceiver, HoneyBadgerKnightsReceiverBlack, M14Rail, @@ -14277,7 +14277,7 @@ public static void init(Object mod) { }) .withName("LeupoldRailScope") .withRotationPoint(-0.12079999459981924, -1.4240000168085098, -2.392400065904859) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); NightRaider = new ItemScope.Builder() .withNightVision() @@ -14289,7 +14289,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.045f, 0.495f, 1.551f); }) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withCrosshair("HP") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withCrosshair("HP") .withModel(new com.paneedah.mwc.models.NightRaiderScope(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14345,7 +14345,7 @@ public static void init(Object mod) { .withName("NightRaiderScope") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M2A1sight = new ItemScope.Builder() .withOpticalZoom() @@ -14355,7 +14355,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.09f, -0.265f, -0.7f); }) .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.M2A1(), "gun.png") .withModel(new com.paneedah.mwc.models.M2A1reticle(), "red.png") @@ -14398,7 +14398,7 @@ public static void init(Object mod) { } }) .withName("m2a1_sight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); F2000Scope = new ItemScope.Builder() .withOpticalZoom() @@ -14408,7 +14408,7 @@ public static void init(Object mod) { GL11.glTranslatef(-0.125f, -0.923f, 1.621f); // GL11.glRotatef(30F, 1f, 0f, 0f); }) - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withCrosshair("HP") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withCrosshair("HP") .withModel(new com.paneedah.mwc.models.F2000Scope(), "gun.png") .withModel(new com.paneedah.mwc.models.F2000Scope2(), "gun.png") .withModel(new com.paneedah.mwc.models.F2000Reticle(), "black.png") @@ -14460,7 +14460,7 @@ public static void init(Object mod) { .withName("F2000Scope") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M202scope = new ItemScope.Builder() .withOpticalZoom() @@ -14499,7 +14499,7 @@ public static void init(Object mod) { .withName("M202scope") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGscope = new ItemScope.Builder() .withOpticalZoom() @@ -14508,7 +14508,7 @@ public static void init(Object mod) { GL11.glScalef(1.05f, 1.05f, 1.05f); GL11.glTranslatef(-0.23f, -0.77f, 0.65f); }) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withCrosshair("HP") .withModel(new com.paneedah.mwc.models.AUGScope_scope(), "gun.png") .withModel(new com.paneedah.mwc.models.JPUreticle(), "black.png") @@ -14562,11 +14562,11 @@ public static void init(Object mod) { .withName("AUGscope") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer556x45 = new AttachmentBuilder() .withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor556x45(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14603,10 +14603,10 @@ public static void init(Object mod) { } }) .withName("Silencer556x45").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer545x39 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor556x39(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14643,10 +14643,10 @@ public static void init(Object mod) { } }) .withName("Silencer545x39").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer762x39 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor762x39(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -14683,10 +14683,10 @@ public static void init(Object mod) { } }) .withName("Silencer762x39").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M32Barrel = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Suppressor) { @@ -14720,10 +14720,10 @@ public static void init(Object mod) { }).withName("M32Barrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870Pump = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Remington870Pump(), "remington870.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -14757,10 +14757,10 @@ public static void init(Object mod) { }).withName("Remington870Pump") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870MagpulPump = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Remington870MagpulPump(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -14794,10 +14794,10 @@ public static void init(Object mod) { }).withName("Remington870MagpulPump") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870PoliceMagnumPump = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Remington870PoliceMagnumPump(), "remington870.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -14831,10 +14831,10 @@ public static void init(Object mod) { }).withName("Remington870PoliceMagnumPump") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870FABDefensePump = new AttachmentBuilder().withCategory(AttachmentCategory.GUARD) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRenderablePart() .withModel(new com.paneedah.mwc.models.Remington870FABDefensePump(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -14877,10 +14877,10 @@ public static void init(Object mod) { }).withName("Remington870FABDefensePump") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870Stock(), "remington870.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Remington870Stock) { @@ -14913,10 +14913,10 @@ public static void init(Object mod) { }).withName("Remington870Stock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870PoliceMagnumStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870PoliceMagnumStock(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Remington870PoliceMagnumStock) { @@ -14949,10 +14949,10 @@ public static void init(Object mod) { }).withName("Remington870PoliceMagnumStock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870MilspecStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870PoliceMagnumStock(), "gun.png") .withModel(new com.paneedah.mwc.models.MilSpecStock(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -14998,10 +14998,10 @@ public static void init(Object mod) { }).withName("Remington870MilSpecStock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870HK416Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870PoliceMagnumStock(), "gun.png") .withModel(new com.paneedah.mwc.models.HK416Stock(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15047,10 +15047,10 @@ public static void init(Object mod) { }).withName("Remington870HK416StockStock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870SawedGrip = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870SawedGrip(), "remington870.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Remington870SawedGrip) { @@ -15083,10 +15083,10 @@ public static void init(Object mod) { }).withName("Remington870SawedGrip") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870Barrel = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870Barrel(), "gun.png") .withModel(new com.paneedah.mwc.models.R870part(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15128,10 +15128,10 @@ public static void init(Object mod) { }).withName("Remington870Barrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870PoliceMagnumBarrel = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870PoliceMagnumBarrel(), "gun.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15173,10 +15173,10 @@ public static void init(Object mod) { }).withName("Remington870PoliceMagnumBarrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington870SawedOffBarrel = new AttachmentBuilder().withCategory(AttachmentCategory.RECEIVER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Remington870SawedBarrel(), "gun.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15218,10 +15218,10 @@ public static void init(Object mod) { }).withName("Remington870SawedBarrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KS23Stock(), "ks23.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.KS23Stock) { @@ -15254,10 +15254,10 @@ public static void init(Object mod) { }).withName("KS23Stock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23RaptorGrip = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KS23RaptorGrip(), "ks23.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.KS23RaptorGrip) { @@ -15290,10 +15290,10 @@ public static void init(Object mod) { }).withName("KS23RaptorGrip") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23MStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KS23Mstock(), "ks23.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.KS23Mstock) { @@ -15326,10 +15326,10 @@ public static void init(Object mod) { }).withName("KS23MStock") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23Barrel = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KS23Barrel(), "ks23.png") .withModel(new com.paneedah.mwc.models.FALIron(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15363,10 +15363,10 @@ public static void init(Object mod) { }).withName("KS23Barrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23ExtendedBarrel = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KS23ExtendedBarrel(), "ks23.png") .withModel(new com.paneedah.mwc.models.FALIron(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15400,10 +15400,10 @@ public static void init(Object mod) { }).withName("KS23ExtendedBarrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RPKBarrel = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.RPKbarrel(), "gun.png") .withModel(new com.paneedah.mwc.models.AKiron3(), "gun") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun") @@ -15446,10 +15446,10 @@ public static void init(Object mod) { }).withName("RPKbarrel") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKIron = new AttachmentBuilder().withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKiron3(), "gun") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15484,10 +15484,10 @@ public static void init(Object mod) { }).withName("AKIron") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12Iron = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AKiron3(), "gun") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun") .withFirstPersonModelPositioning((model, itemStack) -> { @@ -15522,10 +15522,10 @@ public static void init(Object mod) { }).withName("AK12Iron") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SilencerPBS = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(MakarovPBBody) .withModel(new com.paneedah.mwc.models.MakarovPBSSilencer(), "MakarovPBSSilencer.png") .withModernRecipe( @@ -15564,10 +15564,10 @@ public static void init(Object mod) { }).withName("SilencerPBS") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer9mm = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(M9A1Body, ScorpionHandguardShort, ScorpionHandguardLong, Glock19Body, Glock19XBody, Glock19RazorbackBody, P226Slide, APC9Placeholder, MP443Slide, MP5NavyHandGuard, MP5A5HandGuard, MP5SDHandGuard, MIMP5MHandGuard, UTGTriRailHandGuard, MP5BMHandguard, SCCYCPX2Body, SCCYCPX2BodyTan) @@ -15608,10 +15608,10 @@ public static void init(Object mod) { }).withName("Silencer9mm") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SamuraiEdgeSuppressor = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(SamuraiEdgeMount) .withModel(new com.paneedah.mwc.models.SamuraiEdgeSuppressor(), "samuraiedge.png") .withModernRecipe( @@ -15650,10 +15650,10 @@ public static void init(Object mod) { }).withName("SamuraiEdgeSuppressor") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer9x39mm = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "GunmetalTexture.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15691,10 +15691,10 @@ public static void init(Object mod) { }).withName("Silencer9x39mm") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SuppressorKBP9A91 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KBP9A91Suppressor(), "kbp9a91.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15732,10 +15732,10 @@ public static void init(Object mod) { }).withName("KBP9A91Suppressor") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer45ACP = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(KrissVectorReceiver, M1911Body) .withModel(new com.paneedah.mwc.models.Suppressor45ACP(), "gun.png") .withModernRecipe( @@ -15772,10 +15772,10 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("Silencer45ACP").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SilencerEABH = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor45ACP(), "gun.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Suppressor45ACP) { @@ -15807,10 +15807,10 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("silencer_eabh").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer762x54 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15847,10 +15847,10 @@ public static void init(Object mod) { } }) .withName("Silencer762x54").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer762x51 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor762x51(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15887,10 +15887,10 @@ public static void init(Object mod) { } }) .withName("Silencer762x51").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer50BMG = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "GunmetalTexture.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15927,11 +15927,11 @@ public static void init(Object mod) { } }) .withName("Silencer50BMG").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer556x39 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor556x39(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -15968,11 +15968,11 @@ public static void init(Object mod) { } }) .withName("Silencer556x39").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKMIron = new AttachmentBuilder().withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new AKMiron1(), "gun.png") .withModel(new AKMiron2(), "gun.png").withModel(new AK47iron(), "gun.png") .withModel(new M4Iron1(), "gun.png").withModel(new M4Iron2(), "gun.png") @@ -16019,11 +16019,11 @@ public static void init(Object mod) { } }) .withName("AKMIron").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); TritiumRearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.TritiumRearSights(), "gun.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, MIMP5TRRail, MIMP5MRail, ShotgunRail, Kar98Krail, M60Rail, @@ -16066,11 +16066,11 @@ public static void init(Object mod) { } }) .withName("TritiumRearSights").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MBUSRearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new MBUSRearSight(), "gun.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, MIMP5TRRail, MIMP5MRail, ShotgunRail, Kar98Krail, M60Rail, @@ -16114,11 +16114,11 @@ public static void init(Object mod) { } }) .withName("MBUSRearSights").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HK416RearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.G95_upright_rearsights(), "gun.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder, MIMP5TRRail, MIMP5MRail, ShotgunRail, Kar98Krail, M60Rail, @@ -16161,11 +16161,11 @@ public static void init(Object mod) { } }) .withName("HK416RearSights").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALRearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.FNFALRearSight(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.FNFALRearSight) { @@ -16197,7 +16197,7 @@ public static void init(Object mod) { } }) .withName("FNFALRearSights").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M16A1RearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) @@ -16232,11 +16232,11 @@ public static void init(Object mod) { } }) .withName("M16A1RearSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); K2C1RearSights = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.K2C1RearSight(), "gun.png") .withModel(new com.paneedah.mwc.models.ScarIron2(), "gun.png") .withModel(new com.paneedah.mwc.models.FALIron(), "gun.png") @@ -16270,11 +16270,11 @@ public static void init(Object mod) { } }) .withName("K2C1RearSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScorpionRearSight = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScorpionRearSight(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.ScorpionRearSight) { @@ -16306,11 +16306,11 @@ public static void init(Object mod) { } }) .withName("ScorpionRearSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ScorpionFrontSight = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.ScorpionFrontSight(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.ScorpionFrontSight) { @@ -16342,11 +16342,11 @@ public static void init(Object mod) { } }) .withName("ScorpionFrontSight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP7IronSights = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP7RearSights(), "MP7IronSights.png") .withModel(new com.paneedah.mwc.models.MP7FrontSights(), "MP7IronSights.png") .withInventoryModelPositioning((model, s) -> { @@ -16381,11 +16381,11 @@ public static void init(Object mod) { }) .withName("MP7IronSights") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP7IronSightsStanding = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.MP7RearSightFlipped(), "MP7IronSights.png") .withModel(new com.paneedah.mwc.models.MP7FrontSightFlipped(), "MP7IronSights.png") .withInventoryModelPositioning((model, s) -> { @@ -16420,10 +16420,10 @@ public static void init(Object mod) { }) .withName("MP7IronSightsStanding") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Kar98Ksight = new AttachmentBuilder().withCategory(AttachmentCategory.RAILING) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new AK47iron(), "gun.png") .withInventoryModelPositioning((model, s) -> { if (model instanceof com.paneedah.mwc.models.AK47iron) { @@ -16455,11 +16455,11 @@ public static void init(Object mod) { } }) .withName("Kar98Ksight").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK15ironsight = new AttachmentBuilder() .withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.KA_AK12_Ironsight(), "gun.png") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder) @@ -16494,11 +16494,11 @@ public static void init(Object mod) { }) .withName("AK15ironsight") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12ironsight = new AttachmentBuilder() .withCategory(AttachmentCategory.FRONTSIGHT) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AK15ironsight(), "gun.png") .withModel(new com.paneedah.mwc.models.AKMiron2(), "gun.png") .withRequiredAttachments(VeprDustCover, AK15DustCover, Placeholder) @@ -16533,10 +16533,10 @@ public static void init(Object mod) { }) .withName("AK12ironsight") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SilencerMP7 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16572,10 +16572,10 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("SilencerMP7").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer357 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "GunmetalTexture.png") .withFirstPersonModelPositioning((model, itemStack) -> { if (model instanceof com.paneedah.mwc.models.Suppressor) { @@ -16607,10 +16607,10 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("Silencer357").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer57x38 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16646,11 +16646,11 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("Silencer57x38").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer12Gauge = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor45ACP(), "GunmetalTexture.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16686,11 +16686,11 @@ public static void init(Object mod) { GL11.glScaled(0.4F, 0.4F, 0.4F); } }).withName("Silencer12Gauge").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer300AACBlackout = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor300AACBlackout(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16727,7 +16727,7 @@ public static void init(Object mod) { } }) .withName("Silencer300AACBlackout").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HoneyBadgerSilencer = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) .withModel(new com.paneedah.mwc.models.AACHoneyBadgerSilencer(), "gun.png") @@ -16762,10 +16762,10 @@ public static void init(Object mod) { } }) .withName("HoneyBadgerSilencer").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Silencer65x39 = new AttachmentBuilder().withCategory(AttachmentCategory.SILENCER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Suppressor556x39(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16802,10 +16802,10 @@ public static void init(Object mod) { } }) .withName("Silencer65x39").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Laser = new AttachmentBuilder().withCategory(AttachmentCategory.LASER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withRequiredAttachments(M4CarbineHandGuard, M38HandGuard, UTGTriRailHandGuard, PistolPlaceholder, FABDefenseMount, LaserPlaceholder, Mk18HandGuard, M60E4HandGuard, P90Swordfish, AUGA3extGuard, StonerHANDGUARD, M9A1Body, SamuraiEdgeBody, @@ -16869,10 +16869,10 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("Laser").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Laser2 = new AttachmentBuilder().withCategory(AttachmentCategory.LASER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.Laser3(), "laser2.png") .withRequiredAttachments(M4CarbineHandGuard, M38HandGuard, UTGTriRailHandGuard, PistolPlaceholder, LaserPlaceholder, Mk18HandGuard, M60E4HandGuard, P90Swordfish, @@ -16926,11 +16926,11 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("Laser2").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SCCYCPX2Laser = new AttachmentBuilder() .withCategory(AttachmentCategory.LASER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2Laser(), "sccycpx2.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -16978,10 +16978,10 @@ public static void init(Object mod) { .withName("SCCYCPX2Laser") .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DanWessonLaser = new AttachmentBuilder().withCategory(AttachmentCategory.LASER) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.DanWessonLaser(), "DanWessonLaser.png") .withPostRender(new LaserBeamRenderer((p, s) -> { GL11.glTranslatef(-0.2F, 1.4F, 1.8F); @@ -17026,11 +17026,11 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("DanWessonLaser").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1928Grip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.M1928Grip(), "m1a1thompson.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.M1928Grip(), "m1a1thompson.png") .withApply((a, i) -> { i.setRecoil(i.getWeapon().getRecoil() * 0.6f); }).withFirstPersonModelPositioning((model, itemStack) -> { @@ -17064,11 +17064,11 @@ public static void init(Object mod) { } }) .withName("M1928Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1A1Grip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.M1A1Grip(), "m1a1thompson.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.M1A1Grip(), "m1a1thompson.png") .withApply((a, i) -> { i.setRecoil(i.getWeapon().getRecoil() * 1.0f); }).withFirstPersonModelPositioning((model, itemStack) -> { @@ -17102,11 +17102,11 @@ public static void init(Object mod) { } }) .withName("M1A1Grip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Grip2 = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.Grip2(), "gun.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.Grip2(), "gun.png") .withRequiredAttachments(MLOKExtendedHandguard, MLOKHandguard, AK15HandleGuard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, UTGTriRailHandGuard, GripPlaceholder, @@ -17161,11 +17161,11 @@ public static void init(Object mod) { } }) .withName("Grip2").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); JunoGrip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.JunoGrip(), "gun.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.JunoGrip(), "gun.png") .withRequiredAttachments(MLOKExtendedHandguard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, Mk18HandGuard, AR57Handguard, RPK16Handguard, M16A4HandGuard, HoneyBadgerMatrixArmsHandguard, AR10SuperSASSHandguard, @@ -17210,11 +17210,11 @@ public static void init(Object mod) { } }) .withName("JunoGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); GlockStock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.Glock18Cstock(), "gun.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.Glock18Cstock(), "gun.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, new CraftingEntry(MWCItems.gunmetalIngot, 3)) @@ -17251,11 +17251,11 @@ public static void init(Object mod) { } }) .withName("Glock18Cstock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VP70Stock = new AttachmentBuilder().withCategory(AttachmentCategory.STOCK) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VP70stock(), "vp70.png") .withModernRecipe( CraftingGroup.ATTACHMENT_NORMAL, @@ -17293,11 +17293,11 @@ public static void init(Object mod) { } }) .withName("VP70Stock").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AngledGrip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AngledGrip(), "angledgrip.png") .withRequiredAttachments(MLOKExtendedHandguard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, GripPlaceholder, UTGTriRailHandGuard, Mk18HandGuard, @@ -17351,12 +17351,12 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("AngledGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); StubbyGrip = new AttachmentBuilder() .withRenderablePart() .withCategory(AttachmentCategory.GRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.StubbyGrip(), "gun.png") .withRequiredAttachments(MLOKExtendedHandguard, MLOKHandguard, AK15HandleGuard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, UTGTriRailHandGuard, @@ -17418,11 +17418,11 @@ public static void init(Object mod) { } }) .withName("StubbyGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VGrip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.VGrip(), "gun.png") .withRequiredAttachments(MLOKExtendedHandguard, MLOKHandguard, AK15HandleGuard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, UTGTriRailHandGuard, @@ -17479,10 +17479,10 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("VGrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Bipod = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) - .withCreativeTab(ModernWarfareMod.AttachmentsTab).withModel(new com.paneedah.mwc.models.Bipod(), "bipod.png") + .withCreativeTab(MWC.ATTACHMENTS_TAB).withModel(new com.paneedah.mwc.models.Bipod(), "bipod.png") .withRequiredAttachments(MLOKExtendedHandguard, MLOKHandguard, AK15HandleGuard, M4CarbineHandGuard, LVOAVHandGuard, M38HandGuard, UTGTriRailHandGuard, GripPlaceholder, Mk18HandGuard, AUGA3extGuard, AR57Handguard, RPK16Handguard, StonerHANDGUARD, @@ -17533,11 +17533,11 @@ public static void init(Object mod) { } }) .withName("Bipod").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGgrip = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.AUGGrip(), "gun.png") .withApply((a, i) -> { i.setRecoil(i.getWeapon().getRecoil() * 0.6f); @@ -17573,11 +17573,11 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("AUGgrip").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); USPMatchCompensator = new AttachmentBuilder().withCategory(AttachmentCategory.GRIP) .withRenderablePart() - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new com.paneedah.mwc.models.USPMatchCompensator(), "gun.png") .withApply((a, i) -> { i.setRecoil(i.getWeapon().getRecoil() * 0.4f); @@ -17613,7 +17613,7 @@ public static void init(Object mod) { }) .withRenderablePart() .withName("USPMatchCompensator").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/weapons/AuxiliaryAttachments.java b/src/main/java/com/paneedah/mwc/weapons/AuxiliaryAttachments.java index ff0ea316e..c7b7eee66 100644 --- a/src/main/java/com/paneedah/mwc/weapons/AuxiliaryAttachments.java +++ b/src/main/java/com/paneedah/mwc/weapons/AuxiliaryAttachments.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.weapons; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.models.*; import com.paneedah.weaponlib.AttachmentBuilder; import com.paneedah.weaponlib.AttachmentCategory; @@ -229,186 +229,186 @@ public static void init(Object mod) { /* PanelUpper = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinPanelUpper(), "ninthsin.png") .withName("PanelUpper") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); PanelLower = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinPanelLower(), "ninthsin.png") .withName("PanelLower") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorUpper = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorUpper(), "ninthsin.png") .withName("RegulatorUpper") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorLower = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorLower(), "ninthsin.png") .withName("RegulatorLower") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorRotator = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA5) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorRotator(), "ninthsin.png") .withName("RegulatorRotator") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorActionUpper = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA6) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorActionUpper(), "ninthsin.png") .withName("RegulatorActionUpper") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorActionLower = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA7) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorActionLower(), "ninthsin.png") .withName("RegulatorActionLower") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); RegulatorAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA8) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinRegulatorAction(), "ninthsin.png") .withName("RegulatorAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); CyclerFront = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA9) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinCycleFront(), "ninthsin.png") .withName("CyclerFront") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); CyclerBackLeft = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA10) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinCycleBackLeft(), "ninthsin.png") .withName("CyclerBackLeft") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); CyclerBackRight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA11) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinCycleBackRight(), "ninthsin.png") .withName("CyclerBackRight") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); Cycler = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA12) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NinthSinCycle(), "ninthsin.png") .withName("Cycler") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.MOD_CONTEXT); */ ChainB = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ChainsawChainB(), "chainsaw.png") .withName("ChainB") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ChainA = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ChainsawChainA(), "chainsaw.png") .withName("ChainA") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Chain = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ChainsawChain(), "chainsaw.png") .withName("Chain") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G95IronSights = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G95_frontsights(), "gun.png") .withModel(new com.paneedah.mwc.models.G95_rearsights(), "gun.png") .withName("G95IronSights") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G95UprightIronSights = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G95_upright_frontsights(), "gun.png") .withModel(new com.paneedah.mwc.models.G95_upright_rearsights(), "gun.png") .withName("G95UprightIronSights") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Origin12Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Origin12Action(), "origin12.png") .withName("Origin12Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P90Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.P90Action(), "p90.png") .withName("P90Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1CarbineAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1CarbineAction(), "gun.png") .withName("M1CarbineAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); G11Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withRotationPoint(0.1452000024497508, -0.805199984866377, 1.229600028479095) .withModel(new com.paneedah.mwc.models.G11Action(), "gun.png") .withName("G11Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AUGAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.AUGaction(), "gun.png") .withName("AUGAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAS21Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MAS21Slide(), "MAS21.png") .withModel(new com.paneedah.mwc.models.P226rearsight(), "p226rearsight.png") .withModel(new com.paneedah.mwc.models.P226frontsight(), "p226frontsight.png") @@ -416,155 +416,155 @@ public static void init(Object mod) { .withRenderablePart() .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAS21Barrel = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MAS21Barrel(), "MAS21.png") .withName("MAS21Barrel") .withRenderablePart() .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MAS21Part = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MAS21Part(), "MAS21.png") .withName("MAS21Part") .withRenderablePart() .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M32Main1B = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M32Main1B(), "gun.png") .withModel(new com.paneedah.mwc.models.Suppressor(), "gun.png") .withName("M32Main1B") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M134Barrels = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M134Barrels(), "gun.png") .withName("M134Barrels") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); BrowningAuto5Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.BrowningAuto5Action(), "gun.png").withName("BrowningAuto5Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1GarandAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1GarandAction(), "gun.png").withName("M1GarandAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1GarandMag = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1GarandMag1(), "M1GarandMag.png") .withModel(new com.paneedah.mwc.models.M1GarandMag2(), "M1GarandMag.png") .withName("M1GarandMag") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M1897Pump = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1897Pump(), "m1897.png").withName("M1897pump") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Super90Pump = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Super90Pump(), "gun.png").withName("Super90Pump") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); // P226Slide = new AttachmentBuilder() // .withCategory(AttachmentCategory.EXTRA) -// // .withCreativeTab(ModernWarfareMod.gunsTab) +// // .withCreativeTab(MWC.gunsTab) // .withModel(new com.paneedah.mwc.models.P226Slide(), "P226.png") // .withModel(new com.paneedah.mwc.models.P226rearsight(), "p226rearsight.png") // .withModel(new com.paneedah.mwc.models.P226frontsight(), "p226frontsight.png") // .withName("P226Slide") // .withRenderablePart().withTextureName("Dummy.png") -// .build(ModernWarfareMod.MOD_CONTEXT); +// .build(MWC.MOD_CONTEXT); PythonChamber = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.PythonChamber(), "Python.png") .withName("PythonChamber") .withRotationPoint(-0.11759999474287039, -0.9064000131249434, -0.8943999600172051) .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RevolverSpeedLoader = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.TaurusLoader(), "taurusraginghunter.png") .withName("RevolverSpeedloader") .withRotationPoint(-0.11759999474287039, 0.07280001164674715, 0.8548000601351243) .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RevolverSpeedLoaderBullets = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.TaurusBullets(), "taurusraginghunter.png") .withName("RevolverSpeedloaderBullets") .withRotationPoint(-0.11759999474287039, -0.9064000131249434, -0.8943999600172051) .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MagnumChamber = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.TaurusRagingHunterChamber(), "taurusraginghunter.png") .withName("MagnumChamber") .withRotationPoint(-0.11759999474287039, -0.9064000131249434, -0.8943999600172051) .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); RhinoChamber = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new ChiappoRhinoChamber(), "chiapparhino.png").withName("RhinoChamber") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ACRAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.ACRAction(), "ACR.png") .withModel(new com.paneedah.mwc.models.ACRAction2(), "gun.png") .withName("ACRAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1014Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.M1014action(), "m1014.png") .withName("M1014Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ShotgunInsertion = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.ShotgunInsertion(), "ShotgunInsertion.png") .withName("ShotgunInsertion").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); SupernovaPump = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.SupernovaPump(), "supernova.png") .withName("SupernovaPump").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ACRRails = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "acrsbrhandguardtan.png") @@ -573,78 +573,78 @@ public static void init(Object mod) { .withModel(new com.paneedah.mwc.models.AKRail4(), "acrsbrhandguardtan.png") .withModel(new com.paneedah.mwc.models.AKRail5(), "acrsbrhandguardtan.png") .withName("ACRRails").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); RPG7rocket = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.RPG7rocket(), "rpg7.png") .withRenderablePart() .withName("RPG7rocket") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M202rockets = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.M202Rockets(), "gun.png") .withRenderablePart() .withName("m202rockets") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); GLgrenade = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA6) .withModel(new GL06Grenade(), "GL06.png") .withRenderablePart() .withName("GLgrenade") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M79grenade = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA6) .withModel(new com.paneedah.mwc.models.M79grenade(), "gun.png") .withRenderablePart() .withName("M79grenade") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); GL06Cartridge = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.GL06Cartridge(), "GL06.png") .withRenderablePart() .withName("GL06Cartridge") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M79Cartridge = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.M79Cartridge(), "m79.png") .withRenderablePart() .withName("M79Cartridge") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M32Cartridge = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.M32Cartridge(), "gun.png") .withRenderablePart() .withName("M32Cartridge") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M41AMag = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M41AMag(), "M41AMag.png") .withName("M41AMag") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP43Edoublebarrel = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP43Edoublebarrel(), "MP43Edoublebarrel.png") .withName("MP43Edoublebarrel") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); HS12Barrels = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.HS12Barrels(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail(), "gun.png") .withModel(new com.paneedah.mwc.models.AKRail2(), "gun.png") @@ -652,331 +652,331 @@ public static void init(Object mod) { .withName("HS12Barrels") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1873action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1873action(), "M1873.png") .withName("M1873action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); F2000Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.F2000Action(), "gun.png") .withName("F2000Action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); G36CAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G36CAction(), "g36c.png") .withName("G36CAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ARX160Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ARX160Action(), "gun.png") .withName("ARX160Action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1A1ThompsonAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1A1action(), "M1A1Thompson.png") .withName("M1A1ThompsonAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); KedrAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KedrAction(), "kedr.png") .withName("KedrAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); KedrStock = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KedrStock(), "kedr.png") .withName("KedrStock") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP7Grip = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP7Grip(), "mp7.png") .withName("MP7Grip") .withRotationPoint(-0.12000000357627871, -0.20000000596046452, -1.6000000476837126) .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1928ThompsonAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1928ThompsonAction(), "M1A1Thompson.png") .withName("M1928ThompsonAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1A1Sight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1A1rearsight(), "gun.png") .withName("M1A1ThompsonSight") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M1928Sight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M1928rearsight(), "gun.png") .withName("M1928Sight") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); R870part = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.R870part(), "gun.png") .withName("R870part") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M82Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M82Action(), "m82.png") .withName("m82action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP40action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP40Action(), "MP40.png") .withName("MP40action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP5boltaction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP5boltaction(), "MP5.png") .withName("MP5boltaction") .withRotationPoint(-0.12000000357627871, -1.1200000333786013, -2.320000069141389) .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); UMP45action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.UMP45Action(), "ump45.png") .withName("UMP45action") .withRotationPoint(-0.12000000357627871, -1.1200000333786013, -2.320000069141389) .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP5action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP5action(), "MP5.png") .withName("MP5action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MP7action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP7Action(), "MP7.png") .withName("MP7action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); G3Bolt = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G3ChargingHandle(), "G3.png") .withName("G3Bolt") .withRotationPoint(0.0, -1.0800000321865084, -4.120000122785571) .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); G3Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G3Action(), "G3.png") .withName("G3Action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MG42Belt = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MG42belt(), "mg42.png") .withName("mg42belt") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MG42latch = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MG42latch(), "mg42.png") .withName("mg42latch") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MG34latch = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MG34Latch(), "mg42.png") .withName("mg34latch") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M60Belt = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M60Belt(), "m60.png") .withName("M60Belt") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); StonerHATCH = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.StonerA1HATCH(), "gun.png") .withModel(new M27rearsight(), "gun.png") .withName("StonerHATCH") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); StonerBELT = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.StonerA1BELT(), "gun.png") .withName("StonerBELT") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); JohnsonACTION = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.JohnsonLMGACTION(), "gun.png") .withName("JohnsonLMGACTION") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); JohnsonRifleACTION = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.JohnsonRifleAction(), "gun.png") .withName("JohnsonRifleAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); JohnsonRifleSight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.JohnsonRifleSight(), "gun.png") .withName("JohnsonRifleSight") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); StripperClip = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.LeeEnfieldClip(), "stripperclip.png") .withName("StripperClip") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); StripperClipBullets = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.LeeEnfieldClipBullets(), "stripperclip.png") .withName("StripperClipBullets") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); NTW20Barrel = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NTW20Barrel(), "gun.png") .withName("NTW20Barrel") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); NTW20Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.NTW20ACTION(), "gun.png") .withName("NTW20Action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M60Hatch = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M60Hatch(), "m60.png") .withName("M60Hatch") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M249Belt = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M249Belt(), "m249.png") .withName("M249Belt") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M249Hatch = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M249Hatch(), "m249.png") .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") .withModel(new com.paneedah.mwc.models.M249RearSight(), "gun.png") @@ -984,390 +984,390 @@ public static void init(Object mod) { .withName("M249Hatch") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M249Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M249Action(), "m249.png") .withName("M249Action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MG42action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MG42action(), "mg42.png") .withName("mg42action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ScarAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ScarAction(), "gun.png") .withName("ScarAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ScarHAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.ScarHAction(), "scarh.png") .withName("ScarHAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); Mk14EBRaction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Mk14EBRaction(), "m14dmr.png") .withName("Mk14EBRaction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); Mk14EBRsight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.m1garandrearsight(), "gun.png") .withName("Mk14EBRsight") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M14DMRRail = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M14DMRRail(), "gun.png") .withName("M14DMRRail") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); STG44action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.STG44Action(), "STG44.png") .withName("STG44action") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); STG44actionCover = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.STG44actioncover(), "gun.png") .withName("STG44actioncover") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); G43GewehrAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.G43GewehrAction(), "gun.png") .withName("G43GewehrAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); SpringfieldRearSight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.SpringfieldRearSight(), "gun.png") .withName("SpringfieldRearSight") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); SpringfieldAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA7) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.SpringfieldAction(), "m1903a3.png") .withName("SpringfieldAction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); Kar98Kaction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA7) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Kar98Kboltaction(), "gun.png") .withName("Kar98Kaction") .withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); VP70slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.VP70slide(), "vp70.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.GlockRearSight(), "glockrearsight") .withName("VP70slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); APSslide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.APSslide(), "APS.png") .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun") .withModel(new com.paneedah.mwc.models.APSrearsight(), "gun") .withName("APSslide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); APShammer = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.APShammer(), "APS.png") .withName("APShammer") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); USP45hammer = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.USP45Hammer(), "usp45.png") .withName("USP45hammer") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P226hammer = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.P226Hammer(), "p226.png") .withName("P226hammer") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M9A1hammer = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M9hammer(), "m9a1.png") .withName("M9A1hammer") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); MP443hammer = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MP443Hammer(), "mp443.png") .withName("MP443hammer") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M712action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M712action(), "m712.png") .withName("M712action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M45A1slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Emp1911Slide(), "Emp1911.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.M1911rearsight(), "m1911rearsight") .withName("M45A1slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M17_Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M17Slide(), "m17.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") .withName("m17_slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Makarov_Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MakarovSlide(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun.png") .withName("Makarov_Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P12_Slide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.USP45Slide(), "usp45.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "m1911frontsight") .withModel(new com.paneedah.mwc.models.P2000rearsight(), "m1911frontsight.png") .withName("P12_Slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); BrowningHiPowerSlide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.BrowningHiPowerSlide(), "BrowningHiPower.png") .withModel(new com.paneedah.mwc.models.M1911frontsight(), "gun") .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun") .withName("BrowningHiPowerSlide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); VSSVintorezAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.VSSVintorezAction(), "vssvintorez.png") .withName("VSSVintorezAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AKaction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.AK47Action(), "ak47.png") .withName("AKaction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DragunovAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.DragunovAction(), "dragunov.png") .withName("DragunovAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Malyukaction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.MalyukAction(), "malyuk.png") .withName("Malyukaction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK15action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.AK15Action(), "ak15.png") .withName("AK15action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KBP9A91action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KBP9A91Action(), "KBP9A91.png") .withName("KBP9A91action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALActionLever = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.FNFALActionLever(), "FNFAL.png") .withName("FNFALActionLever") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FNFALAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.FNFALAction(), "FNFAL.png") .withName("FNFALAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); FamasF1Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.FamasF1Action(), "famasf1.png") .withName("FamasF1Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AK12action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.AK12action(), "ak12kal.png") .withName("AK12action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Saiga12action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Saiga12action(), "gun.png").withName("Saiga12action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Saiga12sights = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.makarovrearsight(), "gun.png") .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun.png") .withName("Saiga12sights") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AS50Action = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new AS50action(), "as50.png") .withName("AS50Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Albert01Rslide = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Albert01RSlide(), "Albert01R.png") .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") .withName("albert01R_slide") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UziAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.UziAction(), "gun.png") .withName("UziAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UziRelease = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.UziRelease(), "gun.png") .withName("UziRelease") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); UziIronSight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.UziFrontSight(), "gun.png") .withModel(new com.paneedah.mwc.models.UziRearSight(), "gun.png") .withName("UziIronSight") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); P10frontsight = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.makarovfrontsight(), "gun.png") // .withModel(new com.paneedah.mwc.models.M9A1frontsight(), "M9A1frontsight") // .withModel(new com.paneedah.mwc.models.M9A1rearsight(), "M9A1rearsight") .withName("P10frontsight") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M40A6BoltAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) @@ -1375,7 +1375,7 @@ public static void init(Object mod) { .withModel(new com.paneedah.mwc.models.GunwerksHAMRboltaction(), "gunwerkshamr") .withName("M40A6BoltAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M40A6BoltActionPrime = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) @@ -1383,261 +1383,261 @@ public static void init(Object mod) { .withModel(new com.paneedah.mwc.models.GunwerksHAMRboltactionPrime(), "gunwerkshamr") .withName("M40A6BoltActionPrime") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SSG08BoltAction1 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.SSG08BoltAction1(), "SSG08_2") .withName("SSG08BoltAction1") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SSG08BoltAction2 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.SSG08BoltAction2(), "SSG08") .withName("SSG08") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington700BoltAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.R700action(), "remington700") .withName("Remington700BoltAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Remington700BoltActionMain = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.R700actionMain(), "remington700") .withName("Remington700BoltActionMain") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); SV98BoltAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.SV98Action(), "sv98") .withName("SV98BoltAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); L115Bolt1 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.L96Action(), "L96Action.png").withName("L96Action") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); L115Bolt2 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.L115Bolt2(), "gun.png").withName("LP115Bolt2") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1BoltAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.DSR1BoltAction(), "dsr1.png") .withName("DSR1BoltAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); DSR1BoltActionMain = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.DSR1BoltActionMain(), "dsr1.png") .withName("DSR1BoltActionMain") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); InterventionBoltAction = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.InterventionBoltAction(), "intervention.png") .withName("InterventionBoltAction") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); L115Mag = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.L115Mag(), "gun.png").withName("L115Mag") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); M500A2pump = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.M500A2pump(), "gun") .withName("M500A2pump") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); HESCSpump = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.HEShotgunPump(), "spas12") .withName("HESCSpump") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KS23pump = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KS23pump(), "ks23") .withName("KS23pump") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KragAction1 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KragJorgensenAction1(), "KragJorgensen") .withName("KragAction1") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KragAction2 = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA3) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KragJorgensenAction2(), "KragJorgensen") .withName("KragAction2") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); KragChamber = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.KragJorgensenChamber(), "KragJorgensen") .withName("KragChamber") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ShotgunShell = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Shotgun12Gauge(), "shotgun12gauge") .withName("ShotgunShell") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); ShotgunShellDouble = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA2) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Shotgun12Gauge(), "shotgun12gauge") .withModel(new com.paneedah.mwc.models.Shotgun12Gauge2(), "shotgun12gauge") .withName("ShotgunShellDouble") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Shotgun4Gauge = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Shotgun12Gauge(), "Shotgun4Gauge") .withName("Shotgun4Gauge") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Bullet = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.BulletBig(), "Bullet") .withName("Bullet") .withRenderablePart() .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); BulletSmall = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.Bullet44(), "Bullet") .withName("BulletSmall") .withRenderablePart() .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); LaserProjectile = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA4) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new com.paneedah.mwc.models.LaserProjectile(), "Laser") .withName("LaserProjectile") .withRenderablePart().withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AR15Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.AR15Action(), "ar15action.png") .withName("AR15Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M4EjectorAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA) .withModel(new com.paneedah.mwc.models.M4A1Action(), "m4a1.png") .withName("M4EjectorAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); SIG556Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA) .withModel(new com.paneedah.mwc.models.SIG556Action(), "sig556.png") .withName("SIG556Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); SIGMCXAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA) .withModel(new com.paneedah.mwc.models.SIGMCXAction(), "sigmcx.png") .withName("SIGMCXAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M110EjectorAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA) .withModel(new com.paneedah.mwc.models.M110Action(), "m110.png") .withName("M110EjectorAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); BeowulfAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA) .withModel(new com.paneedah.mwc.models.Beowulf50CalAction(), "beowulf50cal.png") .withName("BeowulfAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); S710TricunActionPully = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.S710TricunActionPully(), "s710tricun.png") .withName("S710TricunActionPully").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); S710TricunActionEjector = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.S710TricunActionEjector(), "s710tricun.png") .withName("S710TricunActionEjector").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); K2C1Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.K2C1Action(), "k2c1.png") .withName("K2C1Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); ScorpionAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.ScorpionEVO3A1Action(), "ScorpionEVO3A1.png") .withName("ScorpionAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); APC9Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.APC9Action(), "gun.png") .withName("APC9Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); BrenAction = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.CZ805BrenAction(), "cz805bren.png") .withName("BrenAction").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M110Action = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA2) .withModel(new com.paneedah.mwc.models.AR15Action(), "M110action.png") .withName("M110Action").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); AR15Iron = new AttachmentBuilder().withCategory(AttachmentCategory.SCOPE) - .withCreativeTab(ModernWarfareMod.AttachmentsTab) + .withCreativeTab(MWC.ATTACHMENTS_TAB) .withModel(new M4Iron1(), "gun.png") .withModel(new M4Iron2(), "AK12.png") .withModel(new FALIron(), "gun.png") @@ -1674,11 +1674,11 @@ public static void init(Object mod) { } }) .withName("AR15Iron").withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Extra = new AttachmentBuilder() .withCategory(AttachmentCategory.EXTRA6) - // .withCreativeTab(ModernWarfareMod.gunsTab) + // .withCreativeTab(MWC.gunsTab) .withModel(new AKMiron1(), "gun.png").withModel(new AKMiron2(), "gun.png") .withModel(new AK47iron(), "gun.png").withModel(new M4Iron1(), "gun.png") .withModel(new M4Iron2(), "gun.png").withModel(new P90iron(), "gun.png") @@ -1687,7 +1687,7 @@ public static void init(Object mod) { .withModel(new FALIron(), "gun.png").withModel(new M14Iron(), "gun.png") .withModel(new MP5Iron(), "gun.png") .withName("Extra") - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M4Rail = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "akrail.png") @@ -1696,27 +1696,27 @@ public static void init(Object mod) { .withModel(new com.paneedah.mwc.models.AKRail4(), "akrail.png") .withModel(new com.paneedah.mwc.models.AKRail5(), "akrail.png") .withName("M4Rail").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M4AsiimovRail = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "m4asiimovrail.png") .withName("M4AsiimovRail").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); MagnumRail = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "magnumrail.png") .withName("MagnumRail").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); RailAlt = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.RailAlt(), "gun.png") .withName("RailAlt").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); AACRail = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "aacrail_main.png") .withName("AACRail").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); M110Rail = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKRail(), "M110.png") @@ -1725,17 +1725,17 @@ public static void init(Object mod) { .withModel(new com.paneedah.mwc.models.AKRail4(), "M110.png") .withModel(new com.paneedah.mwc.models.AKRail5(), "M110.png") .withName("M110Rail").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); AKpart = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA5) .withModel(new com.paneedah.mwc.models.AKpart(), "gun") .withName("AKpart").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); AKMuzzle = new AttachmentBuilder().withCategory(AttachmentCategory.EXTRA3) .withModel(new com.paneedah.mwc.models.Suppressor(), "gun") .withName("AKmuzzle").withRenderablePart() - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT); + .withTextureName("Dummy.png").build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/mwc/weapons/Magazines.java b/src/main/java/com/paneedah/mwc/weapons/Magazines.java index ce69d8e2b..3fb75057b 100644 --- a/src/main/java/com/paneedah/mwc/weapons/Magazines.java +++ b/src/main/java/com/paneedah/mwc/weapons/Magazines.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.weapons; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.mwc.models.UMP45mag; import com.paneedah.mwc.models.UMP9Mag; @@ -133,7 +133,7 @@ public static void init(Object mod) { Magazines.FuelCell = new ItemMagazine.Builder().withCapacity(1000) .withName("FuelCell") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.ChainsawFuel(), "ChainsawFuel.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -156,13 +156,13 @@ public static void init(Object mod) { // .withCrafting(CraftingComplexity.MEDIUM, // MwItems.steelIngot, // MwItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); /* Magazines.NinthSinMag = new ItemMagazine.Builder() .withCapacity(100) .withName("NinthSinMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AmmoTab) .withModel(new com.paneedah.mwc.models.NinthSinMagazine(), "ninthsin.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -185,14 +185,14 @@ public static void init(Object mod) { // .withCrafting(CraftingComplexity.MEDIUM, // MwItems.steelIngot, // MwItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.MOD_CONTEXT, ItemMagazine.class); */ Magazines.BrenMag = new ItemMagazine.Builder() .withCapacity(30) .withCompatibleBullet(Bullets.Bullet762x51) .withName("BrenMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.BrenMkIIMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -215,13 +215,13 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.JohnsonMAG = new ItemMagazine.Builder() .withCapacity(20) .withCompatibleBullet(Bullets.Bullet3006Springfield) .withName("JohnsonMAG") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.JohnsonLMGMAG(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -244,7 +244,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.VectorMag = new ItemMagazine.Builder() .withCapacity(25) @@ -252,7 +252,7 @@ public static void init(Object mod) { .withName("VectorMag") .withRotationPoint(-0.12000000357627871, 1.0400000309944155, -2.0400000607967383) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorMagazine(), "krissvector.png") .withRequiredAttachments(Attachments.KrissVectorReceiver) .withFirstPersonPositioning((player, itemStack) -> { @@ -272,7 +272,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(5) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.VectorDrumMag = new ItemMagazine.Builder() .withCapacity(50) @@ -280,7 +280,7 @@ public static void init(Object mod) { .withName("VectorDrumMag") .withRotationPoint(-0.12000000357627871, 1.0400000309944155, -2.0400000607967383) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.KrissVectorMagazineDrum(), "krissvector.png") .withRequiredAttachments(Attachments.KrissVectorReceiver) .withFirstPersonPositioning((player, itemStack) -> { @@ -300,7 +300,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(5) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M4A1Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -308,7 +308,7 @@ public static void init(Object mod) { .withName("M4A1Mag_2") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M4A1Mag(), "M4A1Magazine.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, Attachments.M4AsiimovStock, @@ -331,7 +331,7 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.NGSWRMag = new ItemMagazine.Builder() .withCapacity(20) @@ -339,7 +339,7 @@ public static void init(Object mod) { .withName("NGSWR_Mag") .withRotationPoint(-0.16000000476837162, -0.44000001311302195, -1.4800000441074375) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.NGSWRMag(), "ngswr.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -358,7 +358,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.FamasF1Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -366,7 +366,7 @@ public static void init(Object mod) { .withName("FamasF1Mag") .withRotationPoint(-0.12000000357627871, 1.0400000309944155, -2.0400000607967383) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withRequiredAttachments(Attachments.FamasPlaceholder, Attachments.Vector556Handguard) .withModel(new com.paneedah.mwc.models.FamasF1Mag(), "famasf1.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -386,14 +386,14 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.BeowulfMag = new ItemMagazine.Builder() .withCapacity(13) .withCompatibleBullet(Bullets.Bullet50Beowulf) .withName("BeowulfMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Beowulf50CalMagazine(), "Beowulf50CalMagazine.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, Attachments.M4AsiimovStock, @@ -415,10 +415,10 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AUG9mmMag = new ItemMagazine.Builder().withCapacity(30).withCompatibleBullet(Bullets.Bullet9x19mm).withName("AUG9mmMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AUG9mmConvMAG(), "gun.png") .withRequiredAttachments(Attachments.AUGParaConversion) .withFirstPersonPositioning((player, itemStack) -> { @@ -441,13 +441,13 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.S710TricunMag = new ItemMagazine.Builder() .withCapacity(30) .withCompatibleBullet(Bullets.Bullet10mm) .withName("S710TricunMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.S710TricunMag(), "S710Tricun.png") .withRequiredAttachments(Attachments.S710Receiver) .withFirstPersonPositioning((player, itemStack) -> { @@ -470,10 +470,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M134Mag = new ItemMagazine.Builder().withCapacity(1000).withCompatibleBullet(Bullets.Bullet762x51).withName("M134Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M134Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -496,10 +496,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M60Mag = new ItemMagazine.Builder().withCapacity(100).withCompatibleBullet(Bullets.Bullet762x51).withName("M60Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M60Mag(), "m60.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -522,7 +522,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M249Mag = new ItemMagazine.Builder() .withCapacity(100) @@ -530,7 +530,7 @@ public static void init(Object mod) { .withName("M249Mag") .withRotationPoint(0.8812000082910061, 0.8648000418066975, -1.40640004143715) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M249Mag(), "m249.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -553,10 +553,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.StonerMag = new ItemMagazine.Builder().withCapacity(100).withCompatibleBullet(Bullets.Bullet556x45).withName("StonerMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.StonerA1MAG(), "m249.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -579,7 +579,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.HoneyBadgerMag = new ItemMagazine.Builder() .withCapacity(30) @@ -587,7 +587,7 @@ public static void init(Object mod) { .withName("HoneyBadgerMag_2") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M4A1Mag(), "M4A1Mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -607,7 +607,7 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M38Mag = new ItemMagazine.Builder() @@ -616,7 +616,7 @@ public static void init(Object mod) { .withName("M38Mag_2") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M38Mag(), "M38Mag.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, @@ -640,14 +640,14 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SOCOM_Mag = new ItemMagazine.Builder() .withCapacity(30) .withCompatibleBullet(Bullets.Bullet556x45) .withName("socom_mag") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.SOCOM_Mag(), "socom_mag.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, Attachments.C8SFWReceiver, @@ -670,13 +670,13 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.HK417Mag = new ItemMagazine.Builder() .withCapacity(20) .withCompatibleBullet(Bullets.Bullet762x51) .withName("hk417_mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.HK417Mag(), "HK417mag.png") .withRequiredAttachments(Attachments.HK417Receiver, Attachments.HK417ReceiverTan) .withFirstPersonPositioning((player, itemStack) -> { @@ -696,10 +696,10 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.C8Mag = new ItemMagazine.Builder().withCapacity(30).withCompatibleBullet(Bullets.Bullet556x45).withName("C8Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.C8Mag(), "c8mag.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, Attachments.C8SFWReceiver) @@ -720,14 +720,14 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Stanag50 = new ItemMagazine.Builder() .withCapacity(50) .withCompatibleBullet(Bullets.Bullet556x45) .withName("Stanag50") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Stanag50(), "gun.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, @@ -751,7 +751,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Stanag60 = new ItemMagazine.Builder() .withCapacity(60) @@ -759,7 +759,7 @@ public static void init(Object mod) { .withName("Stanag60") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Stanag60(), "gun.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, @@ -782,14 +782,14 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Stanag100 = new ItemMagazine.Builder() .withCapacity(100) .withCompatibleBullet(Bullets.Bullet556x45) .withName("Stanag100") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.NATODrum100(), "drum100rndmag.png") .withRequiredAttachments(Attachments.Placeholder, Attachments.M4Receiver, Attachments.VLTORReceiver, Attachments.AUGDefaultKit, Attachments.Vector556Handguard, @@ -812,7 +812,7 @@ public static void init(Object mod) { GL11.glScaled(1.2F, 1.2F, 1.2f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.G36CMag = new ItemMagazine.Builder() .withCapacity(30) @@ -820,7 +820,7 @@ public static void init(Object mod) { .withName("G36CMag_2") .withRotationPoint(-0.040000001192092904, -0.28000000834465033, -1.4400000429153446) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.G36CMag(), "g36c.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -840,7 +840,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK101Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -848,7 +848,7 @@ public static void init(Object mod) { .withName("AK101Mag_2") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK101Mag(), "ak101mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -868,7 +868,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK74Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -876,7 +876,7 @@ public static void init(Object mod) { .withName("AK74Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK74Mag(), "ak74mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -896,7 +896,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK74Mag60 = new ItemMagazine.Builder() .withCapacity(60) @@ -904,7 +904,7 @@ public static void init(Object mod) { .withName("AK74Mag60") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK60Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -924,7 +924,7 @@ public static void init(Object mod) { GL11.glScaled(0.6F, 0.6F, 0.6f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK60Mag = new ItemMagazine.Builder() .withCapacity(60) @@ -932,7 +932,7 @@ public static void init(Object mod) { .withName("AK60Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK60Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -952,7 +952,7 @@ public static void init(Object mod) { GL11.glScaled(0.6F, 0.6F, 0.6f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK15Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -960,7 +960,7 @@ public static void init(Object mod) { .withName("AK15Mag_2") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK15Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -980,7 +980,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK12Mag545x39 = new ItemMagazine.Builder() .withCapacity(30) @@ -988,7 +988,7 @@ public static void init(Object mod) { .withName("AK12Mag_2") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK15Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1008,7 +1008,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK75Mag545x39 = new ItemMagazine.Builder() .withCapacity(75) @@ -1016,7 +1016,7 @@ public static void init(Object mod) { .withName("AK75Mag545x39") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Mag75rnd(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1035,14 +1035,14 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK12Mag = new ItemMagazine.Builder() .withCapacity(31) .withCompatibleBullet(Bullets.Bullet545x39) .withName("AK12Mag") .withRotationPoint(-0.12000000357627871, 0.36000001072883614, -1.9200000572204599) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK12Magazine(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1062,7 +1062,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK47PMAGTan = new ItemMagazine.Builder() .withCapacity(30) @@ -1070,7 +1070,7 @@ public static void init(Object mod) { .withName("AK47PMAGTan") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AK15Mag(), "tan.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1090,7 +1090,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK47Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -1098,7 +1098,7 @@ public static void init(Object mod) { .withName("AK47Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.880000056028367) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Magazine762x39(), "ak47mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1118,7 +1118,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK50Mag = new ItemMagazine.Builder() .withCapacity(50) @@ -1126,7 +1126,7 @@ public static void init(Object mod) { .withName("AK50Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Drum50AK(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1146,7 +1146,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK75Mag = new ItemMagazine.Builder() .withCapacity(75) @@ -1154,7 +1154,7 @@ public static void init(Object mod) { .withName("AK75Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Mag75rnd(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1173,7 +1173,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AK100Mag = new ItemMagazine.Builder() .withCapacity(100) @@ -1181,7 +1181,7 @@ public static void init(Object mod) { .withName("AK100Mag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.8800000560283665) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AKDrum100(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1201,7 +1201,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.DragunovMag = new ItemMagazine.Builder() .withCapacity(10) @@ -1209,7 +1209,7 @@ public static void init(Object mod) { .withName("DragunovMag") .withRotationPoint(-0.12000000357627871, 0.28000000834465033, -1.880000056028367) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.DragunovMag(), "dragunov.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1230,10 +1230,10 @@ public static void init(Object mod) { }) .withMaxStackSize(6) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .build(MWC.modContext, ItemMagazine.class); Magazines.SaigaMag = new ItemMagazine.Builder().withCapacity(5).withCompatibleBullet(Bullets.Shotgun12Guage).withName("SaigaMag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Saiga12mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1256,14 +1256,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Origin12Mag = new ItemMagazine.Builder() .withCapacity(5) .withCompatibleBullet(Bullets.Shotgun12Guage) .withName("Origin12Mag") .withRotationPoint(-0.12000000357627871, 1.0000000298023226, -1.9200000572204607) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Origin12Mag(), "Origin12.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1283,14 +1283,14 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Origin12DrumMag = new ItemMagazine.Builder() .withCapacity(20) .withCompatibleBullet(Bullets.Shotgun12Guage) .withName("Origin12DrumMag") .withRotationPoint(-0.12000000357627871, 1.0000000298023226, -1.9200000572204607) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Origin12DrumMag(), "Origin12DrumMag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1310,7 +1310,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M9A1Mag = new ItemMagazine.Builder() .withCapacity(15) @@ -1318,7 +1318,7 @@ public static void init(Object mod) { .withName("M9Mag_2") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9A1mag(), "m9a1.png") .withRequiredAttachments(Attachments.M9A1Body, Attachments.P226Slide) .withFirstPersonPositioning((player, itemStack) -> { @@ -1338,7 +1338,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.FiveSevenMag = new ItemMagazine.Builder() .withCapacity(20) @@ -1346,7 +1346,7 @@ public static void init(Object mod) { .withName("FiveSevenMag") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.FiveSevenMagazine(), "fiveseven.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1365,11 +1365,11 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SamuraiEdgeMag = new ItemMagazine.Builder().withCapacity(15).withCompatibleBullet(Bullets.Bullet40SW) .withName("SamuraiEdgeMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9A1mag(), "m9a1.png") .withRequiredAttachments(Attachments.SamuraiEdgeBody) .withFirstPersonPositioning((player, itemStack) -> { @@ -1389,7 +1389,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SCCYCPX2Mag = new ItemMagazine.Builder() .withCapacity(10) @@ -1397,7 +1397,7 @@ public static void init(Object mod) { .withName("sccycpx2mag") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2Mag(), "sccycpx2.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1417,7 +1417,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SCCYCPX2MagExt = new ItemMagazine.Builder() .withCapacity(15) @@ -1425,7 +1425,7 @@ public static void init(Object mod) { .withName("sccycpx2magext") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.SCCYCPX2MagExt(), "sccycpx2.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1445,7 +1445,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.DesertEagleMag = new ItemMagazine.Builder() .withCapacity(7) @@ -1453,7 +1453,7 @@ public static void init(Object mod) { .withName("DesertEagleMag") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.DesertEagleMag(), "deagle.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1476,10 +1476,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M9Mag30 = new ItemMagazine.Builder().withCapacity(30).withCompatibleBullet(Bullets.Bullet9x19mm).withName("M9Mag30") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9Mag30(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1499,10 +1499,10 @@ public static void init(Object mod) { GL11.glScaled(0.75F, 0.75F, 0.75f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M9DrumMag = new ItemMagazine.Builder().withCapacity(65).withCompatibleBullet(Bullets.Bullet9x19mm).withName("M9DrumMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9DrumMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1522,14 +1522,14 @@ public static void init(Object mod) { GL11.glScaled(0.75F, 0.75F, 0.75f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MP443Mag = new ItemMagazine.Builder() .withCapacity(18) .withCompatibleBullet(Bullets.Bullet9x19mm) .withName("MP443Mag_2") .withRotationPoint(-0.20000000596046452, 0.48000001430511485, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MP443Magazine(), "MP443.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1549,10 +1549,10 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M45A1Mag = new ItemMagazine.Builder().withCapacity(7).withCompatibleBullet(Bullets.Bullet45ACP).withName("M45A1Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.GlockMagazine(), "gun.png") .withRequiredAttachments(Attachments.M1911Body) .withFirstPersonPositioning((player, itemStack) -> { @@ -1575,11 +1575,11 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M1911_44Mag = new ItemMagazine.Builder().withCapacity(7).withCompatibleBullet(Bullets.Bullet44).withName("M1911_44Mag") .withRequiredAttachments(Attachments.M191144MagBody) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.GlockMagazine(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1602,10 +1602,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M45A1Mag14 = new ItemMagazine.Builder().withCapacity(14).withCompatibleBullet(Bullets.Bullet45ACP).withName("M45A1Mag14") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9Mag30(), "gun.png") .withRequiredAttachments(Attachments.M1911Body) .withFirstPersonPositioning((player, itemStack) -> { @@ -1628,7 +1628,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M17Mag = new ItemMagazine.Builder() @@ -1636,7 +1636,7 @@ public static void init(Object mod) { .withCompatibleBullet(Bullets.Bullet9x19mm) .withName("M17Mag") .withRotationPoint(-0.16000000476837162, 0.5600000166893007, 0.040000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M17Mag(), "m17.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1655,13 +1655,13 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MakarovMag = new ItemMagazine.Builder().withCapacity(8) .withCompatibleBullet(Bullets.Bullet9x18mm) .withName("MakarovMag") .withRequiredAttachments(Attachments.MakarovSlide, Attachments.MakarovPBBody) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MakarovMag(), "makarovmag.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1680,10 +1680,10 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.USP45Mag = new ItemMagazine.Builder().withCapacity(8).withCompatibleBullet(Bullets.Bullet45ACP).withName("USP45Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.USP45Mag(), "USP45.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -1702,10 +1702,10 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.HiPowerMag = new ItemMagazine.Builder().withCapacity(13).withCompatibleBullet(Bullets.Bullet9x19mm).withName("HiPowerMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.GlockMagazine(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1728,10 +1728,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.FrommerStopMag = new ItemMagazine.Builder().withCapacity(8).withCompatibleBullet(Bullets.Bullet380ACP).withName("FrommerStopMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9A1mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1754,14 +1754,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.APSMag = new ItemMagazine.Builder() .withCapacity(20) .withCompatibleBullet(Bullets.Bullet9x19mm) .withName("APSMag_2") .withRotationPoint(-0.12000000357627871, 0.48000001430511485, 0.0) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.APSmag(), "aps.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1781,10 +1781,10 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.GlockMag13 = new ItemMagazine.Builder().withCapacity(13).withCompatibleBullet(Bullets.Bullet9x19mm).withName("GlockMag13") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Glock13rndMagazine(), "glock18c.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1804,10 +1804,10 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Glock18CMag = new ItemMagazine.Builder().withCapacity(20).withCompatibleBullet(Bullets.Bullet9x19mm).withName("Glock18Cmag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Glock18Cmag(), "glock18c.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1827,10 +1827,10 @@ public static void init(Object mod) { GL11.glScaled(0.6F, 0.6F, 0.6f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.GlockMag50 = new ItemMagazine.Builder().withCapacity(50).withCompatibleBullet(Bullets.Bullet9x19mm).withName("GlockMag50") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M9DrumMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1850,10 +1850,10 @@ public static void init(Object mod) { GL11.glScaled(0.75F, 0.75F, 0.75f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.AS50Mag = new ItemMagazine.Builder().withCapacity(10).withCompatibleBullet(Bullets.Bullet50BMG).withName("AS50Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.AS50mag(), "M4A1Mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1876,7 +1876,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M82Mag = new ItemMagazine.Builder() .withCapacity(10) @@ -1884,7 +1884,7 @@ public static void init(Object mod) { .withName("M82Mag_2") .withRotationPoint(-0.12000000357627871, 0.40000001192092904, -2.4800000739097605) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M82Mag(), "m82.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1904,10 +1904,10 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.NTW20Mag = new ItemMagazine.Builder().withCapacity(3).withCompatibleBullet(Bullets.Bullet20x82mm).withName("NTW20Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.NTW20MAG(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1930,14 +1930,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.KBP9A91Mag = new ItemMagazine.Builder() .withCapacity(20) .withCompatibleBullet(Bullets.Bullet9x39mm) .withName("KBP9A91Mag_2") .withRotationPoint(-0.12000000357627871, 0.36000001072883614, -1.9600000584125523) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.KBP9A91Mag(), "kbp9a91.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1957,10 +1957,10 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.KedrMag = new ItemMagazine.Builder().withCapacity(20).withCompatibleBullet(Bullets.Bullet9x19mm).withName("KedrMag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.KedrMag(), "kedr.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1980,10 +1980,10 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.L96A1Mag = new ItemMagazine.Builder().withCapacity(10).withCompatibleBullet(Bullets.Bullet762x54).withName("L96A1Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.L115Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2006,14 +2006,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.DSR1Mag = new ItemMagazine.Builder() .withCapacity(5) .withCompatibleBullet(Bullets.Bullet762x54) .withName("DSR1Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.DSR1Mag(), "dsr1.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2036,14 +2036,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.DSR1MagExt = new ItemMagazine.Builder() .withCapacity(10) .withCompatibleBullet(Bullets.Bullet762x54) .withName("DSR1MagExt") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.DSR1MagExt(), "dsr1.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2066,13 +2066,13 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.InterventionMag = new ItemMagazine.Builder() .withCapacity(7) .withCompatibleBullet(Bullets.Bullet408CT) .withName("InterventionMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.InterventionMag(), "Intervention.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2095,14 +2095,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M40A6Mag = new ItemMagazine.Builder() .withCapacity(7) .withCompatibleBullet(Bullets.Bullet308Winchester) .withName("M40A6Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M40A6Mag(), "gunwerkshamr.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2125,10 +2125,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.R700Mag = new ItemMagazine.Builder().withCapacity(5).withCompatibleBullet(Bullets.Bullet762x54).withName("R700Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Remington700Mag(), "remington700.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2151,10 +2151,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.R700Mag10rnd = new ItemMagazine.Builder().withCapacity(10).withCompatibleBullet(Bullets.Bullet762x54).withName("R700Mag10rnd") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Remington700Mag10rnd(), "remington700.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2177,13 +2177,13 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SSG08Mag = new ItemMagazine.Builder() .withCapacity(8) .withCompatibleBullet(Bullets.Bullet308Winchester) .withName("SSG08Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.SSG08Magazine(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2206,14 +2206,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M110Mag = new ItemMagazine.Builder() .withCapacity(10) .withCompatibleBullet(Bullets.Bullet762x51) .withName("M110Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M110Mag(), "m110.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -2232,7 +2232,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Z10Mag = new ItemMagazine.Builder() .withCapacity(10) @@ -2240,7 +2240,7 @@ public static void init(Object mod) { .withName("Z10Mag") .withRotationPoint(-0.1, 0.0, -1.4000000000000001) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Z10Mag(), "z10.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -2259,10 +2259,10 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M1928Mag = new ItemMagazine.Builder().withCapacity(50).withCompatibleBullet(Bullets.Bullet45ACP).withName("M1928Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M1928ThompsonMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2285,11 +2285,11 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M1A1Mag = new ItemMagazine.Builder().withCapacity(30).withCompatibleBullet(Bullets.Bullet45ACP) .withName("M1A1Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M1A1mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2312,10 +2312,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M712Mag = new ItemMagazine.Builder().withCapacity(20).withCompatibleBullet(Bullets.Bullet763x25).withName("M712mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M712mag(), "m712.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2338,10 +2338,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MG42Mag = new ItemMagazine.Builder().withCapacity(50).withCompatibleBullet(Bullets.Bullet792x57).withName("MG42Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MG42mag(), "mg42mag.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2364,10 +2364,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.DP28Mag = new ItemMagazine.Builder().withCapacity(47).withCompatibleBullet(Bullets.Bullet762x54).withName("DP28Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.DP28Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2390,14 +2390,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M1CarbineMag = new ItemMagazine.Builder() .withCapacity(15) .withCompatibleBullet(Bullets.Bullet762x51) .withName("M1CarbineMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Mk14EBRmag(), "m14dmr.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2420,7 +2420,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.FNFALMag = new ItemMagazine.Builder() .withCapacity(20) @@ -2428,7 +2428,7 @@ public static void init(Object mod) { .withName("FNFALMag") .withRotationPoint(-0.12000000357627871, -0.6800000202655794, -2.36000007033348) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.FNFALMag(), "fnfal.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2448,7 +2448,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.G3Mag = new ItemMagazine.Builder() .withCapacity(20) @@ -2456,7 +2456,7 @@ public static void init(Object mod) { .withName("G3Mag") .withRotationPoint(0.0, -0.6400000190734865, -1.4000000417232517) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.G3Mag(), "G3.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2476,7 +2476,7 @@ public static void init(Object mod) { GL11.glScaled(0.8F, 0.8F, 0.8f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Mk14EBRMag = new ItemMagazine.Builder() .withCapacity(20) @@ -2484,7 +2484,7 @@ public static void init(Object mod) { .withName("Mk14EBRmag_2") .withRotationPoint(-0.12000000357627871, 0.5600000166893007, -3.000000089406967) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Mk14EBRmag(), "m14dmr.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2504,7 +2504,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.M14Drum50 = new ItemMagazine.Builder() .withCapacity(50) @@ -2512,7 +2512,7 @@ public static void init(Object mod) { .withName("M14Drum50") .withRotationPoint(-0.12000000357627871, 0.5600000166893007, -3.000000089406967) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M14Drum50(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2532,10 +2532,10 @@ public static void init(Object mod) { GL11.glScaled(1.2F, 1.2F, 1.2f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MP40Mag = new ItemMagazine.Builder().withCapacity(32).withCompatibleBullet(Bullets.Bullet9x19mm).withName("MP40Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MP40MagACTUAL(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2558,7 +2558,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MP5A5Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -2566,7 +2566,7 @@ public static void init(Object mod) { .withName("MP5A5Mag") .withRotationPoint(0.0, 0.20000000596046452, -1.5600000464916233) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.HKMP5Mag(), "mp5.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2586,7 +2586,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.HK50Drum = new ItemMagazine.Builder() .withCapacity(50) @@ -2594,7 +2594,7 @@ public static void init(Object mod) { .withName("HK50Drum") .withRotationPoint(0.0, 0.20000000596046452, -1.5600000464916233) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.HK50Drum(), "mp5.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2614,7 +2614,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MP7Mag = new ItemMagazine.Builder() .withCapacity(40) @@ -2622,7 +2622,7 @@ public static void init(Object mod) { .withName("MP7Mag") .withRotationPoint(-0.12000000357627871, 0.6400000190734865, -0.08000000238418581) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MP7Mag(), "mp7.png") // .withRequiredAttachments(Attachments.VeprDustCover) .withFirstPersonPositioning((player, itemStack) -> { @@ -2642,7 +2642,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MP7Mag20 = new ItemMagazine.Builder() .withCapacity(20) @@ -2650,7 +2650,7 @@ public static void init(Object mod) { .withName("MP7Mag20") .withRotationPoint(-0.12000000357627871, 0.6400000190734865, -0.08000000238418581) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MP7Mag20(), "mp7.png") // .withRequiredAttachments(Attachments.VeprDustCover) .withFirstPersonPositioning((player, itemStack) -> { @@ -2670,7 +2670,7 @@ public static void init(Object mod) { GL11.glScaled(0.9F, 0.9F, 0.9f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.UMP45Mag = new ItemMagazine.Builder() .withCapacity(25) @@ -2678,7 +2678,7 @@ public static void init(Object mod) { .withName("UMP45Mag") .withRotationPoint(-0.12000000357627871, 0.32000000953674324, -1.280000038146973) .withRequiredAttachments(Attachments.UMP45Receiver) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new UMP45mag(), "ump45.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2698,7 +2698,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.UMP9Mag = new ItemMagazine.Builder() .withCapacity(30) @@ -2706,7 +2706,7 @@ public static void init(Object mod) { .withName("UMP9Mag") .withRotationPoint(-0.12000000357627871, 0.32000000953674324, -1.280000038146973) .withRequiredAttachments(Attachments.UMP9Receiver) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new UMP9Mag(), "ump45.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2726,7 +2726,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MPXMag = new ItemMagazine.Builder() .withCapacity(30) @@ -2734,7 +2734,7 @@ public static void init(Object mod) { .withName("MPXMag") .withRotationPoint(-0.040000001192092904, 0.44000001311302195, -1.24000003695488) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MPXMag(), "mpx.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2754,13 +2754,13 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.APC9Mag = new ItemMagazine.Builder().withCapacity(30) .withCompatibleBullet(Bullets.Bullet9x19mm) .withName("APC9Mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.APC9Mag(), "apc9.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -2782,7 +2782,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.ScorpionMag = new ItemMagazine.Builder() .withCapacity(30) @@ -2790,7 +2790,7 @@ public static void init(Object mod) { .withName("ScorpionMag") .withRotationPoint(-0.12000000357627871, 1.0000000298023226, -1.680000050067902) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.ScorpionEVO3A1Magazine(), "scorpionevo3a1.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2810,7 +2810,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.P90Mag = new ItemMagazine.Builder() .withCapacity(50) @@ -2818,7 +2818,7 @@ public static void init(Object mod) { .withName("P90Mag") .withRotationPoint(-0.12000000357627871, -1.1200000333786013, 1.8400000548362736) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.P90Mag(), "p90.png") .withRequiredAttachments(Attachments.P90DefaultKit, Attachments.AR57Receiver) .withFirstPersonPositioning((player, itemStack) -> { @@ -2838,11 +2838,11 @@ public static void init(Object mod) { GL11.glScaled(0.5F, 0.5F, 0.5f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.P90TerminatorMag = new ItemMagazine.Builder().withCapacity(65).withCompatibleBullet(Bullets.Bullet46x30mm) .withName("P90TerminatorMag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.M4A1Mag(), "M4A1Mag.png") .withRequiredAttachments(Attachments.P90Terminator) .withFirstPersonPositioning((player, itemStack) -> { @@ -2865,14 +2865,14 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.MAC10Mag = new ItemMagazine.Builder() .withCapacity(30) .withCompatibleBullet(Bullets.Bullet45ACP) .withName("MAC10Mag") .withRotationPoint(0.08000000238418581, 0.5200000154972078, -0.5600000166893007) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.MAC10Mag(), "mac10.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -2891,14 +2891,14 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.G11Mag = new ItemMagazine.Builder().withCapacity(50) .withCompatibleBullet(Bullets.Bullet473x33mm) .withName("G11Mag") .withRotationPoint(-0.12000000357627871, -1.5200000452995304, -3.8800001156330115) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.G11Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -2920,7 +2920,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.ScarHMag = new ItemMagazine.Builder() .withCapacity(20) @@ -2928,7 +2928,7 @@ public static void init(Object mod) { .withName("ScarHMag_2") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.ScarHMag(), "scarh.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2948,7 +2948,7 @@ public static void init(Object mod) { GL11.glScaled(1.0F, 1.0F, 1.0f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Scar40Mag = new ItemMagazine.Builder() .withCapacity(40) @@ -2956,7 +2956,7 @@ public static void init(Object mod) { .withName("Scar40Mag") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Scar40Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -2976,7 +2976,7 @@ public static void init(Object mod) { GL11.glScaled(1.1F, 1.1F, 1.1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.Scar60Mag = new ItemMagazine.Builder() .withCapacity(60) @@ -2984,7 +2984,7 @@ public static void init(Object mod) { .withName("Scar60Mag") .withRotationPoint(-0.16000000476837162, -0.16000000476837162, -1.5200000452995304) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.Stanag50(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3004,7 +3004,7 @@ public static void init(Object mod) { GL11.glScaled(1F, 1F, 1f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.VSSVintorezMag = new ItemMagazine.Builder() .withCapacity(10) @@ -3012,7 +3012,7 @@ public static void init(Object mod) { .withName("VSSVintorezMag_2") .withRotationPoint(-0.040000001192092904, -0.28000000834465033, -1.3600000405311587) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.VSSVintorezMag(), "vssvintorez.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3032,7 +3032,7 @@ public static void init(Object mod) { GL11.glScaled(0.75F, 0.75F, 0.75f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.ASValMag = new ItemMagazine.Builder() .withCapacity(20) @@ -3040,7 +3040,7 @@ public static void init(Object mod) { .withName("ASValMag") .withRotationPoint(-0.040000001192092904, -0.28000000834465033, -1.3600000405311587) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.ASValMag(), "vssvintorez.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3060,10 +3060,10 @@ public static void init(Object mod) { GL11.glScaled(0.75F, 0.75F, 0.75f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.STG44Mag = new ItemMagazine.Builder().withCapacity(30).withCompatibleBullet(Bullets.Bullet792x33Kurz).withName("STG44Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.STG44Mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3086,10 +3086,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.G43GewehrMag = new ItemMagazine.Builder().withCapacity(10).withCompatibleBullet(Bullets.Bullet792x57).withName("g43_gewehr_mag") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.G43GewehrMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3112,10 +3112,10 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.SV98Mag = new ItemMagazine.Builder().withCapacity(10).withCompatibleBullet(Bullets.Bullet762x54).withName("SV98Mag_2") - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.SV98Mag(), "sv98.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3138,7 +3138,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.UziMag = new ItemMagazine.Builder() .withCapacity(32) @@ -3146,7 +3146,7 @@ public static void init(Object mod) { .withName("UziMag_2") .withRotationPoint(-0.040000001192092904, 0.7200000214576723, -0.40000001192092904) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.UziMag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -3169,7 +3169,7 @@ public static void init(Object mod) { .withCrafting(CraftingComplexity.MEDIUM, MWCItems.steelIngot, MWCItems.gunmetalIngot) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); Magazines.VP70Mag = new ItemMagazine.Builder() .withCapacity(18) @@ -3177,7 +3177,7 @@ public static void init(Object mod) { .withName("VP70mag_2") .withRotationPoint(-0.12000000357627871, 0.24000000715255743, 0.08000000238418581) - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withModel(new com.paneedah.mwc.models.VP70mag(), "gun.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -0.3F, 0.4F); @@ -3196,7 +3196,7 @@ public static void init(Object mod) { GL11.glScaled(0.7F, 0.7F, 0.7f); }) .withMaxStackSize(6) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemMagazine.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemMagazine.class); } diff --git a/src/main/java/com/paneedah/mwc/wearables/Armors.java b/src/main/java/com/paneedah/mwc/wearables/Armors.java index 7215ed548..546ac4424 100644 --- a/src/main/java/com/paneedah/mwc/wearables/Armors.java +++ b/src/main/java/com/paneedah/mwc/wearables/Armors.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.wearables; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.weaponlib.CustomArmor; import com.paneedah.weaponlib.CustomArmor.Builder; import com.paneedah.weaponlib.ModContext; @@ -71,7 +71,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Marine") .withTextureName("USMC") .withModelClass("com.paneedah.mwc.models.USMC") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Marinehelmet = marineArmorBuilder.buildHelmet(modContext); Armors.Marinechest = marineArmorBuilder.buildChest(modContext.isClient()); @@ -82,7 +82,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Spec_Ops") .withTextureName("militaryuniformblack") .withModelClass("com.paneedah.mwc.models.SpecOps") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.SpecOpshelmet = specopsArmorBuilder.buildHelmet(modContext); Armors.SpecOpschest = specopsArmorBuilder.buildChest(modContext.isClient()); @@ -90,11 +90,11 @@ public static void init(Object mod, ModContext modContext) { Builder spetznazArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("Spetznaz") .withTextureName("militaryuniformforest") .withModelClass("com.paneedah.mwc.models.USMC") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Spetznazhelmet = spetznazArmorBuilder.buildHelmet(modContext); Armors.Spetznazchest = spetznazArmorBuilder.buildChest(modContext.isClient()); @@ -102,11 +102,11 @@ public static void init(Object mod, ModContext modContext) { Builder urbanArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("Urban") .withTextureName("militaryuniformurban") .withModelClass("com.paneedah.mwc.models.USMC") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Urbanhelmet = urbanArmorBuilder.buildHelmet(modContext); Armors.Urbanchest = urbanArmorBuilder.buildChest(modContext.isClient()); @@ -114,41 +114,41 @@ public static void init(Object mod, ModContext modContext) { Builder multicamoblackArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("blackcamo") .withTextureName("multicamoblackshirt") .withModelClass("com.paneedah.mwc.models.MultiCamoBlackShirt") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Blackcamochest = multicamoblackArmorBuilder.buildChest(modContext.isClient()); Builder forestArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("forest") .withTextureName("militaryshirtforest") .withModelClass("com.paneedah.mwc.models.MultiCamoBlackShirt") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Forestchest = forestArmorBuilder.buildChest(modContext.isClient()); Builder blackjeansArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("blackjeans") .withTextureName("blackjeans") .withModelClass("com.paneedah.mwc.models.Jeans") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.BlackJeansboots = blackjeansArmorBuilder.buildBoots(modContext.isClient()); Builder khakijeansArmorBuilder = new CustomArmor.Builder() .withMaterial(Armors.Marine) - .withCreativeTab(ModernWarfareMod.ArmorTab) + .withCreativeTab(MWC.ARMOR_TAB) .withUnlocalizedName("khakijeans") .withTextureName("khakijeans") .withModelClass("com.paneedah.mwc.models.Jeans") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.KhakiJeansboots = khakijeansArmorBuilder.buildBoots(modContext.isClient()); @@ -157,7 +157,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Santa") .withTextureName("santasuit_normal") .withModelClass("com.paneedah.mwc.models.SantasuitNormal") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Santahelmet = santaArmorBuilder.buildHelmet(modContext); Armors.Santachest = santaArmorBuilder.buildChest(modContext.isClient()); @@ -167,7 +167,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Nazisanta") .withTextureName("santasuit_nazi") .withModelClass("com.paneedah.mwc.models.SantaSuit") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.NaziSantahelmet = nazisantaArmorBuilder.buildHelmet(modContext); Armors.NaziSantachest = nazisantaArmorBuilder.buildChest(modContext.isClient()); @@ -177,7 +177,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Juggernaut") .withTextureName("JuggernautSuit") .withModelClass("com.paneedah.mwc.models.JuggernautSuit") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Juggernauthelmet = juggernautsuitArmorBuilder.buildHelmet(modContext); Armors.Juggernautchest = juggernautsuitArmorBuilder.buildChest(modContext.isClient()); @@ -188,7 +188,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("ghillie") .withTextureName("ghillie") .withModelClass("com.paneedah.mwc.models.Ghillie") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Ghilliehelmet = ghillieArmorBuilder.buildHelmet(modContext); Armors.Ghilliechest = ghillieArmorBuilder.buildChest(modContext.isClient()); @@ -198,7 +198,7 @@ public static void init(Object mod, ModContext modContext) { .withUnlocalizedName("Swat") .withTextureName("Swat") .withModelClass("com.paneedah.mwc.models.Swat") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Swathelmet = swatArmorBuilder.buildHelmet(modContext); Armors.Swatchest = swatArmorBuilder.buildChest(modContext.isClient()); @@ -210,7 +210,7 @@ public static void init(Object mod, ModContext modContext) { .withTextureName("Tactical") .withModelClass("com.paneedah.mwc.models.Tactical") .withNightVision(true) - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.Tacticalhelmet = tacticalArmorBuilder.buildHelmet(modContext); @@ -219,7 +219,7 @@ public static void init(Object mod, ModContext modContext) { .withTextureName("jpnvg18") .withModelClass("com.paneedah.mwc.models.JPNVG18") .withNightVision(true) - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.JPNVG18helmet = jpnvg18ArmorBuilder.buildHelmet(modContext); @@ -229,7 +229,7 @@ public static void init(Object mod, ModContext modContext) { .withExposureReductionFactor(0.99f) .withModelClass("com.paneedah.mwc.models.M40GasMask") .withHudTextureName("goggles_overlay") - .withCreativeTab(ModernWarfareMod.ArmorTab); + .withCreativeTab(MWC.ARMOR_TAB); Armors.GasMaskM40 = gasSuitArmorBuilder.buildHelmet(modContext); } diff --git a/src/main/java/com/paneedah/mwc/wearables/Backpacks.java b/src/main/java/com/paneedah/mwc/wearables/Backpacks.java index 576068791..c23f34210 100644 --- a/src/main/java/com/paneedah/mwc/wearables/Backpacks.java +++ b/src/main/java/com/paneedah/mwc/wearables/Backpacks.java @@ -1,10 +1,9 @@ package com.paneedah.mwc.wearables; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.weaponlib.ItemStorage; import com.paneedah.weaponlib.Weapon; import com.paneedah.weaponlib.animation.Transform; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import org.lwjgl.opengl.GL11; @@ -32,7 +31,7 @@ public static void init(Object mod) { .withName("combat_sustainment_backpack") .withSize(10) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.CombatSustainmentBackpack", "combatsustainmentbackpack.png") .withGuiTextureName("combat_sustainment_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -47,13 +46,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CombatSustainmentBackpackBlack = new ItemStorage.Builder() .withName("combat_sustainment_backpack_black") .withSize(10) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.CombatSustainmentBackpack", "combatsustainmentblack.png") .withGuiTextureName("combat_sustainment_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -68,13 +67,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); CombatSustainmentBackpackForest = new ItemStorage.Builder() .withName("combat_sustainment_backpack_forest") .withSize(10) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.CombatSustainmentBackpack", "combatsustainmentforest.png") .withGuiTextureName("combat_sustainment_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -89,13 +88,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AssaultBackpack = new ItemStorage.Builder() .withName("assault_backpack") .withSize(16) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.AssaultBackpack", "assaultbackpack.png") .withGuiTextureName("assault_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -110,13 +109,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AssaultBackpackBlack = new ItemStorage.Builder() .withName("assault_backpack_black") .withSize(16) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.AssaultBackpack", "assaultbackpackblack.png") .withGuiTextureName("assault_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -131,13 +130,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); AssaultBackpackForest = new ItemStorage.Builder() .withName("assault_backpack_forest") .withSize(16) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.AssaultBackpack", "assaultbackpackforest.png") .withGuiTextureName("assault_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -152,13 +151,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); F5SwitchbladeBackpack = new ItemStorage.Builder() .withName("f5switchbladebackpack") .withSize(16) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.F5SwitchbladeBackpack", "f5switchbladebackpack.png") .withGuiTextureName("assault_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -173,13 +172,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); TruSpecCorduraBackpack = new ItemStorage.Builder() .withName("tru_spec_cordura_backpack") .withSize(20) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.TruSpecCorduraBackpack", "truspeccordurabackpack.png") .withGuiTextureName("tru_spec_cordura_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -194,13 +193,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); TruSpecCorduraBackpackBlack = new ItemStorage.Builder() .withName("tru_spec_cordura_backpack_black") .withSize(20) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.TruSpecCorduraBackpack", "truspeccordurablack.png") .withGuiTextureName("tru_spec_cordura_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -215,13 +214,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); TruSpecCorduraBackpackForest = new ItemStorage.Builder() .withName("tru_spec_cordura_backpack_forest") .withSize(20) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.TruSpecCorduraBackpack", "truspeccorduraforest.png") .withGuiTextureName("tru_spec_cordura_backpack.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -236,13 +235,13 @@ public static void init(Object mod) { .withScale(3.2, 3.2, 3.2) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); Dufflebag = new ItemStorage.Builder() .withName("duffle_bag") .withSize(24) .withValidItemPredicate(item -> !(item instanceof Weapon)) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.Dufflebag", "dufflebag.png") .withGuiTextureName("duffle_bag.png") .withCustomEquippedPositioning((player, stack) -> { @@ -257,7 +256,7 @@ public static void init(Object mod) { .withScale(2.8, 2.8, 2.8) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); /* * item -> diff --git a/src/main/java/com/paneedah/mwc/wearables/Bullets.java b/src/main/java/com/paneedah/mwc/wearables/Bullets.java index 1ee332c3b..110ac274f 100644 --- a/src/main/java/com/paneedah/mwc/wearables/Bullets.java +++ b/src/main/java/com/paneedah/mwc/wearables/Bullets.java @@ -1,6 +1,6 @@ package com.paneedah.mwc.wearables; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.init.MWCItems; import com.paneedah.weaponlib.ItemBullet; import com.paneedah.weaponlib.crafting.CraftingComplexity; @@ -53,7 +53,7 @@ public class Bullets { public static void init(Object mod) { Grenade40mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("Grenade40mm").withMaxStackSize(16) + .withCreativeTab(MWC.AMMO_TAB).withName("Grenade40mm").withMaxStackSize(16) .withModel(new com.paneedah.mwc.models.GL06Grenade(), "GL06.png") .withCrafting(8, CraftingComplexity.MEDIUM, "ingotCopper", Items.GUNPOWDER) .withFirstPersonPositioning((player, itemStack) -> { @@ -72,10 +72,10 @@ public static void init(Object mod) { GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(2F, 2F, 2f); }).withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); M202Rocket = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("m202rocket").withMaxStackSize(4) + .withCreativeTab(MWC.AMMO_TAB).withName("m202rocket").withMaxStackSize(4) .withModel(new com.paneedah.mwc.models.M202Rocket(), "gun.png") .withCrafting(8, CraftingComplexity.MEDIUM, "ingotCopper", MWCItems.gunmetalPlate, MWCItems.gunmetalIngot) .withFirstPersonPositioning((player, itemStack) -> { @@ -94,10 +94,10 @@ public static void init(Object mod) { GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(0.4F, 0.4F, 0.4f); }).withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); RPGRocket = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("rpg7_rocket").withMaxStackSize(2) + .withCreativeTab(MWC.AMMO_TAB).withName("rpg7_rocket").withMaxStackSize(2) .withModel(new com.paneedah.mwc.models.RPG7rocketPROJECTILE(), "rpg7.png") .withCrafting(8, CraftingComplexity.MEDIUM, "ingotCopper", MWCItems.gunmetalPlate, MWCItems.gunmetalIngot) .withFirstPersonPositioning((player, itemStack) -> { @@ -116,10 +116,10 @@ public static void init(Object mod) { GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(0.4F, 0.4F, 0.4f); }).withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); EnergyCase = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("EnergyCase") + .withCreativeTab(MWC.AMMO_TAB).withName("EnergyCase") .withModel(new com.paneedah.mwc.models.EnergyCase(), "gun.png") .withMaxStackSize(64) .withCrafting(8, CraftingComplexity.LOW, "ingotCopper", Items.GUNPOWDER) @@ -138,10 +138,10 @@ public static void init(Object mod) { GL11.glRotatef(2F, 1f, 0f, 0f); GL11.glRotatef(20F, 0f, 0f, 1f); GL11.glScaled(1.4F, 1.4F, 1.4f); - }).withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + }).withTextureName("Dummy.png").build(MWC.modContext, ItemBullet.class); PlasmaCapsule = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("PlasmaCapsule") + .withCreativeTab(MWC.AMMO_TAB).withName("PlasmaCapsule") .withModel(new com.paneedah.mwc.models.ChainsawFuel(), "PlasmaCapsule.png") .withMaxStackSize(64) //.withCrafting(8, CraftingComplexity.LOW, "ingotCopper", CompatibleItems.GUNPOWDER) @@ -161,11 +161,11 @@ public static void init(Object mod) { GL11.glRotatef(-15F, 0f, 0f, 1f); GL11.glScaled(1F, 1F, 1f); }) - .withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .withTextureName("Dummy.png").build(MWC.modContext, ItemBullet.class); Bullet3006Springfield = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet3006Springfield") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletspringfield.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -185,11 +185,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.6F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet8x58 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet8x58") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet8x58.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -209,11 +209,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.4F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet792x33Kurz = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet792x33Kurz") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -233,11 +233,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.35F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet50BMG = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet50BMG") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -257,11 +257,11 @@ public static void init(Object mod) { GL11.glScaled(1.7F, 1.6F, 1.7f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet20x82mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet20x82mm") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet20x82.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -281,11 +281,11 @@ public static void init(Object mod) { GL11.glScaled(1.7F, 1.6F, 1.7f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet408CT = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet408CT") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -305,11 +305,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.6F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet308Winchester = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet308Winchester") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletspringfield.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -329,11 +329,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.5F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet792x57 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet792x57") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet8x58.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -353,11 +353,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.6F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet762x54 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet762x54") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet762x54.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -377,10 +377,10 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.6F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet762x51 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet762x51") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -400,10 +400,10 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.6F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Shotgun12Guage = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("Shotgun12Gauge") + .withCreativeTab(MWC.AMMO_TAB).withName("Shotgun12Gauge") .withModel(new com.paneedah.mwc.models.Shotgun12Gauge(), "Shotgun12Gauge.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -1F, 0.4F); @@ -420,10 +420,10 @@ public static void init(Object mod) { GL11.glRotatef(2F, 1f, 0f, 0f); GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(1.4F, 1.4F, 1.4f); - }).withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + }).withTextureName("Dummy.png").build(MWC.modContext, ItemBullet.class); Shotgun4G = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab).withName("Shotgun4G") + .withCreativeTab(MWC.AMMO_TAB).withName("Shotgun4G") .withModel(new com.paneedah.mwc.models.Shotgun12Gauge(), "Shotgun4Gauge.png") .withFirstPersonPositioning((player, itemStack) -> { GL11.glTranslatef(0.1F, -1F, 0.4F); @@ -440,11 +440,11 @@ public static void init(Object mod) { GL11.glRotatef(2F, 1f, 0f, 0f); GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(1.4F, 1.4F, 1.4f); - }).withTextureName("Dummy.png").build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + }).withTextureName("Dummy.png").build(MWC.modContext, ItemBullet.class); Bullet762x35 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet762x35") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -464,11 +464,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.4F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet765x21 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet765x21") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet765x21.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -488,11 +488,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.2F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet762x39 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet762x39") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet762x39.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -512,11 +512,11 @@ public static void init(Object mod) { GL11.glScaled(1.6F, 1.5F, 1.6f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet556x45 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet556x45") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -536,11 +536,11 @@ public static void init(Object mod) { GL11.glScaled(1.4F, 1.55F, 1.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet65 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet65") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -560,11 +560,11 @@ public static void init(Object mod) { GL11.glScaled(1.4F, 1.55F, 1.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet545x39 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet545x39") .withModel(new com.paneedah.mwc.models.BulletBig(), "bullet545x39.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -584,11 +584,11 @@ public static void init(Object mod) { GL11.glScaled(1.5F, 1.55F, 1.5f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet4570 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet4570") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet765x21.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -608,11 +608,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 3F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet4440 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet4440") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet765x21.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -632,11 +632,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet45ACP = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet45ACP") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -656,11 +656,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet357 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet357") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -680,11 +680,11 @@ public static void init(Object mod) { GL11.glScaled(2.0F, 2.8F, 2.0f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet44 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet44") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -704,11 +704,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 3F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet40SW = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet40SW") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -728,11 +728,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet50AE = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet50AE") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet50ae.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -752,11 +752,11 @@ public static void init(Object mod) { GL11.glScaled(2.8F, 3F, 2.8f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet50Beowulf = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet50Beowulf") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -776,11 +776,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 3F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet500 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet500") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -800,11 +800,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 3F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet380ACP = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet380ACP") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -824,11 +824,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet763x25 = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet763x25") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -847,11 +847,11 @@ public static void init(Object mod) { GL11.glRotatef(0F, 0f, 0f, 1f); GL11.glScaled(2.4F, 2.4F, 2.4f); }).withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet9x39mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet9x39mm") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet50ae.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -871,11 +871,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet9x19mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet9x19mm") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -895,11 +895,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet9x18mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet9x18mm") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bullet9x18.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -919,10 +919,10 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.4F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet57x28mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet57x28mm") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -942,11 +942,11 @@ public static void init(Object mod) { GL11.glScaled(1.3F, 1.2F, 1.3f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet46x30mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet46x30mm") .withModel(new com.paneedah.mwc.models.BulletBig(), "bulletbig.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -966,11 +966,11 @@ public static void init(Object mod) { GL11.glScaled(1.3F, 1.2F, 1.3f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet10mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet10mm") .withModel(new com.paneedah.mwc.models.BulletSmall(), "bulletsmall.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -990,11 +990,11 @@ public static void init(Object mod) { GL11.glScaled(2.4F, 2.8F, 2.4f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); Bullet473x33mm = new ItemBullet.Builder() - .withCreativeTab(ModernWarfareMod.AmmoTab) + .withCreativeTab(MWC.AMMO_TAB) .withName("Bullet473x33mm") .withModel(new com.paneedah.mwc.models.Bulletcaseless(), "bulletcaseless.png") .withFirstPersonPositioning((player, itemStack) -> { @@ -1014,7 +1014,7 @@ public static void init(Object mod) { GL11.glScaled(1.7F, 2F, 1.7f); }) .withTextureName("Dummy.png") - .build(ModernWarfareMod.MOD_CONTEXT, ItemBullet.class); + .build(MWC.modContext, ItemBullet.class); } } diff --git a/src/main/java/com/paneedah/mwc/wearables/Vests.java b/src/main/java/com/paneedah/mwc/wearables/Vests.java index 73392f95c..4b02e52f0 100644 --- a/src/main/java/com/paneedah/mwc/wearables/Vests.java +++ b/src/main/java/com/paneedah/mwc/wearables/Vests.java @@ -1,9 +1,8 @@ package com.paneedah.mwc.wearables; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.weaponlib.ItemVest; import com.paneedah.weaponlib.animation.Transform; -import net.minecraft.creativetab.CreativeTabs; import org.lwjgl.opengl.GL11; public class Vests { @@ -14,7 +13,7 @@ public static void init(Object mod) { .withName("m43a_chest_harness") .withPercentDamageBlocked(0.1) .withDurability(150) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.M43AChestHarness", "m43achestharness.png") // .withCustomEquippedPositioning((player, stack) -> { // GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -28,13 +27,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("flyye_field_compact_plate_carrier") .withPercentDamageBlocked(0.2) .withDurability(175) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.MollePlateCarrier", "molleplatecarrier.png") // .withCustomEquippedPositioning((player, stack) -> { // GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -48,13 +47,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("molle_black") .withPercentDamageBlocked(0.2) .withDurability(175) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.MollePlateCarrier", "molleplatecarrier_black.png") // .withCustomEquippedPositioning((player, stack) -> { // GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -68,13 +67,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("molle_green") .withPercentDamageBlocked(0.2) .withDurability(175) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.MollePlateCarrier", "molleplatecarrier_green.png") // .withCustomEquippedPositioning((player, stack) -> { // GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -88,13 +87,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("molle_urban") .withPercentDamageBlocked(0.2) .withDurability(175) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.MollePlateCarrier", "molleplatecarrier_urban.png") // .withCustomEquippedPositioning((player, stack) -> { // GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -108,13 +107,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("swat_vest") .withPercentDamageBlocked(0.3) .withDurability(250) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.UTG547Vest", "utg547vest.png") .withCustomEquippedPositioning((player, stack) -> { GL11.glScalef(0.8f, 0.8f, 0.8f); @@ -128,13 +127,13 @@ public static void init(Object mod) { .withScale(3, 3, 3) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("usmc_vest") .withPercentDamageBlocked(0.4) .withDurability(250) - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.USMCVest", "usmc.png") // .withModelTextureName("usmc.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -149,14 +148,14 @@ public static void init(Object mod) { .withScale(2.6, 2.6, 2.6) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("usmc_vest_black") // .withDamageReduceAmount(8) // use numbers from 1 to 8 .withPercentDamageBlocked(0.4) .withDurability(250) // works the same way as shield's max capacity - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.USMCVest", "usmcvestblack.png") // .withModelTextureName("usmc.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -171,14 +170,14 @@ public static void init(Object mod) { .withScale(2.6, 2.6, 2.6) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("usmc_vest_green") // .withDamageReduceAmount(8) // use numbers from 1 to 8 .withPercentDamageBlocked(0.4) .withDurability(250) // works the same way as shield's max capacity - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.USMCVest", "militaryuniformforest.png") // .withModelTextureName("usmc.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -193,14 +192,14 @@ public static void init(Object mod) { .withScale(2.6, 2.6, 2.6) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); new ItemVest.Builder() .withName("usmc_vest_urban") // .withDamageReduceAmount(8) // use numbers from 1 to 8 .withPercentDamageBlocked(0.4) .withDurability(250) // works the same way as shield's max capacity - .withTab(ModernWarfareMod.ArmorTab) + .withTab(MWC.ARMOR_TAB) .withProperModel("com.paneedah.mwc.models.USMCVest", "militaryuniformurban.png") // .withModelTextureName("usmc.png") // .withCustomEquippedPositioning((player, stack) -> { @@ -215,6 +214,6 @@ public static void init(Object mod) { .withScale(2.6, 2.6, 2.6) .doGLDirect(); }) - .build(ModernWarfareMod.MOD_CONTEXT); + .build(MWC.modContext); } } diff --git a/src/main/java/com/paneedah/weaponlib/BlockHitMessageHandler.java b/src/main/java/com/paneedah/weaponlib/BlockHitMessageHandler.java index 34c8e65f4..9d1348ffb 100644 --- a/src/main/java/com/paneedah/weaponlib/BlockHitMessageHandler.java +++ b/src/main/java/com/paneedah/weaponlib/BlockHitMessageHandler.java @@ -1,6 +1,6 @@ package com.paneedah.weaponlib; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -19,7 +19,7 @@ public BlockHitMessageHandler() { @SideOnly(Side.CLIENT) public IMessage onMessage(BlockHitMessage message, MessageContext messageContext) { mc.addScheduledTask(() -> { - for (int i = 0; i < ModernWarfareMod.bulletHitParticleMult; i++) { + for (int i = 0; i < MWC.bulletHitParticleMult; i++) { mc.effectRenderer.addBlockHitEffects(message.getBlockPos(), message.getSideHit()); mc.world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, message.getPosX(), message.getPosY(), message.getPosZ(), 0, 0, 0); } diff --git a/src/main/java/com/paneedah/weaponlib/CommonModContext.java b/src/main/java/com/paneedah/weaponlib/CommonModContext.java index 42fa541a3..aecdb6ae8 100644 --- a/src/main/java/com/paneedah/weaponlib/CommonModContext.java +++ b/src/main/java/com/paneedah/weaponlib/CommonModContext.java @@ -1,6 +1,6 @@ package com.paneedah.weaponlib; -import com.paneedah.mwc.ModernWarfareMod; +import com.paneedah.mwc.MWC; import com.paneedah.mwc.utils.ModReference; import com.paneedah.weaponlib.MagazineReloadAspect.LoadPermit; import com.paneedah.weaponlib.WeaponAttachmentAspect.ChangeAttachmentPermit; @@ -338,7 +338,7 @@ public void preInit(Object mod, SimpleNetworkWrapper channel) { public void preInitEnd(Object mod, SimpleNetworkWrapper channel) { // Workbench GameRegistry.registerTileEntity(TileEntityWorkbench.class, ModReference.ID + ":tileworkbench"); - Block workbenchblock = new WorkbenchBlock(this, "weapon_workbench", Material.WOOD).setCreativeTab(ModernWarfareMod.BlocksTab); + Block workbenchblock = new WorkbenchBlock(this, "weapon_workbench", Material.WOOD).setCreativeTab(MWC.BLOCKS_TAB); if (workbenchblock.getRegistryName() == null) { if (workbenchblock.getTranslationKey().length() < ModReference.ID.length() + 2 + 5) { throw new IllegalArgumentException("Unlocalize block name too short " + workbenchblock.getTranslationKey()); @@ -354,7 +354,7 @@ public void preInitEnd(Object mod, SimpleNetworkWrapper channel) { // Ammo press GameRegistry.registerTileEntity(TileEntityAmmoPress.class, ModReference.ID + ":tileammopress"); - Block ammopressblock = new BlockAmmoPress(this, "ammo_press", Material.IRON).setCreativeTab(ModernWarfareMod.BlocksTab); + Block ammopressblock = new BlockAmmoPress(this, "ammo_press", Material.IRON).setCreativeTab(MWC.BLOCKS_TAB); if (ammopressblock.getRegistryName() == null) { if (ammopressblock.getTranslationKey().length() < ModReference.ID.length() + 2 + 5) { diff --git a/src/main/java/com/paneedah/weaponlib/CustomGui.java b/src/main/java/com/paneedah/weaponlib/CustomGui.java index 3ac7609e6..656f77260 100644 --- a/src/main/java/com/paneedah/weaponlib/CustomGui.java +++ b/src/main/java/com/paneedah/weaponlib/CustomGui.java @@ -241,7 +241,7 @@ public void handleModificationHUD(RenderGameOverlayEvent.Pre event, PlayerWeapon // Ammo counter spec public static final int AMMO_COUNTER_WIDTH = 256; public static final int AMMO_COUNTER_HEIGHT = 53; - public static final double AMMO_COUNTER_SCALE = 0.50; + //public static final double AMMO_COUNTER_SCALE = 0.50; // Weapon name public static final int AMMO_COUNTER_WEAPON_NAME_DOWNSCALE_THRESHOLD = 13; @@ -277,17 +277,20 @@ public void handleModificationHUD(RenderGameOverlayEvent.Pre event, PlayerWeapon public static final double CURRENT_AMMO_WIDTH_MULTIPLIER = 2.0; public static final double TOTAL_AMMO_STRING_SCALE = 6.625; - public void handleAmmoCounter(RenderGameOverlayEvent.Pre event, PlayerWeaponInstance weaponInstance, double scaledWidth, double scaledHeight) { final int AMMO_COUNTER_Y_POS = 128; - + public void handleAmmoCounter(RenderGameOverlayEvent.Pre event, PlayerWeaponInstance weaponInstance, double scaledWidth, double scaledHeight) { + //If moved up, the game needs to be restarted every time there is a change + final int AMMO_COUNTER_X_POS = 256 + ModernConfigManager.ammoCounterX; + final int AMMO_COUNTER_Y_POS = 128 + ModernConfigManager.ammoCounterY; + final double AMMO_COUNTER_SIZE = ModernConfigManager.ammoCounterSize; + GlStateManager.enableBlend(); GlStateManager.pushMatrix(); - GlStateManager.translate((scaledWidth - AMMO_COUNTER_WIDTH * AMMO_COUNTER_SCALE), (scaledHeight - AMMO_COUNTER_Y_POS * AMMO_COUNTER_SCALE), 0); - GlStateManager.scale(AMMO_COUNTER_SCALE, AMMO_COUNTER_SCALE, AMMO_COUNTER_SCALE); + GlStateManager.translate((scaledWidth - AMMO_COUNTER_X_POS * AMMO_COUNTER_SIZE), (scaledHeight - AMMO_COUNTER_Y_POS * AMMO_COUNTER_SIZE), 0); + GlStateManager.scale(AMMO_COUNTER_SIZE, AMMO_COUNTER_SIZE, AMMO_COUNTER_SIZE); mc.getTextureManager().bindTexture(AMMO_COUNTER_TEXTURES); - // Figure out the firemode, and assign it an ID int firemode = 0; switch(weaponInstance.getMaxShots()) { @@ -327,9 +330,16 @@ public void handleModificationHUD(RenderGameOverlayEvent.Pre event, PlayerWeapon double keyNameOffset = getFontRenderer().getStringWidth(keyNameString); // Render main ammo counter body - if(ModernConfigManager.enableAmmoCounterBackground) drawTexturedModalRect(0, 0, 0, 0, AMMO_COUNTER_WIDTH, AMMO_COUNTER_HEIGHT); - - + if(ModernConfigManager.enableAmmoCounterBackground) { + if(ModernConfigManager.ammoCounterBackgroundReverse) { + GlStateManager.enableBlend(); + GlStateManager.pushMatrix(); + GlStateManager.scale(-1, 1, 1); + drawTexturedModalRect(-90, 0, 0, 0, -AMMO_COUNTER_WIDTH, AMMO_COUNTER_HEIGHT); + GlStateManager.popMatrix(); + } else + drawTexturedModalRect(0, 0, 0, 0, AMMO_COUNTER_WIDTH, AMMO_COUNTER_HEIGHT); + } // Draw the firemode indicator @@ -337,7 +347,7 @@ public void handleModificationHUD(RenderGameOverlayEvent.Pre event, PlayerWeapon GlStateManager.translate(AMMO_COUNTER_WIDTH - FIREMODE_INDICATOR_X_OFFSET - (keyNameOffset * KEY_NAME_OFFSET_FIREMODE_INDICATOR_MULTIPLIER), FIREMODE_INDICATOR_Y_OFFSET, 0); GlStateManager.scale(FIREMODE_INDICATOR_SCALE, FIREMODE_INDICATOR_SCALE, FIREMODE_INDICATOR_SCALE); GlStateManager.enableBlend(); - drawTexturedModalRect(0, 0, + drawTexturedModalRect(0, 0, FIREMODE_INDICATOR_U_OFFSET + FIREMODE_INDICATOR_U_WIDTH * (Weapon.FIREMODE_AUTO - firemode), FIREMODE_INDICATOR_V_HEIGHT, FIREMODE_INDICATOR_U_WIDTH, FIREMODE_INDICATOR_U_WIDTH); GlStateManager.popMatrix(); diff --git a/src/main/java/com/paneedah/weaponlib/config/ModernConfigManager.java b/src/main/java/com/paneedah/weaponlib/config/ModernConfigManager.java index fa42bde7a..798a7af2b 100644 --- a/src/main/java/com/paneedah/weaponlib/config/ModernConfigManager.java +++ b/src/main/java/com/paneedah/weaponlib/config/ModernConfigManager.java @@ -95,15 +95,28 @@ public class ModernConfigManager { // Fixing Method @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Enables the ammo counter") public static boolean enableAmmoCounter = true; - + + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "") + public static int ammoCounterX = 0; + + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "") + public static int ammoCounterY = 0; + + @RangeDouble(min=0.1, max=3.0) + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "") + public static double ammoCounterSize = 0.50; + + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Enables the black background on the ammo counter.") + public static boolean enableAmmoCounterBackground = true; + + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "") + public static boolean ammoCounterBackgroundReverse = false; + @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Enable open door key display when hovering doors") public static boolean enableOpenDoorDisplay = true; @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "If true, hold to aim. If false, toggle to aim.") public static boolean holdToAim = true; - - @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Enables the black background on the ammo counter.") - public static boolean enableAmmoCounterBackground = true; @RangeDouble(min=0.0, max=1.0) @ConfigSync(category = CATEGORY_GAMEPLAY, comment = "Should players bleed when hit?") diff --git a/src/main/resources/META-INF/mwc_at.cfg b/src/main/resources/META-INF/mwc_at.cfg index 06be6c16c..e398f3fd8 100644 --- a/src/main/resources/META-INF/mwc_at.cfg +++ b/src/main/resources/META-INF/mwc_at.cfg @@ -1,3 +1,5 @@ +public net.minecraft.client.model.ModelRenderer func_78788_d(F)V # compileDisplayList + public net.minecraft.client.Minecraft field_147124_at # framebuffer public net.minecraft.client.renderer.EntityRenderer field_78530_s # farPlaneDistance diff --git a/update.json b/update.json new file mode 100644 index 000000000..ec59a2cee --- /dev/null +++ b/update.json @@ -0,0 +1,10 @@ +{ + "homepage": "https://www.curseforge.com/minecraft/mc-mods/modern-warfare-cubed", + "promos": { + "1.12.2-latest": "0.1", + "1.12.2-recommended": "0.1" + }, + "1.12.2":{ + "0.1":"Changelog Coming Soon" +} +}