aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil/gregtech')
-rw-r--r--src/Java/miscutil/gregtech/enums/MaterialsNew.java44
-rw-r--r--src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java6
-rw-r--r--src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java4
3 files changed, 5 insertions, 49 deletions
diff --git a/src/Java/miscutil/gregtech/enums/MaterialsNew.java b/src/Java/miscutil/gregtech/enums/MaterialsNew.java
deleted file mode 100644
index ae3ed019cd..0000000000
--- a/src/Java/miscutil/gregtech/enums/MaterialsNew.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package miscutil.gregtech.enums;
-
-import miscutil.core.util.reflection.EnumBuster;
-
-
-public class MaterialsNew {
-
- EnumBuster EB = new EnumBuster(null, null);
-/*
- public static void getGregMaterials() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, SecurityException{
- Utils.LOG_WARNING("Stepping through the process of Greg's materials.");
-
- Constructor<?> con = Materials.class.getDeclaredConstructors()[0];
- Utils.LOG_WARNING("Logging Value for Variable "+"Constructor"+":"+con.getName());
- java.lang.reflect.Method[] methods = con.getClass().getDeclaredMethods();
- Utils.LOG_WARNING("Logging Value for Variable "+"methods"+":"+methods.toString());
- for (java.lang.reflect.Method m1 : methods) {
- Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.getName()+"| Accessible? "+m1.isAccessible());
- if (m1.getName().equals("acquireConstructorAccessor")) {
- Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.getName()+"| Accessible? "+m1.isAccessible());
- m1.setAccessible(true);
- Utils.LOG_WARNING("Logging Value for Variable "+"m1"+":"+m1.toGenericString());
- m1.invoke(con, new Object[0]);}
- }
- Field[] fields = con.getClass().getDeclaredFields();
- Utils.LOG_WARNING("Logging Value for Variable "+"fields"+":"+fields.toString()+"|"+fields.getClass());
- Object ca = null;
- for (Field f : fields) {
- Utils.LOG_WARNING("Logging Value for Variable "+"f"+":"+f.getName()+"|"+f.getModifiers()+"|"+f.isAccessible());
- if (f.getName().equals("constructorAccessor")) {
- Utils.LOG_WARNING("Logging Value for Variable "+"f"+":"+f.isAccessible());
- f.setAccessible(true);
- ca = f.get(con);
- Utils.LOG_WARNING("Logging Value for Variable "+"ca"+":"+ca.toString()+"|"+ca.getClass());
- }
- }
- Method m = ca.getClass().getMethod( "newInstance", new Class[] { Object[].class });
- Utils.LOG_WARNING("Logging Value for Variable "+"m"+":"+m.getModifiers()+"|"+m.getName()+"|"+m.toGenericString()+"|"+m.isAccessible());
- m.setAccessible(true);
- Materials v = (Materials) m.invoke(ca, new Object[] { new Object[] { "NEWMATERIAL", Integer.MAX_VALUE } });
- System.out.println(v.getClass() + ":" + v.name() + ":" + v.ordinal());
-
-}*/
-}
diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
index f758e5c693..3825acd239 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
+++ b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
@@ -2,7 +2,7 @@ package miscutil.gregtech.gui;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.Strings;
+import miscutil.core.lib.CORE;
import net.minecraft.entity.player.InventoryPlayer;
public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
@@ -11,13 +11,13 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
public GUI_SteamCondenser(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName, int aSteamCapacity)
{
- super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), Strings.MODID + ":" + "textures/gui/" + aTextureName);
+ super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), CORE.MODID + ":" + "textures/gui/" + aTextureName);
}
protected void drawGuiContainerForegroundLayer(int par1, int par2)
{
this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
- if (!Strings.DEBUG){
+ if (!CORE.DEBUG){
tickTime = ((CONTAINER_SteamCondenser)this.mContainer).mTickingTime;
this.fontRendererObj.drawString("Tick Time: "+tickTime, 8, 12, 4210752);
}
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
index 6142a2dc0c..7267c005d5 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
@@ -5,7 +5,7 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import miscutil.core.creativetabs.AddToCreativeTab;
-import miscutil.core.lib.Strings;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.gregtech.enums.ExtraOreDictNames;
import miscutil.gregtech.enums.GregtechItemList;
@@ -35,7 +35,7 @@ public class GregtechEnergyBuffer
private static void run1()
{
- itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(Strings.MODID + ":itemBufferCore");;
+ itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");;
//Registry
GameRegistry.registerItem(itemBufferCore, "itemBufferCore");