Refactor ModernWarfareMod to MWC & Cleanup

src/main/java/com/paneedah/mwc/CustomSpawnEggs.java

@@ -16,23 +16,23 @@ 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()
 				.withID(2)
 				.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()
 				.withID(3)
 				.withItemName("turretsilenced")
 				.withEntitySpawnName("turretsilenced")
 				.withBlockPredicate(b -> b.getRegistryName().toString().equals(ModReference.ID + ":turret_base"))
-				.withCreativeTab(ModernWarfareMod.AssaultRiflesTab)
+				.withCreativeTab(MWC.ASSAULT_RIFLES_TAB)
 				.build();
 	}
 }

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);
     }
 }

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<ItemGrenade>().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<ItemGrenade>().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);

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();
+    }
+}

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);
     }
 
 }

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

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) {

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

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);
         }
 }