diff --git a/src/main/java/atomicscience/AtomicScience.java b/src/main/java/atomicscience/AtomicScience.java index df53c3b..ececec4 100644 --- a/src/main/java/atomicscience/AtomicScience.java +++ b/src/main/java/atomicscience/AtomicScience.java @@ -32,6 +32,7 @@ import atomicscience.hecheng.BElectromagnetGlass; import atomicscience.hecheng.BFusionReactor; import atomicscience.hecheng.BPlasma; import atomicscience.hecheng.IBAccelerator; +import atomicscience.hecheng.IBElectromagnet; import atomicscience.hecheng.IBPlasma; import atomicscience.hecheng.IBSiren; import atomicscience.hecheng.TElectromagnetBoiler; @@ -307,8 +308,8 @@ public class AtomicScience { GameRegistry.registerBlock(bThermometer, "bThermometer"); GameRegistry.registerBlock(bFusionReactor, "bFusionReactor"); GameRegistry.registerBlock(bPlasma, IBPlasma.class, "bPlasma"); - GameRegistry.registerBlock(bElectromagnet, "bElectromagnet"); - GameRegistry.registerBlock(bElectromagnetBoiler, "bElectromagnetBoiler"); + GameRegistry.registerBlock(bElectromagnet, IBElectromagnet.class, "bElectromagnet"); + GameRegistry.registerBlock(bElectromagnetBoiler, IBElectromagnet.class, "bElectromagnetBoiler"); GameRegistry.registerBlock(bChemicalExtractor, "bChemicalExtractor"); GameRegistry.registerBlock(bSiren, IBSiren.class, "bSiren"); GameRegistry.registerBlock(bElectromagnetGlass, "bElectromagnetGlass"); diff --git a/src/main/java/atomicscience/Recipes.java b/src/main/java/atomicscience/Recipes.java index 51bc6e5..b917380 100644 --- a/src/main/java/atomicscience/Recipes.java +++ b/src/main/java/atomicscience/Recipes.java @@ -206,6 +206,16 @@ public class Recipes { .ingredient('M', BasicComponents.itemMotor) .register(); + new RecipeBuilder(new ShapelessOreRecipeAdapter()) + .output(AtomicScience.bElectromagnetBoiler) + .ingredient(AtomicScience.bElectromagnet) + .register(); + + new RecipeBuilder(new ShapelessOreRecipeAdapter()) + .output(AtomicScience.bElectromagnet) + .ingredient(AtomicScience.bElectromagnetBoiler) + .register(); + for (ItemArmor armorPiece : new ItemArmor[] {Items.leather_helmet, Items.leather_chestplate, Items.leather_leggings, Items.leather_boots}) { diff --git a/src/main/java/atomicscience/hecheng/IBElectromagnet.java b/src/main/java/atomicscience/hecheng/IBElectromagnet.java new file mode 100644 index 0000000..60f5c23 --- /dev/null +++ b/src/main/java/atomicscience/hecheng/IBElectromagnet.java @@ -0,0 +1,28 @@ +package atomicscience.hecheng; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class IBElectromagnet extends ItemBlock { + + public IBElectromagnet(Block block) { + super(block); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean p_77624_4_) { + if (this.field_150939_a instanceof BElectromagnetBoiler) { + list.add("Used for Fusion Reactors"); + } else { + list.add("Used for Particle Accelerators"); + } + } + +}