diff options
Diffstat (limited to 'main/java/gregtech')
26 files changed, 496 insertions, 135 deletions
diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java index 3f28baf670..90ece775cb 100644 --- a/main/java/gregtech/api/enums/ItemList.java +++ b/main/java/gregtech/api/enums/ItemList.java @@ -633,6 +633,10 @@ public enum ItemList implements IItemContainer { MagicEnergyConverter_LV, MagicEnergyConverter_MV, MagicEnergyConverter_HV, + MagicEnergyAbsorber_LV, + MagicEnergyAbsorber_MV, + MagicEnergyAbsorber_HV, + MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, @@ -640,7 +644,6 @@ public enum ItemList implements IItemContainer { Distillation_Tower, Energy_LapotronicOrb2, ZPM2, - NULL; public static final ItemList[] diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java index 2b2e4e20fb..3fda89be40 100644 --- a/main/java/gregtech/api/enums/Materials.java +++ b/main/java/gregtech/api/enums/Materials.java @@ -198,6 +198,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Fairy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Fairy" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Ludicrite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Ludicrite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Pokefennium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Pokefennium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), /** * Unknown Material Components. Dead End Section. diff --git a/main/java/gregtech/api/enums/TextureSet.java b/main/java/gregtech/api/enums/TextureSet.java index 3b658a8c93..bae20e91f5 100644 --- a/main/java/gregtech/api/enums/TextureSet.java +++ b/main/java/gregtech/api/enums/TextureSet.java @@ -101,7 +101,7 @@ public class TextureSet { mTextures[ 46] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadArrow"); mTextures[ 47] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadScrewdriver"); mTextures[ 48] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadBuzzSaw"); - mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); + mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadSoldering"); mTextures[ 50] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); mTextures[ 51] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/wireFine"); mTextures[ 52] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/gearGtSmall"); diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index 068ee12f66..a0bbce7049 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -41,7 +41,7 @@ public class Textures { , MACHINE_UV_TOP, MACHINE_UV_SIDE, MACHINE_UV_BOTTOM , MACHINE_MAX_TOP, MACHINE_MAX_SIDE, MACHINE_MAX_BOTTOM , MACHINE_BRONZEPLATEDBRICKS, MACHINE_HEATPROOFCASING, MACHINE_BRONZEBLASTFURNACE, MACHINE_BRONZEBLASTFURNACE_ACTIVE - , MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_DRAGONEGG + , MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_ACTIVE,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_MAGIC_FRONT_ACTIVE,MACHINE_CASING_DRAGONEGG , MACHINE_CASING_SOLID_STEEL, MACHINE_CASING_FROST_PROOF, MACHINE_CASING_PUMP, MACHINE_CASING_MOTOR, MACHINE_CASING_PIPE_BRONZE, MACHINE_CASING_PIPE_STEEL, MACHINE_CASING_PIPE_TITANIUM, MACHINE_CASING_PIPE_TUNGSTENSTEEL, MACHINE_CASING_GEARBOX_BRONZE, MACHINE_CASING_GEARBOX_STEEL, MACHINE_CASING_GEARBOX_TITANIUM, MACHINE_CASING_GEARBOX_TUNGSTENSTEEL, MACHINE_CASING_DATA_DRIVE, MACHINE_CASING_CONTAINMENT_FIELD, MACHINE_CASING_ASSEMBLER, MACHINE_CASING_PROCESSOR , MACHINE_CASING_STRIPES_A, MACHINE_CASING_STRIPES_B, MACHINE_CASING_RADIOACTIVEHAZARD, MACHINE_CASING_BIOHAZARD, MACHINE_CASING_EXPLOSIONHAZARD, MACHINE_CASING_FIREHAZARD, MACHINE_CASING_ACIDHAZARD, MACHINE_CASING_MAGICHAZARD, MACHINE_CASING_FROSTHAZARD, MACHINE_CASING_NOISEHAZARD, MACHINE_CASING_GRATE, MACHINE_CASING_VENT, MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL , BOILER_SOLAR, BOILER_FRONT, BOILER_FRONT_ACTIVE, BOILER_LAVA_FRONT, BOILER_LAVA_FRONT_ACTIVE @@ -320,7 +320,7 @@ public class Textures { , KNIFE, BUTCHERYKNIFE, SICKLE , SCOOP, GRAFTER , PLUNGER, ROLLING_PIN - , HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER + , HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING , POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV , DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8 , ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8 diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java index f2416ecc4b..181e5bddf6 100644 --- a/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java +++ b/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java @@ -58,6 +58,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { } else { GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); } + if((tPrefix==OrePrefixes.stick||tPrefix==OrePrefixes.wireFine)&&(tMaterial==Materials.Lead||tMaterial==Materials.Tin||tMaterial==Materials.SolderingAlloy)){GregTech_API.sSolderingMetalList.add(tStack);} } } } diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 058a396593..95d8cc19b2 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -1,6 +1,8 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.V; +import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; import gregtech.api.gui.GT_Container_MultiMachine; import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -25,6 +27,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0; public ItemStack[] mOutputItems = null; public FluidStack[] mOutputFluids = null; + public static boolean disableMaintenance; public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Input>(); public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Output>(); @@ -37,10 +40,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 2); + this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); } public GT_MetaTileEntity_MultiBlockBase(String aName) { super(aName, 2); + this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); } @Override @@ -145,12 +150,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (mMachine) { for (GT_MetaTileEntity_Hatch_Maintenance tHatch : mMaintenanceHatches) { if (isValidMetaTileEntity(tHatch)) { + if(!this.disableMaintenance){ if (tHatch.mWrench) mWrench = true; if (tHatch.mScrewdriver) mScrewdriver = true; if (tHatch.mSoftHammer) mSoftHammer = true; if (tHatch.mHardHammer) mHardHammer = true; if (tHatch.mSolderingTool) mSolderingTool = true; - if (tHatch.mCrowbar) mCrowbar = true; + if (tHatch.mCrowbar) mCrowbar = true;}else{ + mWrench = true; + mScrewdriver = true; + mSoftHammer = true; + mHardHammer = true; + mSolderingTool = true; + mCrowbar = true; + } tHatch.mWrench = false; tHatch.mScrewdriver = false; diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java index 94ac214a61..6f44731c62 100644 --- a/main/java/gregtech/api/util/GT_ModHandler.java +++ b/main/java/gregtech/api/util/GT_ModHandler.java @@ -37,6 +37,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.event.FMLInterModComms; @@ -1457,7 +1458,7 @@ public class GT_ModHandler { * Uses an Item. Tries to discharge in case of Electric Items */ public static boolean damageOrDechargeItem(ItemStack aStack, int aDamage, int aDecharge, EntityLivingBase aPlayer) { - if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F; + if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F; if (aPlayer != null && aPlayer instanceof EntityPlayer && ((EntityPlayer)aPlayer).capabilities.isCreativeMode) return T; if (aStack.getItem() instanceof IDamagableItem) { return ((IDamagableItem)aStack.getItem()).doDamageToItem(aStack, aDamage); @@ -1500,13 +1501,10 @@ public class GT_ModHandler { if (tPlayer.capabilities.isCreativeMode) return T; for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) { if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) { - if (damageOrDechargeItem(aStack, 1, 1000, tPlayer)) { - if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null; - if (damageOrDechargeItem(tPlayer.inventory.mainInventory[i], 1, 1000, tPlayer)) { - if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null; - if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges(); - return T; - } + tPlayer.inventory.mainInventory[i].stackSize--; + if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges(); + if (canUseElectricItem(aStack, 10000)) { + return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer)aPlayer); } } } diff --git a/main/java/gregtech/common/GT_Client.java b/main/java/gregtech/common/GT_Client.java index 354bfa7823..695c77849e 100644 --- a/main/java/gregtech/common/GT_Client.java +++ b/main/java/gregtech/common/GT_Client.java @@ -192,6 +192,16 @@ label0: e.printStackTrace(GT_Log.err); } + +// super.onPostLoad(); +// /* */ +// /* 83 */ for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { +// /* */ try { +// /* 85 */ for (; i < GregTech_API.METATILEENTITIES.length; i++) if (GregTech_API.METATILEENTITIES[i] != null) GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); +// /* */ } catch (Throwable e) { +// /* 87 */ e.printStackTrace(GT_Log.err); +// /* */ } +// /* */ } } public void run() diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java index 2a83654003..2294f243e6 100644 --- a/main/java/gregtech/common/GT_Proxy.java +++ b/main/java/gregtech/common/GT_Proxy.java @@ -2693,11 +2693,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { - return addFluid("molten." + aMaterial.name().toLowerCase(), - "molten.autogenerated", - "Molten " + aMaterial.mDefaultLocalName, aMaterial, - aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 - : aMaterial.mMeltingPoint, null, null, 0); + return addFluid("molten." + aMaterial.name().toLowerCase(),"molten.autogenerated","Molten " + aMaterial.mDefaultLocalName, aMaterial,aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000: aMaterial.mMeltingPoint, null, null, 0); + } + + public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { + return addFluid("plasma." + aMaterial.name().toLowerCase(),"plasma.autogenerated",aMaterial.mDefaultLocalName+" Plasma", aMaterial,aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, @@ -2715,9 +2715,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } public Fluid addFluid(String aName, String aTexture, String aLocalized, - Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, - ItemStack aFullContainer, ItemStack aEmptyContainer, - int aFluidAmount) { + Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,ItemStack aFullContainer, ItemStack aEmptyContainer,int aFluidAmount) { aName = aName.toLowerCase(); Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa : Dyes._NULL.getRGBA()); @@ -2748,7 +2746,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } else { rFluid = FluidRegistry.getFluid(aName); } - if (rFluid.getTemperature() == 295) { + if (rFluid.getTemperature() == new Fluid("test").getTemperature()) { rFluid.setTemperature(aTemperatureK); } if (aMaterial != null) { @@ -2769,14 +2767,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { aMaterial.mStandardMoltenFluid = rFluid; } } - if ((aFullContainer != null) - && (aEmptyContainer != null) - && (!FluidContainerRegistry.registerFluidContainer( - new FluidStack(rFluid, aFluidAmount), aFullContainer, - aEmptyContainer))) { - GT_Values.RA.addFluidCannerRecipe(aFullContainer, - GT_Utility.getContainerItem(aFullContainer, false), null, - new FluidStack(rFluid, aFluidAmount)); + if ((aFullContainer != null) && (aEmptyContainer != null) && (!FluidContainerRegistry.registerFluidContainer( new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer))) { + GT_Values.RA.addFluidCannerRecipe(aFullContainer, GT_Utility.getContainerItem(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); } return rFluid; } diff --git a/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index 6367cf67a1..40819e8eef 100644 --- a/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -12,21 +12,16 @@ /* 12: */ {
/* 13: */ public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer)
/* 14: */ {
-/* 15:13 */ if ((aTileEntity instanceof IMachineProgress))
-/* 16: */ {
-/* 17:14 */ if ((aInputRedstone > 0 ? 1 : 0) == (aCoverVariable == 0 ? 1 : 0)) {
-/* 18:14 */ if (aCoverVariable != 2)
-/* 19: */ {
-/* 20:14 */ ((IMachineProgress)aTileEntity).enableWorking();
-/* 21: */ //break label59;
-/* 22: */ }
-/* 23: */ }
-/* 24:14 */ ((IMachineProgress)aTileEntity).disableWorking();
-/* 25: */ //label59:
-/* 26:15 */ ((IMachineProgress)aTileEntity).setWorkDataValue(aInputRedstone);
-/* 27: */ }
-/* 28:17 */ return aCoverVariable;
-/* 29: */ }
+ if(aTileEntity instanceof IMachineProgress)
+ {
+ if((aInputRedstone > 0) == (aCoverVariable == 0) && aCoverVariable != 2)
+ ((IMachineProgress)aTileEntity).enableWorking();
+ else
+ ((IMachineProgress)aTileEntity).disableWorking();
+ ((IMachineProgress)aTileEntity).setWorkDataValue(aInputRedstone);
+ }
+ return aCoverVariable;
+}
/* 30: */
/* 31: */ public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
/* 32: */ {
diff --git a/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/main/java/gregtech/common/covers/GT_Cover_Shutter.java index f0cf70e5e5..1defd5b62a 100644 --- a/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.covers;
/* 2: */
/* 3: */ import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IMachineProgress;
/* 4: */ import gregtech.api.util.GT_CoverBehavior;
/* 5: */ import gregtech.api.util.GT_Utility;
/* 6: */ import net.minecraft.entity.player.EntityPlayer;
@@ -32,45 +33,45 @@ /* 32:23 */ return aCoverVariable;
/* 33: */ }
/* 34: */
-/* 35: */ public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 36: */ {
-/* 37:28 */ return aCoverVariable % 2 == 0;
-/* 38: */ }
-/* 39: */
-/* 40: */ public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 41: */ {
-/* 42:33 */ return aCoverVariable % 2 == 0;
-/* 43: */ }
-/* 44: */
-/* 45: */ public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 46: */ {
-/* 47:38 */ return aCoverVariable % 2 == 0;
-/* 48: */ }
-/* 49: */
-/* 50: */ public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 51: */ {
-/* 52:43 */ return aCoverVariable % 2 == 0;
-/* 53: */ }
-/* 54: */
-/* 55: */ public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
-/* 56: */ {
-/* 57:48 */ return aCoverVariable % 2 == 0;
-/* 58: */ }
-/* 59: */
-/* 60: */ public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
-/* 61: */ {
-/* 62:53 */ return aCoverVariable % 2 == 0;
-/* 63: */ }
-/* 64: */
-/* 65: */ public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
-/* 66: */ {
-/* 67:58 */ return aCoverVariable % 2 == 0;
-/* 68: */ }
-/* 69: */
-/* 70: */ public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
-/* 71: */ {
-/* 72:63 */ return aCoverVariable % 2 == 0;
-/* 73: */ }
+/* 35: */ public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
+{
+ return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
/* 74: */
/* 75: */ public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
/* 76: */ {
diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index 26417c1194..155625dd8b 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -41,6 +41,7 @@ import gregtech.api.enums.ConfigCategories; /* 40: */ import gregtech.common.tools.GT_Tool_Sense;
/* 41: */ import gregtech.common.tools.GT_Tool_Shovel;
/* 42: */ import gregtech.common.tools.GT_Tool_SoftHammer;
+import gregtech.common.tools.GT_Tool_Soldering_Iron;
/* 43: */ import gregtech.common.tools.GT_Tool_Sword;
/* 44: */ import gregtech.common.tools.GT_Tool_UniversalSpade;
/* 45: */ import gregtech.common.tools.GT_Tool_WireCutter;
@@ -92,6 +93,7 @@ import gregtech.api.enums.ConfigCategories; /* 91: */ public static final short JACKHAMMER = 130;
/* 92: */ public static final short BUZZSAW = 140;
/* 93: */ public static final short SCREWDRIVER_LV = 150;
+ public static final short SOLDERING_IRON_LV = 160;
/* 94: */
/* 95: */ public GT_MetaGenerated_Tool_01()
/* 96: */ {
@@ -134,7 +136,8 @@ import gregtech.api.enums.ConfigCategories; /* =3:56 */ addTool(130, "JackHammer (HV)", "Breaks Rocks into pieces", new GT_Tool_JackHammer(), new Object[] { ToolDictNames.craftingToolJackHammer, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L) });
/* =4:57 */ addTool(140, "Buzzsaw (LV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), new Object[] { ToolDictNames.craftingToolSaw, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L) });
/* =5:58 */ GregTech_API.registerTool(addTool(150, "Screwdriver (LV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), new Object[] { ToolDictNames.craftingToolScrewdriver, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sScrewdriverList);
-/* =6: */
+/* =6: */ GregTech_API.registerTool(addTool(SOLDERING_IRON_LV, "Soldering Iron (LV)", "Fixes burned out Circuits. Needs soldering materials in inventory", new GT_Tool_Soldering_Iron(), new Object[] { ToolDictNames.craftingToolSolderingIron, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sSolderingToolList);
+
/* =7:60 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Flint, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), new ItemStack(Items.flint, 1), Character.valueOf('S'), OrePrefixes.stone });
/* =8:61 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Bronze, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Bronze), Character.valueOf('S'), OrePrefixes.stone });
/* =9:62 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Iron, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Iron), Character.valueOf('S'), OrePrefixes.stone });
diff --git a/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java b/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java index 1b6b9d6d8b..12f7820797 100644 --- a/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java +++ b/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java @@ -35,14 +35,8 @@ /* 35: */
/* 36: */ public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock)
/* 37: */ {
-///* 38:28 */ if (getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0]) {
-///* 39:28 */ if (getStrongestRedstone(aRedstoneCircuitBlock) != (aCircuitData[1] == 0 ? aRedstoneCircuitBlock : aCircuitData[0]))
-///* 40: */ {
-///* 41:28 */ tmpTernaryOp = 15;
-///* 42: */ break label36;
-///* 43: */ }
-///* 44: */ }
-/* 45: */ }
+ aRedstoneCircuitBlock.setRedstone(((byte)((aCircuitData[1] != 0 ? getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0] : getStrongestRedstone(aRedstoneCircuitBlock) != aCircuitData[0]) ? 0 : 15)), aRedstoneCircuitBlock.getOutputFacing());
+}
/* 46: */
/* 47: */ public String getName()
/* 48: */ {
diff --git a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 8852a6bde0..64b452e60c 100644 --- a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -42,7 +42,8 @@ public abstract class GT_MetaTileEntity_Boiler public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - ITexture[] tmp = mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1]; + ITexture[] tmp = mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte)(aActive ? 4 : 3)) : aSide][aColorIndex + 1]; + //mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1]; if(aSide!=aFacing&&tmp.length==2){ tmp = new ITexture[]{tmp[0]}; } diff --git a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index 7105315eb6..2d298fed43 100644 --- a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -8,6 +8,7 @@ import gregtech.api.enums.Textures; /* 7: */ import gregtech.api.metatileentity.MetaTileEntity;
/* 8: */ import gregtech.api.objects.GT_RenderedTexture;
/* 9: */ import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
/* 10: */ import gregtech.common.gui.GT_Container_Boiler;
/* 11: */ import gregtech.common.gui.GT_GUIContainer_Boiler;
/* 12: */ import net.minecraft.entity.player.InventoryPlayer;
@@ -37,18 +38,18 @@ import gregtech.api.enums.Textures; /* 36: */ {ITexture[] tmp0 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
/* 37: 30 */ rTextures[0][(i + 1)] = tmp0;
/* 38: 31 */ ITexture[] tmp1 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) };
-rTextures[1][(i + 1)] = tmp1;
+ rTextures[1][(i + 1)] = tmp1;
/* 39: 32 */ ITexture[] tmp2 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
-rTextures[2][(i + 1)] = tmp2;
+ rTextures[2][(i + 1)] = tmp2;
/* 40: 33 */ ITexture[] tmp3 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
-rTextures[3][(i + 1)] = tmp3;
+ rTextures[3][(i + 1)] = tmp3;
/* 41: */ }
/* 42: 35 */ return rTextures;
/* 43: */ }
/* 44: */
/* 45: */ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
/* 46: */ {
-/* 47: 40 */ return this.mTextures[2][(aColorIndex + 1)];
+ return mTextures[aSide >= 2 ? ((byte)(aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
/* 48: */ }
/* 49: */
/* 50: */ public int maxProgresstime()
diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java index 839485d2b0..01c2912c51 100644 --- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java +++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java @@ -87,26 +87,26 @@ public void onConfigLoad() /* 73: |