mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Recipe tweeks.
This commit is contained in:
1 parent
b06966ee4a
commit
ed8f961973
3 files changed
+6
-33
No files matched your search
@@ -254,10 +254,8 @@ public class EnderIO {
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
|
||||
packetPipeline.postInitialise();
|
||||
MaterialRecipes.registerExternalOresInDictionary();
|
||||
MaterialRecipes.addOreDictionaryRecipes();
|
||||
MachineRecipes.addOreDictionaryRecipes();
|
||||
// ConduitRecipes.addOreDictionaryRecipes();
|
||||
|
||||
CrusherRecipeManager.getInstance().loadRecipesFromConfig();
|
||||
AlloyRecipeManager.getInstance().loadRecipesFromConfig();
|
||||
|
||||
@@ -34,12 +34,13 @@ public class MachineRecipes {
|
||||
|
||||
//reservoir
|
||||
ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0);
|
||||
ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, 1);
|
||||
ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0);
|
||||
ItemStack glassSides;
|
||||
Object glassSides;
|
||||
if(Config.useHardRecipes) {
|
||||
glassSides = fusedQuartz;
|
||||
} else {
|
||||
glassSides = new ItemStack(Blocks.glass_pane, 1, 0);
|
||||
glassSides = "glass";
|
||||
}
|
||||
GameRegistry.addShapedRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz);
|
||||
|
||||
@@ -136,18 +137,11 @@ public class MachineRecipes {
|
||||
//light
|
||||
ItemStack poweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 0);
|
||||
ItemStack glowstone = new ItemStack(Items.glowstone_dust);
|
||||
ArrayList<ItemStack> siliconEntries = OreDictionary.getOres("itemSilicon");
|
||||
Object silicon;
|
||||
if(siliconEntries == null || siliconEntries.isEmpty()) {
|
||||
silicon = new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal());
|
||||
} else {
|
||||
silicon = "itemSilicon";
|
||||
}
|
||||
if(Config.useHardRecipes) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', fusedQuartz, 'd', glowstone, 's', silicon, 'c', capacitor));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', fusedQuartz, 'd', glowstone, 's', "itemSilicon", 'c', capacitor));
|
||||
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', Blocks.glass, 'd', glowstone, 's', silicon, 'c', capacitor));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', "glass", 'd', glowstone, 's', "itemSilicon", 'c', capacitor));
|
||||
|
||||
}
|
||||
|
||||
@@ -158,7 +152,7 @@ public class MachineRecipes {
|
||||
ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2);
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Items.comparator, 'g',
|
||||
Blocks.glass_pane, 's', silicon, 'e',
|
||||
Blocks.glass_pane, 's', "itemSilicon", 'e',
|
||||
electricalSteel));
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
@@ -45,24 +44,6 @@ public class MaterialRecipes {
|
||||
|
||||
}
|
||||
|
||||
public static void registerExternalOresInDictionary() {
|
||||
/**
|
||||
* Register AE1's Silicon, remove after AE2 is out.
|
||||
*/
|
||||
if(Loader.isModLoaded("AppliedEnergistics")) {
|
||||
try {
|
||||
Class materialsAE = Class.forName("appeng.api.Materials");
|
||||
GameRegistry.findItem("AppliedEnergistics", "matSilicon");
|
||||
Object matSilicon = materialsAE.getField("matSilicon").get(materialsAE);
|
||||
if(matSilicon instanceof ItemStack) {
|
||||
OreDictionary.registerOre("itemSilicon", ((ItemStack) matSilicon).copy());
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
/** just ignore any issues. **/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void addRecipes() {
|
||||
|
||||
//Common Ingredients
|
||||
|
||||
Reference in new issue
Block a user