Skip to content

Commit df085ff

Browse files
CardinalstarsDream-Master
Cardinalstars
and
Dream-Master
authored
NewHorizonsCoreChanges to reflect recipe checks in Ae2 (#798)
* Removing recipe removals * Getting rid of one more * A little more love * Fixing some silliness in a comment * Adding in some more comments and adding sticky card because I forgot it * Adding comments and sticky * Whoops --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent 877ea9f commit df085ff

File tree

3 files changed

+38
-177
lines changed

3 files changed

+38
-177
lines changed

‎src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java

-42
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static com.dreammaster.scripts.IScriptLoader.wildcard;
44
import static gregtech.api.enums.Mods.AdvancedSolarPanel;
5-
import static gregtech.api.enums.Mods.AppliedEnergistics2;
65
import static gregtech.api.enums.Mods.DraconicEvolution;
76
import static gregtech.api.enums.Mods.EnderIO;
87
import static gregtech.api.enums.Mods.Forestry;
@@ -39,47 +38,6 @@ public void run() {
3938

4039
// Vanilla
4140
GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.iron_bars, 1, wildcard), true, false, true);
42-
// AE
43-
GT_ModHandler.removeRecipeByOutputDelayed(
44-
getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 2),
45-
true,
46-
false,
47-
true);
48-
GT_ModHandler.removeRecipeByOutputDelayed(
49-
getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 3),
50-
true,
51-
false,
52-
true);
53-
GT_ModHandler.removeRecipeByOutputDelayed(
54-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 36),
55-
true,
56-
false,
57-
true);
58-
GT_ModHandler.removeRecipeByOutputDelayed(
59-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 536),
60-
true,
61-
false,
62-
true);
63-
GT_ModHandler.removeRecipeByOutputDelayed(
64-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 556),
65-
true,
66-
false,
67-
true);
68-
GT_ModHandler.removeRecipeByOutputDelayed(
69-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 56),
70-
true,
71-
false,
72-
true);
73-
GT_ModHandler.removeRecipeByOutputDelayed(
74-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 76),
75-
true,
76-
false,
77-
true);
78-
GT_ModHandler.removeRecipeByOutputDelayed(
79-
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 576),
80-
true,
81-
false,
82-
true);
8341
// ASP
8442
GT_ModHandler.removeRecipeByOutputDelayed(
8543
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0),

‎src/main/java/com/dreammaster/recipes/RecipeRemover.java

-120
Original file line numberDiff line numberDiff line change
@@ -355,126 +355,6 @@ public static void run() {
355355
GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 1, missing));
356356
GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 6, missing));
357357
GT_ModHandler.removeFurnaceSmelting(getModItem("TwilightForest", "item.ironwoodRaw", 1, wildcard, missing));
358-
359-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockFluix", 1, 0, missing));
360-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartz", 1, 0, missing));
361-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1, 0, missing));
362-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockController", 1, 0, missing));
363-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyCell", 1, 0, missing));
364-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDenseEnergyCell", 1, 0, missing));
365-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockChest", 1, 0, missing));
366-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDrive", 1, 0, missing));
367-
removeRecipeByOutputDelayed(
368-
getModItem("appliedenergistics2", "tile.BlockQuartzGrowthAccelerator", 1, 0, missing));
369-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 0, missing));
370-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 1, missing));
371-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockMolecularAssembler", 1, 0, missing));
372-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCharger", 1, 0, missing));
373-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInscriber", 1, 0, missing));
374-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumRing", 1, 0, missing));
375-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumLinkChamber", 1, 0, missing));
376-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialPylon", 1, 0, missing));
377-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialIOPort", 1, 0, missing));
378-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInterface", 1, 0, missing));
379-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCellWorkbench", 1, 0, missing));
380-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockIOPort", 1, 0, missing));
381-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCondenser", 1, 0, missing));
382-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyAcceptor", 1, 0, missing));
383-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockVibrationChamber", 1, 0, missing));
384-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSecurity", 1, 0, missing));
385-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 140, missing));
386-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 16, missing));
387-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 7, missing));
388-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 12, missing));
389-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 9, missing));
390-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 44, missing));
391-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 43, missing));
392-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 41, missing));
393-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyCompass", 1, 0, missing));
394-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing));
395-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 380, missing));
396-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 360, missing));
397-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 480, missing));
398-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 340, missing));
399-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolWirelessTerminal", 1, 0, missing));
400-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzGlass", 1, 0, missing));
401-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzLamp", 1, 0, missing));
402-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzTorch", 1, 0, missing));
403-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockLightDetector", 1, 0, missing));
404-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockTinyTNT", 1, 0, missing));
405-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 28, missing));
406-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing));
407-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 25, missing));
408-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing));
409-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 27, missing));
410-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 53, missing));
411-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 26, missing));
412-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 29, missing));
413-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 31, missing));
414-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 30, missing));
415-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 42, missing));
416-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 300, missing));
417-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 120, missing));
418-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 260, missing));
419-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 320, missing));
420-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 240, missing));
421-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 460, missing));
422-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing));
423-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing));
424-
removeRecipeByOutputDelayed(
425-
getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1, 0, missing));
426-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolCertusQuartzWrench", 1, 0, missing));
427-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMassCannon", 1, 0, missing));
428-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMemoryCard", 1, 0, missing));
429-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolChargedStaff", 1, 0, missing));
430-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolEntropyManipulator", 1, 0, missing));
431-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolColorApplicator", 1, 0, missing));
432-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolBiometricCard", 1, 0, missing));
433-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 0, missing));
434-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 600, missing));
435-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 1200, missing));
436-
removeRecipeByOutputDelayed(
437-
getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1, 0, missing));
438-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolNetherQuartzWrench", 1, 0, missing));
439-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 1, missing));
440-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 2, missing));
441-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 3, missing));
442-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 0, missing));
443-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 1, missing));
444-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockWireless", 1, 0, missing));
445-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 0, missing));
446-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 1, missing));
447-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 2, missing));
448-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 3, missing));
449-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingMonitor", 1, 0, missing));
450-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 420, missing));
451-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 200, missing));
452-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 160, missing));
453-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 400, missing));
454-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 220, missing));
455-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 280, missing));
456-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing));
457-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 100, missing));
458-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.1k", 1, 0, missing));
459-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.4k", 1, 0, missing));
460-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.16k", 1, 0, missing));
461-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.64k", 1, 0, missing));
462-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 39, missing));
463-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 35, missing));
464-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 36, missing));
465-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 37, missing));
466-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 38, missing));
467-
removeRecipeByOutputDelayed(
468-
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.2Cubed", 1, 0, missing));
469-
removeRecipeByOutputDelayed(
470-
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.16Cubed", 1, 0, missing));
471-
removeRecipeByOutputDelayed(
472-
getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.128Cubed", 1, 0, missing));
473-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemViewCell", 1, 0, missing));
474-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 32, missing));
475-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 33, missing));
476-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 34, missing));
477-
removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolPortableCell", 1, 0, missing));
478358
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Encoder", 1, 0, missing));
479359
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Grower", 1, 0, missing));
480360
removeRecipeByOutputDelayed(getModItem("ae2stuff", "Inscriber", 1, 0, missing));

0 commit comments

Comments
 (0)