aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/common
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
commit5715a32d2901922503fd850f3a68503fb77467c3 (patch)
tree7e12520fbc23844e99493d55af4410a785538e35 /src/Java/gtPlusPlus/core/common
parent2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 (diff)
downloadGT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.gz
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.bz2
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.zip
- Disabled some logging.
% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java27
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java6
2 files changed, 17 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 1360932dfb..11be6f5f2d 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -4,6 +4,7 @@ import static gtPlusPlus.core.lib.CORE.DEBUG;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.entity.InternalEntityRegistry;
@@ -34,12 +35,12 @@ public class CommonProxy {
Utils.registerEvent(this);
if (LoadedMods.Gregtech){
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
- Utils.LOG_INFO("We're using Gregtech 5.09 Experimental.");
+ Logger.INFO("We're using Gregtech 5.09 Experimental.");
}
else {
- Utils.LOG_INFO("We're using Gregtech 5.08 or an earlier fork.");
+ Logger.INFO("We're using Gregtech 5.08 or an earlier fork.");
}
- Utils.LOG_INFO("Setting up our own GT_Proxy.");
+ Logger.INFO("Setting up our own GT_Proxy.");
GtProxy = new Meta_GT_Proxy();
}
else {
@@ -48,27 +49,27 @@ public class CommonProxy {
}
public void preInit(final FMLPreInitializationEvent e) {
- Utils.LOG_INFO("Doing some house cleaning.");
+ Logger.INFO("Doing some house cleaning.");
LoadedMods.checkLoaded();
- Utils.LOG_INFO("Making sure we're ready to party!");
+ Logger.INFO("Making sure we're ready to party!");
if (!DEBUG){
- Utils.LOG_WARNING("Development mode not enabled.");
+ Logger.WARNING("Development mode not enabled.");
}
else if (DEBUG){
- Utils.LOG_INFO("Development mode enabled.");
+ Logger.INFO("Development mode enabled.");
}
else {
- Utils.LOG_WARNING("Development mode not set.");
+ Logger.WARNING("Development mode not set.");
}
AddToCreativeTab.initialiseTabs();
COMPAT_IntermodStaging.preInit();
BookHandler.run();
//Registration of entities and renderers
- Utils.LOG_INFO("[Proxy] Calling Entity registrator.");
+ Logger.INFO("[Proxy] Calling Entity registrator.");
registerEntities();
- Utils.LOG_INFO("[Proxy] Calling Tile Entity registrator.");
+ Logger.INFO("[Proxy] Calling Tile Entity registrator.");
registerTileEntities();
@@ -103,7 +104,7 @@ public class CommonProxy {
* End of Subscribe Event registration.
*/
- Utils.LOG_INFO("[Proxy] Calling Render registrator.");
+ Logger.INFO("[Proxy] Calling Render registrator.");
registerRenderThings();
//Compat Handling
@@ -113,7 +114,7 @@ public class CommonProxy {
}
public void postInit(final FMLPostInitializationEvent e) {
- Utils.LOG_INFO("Cleaning up, doing postInit.");
+ Logger.INFO("Cleaning up, doing postInit.");
PlayerCache.initCache();
//Circuits
@@ -126,7 +127,7 @@ public class CommonProxy {
if (!CORE.burnables.isEmpty()){
BurnableFuelHandler fuelHandler = new BurnableFuelHandler();
GameRegistry.registerFuelHandler(fuelHandler);
- Utils.LOG_INFO("[Fuel Handler] Registering "+fuelHandler.getClass().getName());
+ Logger.INFO("[Fuel Handler] Registering "+fuelHandler.getClass().getName());
}
//Compat Handling
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index c365a19231..55a0a8ac10 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -1,9 +1,9 @@
package gtPlusPlus.core.common.compat;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.general.*;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
public class COMPAT_Baubles {
@@ -17,7 +17,7 @@ public class COMPAT_Baubles {
}
public static void baublesLoaded(){
- Utils.LOG_INFO("Baubles Found - Loading Wearables.");
+ Logger.INFO("Baubles Found - Loading Wearables.");
ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0);
//itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set;
ModItems.itemPersonalHealingDevice = new ItemHealingDevice();
@@ -27,7 +27,7 @@ public class COMPAT_Baubles {
}
public static void baublesNotLoaded(){
- Utils.LOG_INFO("Baubles Not Found - Skipping Resources.");
+ Logger.INFO("Baubles Not Found - Skipping Resources.");
}
}