Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Bio and Breakthrough circuits from the modpack #3389

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/main/java/gregtech/loaders/postload/PosteaTransformers.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class PosteaTransformers implements Runnable {
@Override
public void run() {
registerFrameboxTransformers();
registerProgrammedCircuitTransformers();
}

private static NBTTagCompound passthrough(NBTTagCompound tag) {
Expand Down Expand Up @@ -73,4 +74,19 @@ private void registerFrameboxTransformers() {
return tag;
});
}

private void registerProgrammedCircuitTransformers() {
ItemStackReplacementManager.addItemReplacement("miscutils:item.BioRecipeSelector", (tag) -> {
Item circuitItem = GameRegistry.findItem(Mods.GregTech, "gt.integrated_circuit");
int itemId = Item.getIdFromItem(circuitItem);
tag.setInteger("id", itemId);
return tag;
});
ItemStackReplacementManager.addItemReplacement("miscutils:item.T3RecipeSelector", (tag) -> {
Item circuitItem = GameRegistry.findItem(Mods.GregTech, "gt.integrated_circuit");
int itemId = Item.getIdFromItem(circuitItem);
tag.setInteger("id", itemId);
return tag;
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,12 @@
import gregtech.api.util.GTUtility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.plugin.agrichem.BioRecipes;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;

public class AgriculturalChem extends ItemPackage {

Expand Down Expand Up @@ -91,7 +88,6 @@ public class AgriculturalChem extends ItemPackage {
// Fertilizer

public static Item mAlgae;
public static Item mBioCircuit;
public static Item mAgrichemItem1;

/*
Expand Down Expand Up @@ -150,8 +146,6 @@ public void items() {

mAlgae = new ItemAlgaeBase();
mAgrichemItem1 = new ItemAgrichemBase();
mBioCircuit = new GTPPIntegratedCircuitItem("BioRecipeSelector", "bioscience/BioCircuit");
GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);

mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
mGreenAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 1, 1);
Expand Down Expand Up @@ -610,7 +604,7 @@ private static void addMiscRecipes() {

// Red Slurry / Tailings Processing
GTValues.RA.stdBuilder()
.itemInputs(CI.getNumberedBioCircuit(10))
.itemInputs(GTUtility.getIntegratedCircuit(10))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L),
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.GTUtility;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
Expand All @@ -50,7 +49,9 @@ public static void recipeCreateEthylene() {
// C2H6O = C2H4 + H2O
if (bioEth1 != null) {
GTValues.RA.stdBuilder()
.itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
.itemInputs(
GTUtility.getIntegratedCircuit(17),
ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
.fluidInputs(bioEth1)
.fluidOutputs(FluidUtils.getWater(1000))
Expand All @@ -61,7 +62,9 @@ public static void recipeCreateEthylene() {

if (bioEth2 != null) {
GTValues.RA.stdBuilder()
.itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
.itemInputs(
GTUtility.getIntegratedCircuit(18),
ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
.fluidInputs(bioEth2)
.fluidOutputs(FluidUtils.getWater(1000))
Expand Down Expand Up @@ -207,7 +210,7 @@ private static void recipeNaphthaleneToPhthalicAcid() {

private static void recipePhthalicAcidToPhthalicAnhydride() {
GTValues.RA.stdBuilder()
.itemInputs(CI.getNumberedBioCircuit(15))
.itemInputs(GTUtility.getIntegratedCircuit(15))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15))
.fluidInputs(Materials.PhthalicAcid.getFluid(1000))
.eut(TierEU.RECIPE_MV)
Expand Down
Loading
Loading