From 3f4b59faaf90203aa230c6c8e036f0db26003a70 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Wed, 23 Sep 2015 17:27:41 +0100 Subject: [PATCH] Fixes #130 --- .../techreborn/compat/recipes/RecipesIC2.java | 8 ++++ src/main/java/techreborn/init/ModRecipes.java | 44 +++++++++++++++++- src/main/java/techreborn/items/ItemCells.java | 9 +++- .../java/techreborn/util/RecipeUtils.java | 19 ++++++++ .../textures/items/cells/emptyCell.png | Bin 0 -> 486 bytes 5 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 src/main/java/techreborn/util/RecipeUtils.java create mode 100644 src/main/resources/assets/techreborn/textures/items/cells/emptyCell.png diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index dc55bfd19..bc0b5dbce 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -1164,6 +1164,14 @@ public class RecipesIC2 implements ICompatModule { 40, 60 )); } + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSimple"), + "TST", "PCP", "TST", + 'T', "ingotTin", + 'S', ItemCells.getCellByName("sodium"), + 'P', ItemCells.getCellByName("potassium"), + 'C', IC2Items.getItem("reactorCoolantSimple") + ); } static void removeIc2Recipes() { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 3ef88c9a1..291cd9343 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -38,10 +38,12 @@ import techreborn.items.ItemRods; import techreborn.util.CraftingHelper; import techreborn.util.LogHelper; import techreborn.util.OreUtil; +import techreborn.util.RecipeUtils; import java.security.InvalidParameterException; -public class ModRecipes { +public class + ModRecipes { public static ConfigTechReborn config; public static void init() { @@ -192,6 +194,40 @@ public class ModRecipes { 'A', "ingotAluminum" ); + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("heliumCoolantSimple"), + " T ", "TCT", " T ", + 'T', "ingotTin", + 'C', ItemCells.getCellByName("helium", 1, false) + ); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("HeliumCoolantTriple"), + "TTT", "CCC", "TTT", + 'T', "ingotTin", + 'C', ItemParts.getPartByName("heliumCoolantSimple") + ); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("HeliumCoolantSix"), + "THT", "TCT", "THT", + 'T', "ingotTin", + 'C', "ingotCopper", + 'H', ItemParts.getPartByName("HeliumCoolantTriple") + ); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantTriple"), + "TTT", "CCC", "TTT", + 'T', "ingotTin", + 'C', ItemParts.getPartByName("NaKCoolantSimple") + ); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSix"), + "THT", "TCT", "THT", + 'T', "ingotTin", + 'C', "ingotCopper", + 'H', ItemParts.getPartByName("NaKCoolantTriple") + ); + + GameRegistry.addShapelessRecipe(ItemCells.getCellByName("heliumPlasma"), ItemCells.getCellByName("tritium"), ItemCells.getCellByName("deuterium")); + LogHelper.info("Shapped Recipes Added"); } @@ -996,6 +1032,9 @@ public class ModRecipes { RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("tetrahedrite", 8), null, ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("antimony", 1), ItemDusts.getDustByName("sulfur", 3), ItemDusts.getDustByName("iron", 1), 3640, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("lapis", 16), null, ItemDusts.getDustByName("lazurite", 12), ItemDusts.getDustByName("sodalite", 2), ItemDusts.getDustByName("pyrite", 7), ItemDusts.getDustByName("calcite", 1), 3580, 5)); + + RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16), RecipeUtils.getEmptyCell(1), ItemCells.getCellByName("helium", 1, false), ItemDusts.getDustByName("gold", 8), new ItemStack(Items.redstone), null, 25000, 20)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), RecipeUtils.getEmptyCell(2), ItemCells.getCellByName("helium3", 1, false), ItemCells.getCellByName("helium", 1, false), ItemDustsTiny.getTinyDustByName("Tungsten"), new ItemStack(Blocks.sand, 12), 4800, 5)); } static void addIndustrialGrinderRecipes() { @@ -1509,4 +1548,7 @@ public class ModRecipes { FarmTree.harvestableLogs.add(Blocks.log); FarmTree.harvestableLogs.add(Blocks.log2); } + + + } diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index 681330764..a6198b175 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -19,8 +19,13 @@ import java.util.List; public class ItemCells extends ItemTR { public static ItemStack getCellByName(String name, int count) { + return getCellByName(name, count, true); + } + + + public static ItemStack getCellByName(String name, int count, boolean lookForIC2) { Fluid fluid = FluidRegistry.getFluid("fluid" + name.toLowerCase()); - if (IC2Items.getItem("FluidCell") != null) { + if (lookForIC2 && IC2Items.getItem("FluidCell") != null) { if (fluid != null) { ItemStack stack = IC2Items.getItem("FluidCell").copy(); if (stack != null && stack.getItem() instanceof IFluidContainerItem) { @@ -54,7 +59,7 @@ public class ItemCells extends ItemTR { "mercury", "methane", "nitrocarbon", "nitroCoalfuel", "nitroDiesel", "nitrogen", "nitrogenDioxide", "oil", "potassium", "seedOil", "silicon", "sodium", "sodiumPersulfate", - "sodiumSulfide", "sulfur", "sulfuricAcid", "tritium", "wolframium",}; + "sodiumSulfide", "sulfur", "sulfuricAcid", "tritium", "wolframium", "empty"}; private IIcon[] textures; diff --git a/src/main/java/techreborn/util/RecipeUtils.java b/src/main/java/techreborn/util/RecipeUtils.java new file mode 100644 index 000000000..bc863c7d4 --- /dev/null +++ b/src/main/java/techreborn/util/RecipeUtils.java @@ -0,0 +1,19 @@ +package techreborn.util; + +import cpw.mods.fml.common.Loader; +import ic2.api.item.IC2Items; +import net.minecraft.item.ItemStack; +import techreborn.items.ItemCells; + + +public class RecipeUtils { + public static ItemStack getEmptyCell(int stackSize){ + if(Loader.isModLoaded("IC2")){ + ItemStack cell = IC2Items.getItem("cell").copy(); + cell.stackSize = stackSize; + return cell; + } else { + return ItemCells.getCellByName("empty", stackSize); + } + } +} diff --git a/src/main/resources/assets/techreborn/textures/items/cells/emptyCell.png b/src/main/resources/assets/techreborn/textures/items/cells/emptyCell.png new file mode 100644 index 0000000000000000000000000000000000000000..538b65c5194e93558a72506cf9e9e65934e5cd25 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pWm85kOx85n;42hu?CQUeBtR|yOZRx=nF#PcV`A9Vw&WlQpQ zcVYMsf(!O8p9~b?EbxddW?1=Hnx}fBfj6dt$t;02$i>6(mxukg(go-5eiZl+@T@#AoAp3-y!&UvW2cYp zp8w(A_0rhFbBq&$4$a8-<5>7@p}yua*?ZsTezwtnTh++-MW9MA)*C9V-ADTyViR>?)FK#IZ0z|dINz*yJFD8$IX z%EZLVz)ah~(8|ET;CD+0iiX_$l+3hBs0JflBeM_#ODjV&D-#QdhSo^)GN1-2kPX54 sX(i=}MX3w{iJ5sNdVa1U3T4K6rh0}3249L60#z}1y85}Sb4q9e0L3e(OaK4? literal 0 HcmV?d00001