diff options
Diffstat (limited to 'src')
8 files changed, 36 insertions, 23 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java index fbbc1d24eb..80a51d80cc 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -1050,16 +1050,16 @@ public class GenericChem extends ItemPackage { private static final ItemStack getTierOneChip() { - return CI.getNumberedBioCircuit(4); + return CI.getNumberedAdvancedCircuit(4); } private static final ItemStack getTierTwoChip() { - return CI.getNumberedBioCircuit(8); + return CI.getNumberedAdvancedCircuit(8); } private static final ItemStack getTierThreeChip() { - return CI.getNumberedBioCircuit(12); + return CI.getNumberedAdvancedCircuit(12); } private static final ItemStack getTierFourChip() { - return CI.getNumberedBioCircuit(16); + return CI.getNumberedAdvancedCircuit(16); } private static void recipeAdvancedChip() { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index c61ee0c665..71bf2f3e6f 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -609,7 +609,7 @@ public class MilledOreProcessing extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(16), + CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64) }, new FluidStack[] { @@ -633,7 +633,7 @@ public class MilledOreProcessing extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(18), + CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64) }, new FluidStack[] { @@ -670,7 +670,7 @@ public class MilledOreProcessing extends ItemPackage { return CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(14), + CI.getNumberedAdvancedCircuit(14), aInput }, new FluidStack[] { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 459acb31b9..7745f50010 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -185,7 +185,7 @@ public class RocketFuels extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(21), + CI.getNumberedAdvancedCircuit(21), }, new FluidStack[] { FluidUtils.getFluidStack("ammonia", 4000), @@ -220,7 +220,7 @@ public class RocketFuels extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(21), + CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0), }, new FluidStack[] { @@ -258,7 +258,7 @@ public class RocketFuels extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(21), + CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0), }, new FluidStack[] { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 1561f4b475..ea1bcdb9de 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -120,7 +120,7 @@ public class RECIPES_GREGTECH { // Advanced method for Nitric Acid Production CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(17), + CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0), }, new FluidStack[] { @@ -140,7 +140,7 @@ public class RECIPES_GREGTECH { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(16), + CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0), }, new FluidStack[] { @@ -161,7 +161,7 @@ public class RECIPES_GREGTECH { // Produce Boric Acid CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(21), + CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 4), }, new FluidStack[] { @@ -182,7 +182,7 @@ public class RECIPES_GREGTECH { // Produce Th232 CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedCircuit(22), + CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16) }, new FluidStack[] { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index a0c4eaa7a3..387f7bef65 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -316,7 +316,7 @@ public class RECIPES_Machines { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(19), + CI.getNumberedAdvancedCircuit(19), ItemList.Distillation_Tower.get(2), GregtechItemList.GTPP_Casing_IV.get(16), CI.getTieredComponent(OrePrefixes.circuit, 6, 8) @@ -355,7 +355,7 @@ public class RECIPES_Machines { } CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - CI.getNumberedBioCircuit(21), + CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10), CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), @@ -932,7 +932,7 @@ public class RECIPES_Machines { CI.getGear(1, GTNH ? 4 : 2) }; aSemiFluidInputs[1] = new ItemStack[]{ - CI.getNumberedBioCircuit(14), + CI.getNumberedCircuit(14), CI.getTieredMachineHull(2, 1), CI.getElectricPiston(2, GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2), @@ -940,7 +940,7 @@ public class RECIPES_Machines { CI.getGear(2, GTNH ? 4 : 2) }; aSemiFluidInputs[2] = new ItemStack[]{ - CI.getNumberedBioCircuit(14), + CI.getNumberedAdvancedCircuit(14), CI.getTieredMachineHull(3, 1), CI.getElectricPiston(3, GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 4 : 2), diff --git a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java index 48b050d678..19795a41e4 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java +++ b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java @@ -11,6 +11,7 @@ public class SlotIntegratedCircuit extends Slot { public static Item mCircuitItem; public static Item mCircuitItem2; + public static Item mCircuitItem3; private final short mCircuitLock; public SlotIntegratedCircuit(final IInventory inventory, final int slot, final int x, final int y) { @@ -44,9 +45,12 @@ public class SlotIntegratedCircuit extends Slot { if (mCircuitItem2 == null) { mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem(); } - if (mCircuitItem != null && mCircuitItem2 != null) { + if (mCircuitItem3 == null) { + mCircuitItem3 = CI.getNumberedAdvancedCircuit(0).getItem(); + } + if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { - if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) { + if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2 || itemstack.getItem() == mCircuitItem3) { if (aLockedCircuitNumber == -1) { isValid = true; } @@ -73,7 +77,10 @@ public class SlotIntegratedCircuit extends Slot { if (mCircuitItem2 == null) { mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem(); } - if (mCircuitItem != null && mCircuitItem2 != null) { + if (mCircuitItem3 == null) { + mCircuitItem3 = CI.getNumberedAdvancedCircuit(0).getItem(); + } + if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) { if (itemstack.getItem() == mCircuitItem) { @@ -81,7 +88,10 @@ public class SlotIntegratedCircuit extends Slot { } else if (itemstack.getItem() == mCircuitItem2) { return 1; - } + } + else if (itemstack.getItem() == mCircuitItem3) { + return 2; + } } } } diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java index 23ad2a3233..835d9da2cd 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java @@ -110,6 +110,9 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv else if (aTypeInSlot == 1) { aOutput = CI.getNumberedBioCircuit(e); } + else if (aTypeInSlot == 2) { + aOutput = CI.getNumberedAdvancedCircuit(e); + } else { aOutput = null; } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 19a40fd9e6..70b635583d 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1266,7 +1266,7 @@ public class ItemUtils { public static boolean isControlCircuit(ItemStack aStack) { if (aStack != null) { Item aItem = aStack.getItem(); - if (aItem == CI.getNumberedBioCircuit(0).getItem() || aItem == CI.getNumberedCircuit(0).getItem()) { + if (aItem == CI.getNumberedBioCircuit(0).getItem() || aItem == CI.getNumberedCircuit(0).getItem() || aItem == CI.getNumberedAdvancedCircuit(0).getItem()) { return true; } } |