Skip to content

Commit

Permalink
모드 호환성 패치, 버전 1.03a
Browse files Browse the repository at this point in the history
  • Loading branch information
@LoveHoly
LoveHoly committed Sep 9, 2014
1 parent 7f9ac18 commit 69ad7b7
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 80 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.03"
version = "1.03a"
group= "exastris"
archivesBaseName = "Ex-Astris"

Expand All @@ -42,7 +42,7 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/dependency_management.html

compile files("libs/Ex-Nihilo-1.36.jar")
compile files("libs/MineFactoryReloaded-[1.7.10]2.8.0RC3-591.jar")
//compile files("libs/MineFactoryReloaded-[1.7.10]2.8.0RC3-591.jar")
compile files("libs/TConstruct_mc1.7.10_1.6.0d40.1.jar")
compile files("libs/Thaumcraft-1.7.10-4.2.0.1.jar")
compile files("libs/ThermalFoundation-[1.7.10]1.0.0B3-8.jar")
Expand Down
123 changes: 67 additions & 56 deletions src/main/java/ExAstris/Bridge/Thaumcraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import thaumcraft.api.crafting.CrucibleRecipe;
import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.common.config.ConfigResearch;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
Expand Down Expand Up @@ -142,24 +143,28 @@ public static void addResearch()
new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCustomPlant"), 1, 1)).setPages(new ResearchPage[] {
new ResearchPage("exastris.page.EXASTRISTHAUM.12"), new ResearchPage((InfusionRecipe)ConfigResearch.recipes.get("exastrissilverwood"))
}).setConcealed().setSpecial().setParents("EXASTRIS_GREATWOOD").registerResearchItem();
new ResearchItem("EXASTRIS_BEEHIVES",
"EXASTRIS_THAUM",
new AspectList().add(Aspect.MAGIC, 10).add(Aspect.AIR, 10).add(Aspect.BEAST, 10).add(Aspect.CRAFT, 10),
0,
-4,
0,
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)).setPages(new ResearchPage[] {
new ResearchPage("exastris.page.EXASTRISTHAUM.13"), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastriscurioushive")), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrisunusualhive")), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrisresonatinghive"))
}).setConcealed().setParents("EXASTRIS_BARRELTHAUMIUM").registerResearchItem();
new ResearchItem("EXASTRIS_ADVANCEBEEHIVES",
"EXASTRIS_THAUM",
new AspectList().add(Aspect.MAGIC, 10).add(Aspect.AIR, 10).add(Aspect.BEAST, 10).add(Aspect.CRAFT, 10),
-2,
-4,
0,
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)).setPages(new ResearchPage[] {
new ResearchPage("exastris.page.EXASTRISTHAUM.14"), new ResearchPage("exastris.page.EXASTRISTHAUM.15")
}).setConcealed().setSpecial().setParents("EXASTRIS_BEEHIVES").registerResearchItem();
if (Loader.isModLoaded("MagicBees"))
{
new ResearchItem("EXASTRIS_BEEHIVES",
"EXASTRIS_THAUM",
new AspectList().add(Aspect.MAGIC, 10).add(Aspect.AIR, 10).add(Aspect.BEAST, 10).add(Aspect.CRAFT, 10),
0,
-4,
0,
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)).setPages(new ResearchPage[] {
new ResearchPage("exastris.page.EXASTRISTHAUM.13"), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastriscurioushive")), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrisunusualhive")), new ResearchPage((IArcaneRecipe)ConfigResearch.recipes.get("exastrisresonatinghive"))
}).setConcealed().setParents("EXASTRIS_BARRELTHAUMIUM").registerResearchItem();
new ResearchItem("EXASTRIS_ADVANCEBEEHIVES",
"EXASTRIS_THAUM",
new AspectList().add(Aspect.MAGIC, 10).add(Aspect.AIR, 10).add(Aspect.BEAST, 10).add(Aspect.CRAFT, 10),
-2,
-4,
0,
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)).setPages(new ResearchPage[] {
new ResearchPage("exastris.page.EXASTRISTHAUM.14"), new ResearchPage("exastris.page.EXASTRISTHAUM.15")
}).setConcealed().setSpecial().setParents("EXASTRIS_BEEHIVES").registerResearchItem();
}

}
public static void addPages()
{
Expand Down Expand Up @@ -188,42 +193,45 @@ public static void addInfusion()
new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCustomPlant"), 1, 4), new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 14), new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCustomPlant"), 1, 4),
new ItemStack(Blocks.diamond_block, 1, 0), new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCustomPlant"), 1, 4)
}));
if (Loader.isModLoaded("MagicBees"))
{
ConfigResearch.recipes.put("exastrisdeephive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 3),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.VOID, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0)
}));

ConfigResearch.recipes.put("exastrisinfernalhive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 4),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.FIRE, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0)
}));

ConfigResearch.recipes.put("exastrisoblivionhive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 5),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.ELDRITCH, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0)
}));
}

ConfigResearch.recipes.put("exastrisdeephive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 3),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.VOID, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0),
new ItemStack(Blocks.stone, 1, 0), new ItemStack(Blocks.stone, 1, 0)
}));

ConfigResearch.recipes.put("exastrisinfernalhive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 4),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.FIRE, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0),
new ItemStack(Blocks.nether_brick, 1, 0), new ItemStack(Blocks.nether_brick, 1, 0)
}));

ConfigResearch.recipes.put("exastrisoblivionhive",ThaumcraftApi.addInfusionCraftingRecipe("EXASTRIS_ADVANCEBEEHIVES",
new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 5),
12,
new AspectList().add(Aspect.MAGIC, 64).add(Aspect.BEAST, 64).add(Aspect.ELDRITCH, 32),
new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0),
new ItemStack[] {
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0),
new ItemStack(Blocks.end_stone, 1, 0), new ItemStack(Blocks.end_stone, 1, 0)
}));
}
public static void addArcane()
{
Expand All @@ -232,9 +240,12 @@ public static void addArcane()
ConfigResearch.recipes.put("exastrisvisfilter", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_VISFILTER", new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 8), new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5), new Object[] { "mmm", "imi", "mmm", 'i', Items.gold_ingot, 'm', new ItemStack(ENItems.Mesh, 1, 0) }));
ConfigResearch.recipes.put("exastrismatrix", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_MATRIX", new ItemStack(GameRegistry.findItem("Thaumcraft", "blockStoneDevice"), 1, 2), new AspectList().add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), new Object[] { "bcb", "cec", "bcb", 'b', new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCosmeticSolid"), 1, 6), 'c', new ItemStack(GameRegistry.findItem("Thaumcraft", "blockCrystal"), 1, 6), 'e', Items.ender_pearl }));
ConfigResearch.recipes.put("exastrishammerthaumium", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_HAMMERTHAUMIUM", new ItemStack(ExAstrisItem.HammerThaumium, 1, 0), new AspectList().add(Aspect.AIR, 2).add(Aspect.EARTH, 2).add(Aspect.FIRE, 2).add(Aspect.WATER, 2).add(Aspect.ORDER, 2).add(Aspect.ENTROPY, 2), new Object[] { " a ", " ba", "b ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 2), 'b', Items.stick}));
ConfigResearch.recipes.put("exastriscurioushive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 0), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 4), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
ConfigResearch.recipes.put("exastrisunusualhive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 1), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 3), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
ConfigResearch.recipes.put("exastrisresonatinghive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 2), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 6), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
if (Loader.isModLoaded("MagicBees"))
{
ConfigResearch.recipes.put("exastriscurioushive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 0), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 4), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
ConfigResearch.recipes.put("exastrisunusualhive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 1), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 3), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
ConfigResearch.recipes.put("exastrisresonatinghive", ThaumcraftApi.addArcaneCraftingRecipe("EXASTRIS_BEEHIVES", new ItemStack(GameRegistry.findItem("MagicBees", "hive"), 1, 2), new AspectList().add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.FIRE, 4).add(Aspect.WATER, 4), new Object[] { " a ", "aba", " a ", 'a', new ItemStack(GameRegistry.findItem("Thaumcraft", "ItemResource"), 1, 6), 'b', new ItemStack(ExAstrisBlock.BeeTrapInfused, 1, 0)}));
}
}
public static void addCrucible()
{
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/ExAstris/Bridge/ThermalExpansion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ public static void Initialize()
addTransposerRecipe(10000, new ItemStack(GameRegistry.findBlock("exnihilo", "bee_trap_treated")),new ItemStack(GameRegistry.findBlock("ExtraBees", "hive"),1,0),new FluidStack(FluidRegistry.WATER, 8000),false);
addTransposerRecipe(10000, new ItemStack(GameRegistry.findBlock("exnihilo", "bee_trap_treated")),new ItemStack(GameRegistry.findBlock("ExtraBees", "hive"),1,1),new FluidStack(TinkerSmeltery.moltenStoneFluid, 8000),false);
addTransposerRecipe(10000, new ItemStack(GameRegistry.findBlock("exnihilo", "bee_trap_treated")),new ItemStack(GameRegistry.findBlock("ExtraBees", "hive"),1,2),new FluidStack(TFFluids.fluidRedstone, 8000),false);
addTransposerRecipe(10000, new ItemStack(GameRegistry.findBlock("exnihilo", "bee_trap_treated")),new ItemStack(GameRegistry.findBlock("ExtraBees", "hive"),1,3),new FluidStack(LiquidRegistry.getLiquid("milk"), 8000),false);
if(Loader.isModLoaded("MineFactoryReloaded")){
addTransposerRecipe(10000, new ItemStack(GameRegistry.findBlock("exnihilo", "bee_trap_treated")),new ItemStack(GameRegistry.findBlock("ExtraBees", "hive"),1,3),new FluidStack(LiquidRegistry.getLiquid("milk"), 8000),false);
}

}
}
@SuppressWarnings({ "unchecked", "rawtypes" })
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/ExAstris/ExAstrisBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import ExAstris.Block.ItemBlock.ItemBlockBarrelThaumium;
import ExAstris.Block.ItemBlock.ItemBlockSieveAutomatic;
import ExAstris.Data.BlockData;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;

Expand All @@ -15,13 +16,18 @@ public class ExAstrisBlock {
public static Block SieveAutomatic;
public static void registerBlocks()
{
BarrelThaumium = new BlockBarrelThaumium();
GameRegistry.registerBlock(BarrelThaumium, ItemBlockBarrelThaumium.class, BlockData.BARREL_THAUMIUM_KEY);
if(Loader.isModLoaded("Thaumcraft")){
BarrelThaumium = new BlockBarrelThaumium();
GameRegistry.registerBlock(BarrelThaumium, ItemBlockBarrelThaumium.class, BlockData.BARREL_THAUMIUM_KEY);
if(Loader.isModLoaded("MagicBees")){
BeeTrapInfused = new BlockBeeTrapInfused();
GameRegistry.registerBlock(BeeTrapInfused, BlockData.BEE_TRAP_INFUSED_KEY);
}
}

BeeTrapInfused = new BlockBeeTrapInfused();
GameRegistry.registerBlock(BeeTrapInfused, BlockData.BEE_TRAP_INFUSED_KEY);

SieveAutomatic = new BlockSieveAutomatic();
GameRegistry.registerBlock(SieveAutomatic, ItemBlockSieveAutomatic.class, BlockData.SIEVE_AUTOMATIC_KEY);
if(Loader.isModLoaded("ThermalExpansion")){
SieveAutomatic = new BlockSieveAutomatic();
GameRegistry.registerBlock(SieveAutomatic, ItemBlockSieveAutomatic.class, BlockData.SIEVE_AUTOMATIC_KEY);
}
}
}
23 changes: 15 additions & 8 deletions src/main/java/ExAstris/ExAstrisItem.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package ExAstris;

import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import ExAstris.Data.ItemData;
import ExAstris.Data.ModData;
Expand All @@ -9,8 +10,10 @@
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import redstonearsenal.item.RAItems;
import skyboy.core.fluid.LiquidRegistry;

public class ExAstrisItem {
public static Item DollThaumic;
Expand All @@ -19,15 +22,19 @@ public class ExAstrisItem {

public static void registerItems()
{
DollThaumic = new ItemDollThaumic();
GameRegistry.registerItem(DollThaumic, ItemData.THAUMIC_DOLL_UNLOCALIZED_NAME);

HammerThaumium = new ItemHammerThaumium();
GameRegistry.registerItem(HammerThaumium, ItemData.HAMMER_THAUMIUM_UNLOCALIZED_NAME);

HammerRF = new ItemHammerRF();
GameRegistry.registerItem(HammerRF, ItemData.HAMMER_RF_UNLOCALIZED_NAME);
if(Loader.isModLoaded("Thaumcraft")){
DollThaumic = new ItemDollThaumic();
GameRegistry.registerItem(DollThaumic, ItemData.THAUMIC_DOLL_UNLOCALIZED_NAME);

HammerThaumium = new ItemHammerThaumium();
GameRegistry.registerItem(HammerThaumium, ItemData.HAMMER_THAUMIUM_UNLOCALIZED_NAME);
}

if(Loader.isModLoaded("RedstoneArsenal")){
HammerRF = new ItemHammerRF();
GameRegistry.registerItem(HammerRF, ItemData.HAMMER_RF_UNLOCALIZED_NAME);
}

//GameRegistry.addRecipe(new ShapedOreRecipe(HammerRF, new Object[] { " a ", " ba", "b ", Character.valueOf('a'), RAItems.ingotElectrumFlux, Character.valueOf('b'), RAItems.rodObsidianFlux }));
}
}
26 changes: 20 additions & 6 deletions src/main/java/ExAstris/ExAstrisRecipe.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
package ExAstris;

import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;

public class ExAstrisRecipe {
public static void registerCraftingRecipes()
{
GameRegistry.addRecipe(new ItemStack(ExAstrisItem.HammerRF, 1, 0),
" x ",
" yx",
"y ",
'x', new ItemStack(GameRegistry.findItem("RedstoneArsenal", "material"), 1, 32),
'y', new ItemStack(GameRegistry.findItem("RedstoneArsenal", "material"), 1, 193));
if(Loader.isModLoaded("RedstoneArsenal")){
GameRegistry.addRecipe(new ItemStack(ExAstrisItem.HammerRF, 1, 0),
" x ",
" yx",
"y ",
'x', new ItemStack(GameRegistry.findItem("RedstoneArsenal", "material"), 1, 32),
'y', new ItemStack(GameRegistry.findItem("RedstoneArsenal", "material"), 1, 193));
}
if(Loader.isModLoaded("ThermalExpansion")){
GameRegistry.addRecipe(new ItemStack(ExAstrisBlock.SieveAutomatic, 1, 0),
"aba",
"aca",
"d d",
'a', new ItemStack(GameRegistry.findItem("ThermalFoundation", "material"), 1, 72),
'b', new ItemStack(GameRegistry.findItem("exnihilo", "mesh"), 1, 0),
'c', new ItemStack(GameRegistry.findItem("ThermalFoundation", "material"), 1, 135),
'd', new ItemStack(GameRegistry.findItem("ThermalFoundation", "material"), 1, 104));
}

}
}

0 comments on commit 69ad7b7

Please sign in to comment.