diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
15 files changed, 99 insertions, 76 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index c38d2ff6bf..aaf4f9f1a6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -56,7 +56,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder"); @@ -72,7 +72,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_Vanadium_Redox_MAX.set(new ItemStack(this, 1, 8)); GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9)); GregtechItemList.Casing_AdvancedVacuum.set(new ItemStack(this, 1, 10)); - //GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11)); + GregtechItemList.Casing_Adv_BlastFurnace.set(new ItemStack(this, 1, 11)); //GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12)); //GregtechItemList.Casing_CuttingFactoryFrame.set(new ItemStack(this, 1, 13)); //GregtechItemList.Casing_TeslaTower.set(new ItemStack(this, 1, 14)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index a8d363ca0c..85654523fe 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import net.minecraft.util.IIcon; -import gregtech.api.enums.Textures; - public class CasingTextureHandler3 { public static IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57] @@ -40,9 +38,11 @@ public class CasingTextureHandler3 { //Amazon Warehouse Casing return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); case 10: + //Adv. Vac. Freezer return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); case 11: - return TexturesGtBlock._PlaceHolder.getIcon(); + //Adv. EBF + return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); case 12: return TexturesGtBlock._PlaceHolder.getIcon(); case 13: diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 4a8f3131b9..fd46c6d0eb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -209,6 +209,7 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC"); + public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS"); //Overlays //Fan Textures @@ -218,6 +219,8 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast; private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon("TileEntities/adv_machine_vent_rotating"); public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv; + private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon("TileEntities/STEAM_TURBINE_SIDE_ACTIVE"); + public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active; //Grate Texture public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A"); //Speaker Texture diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index aa3403301a..00511d4c8b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -17,6 +17,7 @@ import gregtech.common.items.behaviors.Behaviour_DataOrb; import gregtech.common.items.behaviors.Behaviour_DataStick; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -28,13 +29,22 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { - public MetaGeneratedGregtechItems INSTANCE; + + public final static MetaGeneratedGregtechItems INSTANCE; + + static { + INSTANCE = new MetaGeneratedGregtechItems(); + } public MetaGeneratedGregtechItems() { - super("MU-metaitem.01", new OrePrefixes[]{null}); - this.INSTANCE = this; - int tLastID = 0; + super("MU-metaitem.01", new OrePrefixes[]{null}); + } + public void generateMetaItems() { + int tLastID = 0; + + OldCircuitHandler.addCircuitItems(); + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ Logger.INFO("Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)"); GregtechItemList.Electric_Pump_LuV.set(this.addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); @@ -159,10 +169,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft.set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts", new Object[0])); - + //GTNH Already adds this. if (!CORE.GTNH) - GregtechItemList.Shape_Extruder_SmallGear.set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears", new Object[0])); + GregtechItemList.Shape_Extruder_SmallGear.set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears", new Object[0])); //Batteries @@ -178,7 +188,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { /** * Power Gems */ - + GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Fission Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 24L), getTcAspectStack(TC_Aspects.POTENTIA, 16L)})); this.setElectricStats(32000 + tLastID, 32000000L, GT_Values.V[5], 5L, -3L, false); GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Fusion Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 16L), getTcAspectStack(TC_Aspects.METALLUM, 32L), getTcAspectStack(TC_Aspects.POTENTIA, 32L)})); @@ -188,8 +198,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic"); //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood"); //ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced"); - - + + /*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true); @@ -248,11 +258,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //FOOOOOOOOOOOOOOD GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)})); - //Old Circuits - if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - registerOldCircuits(); - } - if (!CORE.GTNH) { GregtechItemList.Fluid_Cell_144L.set(this.addItem(tLastID = 61, "144L Invar Fluid Cell", "Holds exactly one dust worth of liquid.", new Object[]{new ItemData(Materials.Invar, (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), new MaterialStack[0]), getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); this.setFluidContainerStats(32000 + tLastID, 144L, 64L); @@ -317,7 +322,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { return true; } - private boolean registerOldCircuits(){ + public boolean registerOldCircuits(){ //Enable Old Circuits Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage."); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index c5397b83db..b92a9ce06b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -1,20 +1,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; -import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity_DieselGenerator { public GT_MetaTileEntity_ULV_CombustionGenerator(int aID, String aName, String aNameRegional, int aTier) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index fe550895a3..c53436b059 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -2,15 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Recipe; import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; + public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); @@ -33,4 +33,11 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95); } + + @Override + public ITexture[] getSidesActive(final byte aColor) { + return new ITexture[]{super.getSidesActive(aColor)[0], + new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)}; + } + }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index f4d7a33689..11bdc01823 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -3,15 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; -import net.minecraftforge.fluids.FluidStack; + +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine { public GT_MetaTileEntity_ULV_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) { @@ -36,4 +35,10 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1); } + + @Override + public ITexture[] getSidesActive(final byte aColor) { + return new ITexture[]{super.getSidesActive(aColor)[0], + new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)}; + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 86dd454545..46e6069db3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -261,7 +261,8 @@ extends GregtechMeta_MultiBlockBase { // Time to Defer to Special Handling if it's in replicator mode. if (tCircuitID == MODE_REPLICATOR) { - return checkReplicatorRecipe(aItemInputs, aFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); + return false; + // return checkReplicatorRecipe(aItemInputs, aFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); } // Reset outputs and progress stats @@ -813,7 +814,7 @@ extends GregtechMeta_MultiBlockBase { @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (mInternalMode < 1) { + if (mInternalMode < 2) { mInternalMode++; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 4bfc6681b9..a2d71c2c15 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -26,7 +26,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta public static int CASING_TEXTURE_ID; public static String mCryoFuelName = "Gelid Cryotheum"; - public static String mCasingName = "Advanced Crygenic Casing"; + public static String mCasingName = "Advanced Cryogenic Casing"; public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -134,7 +134,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta } public int getPollutionPerTick(final ItemStack aStack) { - return 400; + return 50; } public int getDamageToComponent(final ItemStack aStack) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 60c508a2b1..8fa9beac33 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -10,9 +10,13 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; + +import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -22,6 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import java.util.ArrayList; + public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase { @@ -36,16 +42,16 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); - mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + mCasingName = GregtechItemList.Casing_Adv_BlastFurnace.get(1).getDisplayName(); } public GregtechMetaTileEntity_Adv_EBF(String aName) { super(aName); - CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); + CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); mHotFuelName = FluidUtils.getFluidStack("pyrotheum", 1).getLocalizedName(); - mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName(); + mCasingName = GregtechItemList.Casing_Adv_BlastFurnace.get(1).getDisplayName(); } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { @@ -74,9 +80,9 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[11]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]}; } public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { @@ -111,7 +117,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase if (!aBaseMetaTileEntity.getAirOffset(xDir, 2, zDir)) { return false; } - if (!addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11)) { + if (!addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), CASING_TEXTURE_ID)) { return false; } byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); @@ -155,8 +161,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { return false; } - if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j), 11)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j) != GregTech_API.sBlockCasings1) { + if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 3, zDir + j), CASING_TEXTURE_ID)) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 3, zDir + j) != ModBlocks.blockCasings3Misc) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 3, zDir + j) != 11) { @@ -170,8 +176,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase for (int j = -1; j < 2; j++) { if ((xDir + i != 0) || (zDir + j != 0)) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 11)) && (!addInputToMachineList(tTileEntity, 11)) && (!addOutputToMachineList(tTileEntity, 11)) && (!addEnergyInputToMachineList(tTileEntity, 11))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings1) { + if ((!addMaintenanceToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addInputToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addOutputToMachineList(tTileEntity, CASING_TEXTURE_ID)) && (!addEnergyInputToMachineList(tTileEntity, CASING_TEXTURE_ID))) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != ModBlocks.blockCasings3Misc) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 11) { @@ -242,8 +248,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase @Override public boolean hasSlotInGUI() { - // TODO Auto-generated method stub - return false; + return true; } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index fd63e7a356..30393128dd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import java.util.ArrayList; import static gregtech.api.GregTech_API.sBlockCasings4; public class GregtechMetaTileEntity_Adv_Implosion @@ -38,7 +39,10 @@ public class GregtechMetaTileEntity_Adv_Implosion return new GregtechMetaTileEntity_Adv_Implosion(this.mName); } - public String[] getDescription() { + public String[] getDescription() { + if (mCasingName.contains("gt.blockcasings")) { + mCasingName = ItemList.Casing_RobustTungstenSteel.get(1).getDisplayName(); + } return new String[]{ "Controller Block for the Advanced Implosion Compressor", "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", @@ -97,6 +101,7 @@ public class GregtechMetaTileEntity_Adv_Implosion for (int h = -1; h < 2; h++) { if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((!addMaintenanceToMachineList(tTileEntity, 48)) && (!addMufflerToMachineList(tTileEntity, 48)) && (!addInputToMachineList(tTileEntity, 48)) && (!addOutputToMachineList(tTileEntity, 48)) && (!addEnergyInputToMachineList(tTileEntity, 48))) { Block tBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index 4c9f83b19f..2ffe6c5121 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -152,6 +152,7 @@ extends GT_MetaTileEntity_MultiBlockBase "1x Muffler Hatch", "1x Maintenance Hatch", "1x Energy Hatch", + "Rest is Autocrafter Frame", "--------------------------------------", CORE.GT_Tooltip }; @@ -366,26 +367,23 @@ extends GT_MetaTileEntity_MultiBlockBase } } } + if (this.mTier > 5) { this.mMaxProgresstime >>= this.mTier - 5; } - if (this.mMaxProgresstime <= 20) { - return false; - } - else { - inputItem.stackSize--; - if (inputItem.stackSize <= 0){ - tInputs[0] = null; - } - this.updateSlots(); - return true; + inputItem.stackSize--; + if (inputItem.stackSize <= 0){ + tInputs[0] = null; } + this.updateSlots(); + return true; + } } } return false; } - + private boolean doesCrafterHave9SlotInput(){ GT_MetaTileEntity_Hatch_InputBus craftingInput = null; if (!this.mInputBusses.isEmpty()){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index d93260733a..e64b38e382 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -51,6 +51,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase @Override public String[] getDescription() { return new String[]{ + "THIS MULTIBLOCK IS DISABLED - DO NOT BUILD", "Controller Block for the Tree Farmer", "How to get your first logs without an axe.", "Size(WxHxD): 15x2x15", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index ed37d901ad..7bee8f41d5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -75,6 +75,6 @@ public class Gregtech4Content { // Gregtech 4 Multiblock Auto-Crafter Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( - new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Asesembler v1.01").getStackForm(1L)); + new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01").getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java index dc79b3953b..5db800d82a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java @@ -17,10 +17,12 @@ public class GregtechAdvancedMixer { private static int mID = 851; public static void run(){ - generateMixerRecipeMap(); + //generateMixerRecipeMap(); run1(); } - + + private static GT_Recipe_Map map = GT_Recipe.GT_Recipe_Map.sMixerRecipes; + private static boolean generateMixerRecipeMap(){ if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){ GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes; @@ -45,7 +47,7 @@ public class GregtechAdvancedMixer { private static void run1(){ GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01", - "Basic Combiner", 1, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Basic Combiner", 1, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_LV_Mixer, Character.valueOf('E'), @@ -54,7 +56,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.02", - "Advanced Combiner I", 2, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Advanced Combiner I", 2, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_MV_Mixer, Character.valueOf('E'), @@ -63,7 +65,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.03", - "Advanced Combiner II", 3, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Advanced Combiner II", 3, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_HV_Mixer, Character.valueOf('E'), @@ -72,7 +74,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.04", - "Super Combiner I", 4, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Super Combiner I", 4, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_EV_Mixer, Character.valueOf('E'), @@ -81,7 +83,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.05", - "Super Combiner II", 5, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Super Combiner II", 5, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), ItemList.Machine_IV_Mixer, Character.valueOf('E'), @@ -93,7 +95,7 @@ public class GregtechAdvancedMixer { if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ try { GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06", - "Mega Combiner I", 6, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Mega Combiner I", 6, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_LuV_Mixer, Character.valueOf('E'), @@ -103,7 +105,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07", - "Mega Combiner II", 7, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Mega Combiner II", 7, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_ZPM_Mixer, Character.valueOf('E'), @@ -113,7 +115,7 @@ public class GregtechAdvancedMixer { GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L)); GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08", - "Ultra Combiner I", 8, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1, + "Ultra Combiner I", 8, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1, "MixerAdvanced.png", "", false, false, 0, "MIXER", new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), //ItemList.Machine_UV_Mixer, Character.valueOf('E'), |