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.

Sign up for GitHub

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

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Remove Bio and Breakthrough circuits from the modpack #3389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b6c4e10
first half of bio circuit removal
StaffiX Oct 8, 2024
f91dd87
spotless
StaffiX Oct 8, 2024
c09d095
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Oct 9, 2024
530cd89
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Oct 16, 2024
67bfef4
second half of bio
StaffiX Oct 16, 2024
efd1819
Merge remote-tracking branch 'origin/yeetBioandBK' into yeetBioandBK
StaffiX Oct 16, 2024
a34103f
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Oct 19, 2024
84447cf
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Oct 22, 2024
7921163
Merge branch 'master' into yeetBioandBK
StaffiX Nov 28, 2024
cc231c6
Merge branch 'master' into yeetBioandBK
Dream-Master Dec 8, 2024
f4156e9
remove breakthrough circuits
StaffiX Dec 16, 2024
4691514
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Dec 17, 2024
43b39ff
fix conflict and remove bio and breakthrough circuits
StaffiX Dec 17, 2024
843e032
Merge branch 'master' into yeetBioandBK
Dream-Master Dec 21, 2024
5ba22ba
postea attempt
StaffiX Dec 21, 2024
a56caec
remove bio recipe circuit functions
StaffiX Dec 21, 2024
7e35870
remove bio/breakthrough crafting recipes
StaffiX Dec 26, 2024
559682a
Merge branch 'master' into yeetBioandBK
StaffiX Dec 26, 2024
44b9af4
fix
StaffiX Dec 26, 2024
a27c7c4
Merge branch 'master' into yeetBioandBK
serenibyss Dec 27, 2024
ad63cec
remove some unnecessary circuits from breakthrough
StaffiX Jan 19, 2025
7fdc835
spotless
StaffiX Jan 19, 2025
5e04af4
remove some unnecessary circuits from bio
StaffiX Jan 21, 2025
ea06eb7
Revert "fix conflict and remove bio and breakthrough circuits"
StaffiX Jan 21, 2025
dc7b44d
fix conflict
StaffiX Jan 21, 2025
6393f1c
hide items from nei
StaffiX Jan 21, 2025
753ca30
spotless
StaffiX Jan 21, 2025
9b7aeee
Merge branch 'GTNewHorizons:master' into yeetBioandBK
StaffiX Jan 21, 2025
c3f9f11
fix conflict (again)
StaffiX Jan 21, 2025
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
17 changes: 17 additions & 0 deletions src/main/java/gregtech/loaders/postload/PosteaTransformers.java
View file
Open in desktop
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,20 @@ private void registerFrameboxTransformers() {
return tag;
});
}

// TODO: Remove this and bio and breakthrough circuits once 2.8 is released.
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;
});
}
Comment on lines +78 to +92
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could instead be done with the FMLMissingMappingsEvent, since metadata fully aligns

}
8 changes: 5 additions & 3 deletions src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
import static gtPlusPlus.core.recipe.common.CI.getNumberedBioCircuit;
import static gtPlusPlus.core.util.minecraft.ItemUtils.hideItemFromNEI;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -35,7 +37,6 @@
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;
Expand Down Expand Up @@ -153,6 +154,8 @@ public void items() {
mBioCircuit = new GTPPIntegratedCircuitItem("BioRecipeSelector", "bioscience/BioCircuit");
GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);

hideItemFromNEI(getNumberedBioCircuit(0));

mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
mGreenAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 1, 1);
mBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 2, 1);
Expand Down Expand Up @@ -423,7 +426,6 @@ private static void addBasicSlurryRecipes() {

// Poop Juice to Basic Slurry
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(10))
.itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1)
.outputChances(2000, 2000, 500, 500, 250, 250)
.fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
Expand Down Expand Up @@ -610,7 +612,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
8 changes: 4 additions & 4 deletions src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
View file
Open in desktop
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,7 @@ public static void recipeCreateEthylene() {

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

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