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

NewHorizonsCoreChanges to reflect recipe checks in Ae2 #798

Merged
merged 11 commits into from
Feb 4, 2024
Merged

NewHorizonsCoreChanges to reflect recipe checks in Ae2 #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74fe40b
Removing recipe removals
Cardinalstars Jan 28, 2024
2b77a7a
Getting rid of one more
Cardinalstars Jan 28, 2024
ca1696f
A little more love
Cardinalstars Jan 28, 2024
1072e99
Fixing some silliness in a comment
Cardinalstars Jan 28, 2024
9588ae3
Merge branch 'master' into Test
Dream-Master Jan 28, 2024
feac6da
Adding in some more comments and adding sticky card because I forgot it
Cardinalstars Jan 29, 2024
d4db2e8
Merge branch 'Test' of https://github.com/Cardinalstars/NewHorizonsCo…
Cardinalstars Jan 29, 2024
be315c8
Adding comments and sticky
Cardinalstars Jan 29, 2024
d661889
Whoops
Cardinalstars Jan 29, 2024
c9381b4
Merge branch 'master' into Test
Dream-Master Jan 29, 2024
6a60466
Merge branch 'master' into Test
Dream-Master Feb 4, 2024
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
42 changes: 0 additions & 42 deletions src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static com.dreammaster.scripts.IScriptLoader.wildcard;
import static gregtech.api.enums.Mods.AdvancedSolarPanel;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.Forestry;
Expand Down Expand Up @@ -39,47 +38,6 @@ public void run() {

// Vanilla
GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.iron_bars, 1, wildcard), true, false, true);
// AE
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 2),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 3),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 36),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 536),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 556),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 56),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 76),
true,
false,
true);
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 576),
true,
false,
true);
// ASP
GT_ModHandler.removeRecipeByOutputDelayed(
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0),
Expand Down
120 changes: 0 additions & 120 deletions src/main/java/com/dreammaster/recipes/RecipeRemover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,126 +355,6 @@ public static void run() {
GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 1, missing));
GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 6, missing));
GT_ModHandler.removeFurnaceSmelting(getModItem("TwilightForest", "item.ironwoodRaw", 1, wildcard, missing));

removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockFluix", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartz", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockController", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyCell", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDenseEnergyCell", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockChest", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDrive", 1, 0, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "tile.BlockQuartzGrowthAccelerator", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 1, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockMolecularAssembler", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCharger", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInscriber", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumRing", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumLinkChamber", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialPylon", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialIOPort", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInterface", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCellWorkbench", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockIOPort", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCondenser", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyAcceptor", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockVibrationChamber", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSecurity", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 140, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 16, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 7, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 12, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 9, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 44, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 43, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 41, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyCompass", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 380, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 360, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 480, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 340, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolWirelessTerminal", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzGlass", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzLamp", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzTorch", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockLightDetector", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockTinyTNT", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 28, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 25, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 27, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 53, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 26, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 29, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 31, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 30, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 42, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 300, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 120, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 260, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 320, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 240, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 460, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolCertusQuartzWrench", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMassCannon", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMemoryCard", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolChargedStaff", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolEntropyManipulator", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolColorApplicator", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolBiometricCard", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 600, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 1200, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolNetherQuartzWrench", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 1, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 2, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 3, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 1, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockWireless", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 1, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 2, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 3, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingMonitor", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 420, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 200, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 160, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 400, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 220, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 280, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 100, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.1k", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.4k", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.16k", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.64k", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 39, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 35, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 36, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 37, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 38, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.2Cubed", 1, 0, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.16Cubed", 1, 0, missing));
removeRecipeByOutputDelayed(
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.128Cubed", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemViewCell", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 32, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 33, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 34, missing));
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolPortableCell", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Encoder", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Grower", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Inscriber", 1, 0, missing));
Expand Down
Loading
Loading