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

Move gregified recipes from GC to coremod #89

Merged
merged 4 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 0 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
dependencies {
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.62:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'Galacticraft'
}
implementation('com.github.GTNewHorizons:TinkersConstruct:1.12.4-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import micdoodle8.mods.galacticraft.core.Constants;
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
Expand Down Expand Up @@ -68,12 +69,12 @@ public boolean isItemValid(ItemStack itemStack) {
&& itemStack.getItemDamage() == 100;
} else if (this.index >= 4 && this.index <= 7) {
return itemStack.getItem() == GCItems.partBuggy && itemStack.getItemDamage() == 0;
} else if (this.index >= 8 && this.index <= 11) {
} else if (this.index >= 8 && this.index <= 11 && Loader.isModLoaded(Constants.MOD_ID_GREGTECH)) {
return itemStack.getItem() == GameRegistry.findItem(Constants.MOD_ID_GREGTECH, "gt.metaitem.01")
&& itemStack.getItemDamage() == 23306;
} else if (this.index >= 12 && this.index <= 16) {
return itemStack.getItem() == GCItems.meteoricIronIngot && itemStack.getItemDamage() == 1;
} else if (this.index >= 17 && this.index <= 24) {
} else if (this.index >= 17 && this.index <= 24 && Loader.isModLoaded(Constants.MOD_ID_GREGTECH)) {
return itemStack.getItem() == GameRegistry.findItem(Constants.MOD_ID_GREGTECH, "gt.metaitem.01")
&& itemStack.getItemDamage() == 27306;
} else if (this.index >= 25 && this.index <= 34) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,11 @@
import codechicken.nei.PositionedStack;
import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import micdoodle8.mods.galacticraft.api.recipe.CompressorRecipes;
import micdoodle8.mods.galacticraft.core.Constants;
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
import micdoodle8.mods.galacticraft.core.blocks.GCBlocks;
import micdoodle8.mods.galacticraft.core.items.GCItems;
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
import micdoodle8.mods.galacticraft.core.util.RecipeUtil;

public class NEIGalacticraftConfig implements IConfigureNEI {

Expand Down Expand Up @@ -140,121 +134,56 @@ public void registerRecipes() {
}

private void addBuggyRecipes() {
final int x = BuggyRecipeHandler.tX - BuggyRecipeHandler.x;
final int y = BuggyRecipeHandler.tY - BuggyRecipeHandler.y;
final HashMap<Integer, PositionedStack> input = new HashMap<>();
input.put(1, new PositionedStack(new ItemStack(GCItems.basicItem, 1, 19), 62 - x, 19 - y));
input.put(2, new PositionedStack(new ItemStack(GCItems.partBuggy, 1, 1), 62 - x, 55 - y));
if (GalacticraftCore.isGalaxySpaceLoaded) {
input.put(
3,
new PositionedStack(
GT_ModHandler
.getModItem(Constants.MOD_ID_GALAXYSPACE, "item.RocketControlComputer", 1, 100),
62 - x,
73 - y));
}
input.put(4, new PositionedStack(new ItemStack(GCItems.partBuggy), 8 - x, 19 - y));
input.put(5, new PositionedStack(new ItemStack(GCItems.partBuggy), 116 - x, 19 - y));
input.put(6, new PositionedStack(new ItemStack(GCItems.partBuggy), 8 - x, 109 - y));
input.put(7, new PositionedStack(new ItemStack(GCItems.partBuggy), 116 - x, 109 - y));
input.put(
8,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
26 - x,
19 - y));
input.put(
9,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
98 - x,
19 - y));
input.put(
10,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
26 - x,
109 - y));
input.put(
11,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
98 - x,
109 - y));
input.put(12, new PositionedStack(new ItemStack(GCItems.meteoricIronIngot, 1, 1), 44 - x, 19 - y));
input.put(13, new PositionedStack(new ItemStack(GCItems.meteoricIronIngot, 1, 1), 80 - x, 19 - y));
input.put(14, new PositionedStack(new ItemStack(GCItems.meteoricIronIngot, 1, 1), 44 - x, 109 - y));
input.put(15, new PositionedStack(new ItemStack(GCItems.meteoricIronIngot, 1, 1), 62 - x, 109 - y));
input.put(16, new PositionedStack(new ItemStack(GCItems.meteoricIronIngot, 1, 1), 80 - x, 109 - y));
input.put(
17,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
8 - x,
37 - y));
input.put(
18,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
26 - x,
37 - y));
input.put(
19,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
98 - x,
37 - y));
input.put(
20,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
116 - x,
37 - y));
input.put(
21,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
8 - x,
91 - y));
input.put(
22,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
26 - x,
91 - y));
input.put(
23,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
98 - x,
91 - y));
input.put(
24,
new PositionedStack(
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
116 - x,
91 - y));
input.put(25, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 44 - x, 37 - y));
input.put(26, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 62 - x, 37 - y));
input.put(27, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 80 - x, 37 - y));
input.put(28, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 44 - x, 55 - y));
input.put(29, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 80 - x, 55 - y));
input.put(30, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 44 - x, 73 - y));
input.put(31, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 80 - x, 73 - y));
input.put(32, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 44 - x, 91 - y));
input.put(33, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 62 - x, 91 - y));
input.put(34, new PositionedStack(new ItemStack(GCItems.heavyPlatingTier1), 80 - x, 91 - y));
this.registerBuggyBenchRecipe(input, new PositionedStack(new ItemStack(GCItems.buggy), 143 - x, 64 - y));
HashMap<Integer, PositionedStack> input2 = new HashMap<>(input);
input2.put(35, new PositionedStack(RecipeUtil.getChestItemStack(1, 3), 107 - x, 64 - y));
this.registerBuggyBenchRecipe(input2, new PositionedStack(new ItemStack(GCItems.buggy, 1, 1), 143 - x, 64 - y));
input2 = new HashMap<>(input);
input2.put(35, new PositionedStack(RecipeUtil.getChestItemStack(1, 0), 107 - x, 64 - y));
this.registerBuggyBenchRecipe(input2, new PositionedStack(new ItemStack(GCItems.buggy, 1, 2), 143 - x, 64 - y));
input2 = new HashMap<>(input);
input2.put(35, new PositionedStack(RecipeUtil.getChestItemStack(1, 1), 107 - x, 64 - y));
this.registerBuggyBenchRecipe(input2, new PositionedStack(new ItemStack(GCItems.buggy, 1, 3), 143 - x, 64 - y));
/*
* final int x = BuggyRecipeHandler.tX - BuggyRecipeHandler.x; final int y = BuggyRecipeHandler.tY -
* BuggyRecipeHandler.y; final HashMap<Integer, PositionedStack> input = new HashMap<>(); input.put(1, new
* PositionedStack(new ItemStack(GCItems.basicItem, 1, 19), 62 - x, 19 - y)); input.put(2, new
* PositionedStack(new ItemStack(GCItems.partBuggy, 1, 1), 62 - x, 55 - y)); if
* (GalacticraftCore.isGalaxySpaceLoaded) { input.put( 3, new PositionedStack( GT_ModHandler
* .getModItem(Constants.MOD_ID_GALAXYSPACE, "item.RocketControlComputer", 1, 100), 62 - x, 73 - y)); }
* input.put(4, new PositionedStack(new ItemStack(GCItems.partBuggy), 8 - x, 19 - y)); input.put(5, new
* PositionedStack(new ItemStack(GCItems.partBuggy), 116 - x, 19 - y)); input.put(6, new PositionedStack(new
* ItemStack(GCItems.partBuggy), 8 - x, 109 - y)); input.put(7, new PositionedStack(new
* ItemStack(GCItems.partBuggy), 116 - x, 109 - y)); input.put( 8, new PositionedStack(
* GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1), 26 - x, 19 - y)); input.put( 9, new
* PositionedStack( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1), 98 - x, 19 - y));
* input.put( 10, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1),
* 26 - x, 109 - y)); input.put( 11, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.stick,
* Materials.StainlessSteel, 1), 98 - x, 109 - y)); input.put(12, new PositionedStack(new
* ItemStack(GCItems.meteoricIronIngot, 1, 1), 44 - x, 19 - y)); input.put(13, new PositionedStack(new
* ItemStack(GCItems.meteoricIronIngot, 1, 1), 80 - x, 19 - y)); input.put(14, new PositionedStack(new
* ItemStack(GCItems.meteoricIronIngot, 1, 1), 44 - x, 109 - y)); input.put(15, new PositionedStack(new
* ItemStack(GCItems.meteoricIronIngot, 1, 1), 62 - x, 109 - y)); input.put(16, new PositionedStack(new
* ItemStack(GCItems.meteoricIronIngot, 1, 1), 80 - x, 109 - y)); input.put( 17, new PositionedStack(
* GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), 8 - x, 37 - y)); input.put( 18, new
* PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), 26 - x, 37 - y));
* input.put( 19, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
* 98 - x, 37 - y)); input.put( 20, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw,
* Materials.StainlessSteel, 1), 116 - x, 37 - y)); input.put( 21, new PositionedStack(
* GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), 8 - x, 91 - y)); input.put( 22, new
* PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), 26 - x, 91 - y));
* input.put( 23, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1),
* 98 - x, 91 - y)); input.put( 24, new PositionedStack( GT_OreDictUnificator.get(OrePrefixes.screw,
* Materials.StainlessSteel, 1), 116 - x, 91 - y)); input.put(25, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 44 - x, 37 - y)); input.put(26, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 62 - x, 37 - y)); input.put(27, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 80 - x, 37 - y)); input.put(28, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 44 - x, 55 - y)); input.put(29, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 80 - x, 55 - y)); input.put(30, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 44 - x, 73 - y)); input.put(31, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 80 - x, 73 - y)); input.put(32, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 44 - x, 91 - y)); input.put(33, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 62 - x, 91 - y)); input.put(34, new PositionedStack(new
* ItemStack(GCItems.heavyPlatingTier1), 80 - x, 91 - y)); this.registerBuggyBenchRecipe(input, new
* PositionedStack(new ItemStack(GCItems.buggy), 143 - x, 64 - y)); HashMap<Integer, PositionedStack> input2 =
* new HashMap<>(input); input2.put(35, new PositionedStack(RecipeUtil.getChestItemStack(1, 3), 107 - x, 64 -
* y)); this.registerBuggyBenchRecipe(input2, new PositionedStack(new ItemStack(GCItems.buggy, 1, 1), 143 - x,
* 64 - y)); input2 = new HashMap<>(input); input2.put(35, new PositionedStack(RecipeUtil.getChestItemStack(1,
* 0), 107 - x, 64 - y)); this.registerBuggyBenchRecipe(input2, new PositionedStack(new ItemStack(GCItems.buggy,
* 1, 2), 143 - x, 64 - y)); input2 = new HashMap<>(input); input2.put(35, new
* PositionedStack(RecipeUtil.getChestItemStack(1, 1), 107 - x, 64 - y)); this.registerBuggyBenchRecipe(input2,
* new PositionedStack(new ItemStack(GCItems.buggy, 1, 3), 143 - x, 64 - y));
*/
}

private void addCircuitFabricatorRecipes() {
Expand Down
Loading