version bump cleanup and meh

HxCKDMS · May 26, 2015 · ae80d67 · karelmikie3 · May 27, 2015 · ae80d67
1 parent 71cc66c
commit ae80d67
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 196 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'forge'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-version = "1.7.10-1.3"
+version = "1.7.10-1.4"
 group= "HxCKDMS.HxCCore" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "HxCCore"
 

diff --git a/src/main/java/HxCKDMS/HxCCore/Handlers/HealthBarUpdateHandler.java b/src/main/java/HxCKDMS/HxCCore/Handlers/HealthBarUpdateHandler.java
diff --git a/src/main/java/HxCKDMS/HxCCore/HxCCore.java b/src/main/java/HxCKDMS/HxCCore/HxCCore.java
@@ -40,6 +40,7 @@ public class HxCCore
     public static final PacketPipeline packetPipeLine = new PacketPipeline();
     public static HashMap<EntityPlayerMP, EntityPlayerMP> tpaRequestList = new HashMap<>();
     public static HashMap<EntityPlayerMP, Integer> TpaTimeoutList = new HashMap<>();
+
     public static final Thread CodersCheckThread = new Thread(new CodersCheck());
     public static volatile ArrayList<UUID> coders = new ArrayList<>();
     public static volatile ArrayList<UUID> helpers = new ArrayList<>();
@@ -56,14 +57,6 @@ public class HxCCore
     @Instance(References.MOD_ID)
     public static HxCCore instance;
 
-    public static boolean ModHxCSkills;
-    public static boolean ModHxCEnchants;
-    public static boolean ModHxCWorldGen;
-    public static boolean ModHxCLinkPads;
-    public static boolean ModHxCBlocks;
-    public static boolean ModHxCMagicEnergy;
-    public static boolean ModHxCBows;
-
     @EventHandler
     public void preInit(FMLPreInitializationEvent event)
     {
@@ -73,7 +66,7 @@ public void preInit(FMLPreInitializationEvent event)
         proxy.preInit(event);
         Config = new Config(new Configuration(event.getSuggestedConfigurationFile()));
         extendEnchantsArray();
-        extendPotionsArray();
+        if (!Loader.isModLoaded("BiomesOPlenty")) extendPotionsArray();
 //        FMLCommonHandler.instance().bus().register(new KeyInputHandler());
         LogHelper.info("Thank your for using HxCCore", References.MOD_NAME);
         LogHelper.info("If you see any debug messages, feel free to bug one of the authors about it ^_^", References.MOD_NAME);
@@ -97,22 +90,16 @@ public void init(FMLInitializationEvent event)
 
     @EventHandler
     public void postInit(FMLPostInitializationEvent event) {
-        ModHxCSkills = Loader.isModLoaded("HxCSkills");
-        ModHxCEnchants = Loader.isModLoaded("HxCEnchants");
-        ModHxCWorldGen = Loader.isModLoaded("HxCWorldGen");
-        ModHxCLinkPads = Loader.isModLoaded("HxCLinkPads");
-        ModHxCBlocks = Loader.isModLoaded("HxCBlocks");
-        ModHxCMagicEnergy = Loader.isModLoaded("magicenergy");
-        ModHxCBows = Loader.isModLoaded("hxcbows");
         packetPipeLine.postInitialize();
-        event.getModState();
-        if (ModHxCSkills)LogHelper.info("Thank your for using HxCSkills", References.MOD_NAME);
-        if (ModHxCEnchants)LogHelper.info("Thank your for using HxCEnchants", References.MOD_NAME);
-        if (ModHxCWorldGen)LogHelper.info("Thank your for using HxCWorldGen", References.MOD_NAME);
-        if (ModHxCLinkPads)LogHelper.info("Thank your for using HxCLinkPads", References.MOD_NAME);
-        if (ModHxCBlocks)LogHelper.info("Thank your for using HxCBlocks", References.MOD_NAME);
-        if (ModHxCMagicEnergy)LogHelper.info("Thank your for using MagicEnergy", References.MOD_NAME);
-        if (ModHxCBows)LogHelper.info("Thank your for using HxCBows", References.MOD_NAME);
+        if (HxCKDMS.HxCCore.Configs.Config.DebugMode)event.getModState();
+
+        if (Loader.isModLoaded("HxCSkills"))LogHelper.info("Thank your for using HxCSkills", References.MOD_NAME);
+        if (Loader.isModLoaded("HxCEnchants"))LogHelper.info("Thank your for using HxCEnchants", References.MOD_NAME);
+        if (Loader.isModLoaded("HxCWorldGen"))LogHelper.info("Thank your for using HxCWorldGen", References.MOD_NAME);
+        if (Loader.isModLoaded("HxCLinkPads"))LogHelper.info("Thank your for using HxCLinkPads", References.MOD_NAME);
+        if (Loader.isModLoaded("HxCBlocks"))LogHelper.info("Thank your for using HxCBlocks", References.MOD_NAME);
+        if (Loader.isModLoaded("magicenergy"))LogHelper.info("Thank your for using MagicEnergy", References.MOD_NAME);
+        if (Loader.isModLoaded("hxcbows"))LogHelper.info("Thank your for using HxCBows", References.MOD_NAME);
     }
 
     @EventHandler
@@ -137,7 +124,7 @@ public void serverStart(FMLServerStartingEvent event)
         } catch(IOException e) {
             e.printStackTrace();
         }
-        System.out.println(Potion.potionTypes.length);
+        LogHelper.info(Potion.potionTypes.length, References.MOD_NAME);
     }
     private static void extendEnchantsArray()
     {

diff --git a/src/main/java/HxCKDMS/HxCCore/Utils/AABBUtils.java b/src/main/java/HxCKDMS/HxCCore/Utils/AABBUtils.java
@@ -8,12 +8,12 @@
 
 @SuppressWarnings("unused")
 public class AABBUtils {
-    public static ArrayList<TileEntity> getTileEntitiesWithinAABB(World world, AxisAlignedBB box){
+    public static ArrayList<TileEntity> getTileEntitiesWithinAABB(World world, AxisAlignedBB box) {
         ArrayList<TileEntity> tileEntities = new ArrayList<>();
 
-        for(int x = (int) box.minX; x <= box.maxX; x++){
-            for(int y = (int) box.minY; y <= box.maxY; y++){
-                for(int z = (int) box.minZ; z <= box.maxZ; z++){
+        for(int x = (int) box.minX; x <= box.maxX; x++) {
+            for(int y = (int) box.minY; y <= box.maxY; y++) {
+                for(int z = (int) box.minZ; z <= box.maxZ; z++) {
                     TileEntity tileEntity = world.getTileEntity(x, y, z);
                     if(tileEntity != null)
                         tileEntities.add(tileEntity);

diff --git a/src/main/java/HxCKDMS/HxCCore/lib/References.java b/src/main/java/HxCKDMS/HxCCore/lib/References.java
@@ -3,7 +3,7 @@
 public class References {
     public static final String MOD_ID = "HxCCore";
     public static final String MOD_NAME = "HxCKDMS Core";
-    public static final String VERSION = "1.3";
+    public static final String VERSION = "1.4";
     public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1230)";
     public static final String CHANNEL_NAME = MOD_ID;
     public static final String RESOURCE_LOCATION = MOD_ID.toLowerCase() + ":";

diff --git a/src/main/resources/assets/HxCCore/textures/gui/64Hearts.png b/src/main/resources/assets/HxCCore/textures/gui/64Hearts.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
     "modid": "HxCCore",
     "name": "HxC-Core",
     "description": "IDK",
-    "version": "1.3",
+    "version": "1.4",
     "credits": "Minor help from Opensource COFH core",
 	"logoFile": "assets/HxCCore/textures/HxC.png",
     "mcversion": "1.7.10",