From: mozipi Date: Mon, 11 Feb 2013 02:07:13 +0000 (+0900) Subject: パッケージをpcc.chemicraft.*に変更 X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=e9b7d6cbb938326e5259ae03045bcd2f2eed6eac パッケージをpcc.chemicraft.*に変更 --- diff --git a/common/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java similarity index 91% rename from common/chemicraft/ChemiCraft.java rename to common/pcc/chemicraft/ChemiCraft.java index 7f8829a..32dac1c 100644 --- a/common/chemicraft/ChemiCraft.java +++ b/common/pcc/chemicraft/ChemiCraft.java @@ -1,374 +1,381 @@ -package chemicraft; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.audio.SoundManager; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; -import chemicraft.block.BlockChemicalCombinationTable; -import chemicraft.block.BlockChemicalCraftingTable; -import chemicraft.block.BlockElectrolysisTable; -import chemicraft.block.BlockPyrolysisTable; -import chemicraft.block.BlockToolAndWeaponCraftingTable; -import chemicraft.compounds.CompoundDebug; -import chemicraft.compounds.CompoundWater; -import chemicraft.debug.CommandDeleteItem; -import chemicraft.debug.CommandGenDebugRoom; -import chemicraft.debug.CommandSetTile; -import chemicraft.item.ItemAtoms; -import chemicraft.item.ItemAtomsGrenade; -import chemicraft.item.ItemCompounds; -import chemicraft.item.ItemGasCollectingBottle; -import chemicraft.system.CommonProxy; -import chemicraft.system.PacketHandler; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityElectrolysisTable; -import chemicraft.tileentity.TileEntityPyrolysisTable; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; -import chemicraft.util.Auxiliary; -import chemicraft.util.Auxiliary.ArrayAuxiliary; -import chemicraft.util.Auxiliary.NameAuxiliary; -import chemicraft.util.CreativeTabAtoms; -import chemicraft.util.NBTRecipeGrenade; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.network.NetworkMod; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - -/** - * ChemiCraft本体 - * @author P.C.C. - * - */ -@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta") -@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class) -public class ChemiCraft { - - public static final String[] ATOMSNAME = { - "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", - "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", - "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", - "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", - "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", - "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", - "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", - "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" }; - - public static final String[] ATOMSNAMEJP = { - "æ°´ç´ ", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "å¡©ç´ ", "アルゴン", "カリウム", "カルシウム", "スカンジウム", - "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム", - "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム", - "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム", - "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム", - "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" }; - - /** - * このmodのインスタンス - */ - @Mod.Instance("chemiCraft") - public static ChemiCraft instance; - - /** - * ChemiCraftのProxy. - */ - @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy") - public static CommonProxy proxy; - - /** - * ChemiCraftのCreativeTab. - */ - public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft"); - - /** - * ItemID. - */ - public int atomsID; - public int compoundsID; - public int gasCollectingBottleID; - public int atomGrenadeID; - - /** - * BlockID. - */ - public int pyrolysisTableID; - public int chemicalConbinationTableID; - public int toolAndWeaponCraftingTableID; - public int chemicalCraftingTableID; - public int electrolysisTableID; - - /** - * GUIID. - */ - public int guiPyrolysisTableID; - public int guiChemicalCombinationTableID; - public int guiToolAndWeaponCraftingTableID; - public int guiChemicalCraftingTableID; - public int guiElectrolysisTableID; - - /** - * Block型変数. - */ - public Block blockPyrolysisTable; - public Block blockChemicalCombinationTable; - public Block blockToolAndWeaponCraftingTable; - public Block blockChemicalCraftingTable; - public Block blockElectrolysisTable; - - /** - * Item型変数. - */ - public Item itemAtoms; - public Item itemCompounds; - public Item itemGasCollectingBottle; - public Item itemAtomGrenade; - - /** - * このmodで使用するTextureのパス. - */ - public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png"; - public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png"; - public final String ITEM_TEXTURE = "/chemicraft/items/items.png"; - public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png"; - public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png"; - public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png"; - public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png"; - public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png"; - public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png"; - - /** - * このmodに必要な補助クラスのインスタンス. - */ - public Auxiliary auxiliary = new Auxiliary(); - public NameAuxiliary nameAuxiliary = new NameAuxiliary(); - public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary(); - - private ChemiCraftAPI api = ChemiCraftAPI.getInstance(); - private ChemiCraftData chemicalData = new ChemiCraftData(); - - @Mod.PreInit - public void chemiPreLoadMethod(final FMLPreInitializationEvent event) { - Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); - cfg.load(); - - Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400); - Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401); - Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402); - Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403); - Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404); - - Property atomsIDProp = cfg.getItem("AtomsID", 25000); - Property compoundsIDProp = cfg.getItem("CompoundsID", 25001); - Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002); - Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003); - - Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000); - Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001); - Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002); - Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003); - Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004); - - - this.pyrolysisTableID = pyrolysisTableIDProp.getInt(); - this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt(); - this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt(); - this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt(); - this.electrolysisTableID = electrolysisTableIDProp.getInt(); - this.atomsID = atomsIDProp.getInt(); - this.compoundsID = compoundsIDProp.getInt(); - this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt(); - this.atomGrenadeID = atomGrenadeIDProp.getInt(); - this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt(); - this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt(); - this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt(); - this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt(); - this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt(); - - cfg.save(); - } - - @Mod.ServerStarting - public void serverStarting(final FMLServerStartingEvent event) { - event.registerServerCommand(new CommandSetTile()); - event.registerServerCommand(new CommandDeleteItem()); - event.registerServerCommand(new CommandGenDebugRoom()); - } - - @Mod.PostInit - public void chemiPostLoadMethod(final FMLPostInitializationEvent event) { - this.settingProcessing(event); - this.apiProcessing(event); - this.debug(event); - } - - private void settingProcessing(final FMLPostInitializationEvent event) { - - // Blockを追加します - this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground). - setHardness(2.0F). - setResistance(0.0F). - setStepSound(Block.soundStoneFootstep). - setBlockName("PyrolysisTable"); - this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground). - setHardness(2.0F). - setResistance(0.0F). - setStepSound(Block.soundStoneFootstep). - setBlockName("ChemicalCombinationTable"); - this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground). - setHardness(2.0F). - setResistance(0.0F). - setStepSound(Block.soundStoneFootstep). - setBlockName("ToolAndWeaponCraftingTable"); - this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground). - setHardness(2.0F). - setResistance(0.0F). - setStepSound(Block.soundStoneFootstep). - setBlockName("ChemicalCraftingTable"); - this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground). - setHardness(2.0F). - setResistance(0.0F). - setStepSound(Block.soundStoneFootstep). - setBlockName("ElectrolysisTable"); - - // Itemを追加します - this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms"); - this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds"); - this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0); - this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1); - - // BlockをMinecraftに登録します - GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable"); - GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable"); - GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable"); - GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable"); - GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable"); - - // Blockの名前を設定します - this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable"); - this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台"); - this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable"); - this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台"); - this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable"); - this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台"); - this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable"); - this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台"); - this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable"); - this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台"); - - // Itemの名前を設定します - this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME); - this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP); - this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle"); - this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶"); - this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade"); - this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾"); - - // TileEntityを追加します - GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable"); - GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable"); - GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable"); - GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable"); - GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable"); - - // GUIを追加します - NetworkRegistry.instance().registerGuiHandler(instance, proxy); - - // 描画関係の読み込み - proxy.registerRenderInformation(); - - //化学作業台類のレシピを追加します - GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable), - new Object[]{ - "XYX", "ZAZ", "ZZZ", - Character.valueOf('X'), new ItemStack(Item.ingotIron), - Character.valueOf('Y'), new ItemStack(Block.workbench), - Character.valueOf('Z'), new ItemStack(Block.stone), - Character.valueOf('A'), new ItemStack(Item.bucketLava), - }); - GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable), - new Object[]{ - "XYX", "ZAZ", "ZZZ", - Character.valueOf('X'), new ItemStack(Item.ingotIron), - Character.valueOf('Y'), new ItemStack(Block.workbench), - Character.valueOf('Z'), new ItemStack(Block.stone), - Character.valueOf('A'), new ItemStack(Block.obsidian), - }); - GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable), - new Object[]{ - "XYX", "ZAZ", "ZZZ", - Character.valueOf('X'), new ItemStack(Item.ingotIron), - Character.valueOf('Y'), new ItemStack(Block.workbench), - Character.valueOf('Z'), new ItemStack(Block.stone), - Character.valueOf('A'), new ItemStack(Item.pickaxeSteel), - }); - GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable), - new Object[]{ - "XYX", "ZAZ", "ZZZ", - Character.valueOf('X'), new ItemStack(Item.ingotIron), - Character.valueOf('Y'), new ItemStack(Block.workbench), - Character.valueOf('Z'), new ItemStack(Block.stone), - Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0), - }); - - // 化合物を追加します - api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素"); - api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素"); - api.addLangCompound("ja_JP", "Water", "æ°´"); - - - //化合物のHandlerを設定します - api.settingCompoundHandler("Water", new CompoundWater()); - - //化合物のレシピを追加します - api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water"))); - - //手榴弾の追加 - api.addMaterialRecipe(new ItemStack[] { - null, - new ItemStack(Block.stone), - null, - new ItemStack(Block.stone), - new ItemStack(Item.gunpowder), - new ItemStack(Block.stone), - null, - new ItemStack(Block.stone), - null - }, - new ItemStack(this.itemAtomGrenade, 16, 0), - new NBTRecipeGrenade() - ); - - api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0), - new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN}, - new int[] {2, 1}); - - api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")), - new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN}, - new int[] {2, 1}); - - api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8); - } - - private void apiProcessing(final FMLPostInitializationEvent event) { - // API用の処理 - this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray()); - for (int i = 0; i < api.getCompoundsLang().size(); i++) { - this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray()); - } - } - - private void debug(final FMLPostInitializationEvent event) { - //DebugTickingの追加 - this.proxy.registerTickHandler(); - api.addCompound("Debug"); - this.api.settingCompoundHandler("Debug", new CompoundDebug()); - } - -} +package pcc.chemicraft; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.Property; +import pcc.chemicraft.block.BlockChemicalCombinationTable; +import pcc.chemicraft.block.BlockChemicalCraftingTable; +import pcc.chemicraft.block.BlockElectrolysisTable; +import pcc.chemicraft.block.BlockPyrolysisTable; +import pcc.chemicraft.block.BlockToolAndWeaponCraftingTable; +import pcc.chemicraft.compounds.CompoundDebug; +import pcc.chemicraft.compounds.CompoundWater; +import pcc.chemicraft.debug.CommandDeleteItem; +import pcc.chemicraft.debug.CommandGenDebugRoom; +import pcc.chemicraft.debug.CommandSetTile; +import pcc.chemicraft.item.ItemAtoms; +import pcc.chemicraft.item.ItemAtomsGrenade; +import pcc.chemicraft.item.ItemCompounds; +import pcc.chemicraft.item.ItemGasCollectingBottle; +import pcc.chemicraft.system.CommonProxy; +import pcc.chemicraft.system.PacketHandler; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.util.Auxiliary; +import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary; +import pcc.chemicraft.util.Auxiliary.NameAuxiliary; +import pcc.chemicraft.util.CreativeTabAtoms; +import pcc.chemicraft.util.NBTRecipeGrenade; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.network.NetworkMod; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + +/** + * ChemiCraft本体 + * @author P.C.C. + * + */ +@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta") +@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class) +public class ChemiCraft { + + public static final String[] ATOMSNAME = { + "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", + "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", + "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", + "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", + "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", + "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", + "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", + "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" }; + + public static final String[] ATOMSNAMEJP = { + "æ°´ç´ ", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "å¡©ç´ ", "アルゴン", "カリウム", "カルシウム", "スカンジウム", + "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム", + "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム", + "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム", + "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム", + "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" }; + + /** + * このmodのインスタンス + */ + @Mod.Instance("chemiCraft") + public static ChemiCraft instance; + + /** + * ChemiCraftのProxy. + */ + @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy") + public static CommonProxy proxy; + + /** + * ChemiCraftのCreativeTab. + */ + public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft"); + + /** + * ItemID. + */ + public int atomsID; + public int compoundsID; + public int gasCollectingBottleID; + public int atomGrenadeID; + + /** + * BlockID. + */ + public int pyrolysisTableID; + public int chemicalConbinationTableID; + public int toolAndWeaponCraftingTableID; + public int chemicalCraftingTableID; + public int electrolysisTableID; + + /** + * GUIID. + */ + public int guiPyrolysisTableID; + public int guiChemicalCombinationTableID; + public int guiToolAndWeaponCraftingTableID; + public int guiChemicalCraftingTableID; + public int guiElectrolysisTableID; + + /** + * Block型変数. + */ + public Block blockPyrolysisTable; + public Block blockChemicalCombinationTable; + public Block blockToolAndWeaponCraftingTable; + public Block blockChemicalCraftingTable; + public Block blockElectrolysisTable; + + /** + * Item型変数. + */ + public Item itemAtoms; + public Item itemCompounds; + public Item itemGasCollectingBottle; + public Item itemAtomGrenade; + + /** + * このmodで使用するTextureのパス. + */ + public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png"; + public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png"; + public final String ITEM_TEXTURE = "/chemicraft/items/items.png"; + public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png"; + public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png"; + public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png"; + public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png"; + public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png"; + public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png"; + + /** + * このmodに必要な補助クラスのインスタンス. + */ + public Auxiliary auxiliary = new Auxiliary(); + public NameAuxiliary nameAuxiliary = new NameAuxiliary(); + public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary(); + + private ChemiCraftAPI api = ChemiCraftAPI.getInstance(); + private ChemiCraftData chemicalData = new ChemiCraftData(); + + @Mod.PreInit + public void chemiPreLoadMethod(final FMLPreInitializationEvent event) { + Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); + cfg.load(); + + Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400); + Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401); + Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402); + Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403); + Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404); + + Property atomsIDProp = cfg.getItem("AtomsID", 25000); + Property compoundsIDProp = cfg.getItem("CompoundsID", 25001); + Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002); + Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003); + + Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000); + Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001); + Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002); + Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003); + Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004); + + + this.pyrolysisTableID = pyrolysisTableIDProp.getInt(); + this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt(); + this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt(); + this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt(); + this.electrolysisTableID = electrolysisTableIDProp.getInt(); + this.atomsID = atomsIDProp.getInt(); + this.compoundsID = compoundsIDProp.getInt(); + this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt(); + this.atomGrenadeID = atomGrenadeIDProp.getInt(); + this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt(); + this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt(); + this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt(); + this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt(); + this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt(); + + cfg.save(); + } + + @Mod.ServerStarting + public void serverStarting(final FMLServerStartingEvent event) { + event.registerServerCommand(new CommandSetTile()); + event.registerServerCommand(new CommandDeleteItem()); + event.registerServerCommand(new CommandGenDebugRoom()); + } + + @Mod.PostInit + public void chemiPostLoadMethod(final FMLPostInitializationEvent event) { + this.settingProcessing(event); + this.apiProcessing(event); + this.debug(event); + } + + private void settingProcessing(final FMLPostInitializationEvent event) { + + // Blockを追加します + this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground). + setHardness(2.0F). + setResistance(0.0F). + setStepSound(Block.soundStoneFootstep). + setBlockName("PyrolysisTable"); + this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground). + setHardness(2.0F). + setResistance(0.0F). + setStepSound(Block.soundStoneFootstep). + setBlockName("ChemicalCombinationTable"); + this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground). + setHardness(2.0F). + setResistance(0.0F). + setStepSound(Block.soundStoneFootstep). + setBlockName("ToolAndWeaponCraftingTable"); + this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground). + setHardness(2.0F). + setResistance(0.0F). + setStepSound(Block.soundStoneFootstep). + setBlockName("ChemicalCraftingTable"); + this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground). + setHardness(2.0F). + setResistance(0.0F). + setStepSound(Block.soundStoneFootstep). + setBlockName("ElectrolysisTable"); + + // Itemを追加します + this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms"); + this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds"); + this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0); + this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1); + + // BlockをMinecraftに登録します + GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable"); + GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable"); + GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable"); + GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable"); + GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable"); + + // Blockの名前を設定します + this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable"); + this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台"); + this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable"); + this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台"); + this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable"); + this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台"); + this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable"); + this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台"); + this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable"); + this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台"); + + // Itemの名前を設定します + this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME); + this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP); + this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle"); + this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶"); + this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade"); + this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾"); + + // TileEntityを追加します + GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable"); + GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable"); + GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable"); + GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable"); + GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable"); + + // GUIを追加します + NetworkRegistry.instance().registerGuiHandler(instance, proxy); + + // 描画関係の読み込み + proxy.registerRenderInformation(); + + //化学作業台類のレシピを追加します + GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable), + new Object[]{ + "XYX", "ZAZ", "ZZZ", + Character.valueOf('X'), new ItemStack(Item.ingotIron), + Character.valueOf('Y'), new ItemStack(Block.workbench), + Character.valueOf('Z'), new ItemStack(Block.stone), + Character.valueOf('A'), new ItemStack(Item.bucketLava), + }); + GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable), + new Object[]{ + "XYX", "ZAZ", "ZZZ", + Character.valueOf('X'), new ItemStack(Item.ingotIron), + Character.valueOf('Y'), new ItemStack(Block.workbench), + Character.valueOf('Z'), new ItemStack(Block.stone), + Character.valueOf('A'), new ItemStack(Block.obsidian), + }); + GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable), + new Object[]{ + "XYX", "ZAZ", "ZZZ", + Character.valueOf('X'), new ItemStack(Item.ingotIron), + Character.valueOf('Y'), new ItemStack(Block.workbench), + Character.valueOf('Z'), new ItemStack(Block.stone), + Character.valueOf('A'), new ItemStack(Item.pickaxeSteel), + }); + GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable), + new Object[]{ + "XYX", "ZAZ", "ZZZ", + Character.valueOf('X'), new ItemStack(Item.ingotIron), + Character.valueOf('Y'), new ItemStack(Block.workbench), + Character.valueOf('Z'), new ItemStack(Block.stone), + Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0), + }); + + // 化合物を追加します + api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素"); + api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素"); + api.addLangCompound("ja_JP", "Water", "æ°´"); + + + //化合物のHandlerを設定します + api.settingCompoundHandler("Water", new CompoundWater()); + + //化合物のレシピを追加します + api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water"))); + + //手榴弾の追加 + api.addMaterialRecipe(new ItemStack[] { + null, + new ItemStack(Block.stone), + null, + new ItemStack(Block.stone), + new ItemStack(Item.gunpowder), + new ItemStack(Block.stone), + null, + new ItemStack(Block.stone), + null + }, + new ItemStack(this.itemAtomGrenade, 16, 0), + new NBTRecipeGrenade() + ); + + api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0), + new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN}, + new int[] {2, 1}); + + api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")), + new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN}, + new int[] {2, 1}); + + api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8); + } + + private void apiProcessing(final FMLPostInitializationEvent event) { + // API用の処理 + this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray()); + for (int i = 0; i < api.getCompoundsLang().size(); i++) { + this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray()); + } + } + + private void debug(final FMLPostInitializationEvent event) { + //DebugTickingの追加 + this.proxy.registerTickHandler(); + api.addCompound("Debug"); + this.api.settingCompoundHandler("Debug", new CompoundDebug()); + + /* + * TWDebug + */ + api.addToolAndWeaponRecipe(new ItemStack[] { + new ItemStack(Block.stone, 1, 1) + }, + new ItemStack(Block.dirt, 1, 0)); + } + +} diff --git a/common/chemicraft/ChemiCraftAPI.java b/common/pcc/chemicraft/ChemiCraftAPI.java similarity index 70% rename from common/chemicraft/ChemiCraftAPI.java rename to common/pcc/chemicraft/ChemiCraftAPI.java index a538fed..2110f73 100644 --- a/common/chemicraft/ChemiCraftAPI.java +++ b/common/pcc/chemicraft/ChemiCraftAPI.java @@ -1,14 +1,14 @@ -package chemicraft; +package pcc.chemicraft; import java.util.ArrayList; import java.util.HashMap; import net.minecraft.item.ItemStack; -import chemicraft.system.ChemiCraftCraftingManager; -import chemicraft.tileentity.TileEntityPyrolysisTable; -import chemicraft.util.ChemicalNBTRecipe; -import chemicraft.util.ICompoundHandler; -import chemicraft.util.MaterialRecipe; +import pcc.chemicraft.system.ChemiCraftCraftingManager; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.util.ChemicalNBTRecipe; +import pcc.chemicraft.util.ICompoundHandler; +import pcc.chemicraft.util.MaterialRecipe; /** * ChemiCraftのAPI @@ -90,6 +90,24 @@ public class ChemiCraftAPI { private ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager(); + /** + * ツール&武器作成台の素材一覧のリスト + */ + private ArrayList toolAndWeaponMaterials = new ArrayList(); + + + /** + * ツール&武器作成台の結果のリスト + */ + private ArrayList toolAndWeaponResult = new ArrayList(); + + + /** + * ツール&武器作成台の不定形であるか + */ + private ArrayList toolAndWeaponSharpless = new ArrayList(); + + /** * add compound. @@ -151,6 +169,12 @@ public class ChemiCraftAPI { + /** + * 分解台のレシピを追加します + * @param material 素材 + * @param results 原子の元素番号の配列 + * @param stacks 原子のできる数の配列 + */ public void addDecompositionRecipe(ItemStack material, int[] results, int[] stacks) { ItemStack[] itemstacks = new ItemStack[results.length]; for (int i = 0; i < itemstacks.length; i++) { @@ -161,18 +185,60 @@ public class ChemiCraftAPI { + /** + * 分解台の燃料を追加します + * @param itemstack 燃料のItemStack + * @param burnTime 燃焼時間(tick * rate) + */ public void addDecompositionFuel(ItemStack itemstack, int burnTime) { TileEntityPyrolysisTable.addFuel(itemstack, burnTime); } + /** + * ツール&武器作成台のレシピを追加します + * @param materials 素材 + * @param result 結果 + */ + public void addToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) { + toolAndWeaponMaterials.add(materials); + toolAndWeaponResult.add(result); + toolAndWeaponSharpless.add(false); + } + + + /** + * ツール&武器作成台の不定形レシピを追加します + * @param materials 素材 + * @param result 結果 + */ + public void addSharplessToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) { + toolAndWeaponMaterials.add(materials); + toolAndWeaponResult.add(result); + toolAndWeaponSharpless.add(true); + } + + + + /** + * 素材作成台の不定形レシピを追加します + * @param materials 素材 + * @param result 結果 + * @param nbtRecipe NBT(Nullの場合はなし) + */ public void addSharplessMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){ materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, true)); } + /** + * 素材作成台のレシピを追加します + * @param materials 素材 + * @param result 結果 + * @param nbtRecipe NBT(Nullの場合はなし) + */ public void addMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){ materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, false)); } @@ -238,6 +304,24 @@ public class ChemiCraftAPI { + public ArrayList getToolAndWeaponMaterials() { + return toolAndWeaponMaterials; + } + + + + public ArrayList getToolAndWeaponResult() { + return toolAndWeaponResult; + } + + + + public ArrayList getToolAndWeaponSharpless() { + return toolAndWeaponSharpless; + } + + + public ChemiCraftCraftingManager getCraftingManager(){ return chemiCraftCraftingManager; } diff --git a/common/chemicraft/ChemiCraftData.java b/common/pcc/chemicraft/ChemiCraftData.java similarity index 99% rename from common/chemicraft/ChemiCraftData.java rename to common/pcc/chemicraft/ChemiCraftData.java index 8dab814..2601196 100644 --- a/common/chemicraft/ChemiCraftData.java +++ b/common/pcc/chemicraft/ChemiCraftData.java @@ -1,4 +1,4 @@ -package chemicraft; +package pcc.chemicraft; public final class ChemiCraftData { diff --git a/common/chemicraft/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java similarity index 92% rename from common/chemicraft/block/BlockChemicalCombinationTable.java rename to common/pcc/chemicraft/block/BlockChemicalCombinationTable.java index 3f8340a..22eb6bf 100644 --- a/common/chemicraft/block/BlockChemicalCombinationTable.java +++ b/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java @@ -1,12 +1,12 @@ -package chemicraft.block; +package pcc.chemicraft.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; public class BlockChemicalCombinationTable extends BlockContainer { diff --git a/common/chemicraft/block/BlockChemicalCraftingTable.java b/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java similarity index 89% rename from common/chemicraft/block/BlockChemicalCraftingTable.java rename to common/pcc/chemicraft/block/BlockChemicalCraftingTable.java index 0ba75da..1c9e72c 100644 --- a/common/chemicraft/block/BlockChemicalCraftingTable.java +++ b/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java @@ -1,12 +1,12 @@ -package chemicraft.block; +package pcc.chemicraft.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; public class BlockChemicalCraftingTable extends BlockContainer { diff --git a/common/chemicraft/block/BlockElectrolysisTable.java b/common/pcc/chemicraft/block/BlockElectrolysisTable.java similarity index 88% rename from common/chemicraft/block/BlockElectrolysisTable.java rename to common/pcc/chemicraft/block/BlockElectrolysisTable.java index 11e8e65..24dfc54 100644 --- a/common/chemicraft/block/BlockElectrolysisTable.java +++ b/common/pcc/chemicraft/block/BlockElectrolysisTable.java @@ -1,12 +1,12 @@ -package chemicraft.block; +package pcc.chemicraft.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; public class BlockElectrolysisTable extends BlockContainer { diff --git a/common/chemicraft/block/BlockPyrolysisTable.java b/common/pcc/chemicraft/block/BlockPyrolysisTable.java similarity index 90% rename from common/chemicraft/block/BlockPyrolysisTable.java rename to common/pcc/chemicraft/block/BlockPyrolysisTable.java index d24cc1a..4b7a2d5 100644 --- a/common/chemicraft/block/BlockPyrolysisTable.java +++ b/common/pcc/chemicraft/block/BlockPyrolysisTable.java @@ -1,13 +1,13 @@ -package chemicraft.block; +package pcc.chemicraft.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.debug.DebugTick; -import chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.debug.DebugTick; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; public class BlockPyrolysisTable extends BlockContainer { diff --git a/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java similarity index 89% rename from common/chemicraft/block/BlockToolAndWeaponCraftingTable.java rename to common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java index 668dfd0..c484184 100644 --- a/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java +++ b/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java @@ -1,12 +1,12 @@ -package chemicraft.block; +package pcc.chemicraft.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; public class BlockToolAndWeaponCraftingTable extends BlockContainer { diff --git a/common/chemicraft/client/ClientProxy.java b/common/pcc/chemicraft/client/ClientProxy.java similarity index 75% rename from common/chemicraft/client/ClientProxy.java rename to common/pcc/chemicraft/client/ClientProxy.java index 5ec9032..185c406 100644 --- a/common/chemicraft/client/ClientProxy.java +++ b/common/pcc/chemicraft/client/ClientProxy.java @@ -1,24 +1,24 @@ -package chemicraft.client; +package pcc.chemicraft.client; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; -import chemicraft.ChemiCraft; -import chemicraft.debug.DebugTick; -import chemicraft.entity.EntityAtomsGrenade; -import chemicraft.gui.GuiChemicalCombinationTable; -import chemicraft.gui.GuiChemicalCraftingTable; -import chemicraft.gui.GuiElectrolysisTable; -import chemicraft.gui.GuiPyrolysisTable; -import chemicraft.gui.GuiToolAndWeaponCraftingTable; -import chemicraft.render.RenderAtomsGrenade; -import chemicraft.system.CommonProxy; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityElectrolysisTable; -import chemicraft.tileentity.TileEntityPyrolysisTable; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.debug.DebugTick; +import pcc.chemicraft.entity.EntityAtomsGrenade; +import pcc.chemicraft.gui.GuiChemicalCombinationTable; +import pcc.chemicraft.gui.GuiChemicalCraftingTable; +import pcc.chemicraft.gui.GuiElectrolysisTable; +import pcc.chemicraft.gui.GuiPyrolysisTable; +import pcc.chemicraft.gui.GuiToolAndWeaponCraftingTable; +import pcc.chemicraft.render.RenderAtomsGrenade; +import pcc.chemicraft.system.CommonProxy; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.TickRegistry; diff --git a/common/chemicraft/compounds/CompoundDebug.java b/common/pcc/chemicraft/compounds/CompoundDebug.java similarity index 94% rename from common/chemicraft/compounds/CompoundDebug.java rename to common/pcc/chemicraft/compounds/CompoundDebug.java index 9e5bf24..06363db 100644 --- a/common/chemicraft/compounds/CompoundDebug.java +++ b/common/pcc/chemicraft/compounds/CompoundDebug.java @@ -1,11 +1,11 @@ -package chemicraft.compounds; +package pcc.chemicraft.compounds; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityLargeFireball; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.util.ICompoundHandler; +import pcc.chemicraft.util.ICompoundHandler; public class CompoundDebug implements ICompoundHandler { diff --git a/common/chemicraft/compounds/CompoundWater.java b/common/pcc/chemicraft/compounds/CompoundWater.java similarity index 90% rename from common/chemicraft/compounds/CompoundWater.java rename to common/pcc/chemicraft/compounds/CompoundWater.java index a009a6c..61cb3a3 100644 --- a/common/chemicraft/compounds/CompoundWater.java +++ b/common/pcc/chemicraft/compounds/CompoundWater.java @@ -1,10 +1,10 @@ -package chemicraft.compounds; +package pcc.chemicraft.compounds; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.util.ICompoundHandler; +import pcc.chemicraft.util.ICompoundHandler; public class CompoundWater implements ICompoundHandler { diff --git a/common/chemicraft/container/ContainerChemicalCombinationTable.java b/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java similarity index 90% rename from common/chemicraft/container/ContainerChemicalCombinationTable.java rename to common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java index 26ebd93..4e1a37b 100644 --- a/common/chemicraft/container/ContainerChemicalCombinationTable.java +++ b/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java @@ -1,4 +1,4 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -6,13 +6,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftAPI; -import chemicraft.inventory.InventoryChemicalCombinationTableMaterial; -import chemicraft.inventory.InventoryChemicalCombinationTableResult; -import chemicraft.slot.SlotChemicalCombinationTableMaterial; -import chemicraft.slot.SlotChemicalCombinationTableResult; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftAPI; +import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial; +import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult; +import pcc.chemicraft.slot.SlotChemicalCombinationTableMaterial; +import pcc.chemicraft.slot.SlotChemicalCombinationTableResult; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; import cpw.mods.fml.common.network.PacketDispatcher; public class ContainerChemicalCombinationTable extends Container { diff --git a/common/chemicraft/container/ContainerChemicalCraftingTable.java b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java similarity index 90% rename from common/chemicraft/container/ContainerChemicalCraftingTable.java rename to common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java index 017066f..277ff92 100644 --- a/common/chemicraft/container/ContainerChemicalCraftingTable.java +++ b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java @@ -1,4 +1,4 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -6,14 +6,14 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftAPI; -import chemicraft.inventory.InventoryChemicalCraftingMaterial; -import chemicraft.inventory.InventoryChemicalCraftingNBT; -import chemicraft.inventory.InventoryChemicalCraftingResult; -import chemicraft.slot.SlotChemicalCraftingTableResult; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.util.ChemicalNBTRecipe; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftAPI; +import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial; +import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT; +import pcc.chemicraft.inventory.InventoryChemicalCraftingResult; +import pcc.chemicraft.slot.SlotChemicalCraftingTableResult; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.util.ChemicalNBTRecipe; public class ContainerChemicalCraftingTable extends Container { diff --git a/common/chemicraft/container/ContainerElectrolysis.java b/common/pcc/chemicraft/container/ContainerElectrolysis.java similarity index 81% rename from common/chemicraft/container/ContainerElectrolysis.java rename to common/pcc/chemicraft/container/ContainerElectrolysis.java index d7f9615..6d612cc 100644 --- a/common/chemicraft/container/ContainerElectrolysis.java +++ b/common/pcc/chemicraft/container/ContainerElectrolysis.java @@ -1,16 +1,16 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.inventory.InventoryElectrolysisFuel; -import chemicraft.inventory.InventoryElectrolysisMaterial; -import chemicraft.inventory.InventoryElectrolysisResult; -import chemicraft.slot.SlotElectrolysisMaterial; -import chemicraft.slot.SlotElectrolysisResult; -import chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.inventory.InventoryElectrolysisFuel; +import pcc.chemicraft.inventory.InventoryElectrolysisMaterial; +import pcc.chemicraft.inventory.InventoryElectrolysisResult; +import pcc.chemicraft.slot.SlotElectrolysisMaterial; +import pcc.chemicraft.slot.SlotElectrolysisResult; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; public class ContainerElectrolysis extends Container { diff --git a/common/chemicraft/container/ContainerElectrolysisTable.java b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java similarity index 83% rename from common/chemicraft/container/ContainerElectrolysisTable.java rename to common/pcc/chemicraft/container/ContainerElectrolysisTable.java index c6e5d50..799c51d 100644 --- a/common/chemicraft/container/ContainerElectrolysisTable.java +++ b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java @@ -1,16 +1,15 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.inventory.InventoryElectrolysisFuel; -import chemicraft.inventory.InventoryElectrolysisMaterial; -import chemicraft.inventory.InventoryElectrolysisResult; -import chemicraft.slot.SlotElectrolysisMaterial; -import chemicraft.slot.SlotElectrolysisResult; -import chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.inventory.InventoryElectrolysisFuel; +import pcc.chemicraft.inventory.InventoryElectrolysisMaterial; +import pcc.chemicraft.inventory.InventoryElectrolysisResult; +import pcc.chemicraft.slot.SlotElectrolysisMaterial; +import pcc.chemicraft.slot.SlotElectrolysisResult; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; public class ContainerElectrolysisTable extends Container { diff --git a/common/chemicraft/container/ContainerPyrolysisTable.java b/common/pcc/chemicraft/container/ContainerPyrolysisTable.java similarity index 85% rename from common/chemicraft/container/ContainerPyrolysisTable.java rename to common/pcc/chemicraft/container/ContainerPyrolysisTable.java index 83477d0..bc3d466 100644 --- a/common/chemicraft/container/ContainerPyrolysisTable.java +++ b/common/pcc/chemicraft/container/ContainerPyrolysisTable.java @@ -1,14 +1,14 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.slot.SlotPyrolysisTableFuel; -import chemicraft.slot.SlotPyrolysisTableMaterial; -import chemicraft.slot.SlotPyrolysisTableResult; -import chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.slot.SlotPyrolysisTableFuel; +import pcc.chemicraft.slot.SlotPyrolysisTableMaterial; +import pcc.chemicraft.slot.SlotPyrolysisTableResult; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; public class ContainerPyrolysisTable extends Container { diff --git a/common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java similarity index 64% rename from common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java rename to common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java index b6b7c2c..d609775 100644 --- a/common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java +++ b/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java @@ -1,11 +1,14 @@ -package chemicraft.container; +package pcc.chemicraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.world.World; -import chemicraft.slot.SlotToolAndWeaponCraftingTableResult; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.ChemiCraftAPI; +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial; +import pcc.chemicraft.slot.SlotToolAndWeaponCraftingTableResult; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; public class ContainerToolAndWeaponCraftingTable extends Container { @@ -24,10 +27,12 @@ public class ContainerToolAndWeaponCraftingTable extends Container { this.posX = this.tileentity.xCoord; this.posY = this.tileentity.yCoord; this.posZ = this.tileentity.zCoord; + this.tileentity.invm.setEventHandler(this); + this.tileentity.invr.setEventHandler(this); for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - this.addSlotToContainer(new Slot(this.tileentity.invm, i * 3 + i, 30 + i * 18, 17 + j * 18)); + this.addSlotToContainer(new Slot(this.tileentity.invm, i * 3 + j, 30 + i * 18, 17 + j * 18)); } } @@ -50,6 +55,13 @@ public class ContainerToolAndWeaponCraftingTable extends Container { } @Override + public void onCraftMatrixChanged(IInventory par1IInventory){ + if (par1IInventory instanceof InventoryToolAndWeaponCraftingTableMaterial) { + this.tileentity.invr.setInventorySlotContents(0, ChemiCraftAPI.getInstance().getCraftingManager().getToolAndWeaponCraftingResult(this.tileentity.invm)); + } + } + + @Override public boolean canInteractWith(EntityPlayer var1) { return true; } diff --git a/common/chemicraft/debug/CommandDeleteItem.java b/common/pcc/chemicraft/debug/CommandDeleteItem.java similarity index 98% rename from common/chemicraft/debug/CommandDeleteItem.java rename to common/pcc/chemicraft/debug/CommandDeleteItem.java index 50fa3d6..362b6ae 100644 --- a/common/chemicraft/debug/CommandDeleteItem.java +++ b/common/pcc/chemicraft/debug/CommandDeleteItem.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import java.util.Iterator; import java.util.List; diff --git a/common/chemicraft/debug/CommandGenDebugRoom.java b/common/pcc/chemicraft/debug/CommandGenDebugRoom.java similarity index 95% rename from common/chemicraft/debug/CommandGenDebugRoom.java rename to common/pcc/chemicraft/debug/CommandGenDebugRoom.java index 1d95976..42ced89 100644 --- a/common/chemicraft/debug/CommandGenDebugRoom.java +++ b/common/pcc/chemicraft/debug/CommandGenDebugRoom.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import net.minecraft.block.Block; import net.minecraft.command.CommandBase; diff --git a/common/chemicraft/debug/CommandSetTile.java b/common/pcc/chemicraft/debug/CommandSetTile.java similarity index 98% rename from common/chemicraft/debug/CommandSetTile.java rename to common/pcc/chemicraft/debug/CommandSetTile.java index 6f649fa..1f9593d 100644 --- a/common/chemicraft/debug/CommandSetTile.java +++ b/common/pcc/chemicraft/debug/CommandSetTile.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import net.minecraft.block.Block; import net.minecraft.command.CommandBase; diff --git a/common/chemicraft/debug/CompoundHandlerTest.java b/common/pcc/chemicraft/debug/CompoundHandlerTest.java similarity index 92% rename from common/chemicraft/debug/CompoundHandlerTest.java rename to common/pcc/chemicraft/debug/CompoundHandlerTest.java index 3dbe818..aa73952 100644 --- a/common/chemicraft/debug/CompoundHandlerTest.java +++ b/common/pcc/chemicraft/debug/CompoundHandlerTest.java @@ -1,10 +1,10 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.util.ICompoundHandler; +import pcc.chemicraft.util.ICompoundHandler; public class CompoundHandlerTest implements ICompoundHandler { diff --git a/common/chemicraft/debug/DebugData.java b/common/pcc/chemicraft/debug/DebugData.java similarity index 89% rename from common/chemicraft/debug/DebugData.java rename to common/pcc/chemicraft/debug/DebugData.java index 7af7876..cec3c67 100644 --- a/common/chemicraft/debug/DebugData.java +++ b/common/pcc/chemicraft/debug/DebugData.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; public class DebugData { diff --git a/common/chemicraft/debug/DebugTick.java b/common/pcc/chemicraft/debug/DebugTick.java similarity index 98% rename from common/chemicraft/debug/DebugTick.java rename to common/pcc/chemicraft/debug/DebugTick.java index 1e1edde..87a6605 100644 --- a/common/chemicraft/debug/DebugTick.java +++ b/common/pcc/chemicraft/debug/DebugTick.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import java.awt.Color; import java.awt.Font; diff --git a/common/chemicraft/debug/SetBlockSupport.java b/common/pcc/chemicraft/debug/SetBlockSupport.java similarity index 99% rename from common/chemicraft/debug/SetBlockSupport.java rename to common/pcc/chemicraft/debug/SetBlockSupport.java index 2663d5d..6987701 100644 --- a/common/chemicraft/debug/SetBlockSupport.java +++ b/common/pcc/chemicraft/debug/SetBlockSupport.java @@ -1,4 +1,4 @@ -package chemicraft.debug; +package pcc.chemicraft.debug; import java.util.Random; import net.minecraft.world.World; diff --git a/common/chemicraft/entity/EntityAtomsGrenade.java b/common/pcc/chemicraft/entity/EntityAtomsGrenade.java similarity index 98% rename from common/chemicraft/entity/EntityAtomsGrenade.java rename to common/pcc/chemicraft/entity/EntityAtomsGrenade.java index deb72b1..87052e1 100644 --- a/common/chemicraft/entity/EntityAtomsGrenade.java +++ b/common/pcc/chemicraft/entity/EntityAtomsGrenade.java @@ -1,4 +1,4 @@ -package chemicraft.entity; +package pcc.chemicraft.entity; import java.util.Iterator; diff --git a/common/chemicraft/gui/GuiChemicalCombinationTable.java b/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java similarity index 90% rename from common/chemicraft/gui/GuiChemicalCombinationTable.java rename to common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java index 3e14652..ded47bf 100644 --- a/common/chemicraft/gui/GuiChemicalCombinationTable.java +++ b/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java @@ -1,12 +1,12 @@ -package chemicraft.gui; +package pcc.chemicraft.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import chemicraft.ChemiCraft; -import chemicraft.container.ContainerChemicalCombinationTable; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.container.ContainerChemicalCombinationTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; import cpw.mods.fml.common.network.PacketDispatcher; public class GuiChemicalCombinationTable extends GuiContainer { diff --git a/common/chemicraft/gui/GuiChemicalCraftingTable.java b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java similarity index 79% rename from common/chemicraft/gui/GuiChemicalCraftingTable.java rename to common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java index ea115d2..7f16e7e 100644 --- a/common/chemicraft/gui/GuiChemicalCraftingTable.java +++ b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java @@ -1,10 +1,10 @@ -package chemicraft.gui; +package pcc.chemicraft.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import chemicraft.ChemiCraft; -import chemicraft.container.ContainerChemicalCraftingTable; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.container.ContainerChemicalCraftingTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/chemicraft/gui/GuiElectrolysisTable.java b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java similarity index 79% rename from common/chemicraft/gui/GuiElectrolysisTable.java rename to common/pcc/chemicraft/gui/GuiElectrolysisTable.java index 5fe55f8..a0f7929 100644 --- a/common/chemicraft/gui/GuiElectrolysisTable.java +++ b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java @@ -1,10 +1,9 @@ -package chemicraft.gui; +package pcc.chemicraft.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import chemicraft.ChemiCraft; -import chemicraft.container.ContainerElectrolysisTable; -import chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.container.ContainerElectrolysisTable; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; public class GuiElectrolysisTable extends GuiContainer { diff --git a/common/chemicraft/gui/GuiPyrolysisTable.java b/common/pcc/chemicraft/gui/GuiPyrolysisTable.java similarity index 83% rename from common/chemicraft/gui/GuiPyrolysisTable.java rename to common/pcc/chemicraft/gui/GuiPyrolysisTable.java index 59b7008..6a68008 100644 --- a/common/chemicraft/gui/GuiPyrolysisTable.java +++ b/common/pcc/chemicraft/gui/GuiPyrolysisTable.java @@ -1,10 +1,10 @@ -package chemicraft.gui; +package pcc.chemicraft.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import chemicraft.ChemiCraft; -import chemicraft.container.ContainerPyrolysisTable; -import chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.container.ContainerPyrolysisTable; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; public class GuiPyrolysisTable extends GuiContainer{ diff --git a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java similarity index 77% rename from common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java rename to common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java index d26ce31..5917df5 100644 --- a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java +++ b/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java @@ -1,10 +1,10 @@ -package chemicraft.gui; +package pcc.chemicraft.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import chemicraft.ChemiCraft; -import chemicraft.container.ContainerToolAndWeaponCraftingTable; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; public class GuiToolAndWeaponCraftingTable extends GuiContainer { diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java b/common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java similarity index 98% rename from common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java rename to common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java index 42f2f05..c4c5b9d 100644 --- a/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java +++ b/common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java b/common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableResult.java similarity index 98% rename from common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java rename to common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableResult.java index a6edc74..da0a43a 100644 --- a/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java +++ b/common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingMaterial.java similarity index 97% rename from common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java rename to common/pcc/chemicraft/inventory/InventoryChemicalCraftingMaterial.java index 6bd7c4b..9704023 100644 --- a/common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java +++ b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingNBT.java b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingNBT.java similarity index 97% rename from common/chemicraft/inventory/InventoryChemicalCraftingNBT.java rename to common/pcc/chemicraft/inventory/InventoryChemicalCraftingNBT.java index f57eb68..7e717fc 100644 --- a/common/chemicraft/inventory/InventoryChemicalCraftingNBT.java +++ b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingNBT.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingResult.java b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingResult.java similarity index 97% rename from common/chemicraft/inventory/InventoryChemicalCraftingResult.java rename to common/pcc/chemicraft/inventory/InventoryChemicalCraftingResult.java index 1c6aa6e..7aadc69 100644 --- a/common/chemicraft/inventory/InventoryChemicalCraftingResult.java +++ b/common/pcc/chemicraft/inventory/InventoryChemicalCraftingResult.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryElectrolysisFuel.java b/common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java similarity index 97% rename from common/chemicraft/inventory/InventoryElectrolysisFuel.java rename to common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java index a811979..536314e 100644 --- a/common/chemicraft/inventory/InventoryElectrolysisFuel.java +++ b/common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryElectrolysisMaterial.java b/common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java similarity index 97% rename from common/chemicraft/inventory/InventoryElectrolysisMaterial.java rename to common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java index d004d5c..0565df6 100644 --- a/common/chemicraft/inventory/InventoryElectrolysisMaterial.java +++ b/common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryElectrolysisResult.java b/common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java similarity index 97% rename from common/chemicraft/inventory/InventoryElectrolysisResult.java rename to common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java index 2acf3a2..05d8754 100644 --- a/common/chemicraft/inventory/InventoryElectrolysisResult.java +++ b/common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableFuel.java similarity index 98% rename from common/chemicraft/inventory/InventoryPyrolysisTableFuel.java rename to common/pcc/chemicraft/inventory/InventoryPyrolysisTableFuel.java index 1f4c5be..0dec473 100644 --- a/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java +++ b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableFuel.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableMaterial.java similarity index 98% rename from common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java rename to common/pcc/chemicraft/inventory/InventoryPyrolysisTableMaterial.java index fab443c..5f1afa9 100644 --- a/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java +++ b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableResult.java b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableResult.java similarity index 98% rename from common/chemicraft/inventory/InventoryPyrolysisTableResult.java rename to common/pcc/chemicraft/inventory/InventoryPyrolysisTableResult.java index ea14e17..645fa6b 100644 --- a/common/chemicraft/inventory/InventoryPyrolysisTableResult.java +++ b/common/pcc/chemicraft/inventory/InventoryPyrolysisTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java b/common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java similarity index 98% rename from common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java rename to common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java index aad5063..056e814 100644 --- a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java +++ b/common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java b/common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java similarity index 98% rename from common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java rename to common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java index b6743a7..fdc10e5 100644 --- a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java +++ b/common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.inventory; +package pcc.chemicraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/chemicraft/item/ItemAtomInfoContainer.java b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java similarity index 78% rename from common/chemicraft/item/ItemAtomInfoContainer.java rename to common/pcc/chemicraft/item/ItemAtomInfoContainer.java index b5aec03..f57e822 100644 --- a/common/chemicraft/item/ItemAtomInfoContainer.java +++ b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java @@ -1,7 +1,7 @@ -package chemicraft.item; +package pcc.chemicraft.item; import net.minecraft.item.Item; -import chemicraft.util.AtomInfo; +import pcc.chemicraft.util.AtomInfo; public class ItemAtomInfoContainer extends Item { diff --git a/common/chemicraft/item/ItemAtoms.java b/common/pcc/chemicraft/item/ItemAtoms.java similarity index 94% rename from common/chemicraft/item/ItemAtoms.java rename to common/pcc/chemicraft/item/ItemAtoms.java index ad1b147..0a32c3b 100644 --- a/common/chemicraft/item/ItemAtoms.java +++ b/common/pcc/chemicraft/item/ItemAtoms.java @@ -1,11 +1,11 @@ -package chemicraft.item; +package pcc.chemicraft.item; import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraft; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/chemicraft/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/item/ItemAtomsGrenade.java similarity index 96% rename from common/chemicraft/item/ItemAtomsGrenade.java rename to common/pcc/chemicraft/item/ItemAtomsGrenade.java index 8d33bec..9ce2832 100644 --- a/common/chemicraft/item/ItemAtomsGrenade.java +++ b/common/pcc/chemicraft/item/ItemAtomsGrenade.java @@ -1,4 +1,4 @@ -package chemicraft.item; +package pcc.chemicraft.item; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import chemicraft.entity.EntityAtomsGrenade; +import pcc.chemicraft.entity.EntityAtomsGrenade; public class ItemAtomsGrenade extends Item { diff --git a/common/chemicraft/item/ItemCompounds.java b/common/pcc/chemicraft/item/ItemCompounds.java similarity index 97% rename from common/chemicraft/item/ItemCompounds.java rename to common/pcc/chemicraft/item/ItemCompounds.java index 17d6514..c493bf0 100644 --- a/common/chemicraft/item/ItemCompounds.java +++ b/common/pcc/chemicraft/item/ItemCompounds.java @@ -1,4 +1,4 @@ -package chemicraft.item; +package pcc.chemicraft.item; import java.util.List; @@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftAPI; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftAPI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/chemicraft/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java similarity index 96% rename from common/chemicraft/item/ItemGasCollectingBottle.java rename to common/pcc/chemicraft/item/ItemGasCollectingBottle.java index fd8cca2..1a59647 100644 --- a/common/chemicraft/item/ItemGasCollectingBottle.java +++ b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java @@ -1,13 +1,13 @@ -package chemicraft.item; +package pcc.chemicraft.item; import net.minecraft.block.Block; import net.minecraft.block.BlockFire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftAPI; -import chemicraft.util.MathHelperPlus; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftAPI; +import pcc.chemicraft.util.MathHelperPlus; public class ItemGasCollectingBottle extends ItemAtomInfoContainer { diff --git a/common/chemicraft/render/RenderAtomsGrenade.java b/common/pcc/chemicraft/render/RenderAtomsGrenade.java similarity index 95% rename from common/chemicraft/render/RenderAtomsGrenade.java rename to common/pcc/chemicraft/render/RenderAtomsGrenade.java index dd402de..bdfa3a6 100644 --- a/common/chemicraft/render/RenderAtomsGrenade.java +++ b/common/pcc/chemicraft/render/RenderAtomsGrenade.java @@ -1,4 +1,4 @@ -package chemicraft.render; +package pcc.chemicraft.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -7,8 +7,8 @@ import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import chemicraft.ChemiCraft; -import chemicraft.entity.EntityAtomsGrenade; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.entity.EntityAtomsGrenade; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java similarity index 88% rename from common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java rename to common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java index 288775d..77d2c11 100644 --- a/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java +++ b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java @@ -1,9 +1,9 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraft; public class SlotChemicalCombinationTableMaterial extends Slot { diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableResult.java b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableResult.java similarity index 93% rename from common/chemicraft/slot/SlotChemicalCombinationTableResult.java rename to common/pcc/chemicraft/slot/SlotChemicalCombinationTableResult.java index 52a1837..706d509 100644 --- a/common/chemicraft/slot/SlotChemicalCombinationTableResult.java +++ b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotChemicalCraftingTableResult.java b/common/pcc/chemicraft/slot/SlotChemicalCraftingTableResult.java similarity index 93% rename from common/chemicraft/slot/SlotChemicalCraftingTableResult.java rename to common/pcc/chemicraft/slot/SlotChemicalCraftingTableResult.java index 1611868..1834875 100644 --- a/common/chemicraft/slot/SlotChemicalCraftingTableResult.java +++ b/common/pcc/chemicraft/slot/SlotChemicalCraftingTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotDecompositionTableMaterial.java b/common/pcc/chemicraft/slot/SlotDecompositionTableMaterial.java similarity index 90% rename from common/chemicraft/slot/SlotDecompositionTableMaterial.java rename to common/pcc/chemicraft/slot/SlotDecompositionTableMaterial.java index 4925d0d..c70e52d 100644 --- a/common/chemicraft/slot/SlotDecompositionTableMaterial.java +++ b/common/pcc/chemicraft/slot/SlotDecompositionTableMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotDecompositionTableResult.java b/common/pcc/chemicraft/slot/SlotDecompositionTableResult.java similarity index 93% rename from common/chemicraft/slot/SlotDecompositionTableResult.java rename to common/pcc/chemicraft/slot/SlotDecompositionTableResult.java index 1200f4b..f394629 100644 --- a/common/chemicraft/slot/SlotDecompositionTableResult.java +++ b/common/pcc/chemicraft/slot/SlotDecompositionTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotElectrolysisFuel.java b/common/pcc/chemicraft/slot/SlotElectrolysisFuel.java similarity index 90% rename from common/chemicraft/slot/SlotElectrolysisFuel.java rename to common/pcc/chemicraft/slot/SlotElectrolysisFuel.java index e4e70fe..7e6ba02 100644 --- a/common/chemicraft/slot/SlotElectrolysisFuel.java +++ b/common/pcc/chemicraft/slot/SlotElectrolysisFuel.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotElectrolysisMaterial.java b/common/pcc/chemicraft/slot/SlotElectrolysisMaterial.java similarity index 90% rename from common/chemicraft/slot/SlotElectrolysisMaterial.java rename to common/pcc/chemicraft/slot/SlotElectrolysisMaterial.java index 6483b88..01ed39b 100644 --- a/common/chemicraft/slot/SlotElectrolysisMaterial.java +++ b/common/pcc/chemicraft/slot/SlotElectrolysisMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotElectrolysisResult.java b/common/pcc/chemicraft/slot/SlotElectrolysisResult.java similarity index 90% rename from common/chemicraft/slot/SlotElectrolysisResult.java rename to common/pcc/chemicraft/slot/SlotElectrolysisResult.java index 3fe451e..046630d 100644 --- a/common/chemicraft/slot/SlotElectrolysisResult.java +++ b/common/pcc/chemicraft/slot/SlotElectrolysisResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotPyrolysisTableFuel.java b/common/pcc/chemicraft/slot/SlotPyrolysisTableFuel.java similarity index 90% rename from common/chemicraft/slot/SlotPyrolysisTableFuel.java rename to common/pcc/chemicraft/slot/SlotPyrolysisTableFuel.java index a2ab846..be32955 100644 --- a/common/chemicraft/slot/SlotPyrolysisTableFuel.java +++ b/common/pcc/chemicraft/slot/SlotPyrolysisTableFuel.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotPyrolysisTableMaterial.java b/common/pcc/chemicraft/slot/SlotPyrolysisTableMaterial.java similarity index 90% rename from common/chemicraft/slot/SlotPyrolysisTableMaterial.java rename to common/pcc/chemicraft/slot/SlotPyrolysisTableMaterial.java index fb83ba6..f1351fa 100644 --- a/common/chemicraft/slot/SlotPyrolysisTableMaterial.java +++ b/common/pcc/chemicraft/slot/SlotPyrolysisTableMaterial.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotPyrolysisTableResult.java b/common/pcc/chemicraft/slot/SlotPyrolysisTableResult.java similarity index 93% rename from common/chemicraft/slot/SlotPyrolysisTableResult.java rename to common/pcc/chemicraft/slot/SlotPyrolysisTableResult.java index 41d25e0..da8cc66 100644 --- a/common/chemicraft/slot/SlotPyrolysisTableResult.java +++ b/common/pcc/chemicraft/slot/SlotPyrolysisTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java b/common/pcc/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java similarity index 93% rename from common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java rename to common/pcc/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java index a49b5f3..e2e5d75 100644 --- a/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java +++ b/common/pcc/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java @@ -1,4 +1,4 @@ -package chemicraft.slot; +package pcc.chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/chemicraft/system/ChemiCraftCraftingManager.java b/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java similarity index 54% rename from common/chemicraft/system/ChemiCraftCraftingManager.java rename to common/pcc/chemicraft/system/ChemiCraftCraftingManager.java index 48d177d..ab390a3 100644 --- a/common/chemicraft/system/ChemiCraftCraftingManager.java +++ b/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java @@ -1,21 +1,65 @@ -package chemicraft.system; +package pcc.chemicraft.system; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import chemicraft.ChemiCraftAPI; -import chemicraft.inventory.InventoryChemicalCraftingMaterial; -import chemicraft.inventory.InventoryChemicalCraftingNBT; -import chemicraft.inventory.InventoryChemicalCraftingResult; -import chemicraft.util.ChemicalNBTRecipe; -import chemicraft.util.ComparatorFormulaPart; -import chemicraft.util.FormulaPart; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftAPI; +import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial; +import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT; +import pcc.chemicraft.inventory.InventoryChemicalCraftingResult; +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial; +import pcc.chemicraft.util.ChemicalNBTRecipe; +import pcc.chemicraft.util.ComparatorFormulaPart; +import pcc.chemicraft.util.ComparatorItemStack; +import pcc.chemicraft.util.FormulaPart; public class ChemiCraftCraftingManager { - public ItemStack[] getDecompositionResults(IInventory par1IInventory){ + public ItemStack getToolAndWeaponCraftingResult(InventoryToolAndWeaponCraftingTableMaterial par1IInventory){ + ChemiCraftAPI api = ChemiCraftAPI.getInstance(); + ArrayList materials = api.getToolAndWeaponMaterials(); + ArrayList result = api.getToolAndWeaponResult(); + ArrayList sharpless = api.getToolAndWeaponSharpless(); + + ItemStack[] slotItems = new ItemStack[par1IInventory.getSizeInventory()]; + for (int i = 0; i < par1IInventory.getSizeInventory(); i++) { + slotItems[i] = (par1IInventory.getStackInSlot(i)); + } + + label1 : + for (int i = 0; i < materials.size(); i++) { + if (sharpless.get(i)) { + slotItems = ChemiCraft.instance.arrayAuxiliary.deleteNull(slotItems); + Collections.sort(materials, new ComparatorItemStack()); + Arrays.sort(slotItems, new ComparatorItemStack()); + if (materials.size() != slotItems.length) continue label1; + + for (int j = 0; j < materials.size(); j++) { + if (materials.get(i)[j].itemID != slotItems[j].itemID) { + if (materials.get(i)[j].getItemDamage() != slotItems[j].getItemDamage()) { + continue label1; + } + } + } + return result.get(i); + } else { + slotItems = ChemiCraft.instance.arrayAuxiliary.deleteNull(slotItems); + if (materials.get(i).length != slotItems.length) continue label1; + + for (int j = 0; j < materials.size(); j++) { + if (materials.get(i)[j].itemID != slotItems[j].itemID) { + if (materials.get(i)[j].getItemDamage() != slotItems[j].getItemDamage()) { + continue label1; + } + } + } + return result.get(i); + } + } return null; } diff --git a/common/chemicraft/system/CommonProxy.java b/common/pcc/chemicraft/system/CommonProxy.java similarity index 71% rename from common/chemicraft/system/CommonProxy.java rename to common/pcc/chemicraft/system/CommonProxy.java index 7edcb3a..0782c6f 100644 --- a/common/chemicraft/system/CommonProxy.java +++ b/common/pcc/chemicraft/system/CommonProxy.java @@ -1,19 +1,19 @@ -package chemicraft.system; +package pcc.chemicraft.system; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.container.ContainerChemicalCombinationTable; -import chemicraft.container.ContainerChemicalCraftingTable; -import chemicraft.container.ContainerElectrolysisTable; -import chemicraft.container.ContainerPyrolysisTable; -import chemicraft.container.ContainerToolAndWeaponCraftingTable; -import chemicraft.debug.DebugTick; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityElectrolysisTable; -import chemicraft.tileentity.TileEntityPyrolysisTable; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.container.ContainerChemicalCombinationTable; +import pcc.chemicraft.container.ContainerChemicalCraftingTable; +import pcc.chemicraft.container.ContainerElectrolysisTable; +import pcc.chemicraft.container.ContainerPyrolysisTable; +import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable; +import pcc.chemicraft.debug.DebugTick; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/common/chemicraft/system/PacketHandler.java b/common/pcc/chemicraft/system/PacketHandler.java similarity index 94% rename from common/chemicraft/system/PacketHandler.java rename to common/pcc/chemicraft/system/PacketHandler.java index 59945b4..969c964 100644 --- a/common/chemicraft/system/PacketHandler.java +++ b/common/pcc/chemicraft/system/PacketHandler.java @@ -1,4 +1,4 @@ -package chemicraft.system; +package pcc.chemicraft.system; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -10,12 +10,12 @@ import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityChemicalCombinationTable; -import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityElectrolysisTable; -import chemicraft.tileentity.TileEntityPyrolysisTable; -import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable; +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable; +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable; +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable; +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; diff --git a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java similarity index 96% rename from common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java rename to common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java index 35b2dcb..f1fe61c 100644 --- a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java +++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java @@ -1,4 +1,4 @@ -package chemicraft.tileentity; +package pcc.chemicraft.tileentity; import java.io.DataOutputStream; import java.util.ArrayList; @@ -11,12 +11,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftData; -import chemicraft.inventory.InventoryChemicalCombinationTableMaterial; -import chemicraft.inventory.InventoryChemicalCombinationTableResult; -import chemicraft.system.PacketHandler; -import chemicraft.util.ComparatorItemStack; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftData; +import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial; +import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult; +import pcc.chemicraft.system.PacketHandler; +import pcc.chemicraft.util.ComparatorItemStack; import com.google.common.io.ByteArrayDataInput; diff --git a/common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java similarity index 93% rename from common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java rename to common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java index dfd5a19..b0ab691 100644 --- a/common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java +++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java @@ -1,4 +1,4 @@ -package chemicraft.tileentity; +package pcc.chemicraft.tileentity; import java.io.DataOutputStream; @@ -8,10 +8,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import chemicraft.inventory.InventoryChemicalCraftingMaterial; -import chemicraft.inventory.InventoryChemicalCraftingNBT; -import chemicraft.inventory.InventoryChemicalCraftingResult; -import chemicraft.system.PacketHandler; +import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial; +import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT; +import pcc.chemicraft.inventory.InventoryChemicalCraftingResult; +import pcc.chemicraft.system.PacketHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java similarity index 84% rename from common/chemicraft/tileentity/TileEntityElectrolysisTable.java rename to common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java index 726b1ae..9ad1f58 100644 --- a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java +++ b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java @@ -1,13 +1,13 @@ -package chemicraft.tileentity; +package pcc.chemicraft.tileentity; import java.io.DataOutputStream; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import chemicraft.inventory.InventoryElectrolysisFuel; -import chemicraft.inventory.InventoryElectrolysisMaterial; -import chemicraft.inventory.InventoryElectrolysisResult; +import pcc.chemicraft.inventory.InventoryElectrolysisFuel; +import pcc.chemicraft.inventory.InventoryElectrolysisMaterial; +import pcc.chemicraft.inventory.InventoryElectrolysisResult; public class TileEntityElectrolysisTable extends TileEntity { diff --git a/common/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java similarity index 98% rename from common/chemicraft/tileentity/TileEntityPyrolysisTable.java rename to common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java index 9a451cb..315aa53 100644 --- a/common/chemicraft/tileentity/TileEntityPyrolysisTable.java +++ b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java @@ -1,4 +1,4 @@ -package chemicraft.tileentity; +package pcc.chemicraft.tileentity; import java.io.DataOutputStream; import java.util.HashMap; @@ -11,10 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import chemicraft.inventory.InventoryPyrolysisTableFuel; -import chemicraft.inventory.InventoryPyrolysisTableMaterial; -import chemicraft.inventory.InventoryPyrolysisTableResult; -import chemicraft.system.PacketHandler; +import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel; +import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial; +import pcc.chemicraft.inventory.InventoryPyrolysisTableResult; +import pcc.chemicraft.system.PacketHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java similarity index 77% rename from common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java rename to common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java index 32d3adc..c6e0fa1 100644 --- a/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java +++ b/common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java @@ -1,10 +1,10 @@ -package chemicraft.tileentity; +package pcc.chemicraft.tileentity; import java.io.DataOutputStream; import net.minecraft.tileentity.TileEntity; -import chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial; -import chemicraft.inventory.InventoryToolAndWeaponCraftingTableResult; +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial; +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableResult; import com.google.common.io.ByteArrayDataInput; diff --git a/common/chemicraft/util/AtomInfo.java b/common/pcc/chemicraft/util/AtomInfo.java similarity index 99% rename from common/chemicraft/util/AtomInfo.java rename to common/pcc/chemicraft/util/AtomInfo.java index ccc5f01..822dea3 100644 --- a/common/chemicraft/util/AtomInfo.java +++ b/common/pcc/chemicraft/util/AtomInfo.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/chemicraft/util/Auxiliary.java b/common/pcc/chemicraft/util/Auxiliary.java similarity index 99% rename from common/chemicraft/util/Auxiliary.java rename to common/pcc/chemicraft/util/Auxiliary.java index fbd32a4..309675d 100644 --- a/common/chemicraft/util/Auxiliary.java +++ b/common/pcc/chemicraft/util/Auxiliary.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/common/chemicraft/util/ChemicalNBTRecipe.java b/common/pcc/chemicraft/util/ChemicalNBTRecipe.java similarity index 88% rename from common/chemicraft/util/ChemicalNBTRecipe.java rename to common/pcc/chemicraft/util/ChemicalNBTRecipe.java index 7fcf71e..7e9de4c 100644 --- a/common/chemicraft/util/ChemicalNBTRecipe.java +++ b/common/pcc/chemicraft/util/ChemicalNBTRecipe.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.item.ItemStack; diff --git a/common/chemicraft/util/ChunkProviderChemical.java b/common/pcc/chemicraft/util/ChunkProviderChemical.java similarity index 99% rename from common/chemicraft/util/ChunkProviderChemical.java rename to common/pcc/chemicraft/util/ChunkProviderChemical.java index 31cb6a9..5010339 100644 --- a/common/chemicraft/util/ChunkProviderChemical.java +++ b/common/pcc/chemicraft/util/ChunkProviderChemical.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE; import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT; diff --git a/common/chemicraft/util/ComparatorFormulaPart.java b/common/pcc/chemicraft/util/ComparatorFormulaPart.java similarity index 94% rename from common/chemicraft/util/ComparatorFormulaPart.java rename to common/pcc/chemicraft/util/ComparatorFormulaPart.java index d6a7cf6..66c2c52 100644 --- a/common/chemicraft/util/ComparatorFormulaPart.java +++ b/common/pcc/chemicraft/util/ComparatorFormulaPart.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import java.util.Comparator; diff --git a/common/chemicraft/util/ComparatorItemStack.java b/common/pcc/chemicraft/util/ComparatorItemStack.java similarity index 95% rename from common/chemicraft/util/ComparatorItemStack.java rename to common/pcc/chemicraft/util/ComparatorItemStack.java index 8962fd6..96c4849 100644 --- a/common/chemicraft/util/ComparatorItemStack.java +++ b/common/pcc/chemicraft/util/ComparatorItemStack.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import java.util.Comparator; diff --git a/common/chemicraft/util/CreativeTabAtoms.java b/common/pcc/chemicraft/util/CreativeTabAtoms.java similarity index 88% rename from common/chemicraft/util/CreativeTabAtoms.java rename to common/pcc/chemicraft/util/CreativeTabAtoms.java index a71d7c1..876e61b 100644 --- a/common/chemicraft/util/CreativeTabAtoms.java +++ b/common/pcc/chemicraft/util/CreativeTabAtoms.java @@ -1,7 +1,7 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.creativetab.CreativeTabs; -import chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraft; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/chemicraft/util/FormulaPart.java b/common/pcc/chemicraft/util/FormulaPart.java similarity index 94% rename from common/chemicraft/util/FormulaPart.java rename to common/pcc/chemicraft/util/FormulaPart.java index 1786cd4..9067c91 100644 --- a/common/chemicraft/util/FormulaPart.java +++ b/common/pcc/chemicraft/util/FormulaPart.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; public class FormulaPart { diff --git a/common/chemicraft/util/ICompoundHandler.java b/common/pcc/chemicraft/util/ICompoundHandler.java similarity index 97% rename from common/chemicraft/util/ICompoundHandler.java rename to common/pcc/chemicraft/util/ICompoundHandler.java index 745bc2c..4257843 100644 --- a/common/chemicraft/util/ICompoundHandler.java +++ b/common/pcc/chemicraft/util/ICompoundHandler.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/chemicraft/util/MaterialRecipe.java b/common/pcc/chemicraft/util/MaterialRecipe.java similarity index 96% rename from common/chemicraft/util/MaterialRecipe.java rename to common/pcc/chemicraft/util/MaterialRecipe.java index 872d7bb..eebf6da 100644 --- a/common/chemicraft/util/MaterialRecipe.java +++ b/common/pcc/chemicraft/util/MaterialRecipe.java @@ -1,11 +1,11 @@ -package chemicraft.util; +package pcc.chemicraft.util; import java.util.ArrayList; import java.util.Arrays; import net.minecraft.item.ItemStack; -import chemicraft.ChemiCraft; -import chemicraft.inventory.InventoryChemicalCraftingMaterial; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial; public class MaterialRecipe { diff --git a/common/chemicraft/util/MathHelperPlus.java b/common/pcc/chemicraft/util/MathHelperPlus.java similarity index 95% rename from common/chemicraft/util/MathHelperPlus.java rename to common/pcc/chemicraft/util/MathHelperPlus.java index 775a77e..aaacea7 100644 --- a/common/chemicraft/util/MathHelperPlus.java +++ b/common/pcc/chemicraft/util/MathHelperPlus.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import java.util.ArrayList; import java.util.Random; diff --git a/common/chemicraft/util/NBTRecipeGrenade.java b/common/pcc/chemicraft/util/NBTRecipeGrenade.java similarity index 94% rename from common/chemicraft/util/NBTRecipeGrenade.java rename to common/pcc/chemicraft/util/NBTRecipeGrenade.java index 8d342e0..faa6c5c 100644 --- a/common/chemicraft/util/NBTRecipeGrenade.java +++ b/common/pcc/chemicraft/util/NBTRecipeGrenade.java @@ -1,10 +1,10 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import chemicraft.ChemiCraft; -import chemicraft.ChemiCraftData; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.ChemiCraftData; public class NBTRecipeGrenade extends ChemicalNBTRecipe { diff --git a/common/chemicraft/util/WorldProviderChemical.java b/common/pcc/chemicraft/util/WorldProviderChemical.java similarity index 87% rename from common/chemicraft/util/WorldProviderChemical.java rename to common/pcc/chemicraft/util/WorldProviderChemical.java index ca7b168..059f71f 100644 --- a/common/chemicraft/util/WorldProviderChemical.java +++ b/common/pcc/chemicraft/util/WorldProviderChemical.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.world.WorldProvider; diff --git a/common/chemicraft/util/WorldTypeChemical.java b/common/pcc/chemicraft/util/WorldTypeChemical.java similarity index 96% rename from common/chemicraft/util/WorldTypeChemical.java rename to common/pcc/chemicraft/util/WorldTypeChemical.java index afe6a2e..21f3c08 100644 --- a/common/chemicraft/util/WorldTypeChemical.java +++ b/common/pcc/chemicraft/util/WorldTypeChemical.java @@ -1,4 +1,4 @@ -package chemicraft.util; +package pcc.chemicraft.util; import net.minecraft.world.World; import net.minecraft.world.WorldType;