aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/gregtech
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-04-03 18:14:21 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-04-03 18:14:21 +1000
commit915139115434ff5797df6f82a63578e938864016 (patch)
tree5e8f655e8e9cc8b1af2db2ae3fdbbedfb942ec39 /src/Java/miscutil/gregtech
parent6e2d7b787d2338fd6e35532f91e6ff6a48eed682 (diff)
downloadGT5-Unofficial-915139115434ff5797df6f82a63578e938864016.tar.gz
GT5-Unofficial-915139115434ff5797df6f82a63578e938864016.tar.bz2
GT5-Unofficial-915139115434ff5797df6f82a63578e938864016.zip
Finally, Got everything working how I want. Only thing left to do is the anti-grief block.
Fixed Buffer Cores, now there is 10 tiers, all with a unique colour and recipe. Energy Buffers have had their recipes revised, due to new recipes for the cores. Steam condenser may need tweaking, but for now, I'll let it slide and players test it. Updated a few graphics too, the Staballoy Axe and Pickaxe, the Buffer Core and the New Hammer Tool all received visual updates. Compiled build and Dev. build will be up shortly.
Diffstat (limited to 'src/Java/miscutil/gregtech')
-rw-r--r--src/Java/miscutil/gregtech/enums/AddExtraOreDict.java5
-rw-r--r--src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java16
-rw-r--r--src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java4
3 files changed, 8 insertions, 17 deletions
diff --git a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java
index 4b3e352292..171bdda533 100644
--- a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java
+++ b/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java
@@ -1,16 +1,13 @@
package miscutil.gregtech.enums;
-import gregtech.api.util.GT_OreDictUnificator;
import gregtech.loaders.preload.GT_Loader_OreDictionary;
-import miscutil.gregtech.init.machines.GregtechEnergyBuffer;
-import net.minecraft.item.ItemStack;
public class AddExtraOreDict extends GT_Loader_OreDictionary {
@Override
public void run()
{
- GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore));
+ //GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore));
}
}
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
index 7267c005d5..ab96340365 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java
@@ -4,23 +4,17 @@ import gregtech.api.enums.ItemList;
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.CORE;
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.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
public class GregtechEnergyBuffer
{
//Misc Items
- public static Item itemBufferCore;
+ //public static Item itemBufferCore;
public static void run()
{
@@ -35,12 +29,12 @@ public class GregtechEnergyBuffer
private static void run1()
{
- itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");;
+ //itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");
//Registry
- GameRegistry.registerItem(itemBufferCore, "itemBufferCore");
- LanguageRegistry.addName(itemBufferCore, "Buffer Core");
- OreDictionary.registerOre("itemBufferCore", itemBufferCore);
+ //GameRegistry.registerItem(itemBufferCore, "itemBufferCore");
+ //LanguageRegistry.addName(itemBufferCore, "Buffer Core");
+ //OreDictionary.registerOre("itemBufferCore", itemBufferCore);
//Energy Buffers
diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java
index 82f1ad98be..95e12a5ed9 100644
--- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java
+++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaCondensor.java
@@ -41,8 +41,8 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{
rTextures[0][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))};
rTextures[1][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
rTextures[2][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
- rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER) };
- rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE) };
+ rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) };
+ rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) };
}
return rTextures;
}