OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java
index afe39c8..5b6adbb 100644 (file)
@@ -7,11 +7,32 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
-import chemicraft.Auxiliary.NameAuxiliary;\r
+import chemicraft.block.BlockChemicalCombinationTable;\r
+import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockMaterialCraftingTable;\r
+import chemicraft.block.BlockToolAndMaterialCraftingTable;\r
+import chemicraft.debug.CommandDeleteItem;\r
+import chemicraft.debug.CommandSetTile;\r
+import chemicraft.debug.CompoundHandlerTest;\r
+import chemicraft.item.ItemAtomGrenade;\r
+import chemicraft.item.ItemAtoms;\r
+import chemicraft.item.ItemCompounds;\r
+import chemicraft.item.ItemGasCollectingBottle;\r
+import chemicraft.system.CommonProxy;\r
+import chemicraft.system.PacketHandler;\r
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
+import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;\r
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
+import chemicraft.util.Auxiliary;\r
+import chemicraft.util.Auxiliary.NameAuxiliary;\r
+import chemicraft.util.CreativeTabAtoms;\r
+import chemicraft.util.NBTRecipeGrenade;\r
 import cpw.mods.fml.common.Mod;\r
 import cpw.mods.fml.common.SidedProxy;\r
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;\r
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;\r
+import cpw.mods.fml.common.event.FMLServerStartingEvent;\r
 import cpw.mods.fml.common.network.NetworkMod;\r
 import cpw.mods.fml.common.network.NetworkRegistry;\r
 import cpw.mods.fml.common.registry.GameRegistry;\r
@@ -159,6 +180,11 @@ public class ChemiCraft {
                proxy.registerRenderInformation();\r
        }\r
 \r
+       @Mod.ServerStarting\r
+       public void serverStarting(FMLServerStartingEvent event){\r
+               event.registerServerCommand(new CommandSetTile());\r
+               event.registerServerCommand(new CommandDeleteItem());\r
+       }\r
 \r
        @Mod.PostInit\r
        public void chemiPostLoadMethod(FMLPostInitializationEvent event) {\r
@@ -167,6 +193,11 @@ public class ChemiCraft {
        }\r
 \r
        private void settingProcessing(FMLPostInitializationEvent event){\r
+\r
+               ChemiCraftAPI.instance.addCompound("Test");\r
+               ChemiCraftAPI.instance.addCompound("Test2");\r
+               ChemiCraftAPI.instance.settingCompoundHandler("Test", new CompoundHandlerTest());\r
+\r
                // Blockを追加します\r
                this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("DecompositionTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCombinationTable");\r