diff --git a/dependencies.gradle b/dependencies.gradle index 44c4abbef..a279fafaf 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.77:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.78:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index b4ee99839..62cbddac9 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -437,6 +438,19 @@ public void loadRecipes() { .itemOutputs(AE2FC_FLUID_STORAGE_BUS).duration(15 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); + // preconfigurated priorities for storage buses + ItemStack preconfiguredStorageBus = AE2FC_FLUID_STORAGE_BUS.copy(); + for (int i = 1; i < 25; i++) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("priority", i); + preconfiguredStorageBus.setTagCompound(tag); + GTValues.RA.stdBuilder().itemInputs(AE2FC_FLUID_STORAGE_BUS, GTUtility.getIntegratedCircuit(i)) + .itemOutputs(preconfiguredStorageBus).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(circuitAssemblerRecipes); + + addShapelessRecipe(preconfiguredStorageBus, AE2FC_FLUID_STORAGE_BUS, GTUtility.getIntegratedCircuit(i)); + } + // Big Long But: Components in Circuit Assembler // 1k ME Storage Component GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index e2051752a..6ecc8b9ac 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -27,6 +27,7 @@ import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -90,7 +91,20 @@ public void loadRecipes() { ItemStack[] FluixSmartCableColor = new ItemStack[16]; ItemStack[] FluixDenseSmartCableColor = new ItemStack[16]; ItemStack[] FluixGlassCableColor = new ItemStack[16]; + final ItemStack storageBus = getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing); + // preconfigurated priorities for storage buses + ItemStack preconfiguredStorageBus = storageBus.copy(); + for (int i = 1; i < 25; i++) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("priority", i); + preconfiguredStorageBus.setTagCompound(tag); + GTValues.RA.stdBuilder().itemInputs(storageBus, GTUtility.getIntegratedCircuit(i)) + .itemOutputs(preconfiguredStorageBus).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(circuitAssemblerRecipes); + + addShapelessRecipe(preconfiguredStorageBus, storageBus, GTUtility.getIntegratedCircuit(i)); + } // Hyper-Acceleration Card addShapelessRecipe( SuperSpeedCard, @@ -1411,7 +1425,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); // ME storage bus addShapedRecipe( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing), + storageBus, "craftingToolScrewdriver", "chestWood", "craftingToolHardHammer", @@ -1911,8 +1925,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440, missing), GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 2), ItemList.Electric_Piston_LV.get(1L)) - .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + .itemOutputs(storageBus).duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1),