Skip to content

Commit

Permalink
Remove removed stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor Colenso authored and Connor Colenso committed Dec 9, 2024
1 parent afa16c7 commit b2cd76d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 150 deletions.
1 change: 0 additions & 1 deletion src/main/java/com/dreammaster/detrav/ScannerTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
public class ScannerTools implements IOreRecipeRegistrator {

public ScannerTools() {
OrePrefixes.toolHeadPickaxe.add(this);
}

public void registerOre(OrePrefixes o, Materials material, String s, String s2, ItemStack i) {
Expand Down
14 changes: 1 addition & 13 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,11 +1053,6 @@ public void run() {
GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
new Object[] { " h ", "SSS", "SSS", 'S',
GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1) });
GTModHandler.addCraftingRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1L),
GTProxy.tBits,
new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(Materials.Steel), 'I',
OrePrefixes.ingot.get(Materials.Steel) });

GTModHandler.addShapelessCraftingRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
Expand Down Expand Up @@ -1116,14 +1111,7 @@ public void run() {
GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C',
OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W),
bits,
new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H',
OrePrefixes.toolHeadHoe.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel),
'B', GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P',
OrePrefixes.plate.get(Materials.Steel) });


if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0),
Expand Down
17 changes: 1 addition & 16 deletions src/main/java/com/dreammaster/recipes/RecipeRemover.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,7 @@ public static void run() {

GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 1L));
GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 1L));
GTModHandler
.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Sunnarium, 1L));
GTModHandler.removeFurnaceSmelting(
GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, Materials.Sunnarium, 1L));

GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.spring, Materials.Sunnarium, 1L));
GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Sunnarium, 1L));
GTModHandler.removeFurnaceSmelting(getModItem(Backpack.ID, "boundLeather", 1, wildcard, missing));
Expand Down Expand Up @@ -1240,11 +1237,6 @@ public static void run() {
removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "graviTool", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "ultimateLappack", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(GraviSuiteNEO.ID, "epicLappack", 1, wildcard, missing));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemRTGPellet", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemOreIridium", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(ThaumicBases.ID, "resource", 1, 0, missing));
Expand Down Expand Up @@ -1558,14 +1550,7 @@ public static void run() {
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockMiningPipe", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5, missing));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1, 0, missing));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemDust2", 1, 2, missing));
removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemPartCFPowder", 1, 0, missing));
Expand Down
55 changes: 0 additions & 55 deletions src/main/java/com/dreammaster/scripts/ScriptGregtech.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,61 +98,6 @@ public void loadRecipes() {
getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing),
getModItem(SGCraft.ID, "ocInterface", 1, 0, missing),
getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing));
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L),
null,
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
null,
"craftingToolFile",
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
"craftingToolHardHammer",
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
"gemDiamond",
"gemDiamond",
"craftingToolFile",
null,
"craftingToolHardHammer",
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L),
"craftingToolFile",
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
"craftingToolHardHammer",
null,
null,
null,
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
"gemDiamond",
"craftingToolHardHammer",
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
null,
null,
"craftingToolFile",
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
"gemDiamond",
"craftingToolHardHammer",
"craftingToolFile",
null,
null,
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.ring, Materials.Wood, 1L),
"craftingToolKnife",
Expand Down
66 changes: 1 addition & 65 deletions src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,33 +1018,7 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L),
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L),
"plateIridium",
"ingotIridium",
"craftingToolHardHammer",
"plateIridium",
null,
null,
"craftingToolFile",
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L),
"plateIridium",
"ingotIridium",
"craftingToolHardHammer",
"craftingToolFile",
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L),
"plateIridium",
"plateIridium",
"ingotIridium",
"craftingToolHardHammer",
"craftingToolFile",
null);

addShapedRecipe(
createItemStack(
GregTech.ID,
Expand All @@ -1062,39 +1036,6 @@ public void loadRecipes() {
"ingotIridium",
"ingotIridium",
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L),
"plateIridium",
"ingotIridium",
"ingotIridium",
"craftingToolFile",
null,
"craftingToolHardHammer",
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L),
"plateIridium",
"plateIridium",
null,
"plateIridium",
"plateIridium",
null,
"craftingToolHardHammer",
"craftingToolFile",
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L),
null,
"plateIridium",
null,
"craftingToolFile",
"plateIridium",
"craftingToolHardHammer",
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L),
"plateIridium",
Expand All @@ -1106,11 +1047,6 @@ public void loadRecipes() {
null,
null,
null);
addShapedRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L),
"craftingToolFile",
"plateIridium",
"craftingToolHardHammer");
addShapedRecipe(
getModItem(IndustrialCraft2.ID, "itemWeedingTrowel", 1, 0, missing),
"screwSteel",
Expand Down

0 comments on commit b2cd76d

Please sign in to comment.