diff options
author | Dream-Master <dream-master@gmx.net> | 2016-07-02 11:31:02 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2016-07-02 11:31:02 +0200 |
commit | df720f7ace3ac6d8b90baf82bef5ff8f6efbe9b6 (patch) | |
tree | 1b6049964aeb1d7fc126eecbf7688dad9d9c6c80 /src/main/java/gregtech/api/metatileentity | |
parent | e10a473d312ced16825807ccd352f0af9e9751be (diff) | |
download | GT5-Unofficial-df720f7ace3ac6d8b90baf82bef5ff8f6efbe9b6.tar.gz GT5-Unofficial-df720f7ace3ac6d8b90baf82bef5ff8f6efbe9b6.tar.bz2 GT5-Unofficial-df720f7ace3ac6d8b90baf82bef5ff8f6efbe9b6.zip |
Adding Blood Infused Iron to GT
More recipe changes (Blood Asp)
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 104 |
1 files changed, 87 insertions, 17 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index edab9b77c5..8398e25139 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -69,6 +69,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ if (aRecipe[i] == X.GLASS) { switch (mTier) { + case 6: + case 7: + case 8: + aRecipe[i] = GT_ModHandler.getIC2Item("blockAlloyGlass", 1); + break; default: aRecipe[i] = new ItemStack(Blocks.glass, 1, W); break; @@ -91,6 +96,18 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 4: aRecipe[i] = OrePrefixes.plate.get(Materials.Titanium); break; + case 5: + aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel); + break; + case 6: + aRecipe[i] = OrePrefixes.plate.get(Materials.HSSE); + break; + case 7: + aRecipe[i] = OrePrefixes.plate.get(Materials.HSSG); + break; + case 8: + aRecipe[i] = OrePrefixes.plate.get(Materials.Neutronium); + break; default: aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel); break; @@ -113,6 +130,18 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 4: aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Titanium); break; + case 5: + aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.TungstenSteel); + break; + case 6: + aRecipe[i] = OrePrefixes.pipeSmall.get(Materials.Ultimate); + break; + case 7: + aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Ultimate); + break; + case 8: + aRecipe[i] = OrePrefixes.pipeLarge.get(Materials.Ultimate); + break; default: aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.TungstenSteel); break; @@ -135,6 +164,18 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 4: aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Nichrome); break; + case 5: + aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Nichrome); + break; + case 6: + aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NiobiumTitanium); + break; + case 7: + aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Superconductor); + break; + case 8: + aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Superconductor); + break; default: aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Nichrome); break; @@ -157,6 +198,18 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 4: aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Nichrome); break; + case 5: + aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Nichrome); + break; + case 6: + aRecipe[i] = OrePrefixes.wireGt16.get(Materials.NiobiumTitanium); + break; + case 7: + aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Superconductor); + break; + case 8: + aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Superconductor); + break; default: aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Nichrome); break; @@ -183,9 +236,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 3: aRecipe[i] = OrePrefixes.stick.get(Materials.SteelMagnetic); break; - default: + case 4: + case 5: aRecipe[i] = OrePrefixes.stick.get(Materials.NeodymiumMagnetic); break; + case 6: + case 7: + aRecipe[i] = OrePrefixes.stickLong.get(Materials.NeodymiumMagnetic); + break; + default: + aRecipe[i] = OrePrefixes.block.get(Materials.NeodymiumMagnetic); + break; } continue; } @@ -227,8 +288,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 4: aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper); break; + case 5: + aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper); + break; + case 6: + aRecipe[i] = OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate); + break; + case 7: + aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Superconductor); + break; default: - aRecipe[i] = OrePrefixes.wireGt16.get(Materials.AnnealedCopper); + aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Superconductor); break; } continue; @@ -315,13 +385,13 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); break; case 6: - aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); + aRecipe[i] = OrePrefixes.rotor.get(Materials.Chrome); break; case 7: - aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); + aRecipe[i] = OrePrefixes.rotor.get(Materials.Iridium); break; default: - aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); + aRecipe[i] = OrePrefixes.rotor.get(Materials.Osmium); break; } continue; @@ -550,17 +620,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), mGUIName, GT_Utility.isStringValid(mNEIName) ? mNEIName : getRecipeList() != null ? getRecipeList().mUnlocalizedName : "", mGUIParameterA, mGUIParameterB); } - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) return false; - if (mInventory[aIndex] != null) return true; - switch (mInputSlotCount) { - case 0: return false; - case 1: return getFillableStack() == null ? !mRequiresFluidForFiltering && getRecipeList().containsInput(aStack) : null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), new ItemStack[] {aStack}); - case 2: return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0)!=null&&getInputAt(1)!=null) || (getInputAt(0)==null&&getInputAt(1)==null?getRecipeList().containsInput(aStack):(getRecipeList().containsInput(aStack)&&null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[] {aStack, getInputAt(1)} : new ItemStack[] {getInputAt(0), aStack}))))); - default: return getRecipeList().containsInput(aStack); - } - } + @Override + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) return false; + if (mInventory[aIndex] != null) return true; + switch (mInputSlotCount) { + case 0: return false; + case 1: return getFillableStack() == null ? !mRequiresFluidForFiltering && getRecipeList().containsInput(aStack) : null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), new ItemStack[] {aStack}); + case 2: return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0)!=null&&getInputAt(1)!=null) || (getInputAt(0)==null&&getInputAt(1)==null?getRecipeList().containsInput(aStack):(getRecipeList().containsInput(aStack)&&null!=getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[] {getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[] {aStack, getInputAt(1)} : new ItemStack[] {getInputAt(0), aStack}))))); + default: return getRecipeList().containsInput(aStack); + } + } @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { @@ -616,4 +686,4 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ } public static enum X {PUMP, WIRE, WIRE4, HULL, PIPE, GLASS, PLATE, MOTOR, ROTOR, SENSOR, PISTON, CIRCUIT, EMITTER, CONVEYOR, ROBOT_ARM, COIL_HEATING, COIL_ELECTRIC, STICK_MAGNETIC, STICK_DISTILLATION, BETTER_CIRCUIT, FIELD_GENERATOR, COIL_HEATING_DOUBLE, STICK_ELECTROMAGNETIC;} -}
\ No newline at end of file +} |