From 87fa1b92d635ebafa6559bba1bc33c052d00ddcf Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 22 Jul 2014 01:58:53 -0400 Subject: [PATCH] Small test start --- .../resonantinduction/archaic/Archaic.java | 176 ------------------ .../resonantinduction/archaic/Archaic.scala | 166 +++++++++++++++++ .../archaic/ArchaicBlocks.scala | 20 ++ .../archaic/ArchaicItems.scala | 9 + .../archaic/CommonProxy.java | 4 +- .../archaic/fluid/tank/ItemBlockTank.java | 10 +- .../resonantinduction/atomic/Atomic.java | 4 +- .../schematic/SchematicAccelerator.java | 3 +- 8 files changed, 205 insertions(+), 187 deletions(-) delete mode 100644 src/main/scala/resonantinduction/archaic/Archaic.java create mode 100644 src/main/scala/resonantinduction/archaic/Archaic.scala create mode 100644 src/main/scala/resonantinduction/archaic/ArchaicBlocks.scala create mode 100644 src/main/scala/resonantinduction/archaic/ArchaicItems.scala diff --git a/src/main/scala/resonantinduction/archaic/Archaic.java b/src/main/scala/resonantinduction/archaic/Archaic.java deleted file mode 100644 index 5a06e40aa..000000000 --- a/src/main/scala/resonantinduction/archaic/Archaic.java +++ /dev/null @@ -1,176 +0,0 @@ -package resonantinduction.archaic; - -import resonantinduction.archaic.firebox.BlockFirebox; -import archaic.firebox.BlockHotPlate; -import resonantinduction.archaic.fluid.gutter.TileGutter; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import resonant.lib.content.ContentRegistry; -import resonant.lib.modproxy.ProxyHandler; -import resonant.lib.network.PacketAnnotation; -import resonant.lib.network.PacketHandler; -import resonant.lib.prefab.item.ItemBlockMetadata; -import resonant.lib.recipe.UniversalRecipe; -import resonantinduction.archaic.blocks.TileTurntable; -import resonantinduction.archaic.crate.BlockCrate; -import resonantinduction.archaic.crate.CrateCraftingHandler; -import resonantinduction.archaic.crate.ItemBlockCrate; -import resonantinduction.archaic.crate.TileCrate; -import archaic.engineering.ItemHammer; -import resonantinduction.archaic.engineering.TileEngineeringTable; -import archaic.filter.BlockImprinter; -import resonantinduction.archaic.filter.TileFilter; -import archaic.filter.TileImprinter; -import archaic.firebox.BlockHotPlate; -import archaic.firebox.TileFirebox; -import resonantinduction.archaic.firebox.TileHotPlate; -import resonantinduction.archaic.fluid.grate.TileGrate; -import resonantinduction.archaic.fluid.tank.TileTank; -import archaic.process.BlockCastingMold; -import archaic.process.BlockMillstone; -import archaic.process.TileCastingMold; -import archaic.process.TileMillstone; -import resonantinduction.archaic.waila.Waila; -import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; -import resonantinduction.core.ResonantTab; -import resonantinduction.core.Settings; -import resonantinduction.archaic.filter.imprint.ItemImprint; -import resonantinduction.mechanical.gear.ItemHandCrank; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkMod; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - -/** Resonant Induction Archaic Module - * - * @author DarkCow, Calclavia */ -@Mod(modid = Archaic.ID, name = Archaic.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID) -@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) -public class Archaic -{ - /** Mod Information */ - public static final String ID = "ResonantInduction|Archaic"; - public static final String NAME = Reference.NAME + " Archaic"; - public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.config, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(ResonantTab.DEFAULT); - @Instance(ID) - public static Archaic INSTANCE; - @SidedProxy(clientSide = "resonantinduction.archaic.ClientProxy", serverSide = "resonantinduction.archaic.CommonProxy") - public static CommonProxy proxy; - @Mod.Metadata(ID) - public static ModMetadata metadata; - public static Block blockEngineeringTable; - public static Block blockCrate; - public static Block blockImprinter; - public static Block blockTurntable; - public static Block blockFirebox; - public static Block blockHotPlate; - public static Block blockMillstone; - public static Block blockCast; - public static Item itemImprint; - - // Machine and Processing - public static Item itemHammer; - public static Item itemHandCrank; - public static Block blockFilter; - - // Fluid - public static Block blockGrate; - public static Block blockGutter; - public static Block blockTank; - - public ProxyHandler modproxies; - - @EventHandler - public void preInit(FMLPreInitializationEvent evt) - { - modproxies = new ProxyHandler(); - NetworkRegistry.instance().registerGuiHandler(this, proxy); - Settings.config.load(); - blockEngineeringTable = contentRegistry.newBlock(TileEngineeringTable.class); - blockCrate = contentRegistry.createBlock(BlockCrate.class, ItemBlockCrate.class, TileCrate.class); - blockImprinter = contentRegistry.createTile(BlockImprinter.class, TileImprinter.class); - blockTurntable = contentRegistry.newBlock(TileTurntable.class); - blockFirebox = contentRegistry.createBlock(BlockFirebox.class, ItemBlockMetadata.class, TileFirebox.class); - blockHotPlate = contentRegistry.createTile(BlockHotPlate.class, TileHotPlate.class); - blockMillstone = contentRegistry.createTile(BlockMillstone.class, TileMillstone.class); - blockCast = contentRegistry.createTile(BlockCastingMold.class, TileCastingMold.class); - blockGutter = contentRegistry.newBlock(TileGutter.class); - blockGrate = contentRegistry.newBlock(TileGrate.class); - blockFilter = contentRegistry.newBlock(TileFilter.class); - blockTank = contentRegistry.newBlock(TileTank.class); - - itemHandCrank = contentRegistry.createItem(ItemHandCrank.class); - itemImprint = contentRegistry.createItem(ItemImprint.class); - itemHammer = contentRegistry.createItem(ItemHammer.class); - - modproxies.applyModule(Waila.class, true); - Settings.config.save(); - - PacketAnnotation.register(TileFirebox.class); - PacketAnnotation.register(TileFilter.class); - proxy.preInit(); - modproxies.preInit(); - } - - @EventHandler - public void init(FMLInitializationEvent evt) - { - Settings.setModMetadata(metadata, ID, NAME, ResonantInduction.ID); - proxy.init(); - modproxies.init(); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent evt) - { - ResonantTab.ITEMSTACK = new ItemStack(blockEngineeringTable); - if (OreDictionary.getOres("cobblestone") == null) - { - OreDictionary.registerOre("cobblestone", Block.cobblestone); - } - if (OreDictionary.getOres("stickWood") == null) - { - OreDictionary.registerOre("stickWood", Item.stick); - } - - // Add recipes - GameRegistry.addRecipe(new ShapedOreRecipe(blockEngineeringTable, "P", "C", 'P', Block.pressurePlatePlanks, 'C', Block.workbench)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockFilter, "B", "P", "B", 'B', Block.fenceIron, 'P', Item.paper)); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCrate, 1, 0), "WWW", "WSW", "WWW", 'S', "stickWood", 'W', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCrate, 1, 1), "WWW", "WSW", "WWW", 'S', new ItemStack(blockCrate, 1, 0), 'W', "ingotIron")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCrate, 1, 2), "WWW", "WSW", "WWW", 'S', new ItemStack(blockCrate, 1, 1), 'W', UniversalRecipe.PRIMARY_METAL.get())); - - GameRegistry.addRecipe(new ShapedOreRecipe(blockFirebox, "III", "SFS", "SSS", 'I', Item.ingotIron, 'F', Block.furnaceIdle, 'S', Block.stone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockFirebox, 1, 1), "III", "SFS", "SSS", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'F', new ItemStack(blockFirebox, 1, 0), 'S', UniversalRecipe.WIRE.get())); - - GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, "SSS", "W W", "PPP", 'S', Block.stone, 'P', Block.pistonBase, 'W', "logWood")); - - GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "PGP", "WWW", 'S', Block.stone, 'G', Item.redstone, 'P', Block.pistonBase, 'W', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(blockCast, "I I", "IBI", "III", 'S', Item.ingotIron, 'B', Block.fenceIron)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockGutter, "S S", "I I", "III", 'S', Item.stick, 'I', "cobblestone")); - GameRegistry.addRecipe(new ShapedOreRecipe(blockGrate, "WBW", "B B", "WBW", 'B', Block.fenceIron, 'W', "plankWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockMillstone, "SPS", "SAS", "SSS", 'P', Block.pistonBase, 'A', Item.pickaxeStone, 'S', Block.stone)); - GameRegistry.addRecipe(new ShapedOreRecipe(blockTank, "GGG", "GSG", "GGG", 'G', Block.glass, 'S', Item.ingotIron)); - - GameRegistry.addRecipe(new ShapedOreRecipe(itemHandCrank, "S ", "SSS", " S", 'S', "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, "PPP", "PIP", "PPP", 'P', Item.paper, 'I', new ItemStack(Item.dyePowder, 0))); - GameRegistry.addRecipe(new ShapedOreRecipe(itemHammer, "CC ", "CS ", " S", 'C', "cobblestone", 'S', "stickWood")); - - GameRegistry.registerCraftingHandler(new CrateCraftingHandler()); - proxy.postInit(); - modproxies.postInit(); - } -} diff --git a/src/main/scala/resonantinduction/archaic/Archaic.scala b/src/main/scala/resonantinduction/archaic/Archaic.scala new file mode 100644 index 000000000..45b58e374 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/Archaic.scala @@ -0,0 +1,166 @@ +package resonantinduction.archaic + +import resonantinduction.archaic.firebox.BlockFirebox +import archaic.firebox.BlockHotPlate +import resonantinduction.archaic.fluid.gutter.TileGutter +import net.minecraft.block.Block +import net.minecraft.init.Blocks +import net.minecraft.item.Item +import net.minecraft.init.Items +import net.minecraft.item.ItemStack +import net.minecraftforge.oredict.OreDictionary +import net.minecraftforge.oredict.ShapedOreRecipe +import resonant.content.loader.ModManager +import resonant.lib.content.ContentRegistry +import resonant.lib.modproxy.ProxyHandler +import resonant.lib.network.PacketAnnotation +import resonant.lib.network.PacketHandler +import resonant.lib.prefab.item.ItemBlockMetadata +import resonant.lib.recipe.UniversalRecipe +import resonantinduction.archaic.blocks.TileTurntable +import resonantinduction.archaic.crate.BlockCrate +import resonantinduction.archaic.crate.CrateCraftingHandler +import resonantinduction.archaic.crate.ItemBlockCrate +import resonantinduction.archaic.crate.TileCrate +import archaic.engineering.ItemHammer +import resonantinduction.archaic.engineering.TileEngineeringTable +import archaic.filter.BlockImprinter +import resonantinduction.archaic.filter.TileFilter +import archaic.filter.TileImprinter +import archaic.firebox.BlockHotPlate +import archaic.firebox.TileFirebox +import resonantinduction.archaic.firebox.TileHotPlate +import resonantinduction.archaic.fluid.grate.TileGrate +import resonantinduction.archaic.fluid.tank.TileTank +import archaic.process.BlockCastingMold +import archaic.process.BlockMillstone +import archaic.process.TileCastingMold +import archaic.process.TileMillstone +import resonantinduction.archaic.waila.Waila +import resonantinduction.core.Reference +import resonantinduction.core.ResonantInduction +import resonantinduction.core.ResonantTab +import resonantinduction.core.Settings +import resonantinduction.archaic.filter.imprint.ItemImprint +import resonantinduction.mechanical.gear.ItemHandCrank +import cpw.mods.fml.common.Mod +import cpw.mods.fml.common.Mod.EventHandler +import cpw.mods.fml.common.Mod.Instance +import cpw.mods.fml.common.ModMetadata +import cpw.mods.fml.common.SidedProxy +import cpw.mods.fml.common.event.FMLInitializationEvent +import cpw.mods.fml.common.event.FMLPostInitializationEvent +import cpw.mods.fml.common.event.FMLPreInitializationEvent +import cpw.mods.fml.common.network.NetworkMod +import cpw.mods.fml.common.network.NetworkRegistry +import cpw.mods.fml.common.registry.GameRegistry +import Archaic._ +//remove if not needed +import scala.collection.JavaConversions._ + +object Archaic { + + final val ID = "ResonantInduction|Archaic" + + final val NAME = Reference.NAME + " Archaic" + + val contentRegistry = new ModManager().setPrefix(Reference.PREFIX).setTab(ResonantTab.DEFAULT) + + @Instance(ID) + var INSTANCE: Archaic = _ + + @SidedProxy(clientSide = "resonantinduction.archaic.ClientProxy", serverSide = "resonantinduction.archaic.CommonProxy") + var proxy: CommonProxy = _ + + @Mod.Metadata(ID) + var metadata: ModMetadata = _ + +} + +@Mod(modid = Archaic.ID, name = Archaic.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID) +class Archaic { + + var modproxies: ProxyHandler = _ + + @EventHandler + def preInit(evt: FMLPreInitializationEvent) { + modproxies = new ProxyHandler() + NetworkRegistry.instance().registerGuiHandler(this, proxy) + Settings.config.load() + ArchaicBlocks.blockEngineeringTable = contentRegistry.newBlock(classOf[TileEngineeringTable]) + ArchaicBlocks.blockCrate = contentRegistry.createBlock(classOf[BlockCrate], classOf[ItemBlockCrate], classOf[TileCrate]) + ArchaicBlocks.blockImprinter = contentRegistry.createTile(classOf[BlockImprinter], classOf[TileImprinter]) + ArchaicBlocks.blockTurntable = contentRegistry.newBlock(classOf[TileTurntable]) + ArchaicBlocks.blockFirebox = contentRegistry.createBlock(classOf[BlockFirebox], classOf[ItemBlockMetadata], classOf[TileFirebox]) + ArchaicBlocks.blockHotPlate = contentRegistry.createTile(classOf[BlockHotPlate], classOf[TileHotPlate]) + ArchaicBlocks.blockMillstone = contentRegistry.createTile(classOf[BlockMillstone], classOf[TileMillstone]) + ArchaicBlocks.blockCast = contentRegistry.createTile(classOf[BlockCastingMold], classOf[TileCastingMold]) + ArchaicBlocks.blockGutter = contentRegistry.newBlock(classOf[TileGutter]) + ArchaicBlocks.blockGrate = contentRegistry.newBlock(classOf[TileGrate]) + ArchaicBlocks.blockFilter = contentRegistry.newBlock(classOf[TileFilter]) + ArchaicBlocks.blockTank = contentRegistry.newBlock(classOf[TileTank]) + ArchaicItems.itemHandCrank = contentRegistry.createItem(classOf[ItemHandCrank]) + ArchaicItems.itemImprint = contentRegistry.createItem(classOf[ItemImprint]) + ArchaicItems.itemHammer = contentRegistry.createItem(classOf[ItemHammer]) + modproxies.applyModule(classOf[Waila], true) + Settings.config.save() + proxy.preInit() + modproxies.preInit() + } + + @EventHandler + def init(evt: FMLInitializationEvent) { + Settings.setModMetadata(metadata, ID, NAME, ResonantInduction.ID) + proxy.init() + modproxies.init() + } + + @EventHandler + def postInit(evt: FMLPostInitializationEvent) { + ResonantTab.ITEMSTACK = new ItemStack(blockEngineeringTable) + if (OreDictionary.getOres("cobblestone") == null) { + OreDictionary.registerOre("cobblestone", Block.cobblestone) + } + if (OreDictionary.getOres("stickWood") == null) { + OreDictionary.registerOre("stickWood", Item.stick) + } + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockEngineeringTable, "P", "C", 'P', Blocks.pressurePlatePlanks, + 'C', Blocks.workbench)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFilter, "B", "P", "B", 'B', Blocks.fenceIron, 'P', + Items.paper)) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 0), "WWW", "WSW", "WWW", + 'S', "stickWood", 'W', "logWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 1), "WWW", "WSW", "WWW", + 'S', new ItemStack(blockCrate, 1, 0), 'W', "ingotIron")) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 2), "WWW", "WSW", "WWW", + 'S', new ItemStack(blockCrate, 1, 1), 'W', UniversalRecipe.PRIMARY_METAL.get)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFirebox, "III", "SFS", "SSS", 'I', Items.iron_ingot, + 'F', Block.furnaceIdle, 'S', Block.stone)) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockFirebox, 1, 1), "III", "SFS", "SSS", + 'I', UniversalRecipe.PRIMARY_METAL.get, 'F', new ItemStack(ArchaicBlocks.blockFirebox, 1, 0), 'S', UniversalRecipe.WIRE.get)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockImprinter, "SSS", "W W", "PPP", 'S', Blocks.stone, + 'P', Block.pistonBase, 'W', "logWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTurntable, "SSS", "PGP", "WWW", 'S', Blocks.stone, + 'G', Item.redstone, 'P', Block.pistonBase, 'W', "logWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockCast, "I I", "IBI", "III", 'S', Items.ingotIron, 'B', + Block.fenceIron)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGutter, "S S", "I I", "III", 'S', Items.stick, 'I', + "cobblestone")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGrate, "WBW", "B B", "WBW", 'B', Blocks.fenceIron, + 'W', "plankWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockHotPlate, "SSS", "III", 'I', Items.iron_ingot, 'S', + Block.stone)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockMillstone, "SPS", "SAS", "SSS", 'P', Blocks.pistonBase, + 'A', Item.pickaxeStone, 'S', Block.stone)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTank, "GGG", "GSG", "GGG", 'G', Blocks.glass, 'S', + Item.ingotIron)) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHandCrank, "S ", "SSS", " S", 'S', "stickWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemImprint, "PPP", "PIP", "PPP", 'P', Items.paper, 'I', + new ItemStack(Item.dyePowder, 0))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHammer, "CC ", "CS ", " S", 'C', "cobblestone", 'S', + "stickWood")) + GameRegistry.registerCraftingHandler(new CrateCraftingHandler()) + proxy.postInit() + modproxies.postInit() + } +} diff --git a/src/main/scala/resonantinduction/archaic/ArchaicBlocks.scala b/src/main/scala/resonantinduction/archaic/ArchaicBlocks.scala new file mode 100644 index 000000000..706c87c04 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/ArchaicBlocks.scala @@ -0,0 +1,20 @@ +package resonantinduction.archaic + +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +object ArchaicBlocks { + + var blockEngineeringTable: Block = _ + var blockCrate: Block = _ + var blockImprinter: Block = _ + var blockTurntable: Block = _ + var blockFirebox: Block = _ + var blockHotPlate: Block = _ + var blockMillstone: Block = _ + var blockCast: Block = _ + var blockFilter: Block = _ + var blockGrate: Block = _ + var blockGutter: Block = _ + var blockTank: Block = _ +} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/ArchaicItems.scala b/src/main/scala/resonantinduction/archaic/ArchaicItems.scala new file mode 100644 index 000000000..833b845f9 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/ArchaicItems.scala @@ -0,0 +1,9 @@ +package resonantinduction.archaic + +import net.minecraft.item.Item; + +object ArchaicItems { + var itemImprint: Item = _ + var itemHammer: Item = _ + var itemHandCrank: Item = _ +} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/CommonProxy.java b/src/main/scala/resonantinduction/archaic/CommonProxy.java index 0e02ddc7b..1aec45135 100644 --- a/src/main/scala/resonantinduction/archaic/CommonProxy.java +++ b/src/main/scala/resonantinduction/archaic/CommonProxy.java @@ -1,8 +1,8 @@ package resonantinduction.archaic; -import resonant.lib.prefab.ProxyBase; +import resonant.lib.prefab.AbstractProxy; -public class CommonProxy extends ProxyBase +public class CommonProxy extends AbstractProxy { } diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java index debf28340..f75a0f841 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java @@ -13,18 +13,18 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import resonant.lib.utility.LanguageUtility; import resonantinduction.core.grid.fluid.distribution.TileFluidDistribution; -import universalelectricity.api.energy.UnitDisplay; -import universalelectricity.api.energy.UnitDisplay.Unit; -import universalelectricity.api.energy.UnitDisplay.UnitPrefix; +import universalelectricity.api.UnitDisplay; +import universalelectricity.api.UnitDisplay.Unit; +import universalelectricity.api.UnitDisplay.UnitPrefix; /** * @author Darkguardsman */ public class ItemBlockTank extends ItemBlock implements IFluidContainerItem { - public ItemBlockTank(int id) + public ItemBlockTank(Block block) { - super(id); + super(block); this.setMaxDamage(0); this.setHasSubtypes(true); } diff --git a/src/main/scala/resonantinduction/atomic/Atomic.java b/src/main/scala/resonantinduction/atomic/Atomic.java index a290d082f..ac30bff57 100644 --- a/src/main/scala/resonantinduction/atomic/Atomic.java +++ b/src/main/scala/resonantinduction/atomic/Atomic.java @@ -111,8 +111,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @Mod(modid = Atomic.ID, name = Atomic.NAME, version = Reference.VERSION, dependencies = "required-after:ResonantEngine;after:IC2;after:ResonantInduction|Electrical;required-after:" + ResonantInduction.ID) -@NetworkMod(channels = -{ Reference.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) public class Atomic { public static final String ID = "ResonantInduction|Atomic"; @@ -411,7 +409,7 @@ public class Atomic public void postInit(FMLPostInitializationEvent event) { /** IC2 Recipes */ - if (Loader.isModLoaded("IC2") && Settings.allowAlternateRecipes) + if (Loader.isModLoaded("IC2") && Settings.allowAlternateRecipes()) { OreDictionary.registerOre("cellEmpty", Items.getItem("cell")); diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java index faac428da..4fde1ce41 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java @@ -3,6 +3,7 @@ package resonantinduction.atomic.schematic; import java.util.HashMap; import atomic.Atomic; +import net.minecraft.block.Block; import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; @@ -17,7 +18,7 @@ public class SchematicAccelerator extends Schematic } @Override - public HashMap> getStructure(ForgeDirection dir, int size) + public HashMap> getStructure(ForgeDirection dir, int size) { HashMap> returnMap = new HashMap>();