Skip to content

Commit

Permalink
GCPlanets item and recipe cleanup for gtnh (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chochem
chochem authored Jan 12, 2025
1 parent 2cbcd2e commit 067aee0
Show file tree
Hide file tree
Showing 6 changed files with 457 additions and 431 deletions.
4 changes: 4 additions & 0 deletions src/main/java/micdoodle8/mods/galacticraft/core/nei/NEIGalacticraftConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
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.planets.asteroids.items.AsteroidsItems;
import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems;

public class NEIGalacticraftConfig implements IConfigureNEI {

Expand Down Expand Up @@ -54,6 +56,8 @@ public void loadConfig() {
API.hideItem(new ItemStack(GCItems.basicItem, 1, 4));
API.hideItem(new ItemStack(GCItems.basicItem, 1, 5));
API.hideItem(new ItemStack(GCItems.meteoricIronIngot, 1, 0));
API.hideItem(new ItemStack(MarsItems.marsItemBasic, 1, 2));
API.hideItem(new ItemStack(AsteroidsItems.basicItem, 1, 5));
}

// Handled by GalaxySpace
Expand Down
80 changes: 40 additions & 40 deletions src/main/java/micdoodle8/mods/galacticraft/core/recipe/RecipeManagerGC.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,46 +124,6 @@ private static void addUniversalRecipes() {
GCLog.exception(e);
}
}

final Object meteoricIronIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals ? GCItems.meteoricIronIngot
: "ingotMeteoricIron";
final Object meteoricIronPlate = ConfigManagerCore.recipesRequireGCAdvancedMetals
? new ItemStack(GCItems.meteoricIronIngot, 1, 1)
: "compressedMeteoricIron";
final Object deshIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals
? new ItemStack(MarsItems.marsItemBasic, 1, 2)
: "ingotDesh";

// RocketFuelRecipe.addFuel(GalacticraftCore.fluidFuel,1);
if (!Loader.isModLoaded(Constants.MOD_ID_NEW_HORIZONS_CORE_MOD)) {
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 5),
new ItemStack(GCItems.basicItem, 1, 3),
0.5F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 6),
new ItemStack(GCItems.basicItem, 1, 4),
0.5F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 7),
new ItemStack(GCItems.basicItem, 1, 5),
0.5F);
FurnaceRecipes.smelting()
.func_151396_a(GCItems.meteoricIronRaw, new ItemStack(GCItems.meteoricIronIngot), 1.0F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.blockMoon, 1, 0),
new ItemStack(GCItems.basicItem, 1, 3),
1.0F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.blockMoon, 1, 1),
new ItemStack(GCItems.basicItem, 1, 4),
1.0F);
// Recycling: smelt tin/copper canisters back into ingots
FurnaceRecipes.smelting()
.func_151394_a(new ItemStack(GCItems.canister, 1, 0), new ItemStack(GCItems.basicItem, 3, 4), 1.0F);
FurnaceRecipes.smelting()
.func_151394_a(new ItemStack(GCItems.canister, 1, 1), new ItemStack(GCItems.basicItem, 3, 3), 1.0F);
}
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCItems.meteorChunk, 1, 0),
new ItemStack(GCItems.meteorChunk, 1, 1),
Expand Down Expand Up @@ -202,6 +162,43 @@ private static void addUniversalRecipes() {
}

if (!Loader.isModLoaded(Constants.MOD_ID_NEW_HORIZONS_CORE_MOD)) {
final Object meteoricIronIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals
? GCItems.meteoricIronIngot
: "ingotMeteoricIron";
final Object meteoricIronPlate = ConfigManagerCore.recipesRequireGCAdvancedMetals
? new ItemStack(GCItems.meteoricIronIngot, 1, 1)
: "compressedMeteoricIron";
final Object deshIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals
? new ItemStack(MarsItems.marsItemBasic, 1, 2)
: "ingotDesh";
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 5),
new ItemStack(GCItems.basicItem, 1, 3),
0.5F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 6),
new ItemStack(GCItems.basicItem, 1, 4),
0.5F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.basicBlock, 1, 7),
new ItemStack(GCItems.basicItem, 1, 5),
0.5F);
FurnaceRecipes.smelting()
.func_151396_a(GCItems.meteoricIronRaw, new ItemStack(GCItems.meteoricIronIngot), 1.0F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.blockMoon, 1, 0),
new ItemStack(GCItems.basicItem, 1, 3),
1.0F);
FurnaceRecipes.smelting().func_151394_a(
new ItemStack(GCBlocks.blockMoon, 1, 1),
new ItemStack(GCItems.basicItem, 1, 4),
1.0F);
// Recycling: smelt tin/copper canisters back into ingots
FurnaceRecipes.smelting()
.func_151394_a(new ItemStack(GCItems.canister, 1, 0), new ItemStack(GCItems.basicItem, 3, 4), 1.0F);
FurnaceRecipes.smelting()
.func_151394_a(new ItemStack(GCItems.canister, 1, 1), new ItemStack(GCItems.basicItem, 3, 3), 1.0F);

RecipeUtil.addRecipe(
new ItemStack(GCBlocks.aluminumWire, 6),
new Object[] { "WWW", "CCC", "WWW", 'W', Blocks.wool, 'C', "ingotAluminum" });
Expand Down Expand Up @@ -716,6 +713,9 @@ private static void addUniversalRecipes() {
.add(new ShapelessOreRecipe(new ItemStack(GCItems.meteorChunk, 3), GCItems.meteoricIronRaw));

if (!Loader.isModLoaded(Constants.MOD_ID_NEW_HORIZONS_CORE_MOD)) {
final Object meteoricIronIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals
? GCItems.meteoricIronIngot
: "ingotMeteoricIron";
for (int i = 3; i < 6; i++) {
if (ItemBasic.names[i].contains("ingot")) {
CompressorRecipes.addShapelessRecipe(
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/micdoodle8/mods/galacticraft/planets/asteroids/items/AsteroidsItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary;

import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import micdoodle8.mods.galacticraft.core.Constants;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
Expand Down Expand Up @@ -65,7 +66,9 @@ public static void initItems() {
AsteroidsItems.registerItems();

OreDictionary.registerOre("compressedTitanium", new ItemStack(AsteroidsItems.basicItem, 1, 6));
OreDictionary.registerOre("ingotTitanium", new ItemStack(AsteroidsItems.basicItem, 1, 5));
if (!Loader.isModLoaded(Constants.MOD_ID_NEW_HORIZONS_CORE_MOD)) {
OreDictionary.registerOre("ingotTitanium", new ItemStack(AsteroidsItems.basicItem, 1, 5));
}
OreDictionary.registerOre("shardTitanium", new ItemStack(AsteroidsItems.basicItem, 1, 4));
OreDictionary.registerOre("shardIron", new ItemStack(AsteroidsItems.basicItem, 1, 3));

Expand Down
Loading

0 comments on commit 067aee0

Please sign in to comment.