diff options
Diffstat (limited to 'src')
5 files changed, 33 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index f1676689e7..69bd414d9c 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -701,6 +701,7 @@ public class RECIPES_GREGTECH { //NITINOL_60 CORE.RA.addBlastSmelterRecipe( new ItemStack[] { + ItemUtils.getGregtechCircuit(2), ELEMENT.getInstance().TITANIUM.getDust(3), ELEMENT.getInstance().NICKEL.getDust(2) }, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java index 74e269e932..2891741b2c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java @@ -258,31 +258,31 @@ public class StaticFields59 { public static int getHeatingCapacityForCoilTier(int aCoilTier) { int mHeatingCapacity = 0; switch (aCoilTier) { - case 1: + case 0: mHeatingCapacity = 1800; break; - case 2: + case 1: mHeatingCapacity = 2700; break; - case 3: + case 2: mHeatingCapacity = 3600; break; - case 4: + case 3: mHeatingCapacity = 4500; break; - case 5: + case 4: mHeatingCapacity = 5400; break; - case 6: + case 5: mHeatingCapacity = 7200; break; - case 7: + case 6: mHeatingCapacity = 9000; break; - case 8: + case 7: mHeatingCapacity = 9900; break; - case 9: + case 8: mHeatingCapacity = 10800; break; default: diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index 0c7067b3c0..358a8eec66 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -121,15 +121,16 @@ extends GregtechMeta_MultiBlockBase { if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null) tBusItems.add(tBus.getBaseMetaTileEntity().getStackInSlot(i)); } - } + } ItemStack[] inputs = new ItemStack[tBusItems.size()]; int slot = 0; for (ItemStack g : tBusItems) { inputs[slot++] = g; } if (inputs.length > 0) { - log("Recipe. ["+inputs.length+"]["+getMaxParallelRecipes()+"]"); - if (checkRecipeGeneric(inputs, (FluidStack[]) ArrayUtils.getArrayFromArrayList(this.getStoredFluids()), getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000)) { + log("Recipe. ["+inputs.length+"]["+getMaxParallelRecipes()+"]"); + FluidStack[] fluid = this.getStoredFluids().toArray(new FluidStack[] {}); + if (checkRecipeGeneric(inputs,fluid , getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000)) { log("Recipe 2."); return true; } 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 05aec14500..caf694669c 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 @@ -330,9 +330,10 @@ extends GregtechMeta_MultiBlockBase { long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - - - GT_Recipe tRecipe = this.getRecipeMap(tCircuit).findRecipe( + GT_Recipe.GT_Recipe_Map tRecipeMap = this.getRecipeMap(tCircuit); + if (tRecipeMap == null) + return false; + GT_Recipe tRecipe = tRecipeMap.findRecipe( getBaseMetaTileEntity(), this.mLastRecipeExtended[tCircuitID], false, gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs); 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 9754eebbb8..b8e6d0c252 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 @@ -197,6 +197,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { return false; } // mInventoryCrafter = new CraftingHelper(this); + setTier(); return tAmount >= 10; } @@ -225,7 +226,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { } catch (IllegalArgumentException | IllegalAccessException e) { } } - else if (this.mMachineMode == MODE.DISASSEMBLY) { + else if (this.mMachineMode == MODE.DISASSEMBLY || this.mMachineMode == MODE.CRAFTING) { return null; } return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; @@ -285,6 +286,11 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { // } // } + private void setTier() { + long tVoltage = getMaxInputVoltage(); + this.mTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + } + @Override public boolean checkRecipe(final ItemStack aStack) { if (mMachineMode == MODE.DISASSEMBLY) { @@ -296,7 +302,6 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { //Logger.MACHINE_INFO("1"); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { ArrayList<ItemStack> tBusItems = new ArrayList<ItemStack>(); - tBus.mRecipeMap = getRecipeMap(); //Logger.MACHINE_INFO("2"); if (isValidMetaTileEntity(tBus)) { //Logger.MACHINE_INFO("3"); @@ -380,6 +385,10 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { if (this.mTier > 5) { this.mMaxProgresstime >>= this.mTier - 5; } + if (this.mEUt > 0) + this.mEUt = (-this.mEUt); + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; inputItem.stackSize--; if (inputItem.stackSize <= 0) { tInputs[0] = null; @@ -508,6 +517,10 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { if (this.mTier > 5) { this.mMaxProgresstime >>= this.mTier - 5; } + if (this.mEUt > 0) + this.mEUt = (-this.mEUt); + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; if (mCorrectInputs == 9) { ItemStack mOutputItem = storedData_Output[0]; |