diff options
Diffstat (limited to 'src/Java/miscutil/gregtech')
7 files changed, 59 insertions, 11 deletions
diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/enums/GregtechItemList.java index fb09dc36cb..9e663e05c8 100644 --- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java +++ b/src/Java/miscutil/gregtech/enums/GregtechItemList.java @@ -31,7 +31,8 @@ public enum GregtechItemList implements GregtechItemContainer { Energy_Buffer_CREATIVE, //Energy Buffes Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX, - Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX; + Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX, + Condensor_MAX; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/init/InitGregtech.java index cabb0357cb..635443e70d 100644 --- a/src/Java/miscutil/gregtech/init/InitGregtech.java +++ b/src/Java/miscutil/gregtech/init/InitGregtech.java @@ -4,6 +4,7 @@ import static miscutil.core.lib.LoadedMods.Gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.init.machines.GregtechConduits; import miscutil.gregtech.init.machines.GregtechEnergyBuffer; +import miscutil.gregtech.init.machines.GregtechSteamCondenser; public class InitGregtech { @@ -22,6 +23,7 @@ public class InitGregtech { // GregtechCobbleGenerator.run(); TODO - Weird Textures GregtechEnergyBuffer.run(); GregtechConduits.run(); + GregtechSteamCondenser.run(); } } diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java index 9f1847f9a3..c0822f5c4e 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java +++ b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java @@ -28,7 +28,7 @@ public class GregtechConduits { private static void run1(){ wireFactory("Blutonium", 8196, 30600, 1, 8, 2); - wireFactory("Cheese", 8, 30615, 3,6,9); + wireFactory("Helium", 8, 30615, 3,6,9); wireFactory("HSLA", 128, 30630, 4, 8, 1); } diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java index 4823f446fb..6142a2dc0c 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/init/machines/GregtechEnergyBuffer.java @@ -71,7 +71,7 @@ public class GregtechEnergyBuffer GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + /*GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE @@ -80,7 +80,7 @@ public class GregtechEnergyBuffer "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), - Character.valueOf('T'), ExtraOreDictNames.buffer_core }); + Character.valueOf('T'), ExtraOreDictNames.buffer_core });*/ diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java index 46add14c15..7f70b7bff6 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaEnergyBuffer.java @@ -18,14 +18,21 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import ic2.api.item.IElectricItem; + +import java.util.List; + import miscutil.core.handler.GuiHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.util.IMessage; +import miscutil.core.waila.IWailaInfoProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import crazypants.enderio.gui.TooltipAddera; +import crazypants.util.Lang; +import crazypants.util.Util; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -33,7 +40,7 @@ import net.minecraft.world.World; * This is the main construct for my Basic Machines such as the Automatic Extractor * Extend this class to make a simple Machine */ -public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { +public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity implements IWailaInfoProvider{ /* * public GregtechMetaEnergyBuffer() { super.this @@ -45,6 +52,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { public GregtechMetaEnergyBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); + //setCreativeTab(AddToCreativeTab.tabMachines); } public GregtechMetaEnergyBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) { @@ -53,7 +61,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public String[] getDescription() { - return new String[] {mDescription, mInventory.length + " Slots"}; + return new String[] {mDescription, "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus"}; } /* @@ -64,10 +72,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { ITexture[][][] rTextures = new ITexture[2][17][]; for (byte i = -1; i < 16; i++) { rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_FROST_PROOF) }; + Textures.BlockIcons.MACHINE_HEATPROOFCASING) }; rTextures[1][i + 1] = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_FROST_PROOF), + Textures.BlockIcons.MACHINE_HEATPROOFCASING), mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; } @@ -171,7 +179,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { final double c = ((double) getProgresstime() / maxProgresstime()) * 100; Utils.LOG_WARNING(""+c); final double roundOff = Math.round(c * 100.0) / 100.0; - IMessage.messageThePlayer("Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)"); + Utils.messagePlayer(playerIn, "Energy: " + getProgresstime() + " EU at "+V[mTier]+"v ("+roundOff+"%)"); Utils.LOG_WARNING("Making new instance of Guihandler"); GuiHandler block = new GuiHandler(); Utils.LOG_WARNING("Guihandler.toString(): "+block.toString()); @@ -398,4 +406,40 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { // TODO Auto-generated method stub return false; } + + @Override + public void getWailaInfo(List<String> tooltip, EntityPlayer player, World world, int x, int y, int z) { + String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + if(TooltipAddera.showAdvancedTooltips()) { + tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(this.maxEUStore()), Util.TAB + Util.ALIGNRIGHT)); + tooltip + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(this.maxEUInput()), Util.TAB + Util.ALIGNRIGHT)); + tooltip + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(this.maxEUOutput()), Util.TAB + Util.ALIGNRIGHT)); + + tooltip.add(""); + } + + long stored = this.getProgresstime(); + long max = this.maxEUStore(); + tooltip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, + fmt.format(max), + EnumChatFormatting.RESET)); + + //int change = Math.round(nw.getAverageChangePerTick()); + String color = EnumChatFormatting.WHITE.toString(); + /* if(change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if(change < 0) { + color = EnumChatFormatting.RED.toString(); + }*/ + tooltip + .add(String.format("%s%s%sRF/t ", color, fmt.format("null"), " " + EnumChatFormatting.RESET.toString())); + + } + + @Override + public int getDefaultDisplayMask(World paramWorld, int paramInt1, int paramInt2, int paramInt3) { + return IWailaInfoProvider.BIT_DETAILED; + } }
\ No newline at end of file diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java index a4ebe2e9c2..11aa483a15 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java @@ -222,7 +222,7 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem "Max Voltage: " + EnumChatFormatting.GREEN + mVoltage + " (" + VN[GT_Utility.getTier(mVoltage)] + ")" + EnumChatFormatting.GRAY, "Max Amperage: " + EnumChatFormatting.YELLOW + mAmperage + EnumChatFormatting.GRAY, "Loss/Meter/Ampere: " + EnumChatFormatting.RED + mCableLossPerMeter + EnumChatFormatting.GRAY + " EU-Volt", - "Added by: " + EnumChatFormatting.RED+" Alkalus" + "Added by:" + EnumChatFormatting.DARK_GREEN+" Alkalus" }; } diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java index c95c7ba75a..669786c423 100644 --- a/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java +++ b/src/Java/miscutil/gregtech/metatileentity/implementations/GregtechMetaTileEntity.java @@ -34,6 +34,7 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity { mTier = (byte)aTier; mDescription = aDescription; mTextures = aTextures; + } @Override |