aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/miscutil/MiscUtils.java44
-rw-r--r--src/Java/miscutil/core/common/CommonProxy.java127
-rw-r--r--src/Java/miscutil/enderio/conduit/ConduitGTHandler.java70
-rw-r--r--src/Java/miscutil/gregtech/init/InitGregtech.java8
-rw-r--r--src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java4
5 files changed, 138 insertions, 115 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index cfb7944c8e..93e1800bc7 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -7,6 +7,7 @@ import miscutil.core.commands.CommandMath;
import miscutil.core.common.CommonProxy;
import miscutil.core.creativetabs.AddToCreativeTab;
import miscutil.core.handler.CraftingManager;
+import miscutil.core.lib.LoadedMods;
import miscutil.core.lib.Strings;
import miscutil.core.util.Utils;
import net.minecraftforge.common.MinecraftForge;
@@ -24,9 +25,6 @@ import cpw.mods.fml.common.event.FMLServerStoppingEvent;
public class MiscUtils
implements ActionListener
{
-
- //Vars
- //EnumBuster EB = new EnumBuster(gregtech.api.enums.Materials, null);
@Mod.Instance(Strings.MODID)
public static MiscUtils instance;
@@ -39,52 +37,21 @@ implements ActionListener
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
- /*try {
- MaterialsNew.getGregMaterials();
- } catch (IllegalAccessException | IllegalArgumentException
- | InvocationTargetException | NoSuchMethodException | SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }*/
- //java.lang.reflect.Array.get(Materials, index)
+ LoadedMods.checkLoaded();
Utils.LOG_INFO("Doing some house cleaning.");
AddToCreativeTab.initialiseTabs();
- //TMEntity.mainRegistry();
CraftingManager.mainRegistry();
- //TMWorld.mainRegistry();
- //TMHooks.mainRegistry();
proxy.registerTileEntities();
proxy.registerRenderThings();
proxy.preInit(event);
-
-
-
}
//Init
@Mod.EventHandler
public void init(FMLInitializationEvent event)
{
- /* Utils.LOG_INFO("Double checking floating point precision.");
- try {
- Thread.sleep(100);
- Benchmark GammeRayBurst = new Benchmark();
- GammeRayBurst.math();
- } catch (InterruptedException | ParseException | NumberFormatException | UnknownFormatConversionException | MissingFormatArgumentException e) {
- if (Strings.DEBUG){
- e.printStackTrace();
- Utils.LOG_INFO("Math went wrong somewhere.");
- }
- ;
- }*/
proxy.init(event);
- /*if (Strings.DEBUG){
- Benchmark GammeRayBurst = new Benchmark();
- String Insight = GammeRayBurst.superhash("This is Absolution");
- FMLLog.info(Insight);
- Utils.LOG_INFO("Math is ok.");
- }*/
-
+ proxy.registerOreDict();
MinecraftForge.EVENT_BUS.register(this);
FMLCommonHandler.instance().bus().register(this);
proxy.registerNetworkStuff();
@@ -100,12 +67,7 @@ implements ActionListener
@EventHandler
public void serverStarting(FMLServerStartingEvent event)
{
-
event.registerServerCommand(new CommandMath());
-
- //while (Strings.DEBUG){
- //Thread.setDefaultUncaughtExceptionHandler(null);
- //}
}
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
new file mode 100644
index 0000000000..18ced41ca1
--- /dev/null
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -0,0 +1,127 @@
+package miscutil.core.common;
+
+import static miscutil.core.lib.LoadedMods.Gregtech;
+import gregtech.api.util.GT_OreDictUnificator;
+import miscutil.core.block.ModBlocks;
+import miscutil.core.gui.ModGUI;
+import miscutil.core.item.ModItems;
+import miscutil.core.lib.LoadedMods;
+import miscutil.core.tileentities.ModTileEntities;
+import miscutil.core.util.Utils;
+import miscutil.gregtech.init.InitGregtech;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class CommonProxy {
+
+ public void preInit(FMLPreInitializationEvent e) {
+ ModItems.init();
+ ModBlocks.init();
+
+
+ //Register Gregtech related items
+ if (Gregtech) {
+ Utils.LOG_INFO("Gregtech Found - Loading Resources.");
+ Utils.LOG_INFO("Begining initialization of Gregtech related content.");
+ // Init Gregtech
+ InitGregtech.run();
+
+ }
+ else {
+ Utils.LOG_WARNING("Gregtech not Found - Skipping Resources.");
+ }
+
+ }
+
+ public void init(FMLInitializationEvent e) {
+
+
+
+ }
+
+ public void postInit(FMLPostInitializationEvent e) {
+
+ }
+
+ public void registerNetworkStuff(){
+ ModGUI.init();
+ //NetworkRegistry.INSTANCE.registerGuiHandler(MiscUtils.instance, new BloodSteelFurnaceGuiHandler());
+
+ }
+
+ public void registerTileEntities(){
+ ModTileEntities.init();
+ //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, "tileEntityBloodSteelChest");
+ //GameRegistry.registerTileEntity(TileEntityBloodSteelFurnace.class, "tileEntityBloodSteelFurnace");
+ //GameRegistry.registerTileEntity(TileEntityBloodSteelChest.class, Strings.MODID);
+ //GameRegistry.registerTileEntity(TileEntityArcaneInfuser.class, "TileEntityArcaneInfuser");
+ }
+
+ public void registerRenderThings() {
+
+ }
+
+ public void registerOreDict(){
+
+ Utils.LOG_INFO("Registering Ingots & Plates with OreDict.");
+ //Ingots
+ //OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
+ GT_OreDictUnificator.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
+ //OreDictionary.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy));
+ GT_OreDictUnificator.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy));
+
+ //Plates
+ //InterMod
+ if (LoadedMods.Big_Reactors){
+ OreDictionary.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
+ OreDictionary.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
+ OreDictionary.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
+ }
+ if (LoadedMods.EnderIO){
+ OreDictionary.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
+ OreDictionary.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel));
+ OreDictionary.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel));
+ OreDictionary.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy));
+ OreDictionary.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron));
+ OreDictionary.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy));
+ OreDictionary.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium));
+ OreDictionary.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy));
+ }
+ if (LoadedMods.Simply_Jetpacks){
+ OreDictionary.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
+
+ }
+ if (LoadedMods.RFTools){
+ OreDictionary.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
+
+ }
+ if (LoadedMods.Thaumcraft){
+ OreDictionary.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
+
+ }
+ if (LoadedMods.Extra_Utils){
+ OreDictionary.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
+ }
+ if (LoadedMods.PneumaticCraft){
+ OreDictionary.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));
+ }
+ //In-house
+ OreDictionary.registerOre("plateBloodSteel", new ItemStack(ModItems.itemPlateBloodSteel));
+ OreDictionary.registerOre("plateStaballoy", new ItemStack(ModItems.itemPlateStaballoy));
+
+
+ //Blocks
+ OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
+
+
+ //Misc
+ }
+
+ public int addArmor(String armor) {
+ return 0;
+ }
+
+}
diff --git a/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java b/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java
index f8786fd578..1f73134a80 100644
--- a/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java
+++ b/src/Java/miscutil/enderio/conduit/ConduitGTHandler.java
@@ -1,76 +1,10 @@
package miscutil.enderio.conduit;
import gregtech.api.interfaces.tileentity.IEnergyConnected;
-import gregtech.api.metatileentity.BaseTileEntity;
-import mekanism.api.gas.GasStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
-public class ConduitGTHandler extends BaseTileEntity implements IEnergyConnected{
+public class ConduitGTHandler extends BaseMetaTileEntity implements IEnergyConnected{
- @Override
- public byte getColorization() {
- // TODO Auto-generated method stub
- return 0;
- }
- @Override
- public byte setColorization(byte arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public long getTimer() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public boolean isInvalidTileEntity() {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void readFromNBT(NBTTagCompound arg0) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setLightValue(byte arg0) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void writeToNBT(NBTTagCompound arg0) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public long injectEnergyUnits(byte arg0, long arg1, long arg2) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public boolean inputEnergyFrom(byte arg0) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean outputsEnergyTo(byte arg0) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public int receiveGas(ForgeDirection dir, GasStack offer) {
- // TODO Auto-generated method stub
- return 0;
- }
}
diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/init/InitGregtech.java
index 46e9217f24..017a935e46 100644
--- a/src/Java/miscutil/gregtech/init/InitGregtech.java
+++ b/src/Java/miscutil/gregtech/init/InitGregtech.java
@@ -1,14 +1,14 @@
package miscutil.gregtech.init;
-import miscutil.core.lib.Strings;
+import static miscutil.core.lib.LoadedMods.Gregtech;
+import miscutil.core.util.Utils;
import miscutil.gregtech.init.machines.GregtechEnergyBuffer;
-import cpw.mods.fml.common.FMLLog;
public class InitGregtech {
public static void run() {
- if (Strings.GREGTECH) {
- FMLLog.info("MiscUtils|Gregtech5u Content: Registering MetaTileEntities.");
+ if (Gregtech) {
+ Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering MetaTileEntities.");
}
/***
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
index 5d2917da1b..bc3a3ce5c9 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
@@ -6,13 +6,13 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import miscutil.core.creativetabs.AddToCreativeTab;
import miscutil.core.lib.Strings;
+import miscutil.core.util.Utils;
import miscutil.gregtech.enums.ExtraOreDictNames;
import miscutil.gregtech.enums.GregtechItemList;
import miscutil.gregtech.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer;
import miscutil.gregtech.metatileentity.implementations.GregtechMetaEnergyBuffer;
import net.minecraft.item.Item;
import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@@ -25,7 +25,7 @@ public class GregtechEnergyBuffer
public static void run()
{
if (Strings.GREGTECH){
- FMLLog.info("MiscUtils: Registering Energy Buffer Blocks.");
+ Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Energy Buffer Blocks.");
}
run1();
}
generated by cgit (git 2.46.0) at 2025-03-11 03:45:43 +0000