Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

diff --git a/common/pcc/addon/crops/ChemicalCrops.java b/common/pcc/addon/crops/ChemicalCrops.java
index 38ce993..5d734a5 100644 (file)
--- a/common/pcc/addon/crops/ChemicalCrops.java
+++ b/common/pcc/addon/crops/ChemicalCrops.java
@@ -94,7 +94,7 @@ public class ChemicalCrops {
                MinecraftForge.EVENT_BUS.register(new WorldEventHandler());
 
                //Blockのインスタンス作成
-               this.blockCrops1 = new BlockChemicalCrops1(this.crops1ID, Material.glass).setUnlocalizedName("BlockCrops");
+               this.blockCrops1 = new BlockChemicalCrops1(this.crops1ID, Material.plants).setUnlocalizedName("BlockCrops");
 
                //Minecraftに登録
                GameRegistry.registerBlock(this.blockCrops1, "BlockCrops");

diff --git a/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java b/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java
index 3bc3ddb..e760b3c 100644 (file)
--- a/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java
+++ b/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java
@@ -13,7 +13,7 @@ import net.minecraftforge.common.EnumPlantType;
 import net.minecraftforge.common.IPlantable;
 import pcc.addon.crops.ChemicalCrops;
 
-public class BlockChemicalCrops1 extends BlockFlower {
+public class BlockChemicalCrops1 extends BlockFlower implements IPlantable {
 
        private int plantID;
        private int plantMetadata;
@@ -48,6 +48,12 @@ public class BlockChemicalCrops1 extends BlockFlower {
        @Override
        public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
                super.updateTick(par1World, par2, par3, par4, par5Random);
+               final int meta = par1World.getBlockMetadata(par2, par3, par4);
+               if (meta < 7) {
+                       par1World.setBlockMetadataWithNotify(par2, par3, par4, meta+1, 0x02);
+               } else if (meta > 7 && meta < 15) {
+                       par1World.setBlockMetadataWithNotify(par2, par3, par4, meta+1, 0x02);
+               }
        }
 
        @Override
@@ -71,4 +77,10 @@ public class BlockChemicalCrops1 extends BlockFlower {
                return 6;
        }
 
+    @Override
+    public EnumPlantType getPlantType(World world, int x, int y, int z) {
+       return EnumPlantType.Crop;
+    }
+
+
 }

diff --git a/common/pcc/addon/crops/util/MultiBlockData.java b/common/pcc/addon/crops/util/MultiBlockData.java
index d979621..3446b6d 100644 (file)
--- a/common/pcc/addon/crops/util/MultiBlockData.java
+++ b/common/pcc/addon/crops/util/MultiBlockData.java
@@ -85,4 +85,9 @@ public class MultiBlockData {
                return false;
        }
 
+       @Override
+       public int hashCode() {
+               return x*100 + y*200 + z*300;
+       }
+
 }

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index b4275c2..3a1ebc1 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -51,7 +51,6 @@ public class ChemiCraftBase extends ChemiCraft {
        /**
         * API Instance.
         */
-       public ChemiCraftAPI api = ChemiCraftAPI.instance();
        public ChemiCraftBaseAPI apiBase = ChemiCraftBaseAPI.instance();
 
        /**

diff --git a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
index ada8ec0..a6d0747 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
@@ -59,7 +59,6 @@ public class ItemAtomsGrenade extends Item {
 
        @Override
        public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-               ItemStack var2 = new ItemStack(this);
                if (par1ItemStack.hasTagCompound()) {
                        NBTTagList var1 = par1ItemStack.getTagCompound().getTagList("Effect");
 

diff --git a/common/pcc/chemicraft/core/ChemiCraftAPI.java b/common/pcc/chemicraft/core/ChemiCraftAPI.java
index c7a3303..5f4d1cb 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftAPI.java
+++ b/common/pcc/chemicraft/core/ChemiCraftAPI.java
@@ -42,97 +42,97 @@ public class ChemiCraftAPI {
        /**
         * 化合台の原子の数のリスト
         */
-       private ArrayList<Integer[]> chemicalCombinationAmounts = new ArrayList<Integer[]>();
+       private static ArrayList<Integer[]> chemicalCombinationAmounts = new ArrayList<Integer[]>();
 
 
        /**
         * 化合台の原子の種類のリスト
         */
-       private ArrayList<String[]> chemicalCombinationAtoms = new ArrayList<String[]>();
+       private static ArrayList<String[]> chemicalCombinationAtoms = new ArrayList<String[]>();
 
 
        /**
         * 化合台の結果のリスト
         */
-       private ArrayList<ItemStack> chemicalCombinationResult = new ArrayList<ItemStack>();
+       private static ArrayList<ItemStack> chemicalCombinationResult = new ArrayList<ItemStack>();
 
 
        /**
         * ChemiCraftの化学作業台類のレシピのマネージャー
         */
-       private ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager();
+       private static ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager();
 
 
        /**
         * List of item name of handler to compounds.
         */
-       private ArrayList<String> compoundHandlerItemNames = new ArrayList<String>();
+       private static ArrayList<String> compoundHandlerItemNames = new ArrayList<String>();
 
 
        /**
         * List of compounds handlers.
         */
-       private ArrayList<ICompoundHandler> compoundHandlers = new ArrayList<ICompoundHandler>();
+       private static ArrayList<ICompoundHandler> compoundHandlers = new ArrayList<ICompoundHandler>();
 
 
        /**
         * 化合物の文字列をダメージ値に変換します。
         */
-       private HashMap<String, Integer> compoundHash = new HashMap<String, Integer>();
+       private static HashMap<String, Integer> compoundHash = new HashMap<String, Integer>();
 
 
        /**
         * List of compounds names.
         */
-       private ListHash<String, String> compoundsNameListHash = new ListHash<String, String>();
+       private static ListHash<String, String> compoundsNameListHash = new ListHash<String, String>();
 
 
        /**
         * 電気分解燃料のリスト。
         */
-       private HashMap<ItemStack, Integer> electrolysisFuelList = new HashMap<ItemStack, Integer>();
+       private static HashMap<ItemStack, Integer> electrolysisFuelList = new HashMap<ItemStack, Integer>();
 
 
        /**
         * 電気分解レシピのリスト
         */
-       private HashMap<ItemStack, ItemStack[]> electrolysisRecipeList = new HashMap<ItemStack, ItemStack[]>();
+       private static HashMap<ItemStack, ItemStack[]> electrolysisRecipeList = new HashMap<ItemStack, ItemStack[]>();
 
 
        /**
         * 素材製作台のレシピクラス
         */
-       private ArrayList<MaterialRecipe> materialRecipe = new ArrayList<MaterialRecipe>();
+       private static ArrayList<MaterialRecipe> materialRecipe = new ArrayList<MaterialRecipe>();
 
 
        /**
         * 熱分解燃料のリスト。
         */
-       private HashMap<ItemStack, Integer> pyrolysisFuelList = new HashMap<ItemStack, Integer>();
+       private static HashMap<ItemStack, Integer> pyrolysisFuelList = new HashMap<ItemStack, Integer>();
 
 
        /**
         * 熱分解レシピのリスト
         */
-       private HashMap<ItemStack, ItemStack[]> pyrolysisRecipeList = new HashMap<ItemStack, ItemStack[]>();
+       private static HashMap<ItemStack, ItemStack[]> pyrolysisRecipeList = new HashMap<ItemStack, ItemStack[]>();
 
 
        /**
         * ツール&武器作成台の素材一覧のリスト
         */
-       private ArrayList<ItemStack[]> toolAndWeaponMaterials = new ArrayList<ItemStack[]>();
+       private static ArrayList<ItemStack[]> toolAndWeaponMaterials = new ArrayList<ItemStack[]>();
 
 
        /**
         * ツール&武器作成台の結果のリスト
         */
-       private ArrayList<ItemStack> toolAndWeaponResult = new ArrayList<ItemStack>();
+       private static ArrayList<ItemStack> toolAndWeaponResult = new ArrayList<ItemStack>();
 
 
        /**
         * ツール&武器作成台の不定形であるか
         */
-       private ArrayList<Boolean> toolAndWeaponSharpless = new ArrayList<Boolean>();
+       private static ArrayList<Boolean> toolAndWeaponSharpless = new ArrayList<Boolean>();
 
 
 
@@ -141,8 +141,8 @@ public class ChemiCraftAPI {
         * @param material 素材
         * @param result 結果
         */
-       public void addChemicalCombinationRecipe(ItemStack result, Formula formula){
-               ChemiCraftCore.logger.write("addChemicalCombinationRecipe:" + "Result-" + result.getItemName() + "/Material-" + formula.getAtoms().toString()
+       public static void addChemicalCombinationRecipe(ItemStack result, Formula formula){
+               ChemiCraftCore.logger.write("addChemicalCombinationRecipe:" + "Result-" + result.getItemName() + "/Material-" + Arrays.toString(formula.getAtoms())
                                , EnumLoggingType.INFO);
                chemicalCombinationAtoms.add(formula.getAtoms());
                chemicalCombinationAmounts.add(formula.getAmonts());
@@ -155,7 +155,7 @@ public class ChemiCraftAPI {
         * 化合物を追加します
         * @param name 化合物の名前
         */
-       public void addCompound(String name){
+       public static void addCompound(String name){
                ChemiCraftCore.logger.write("addCompound:" + name
                                , EnumLoggingType.INFO);
                compoundsNameListHash.add("en_US", name);
@@ -169,7 +169,7 @@ public class ChemiCraftAPI {
         * @param englishName 英語名
         * @param langName 別言語への名前
         */
-       public void addCompound(String lang, String englishName, String langName){
+       public static void addCompound(String lang, String englishName, String langName){
                ChemiCraftCore.logger.write("addCompound(MultiLang):" + "lang-" + lang + "/name-" + englishName + "/langToName-" + langName
                                , EnumLoggingType.INFO);
                addCompound(englishName);
@@ -184,7 +184,7 @@ public class ChemiCraftAPI {
         * @param langName 言語への名前
         */
        @Deprecated
-       private void addCompoundLanguage(String lang, String langName){
+       private static void addCompoundLanguage(String lang, String langName){
                compoundsNameListHash.add(
                                lang,
                                langName);
@@ -197,8 +197,8 @@ public class ChemiCraftAPI {
         * @param material 素材
         * @param formula 化学式(結果)
         */
-       public void addElectrolysisDecompositionRecipe(ItemStack material, Formula formula) {
-               ChemiCraftCore.logger.write("addElectrolysisRecipe:" + "Material-" + material.getItemName() + "/Result-" + formula.getAtoms().toString(),
+       public static void addElectrolysisDecompositionRecipe(ItemStack material, Formula formula) {
+               ChemiCraftCore.logger.write("addElectrolysisRecipe:" + "Material-" + material.getItemName() + "/Result-" + Arrays.toString(formula.getAtoms()),
                                EnumLoggingType.INFO);
 
                ItemStack[] itemstacks =
@@ -210,7 +210,7 @@ public class ChemiCraftAPI {
                                                        formula.getAmonts()[i],
                                                        ChemiCraftData.toAtoms(formula.getAtoms()[i]));
                }
-               this.electrolysisRecipeList.put(
+               electrolysisRecipeList.put(
                                material,
                                itemstacks);
        }
@@ -222,12 +222,12 @@ public class ChemiCraftAPI {
         * @param material 素材 (すべて結果は同じになります)
         * @param formula 化学式(結果)
         */
-       public void addElectrolysisDecompositionRecipe(ArrayList<ItemStack> material, Formula formula) {
+       public static void addElectrolysisDecompositionRecipe(ArrayList<ItemStack> material, Formula formula) {
                for (ItemStack item : material) {
                        if (item != null) {
                                addElectrolysisDecompositionRecipe(item, formula);
                        }
-        }
+               }
        }
 
 
@@ -237,8 +237,8 @@ public class ChemiCraftAPI {
         * @param material 素材
         * @param formula 化学式(結果)
         */
-       public void addPyrolysisDecompositionRecipe(ItemStack material, Formula formula) {
-               ChemiCraftCore.logger.write("addPyrolysisRecipe:" + "Material-" + material.getItemName() + "/Result-" + formula.getAtoms().toString(),
+       public static void addPyrolysisDecompositionRecipe(ItemStack material, Formula formula) {
+               ChemiCraftCore.logger.write("addPyrolysisRecipe:" + "Material-" + material.getItemName() + "/Result-" + Arrays.toString(formula.getAtoms()),
                                EnumLoggingType.INFO);
 
                ItemStack[] itemstacks =
@@ -250,7 +250,7 @@ public class ChemiCraftAPI {
                                                        formula.getAmonts()[i],
                                                        ChemiCraftData.toAtoms(formula.getAtoms()[i]));
                }
-               this.pyrolysisRecipeList.put(
+               pyrolysisRecipeList.put(
                                material,
                                itemstacks);
        }
@@ -262,13 +262,13 @@ public class ChemiCraftAPI {
         * @param material 素材 (すべて結果は同じになります)
         * @param formula 化学式(結果)
         */
-       public void addPyrolysisDecompositionRecipe(ArrayList<ItemStack> material, Formula formula) {
+       public static void addPyrolysisDecompositionRecipe(ArrayList<ItemStack> material, Formula formula) {
                for (ItemStack item : material) {
                        if (item != null) {
                                addPyrolysisDecompositionRecipe(item, formula);
                                return;
                        }
-        }
+               }
        }
 
 
@@ -278,7 +278,7 @@ public class ChemiCraftAPI {
         * @param materialAndResult 素材(分解)と結果(化合)
         * @param formula 化学式(分解なら結果に。化合なら素材に)
         */
-       public void addReversible(ItemStack materialAndResult, Formula formula){
+       public static void addReversible(ItemStack materialAndResult, Formula formula){
                addChemicalCombinationRecipe(materialAndResult, formula);
                addPyrolysisDecompositionRecipe(materialAndResult, formula);
                addElectrolysisDecompositionRecipe(materialAndResult, formula);
@@ -291,7 +291,7 @@ public class ChemiCraftAPI {
         * @param materialAndResult 素材(分解)と結果(化合)
         * @param formula 化学式(分解なら結果に。化合なら素材に)
         */
-       public void addReversibleOfElectrolysis(ItemStack result, Formula formula){
+       public static void addReversibleOfElectrolysis(ItemStack result, Formula formula){
                addChemicalCombinationRecipe(result, formula);
                addElectrolysisDecompositionRecipe(result, formula);
        }
@@ -303,7 +303,7 @@ public class ChemiCraftAPI {
         * @param materialAndResult 素材(分解)と結果(化合)
         * @param formula 化学式(分解なら結果に。化合なら素材に)
         */
-       public void addReversibleOfPyrolysis(ItemStack result, Formula formula){
+       public static void addReversibleOfPyrolysis(ItemStack result, Formula formula){
                addChemicalCombinationRecipe(result, formula);
                addPyrolysisDecompositionRecipe(result, formula);
        }
@@ -315,11 +315,11 @@ public class ChemiCraftAPI {
         * @param itemstack 燃料のItemStack
         * @param burnTime 燃焼時間(tick * rate)
         */
-       public void addElectrolysisDecompositionFuel(ItemStack itemstack, int burnTime) {
+       public static void addElectrolysisDecompositionFuel(ItemStack itemstack, int burnTime) {
                ChemiCraftCore.logger.write("addElectrolysisFuel:" + "Fuel-" + itemstack.getItemName() + "/BurnTime-" + burnTime,
                                EnumLoggingType.INFO);
 
-               this.electrolysisFuelList.put(
+               electrolysisFuelList.put(
                                itemstack,
                                burnTime);
        }
@@ -331,11 +331,11 @@ public class ChemiCraftAPI {
         * @param itemstack 燃料のItemStack
         * @param burnTime 燃焼時間(tick * rate)
         */
-       public void addPyrolysisDecompositionFuel(ItemStack itemstack, int burnTime) {
+       public static void addPyrolysisDecompositionFuel(ItemStack itemstack, int burnTime) {
                ChemiCraftCore.logger.write("addPyrolysisFuel:" + "Fuel-" + itemstack.getItemName() + "/BurnTime-" + burnTime,
                                EnumLoggingType.INFO);
 
-               this.pyrolysisFuelList.put(
+               pyrolysisFuelList.put(
                                itemstack,
                                burnTime);
        }
@@ -348,8 +348,8 @@ public class ChemiCraftAPI {
         * @param result 結果
         * @param nbtRecipe NBT(Nullの場合はなし)
         */
-       public void addMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
-               ChemiCraftCore.logger.write("addMaterialRecipe:" + "Materials-" + materials.toString() + "/Result-" + result.getItemName() + "/NBT-" + nbtRecipe,
+       public static void addMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
+               ChemiCraftCore.logger.write("addMaterialRecipe:" + "Materials-" + Arrays.toString(materials) + "/Result-" + result.getItemName() + "/NBT-" + nbtRecipe,
                                EnumLoggingType.INFO);
 
                materialRecipe.add(
@@ -368,8 +368,8 @@ public class ChemiCraftAPI {
         * @param result 結果
         * @param nbtRecipe NBT(Nullの場合はなし)
         */
-       public void addSharplessMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
-               ChemiCraftCore.logger.write("addMaterialRecipe:" + "Materials-" + materials.toString() + "/Result-" + result.getItemName() + "/NBT-" + nbtRecipe,
+       public static void addSharplessMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
+               ChemiCraftCore.logger.write("addMaterialRecipe:" + "Materials-" + Arrays.toString(materials) + "/Result-" + result.getItemName() + "/NBT-" + nbtRecipe,
                                EnumLoggingType.INFO);
 
                materialRecipe.add(
@@ -389,7 +389,7 @@ public class ChemiCraftAPI {
         * @param handlerItemName ハンドラーをつける化合物の英語名
         * @param compoundHandler ハンドラー
         */
-       public void settingCompoundHandler(String handlerItemName, ICompoundHandler compoundHandler){
+       public static void settingCompoundHandler(String handlerItemName, ICompoundHandler compoundHandler){
                ChemiCraftCore.logger.write("settingCompoundHandler:" + "Name-" + handlerItemName + "/CompoundHandler-" + compoundHandler,
                                EnumLoggingType.INFO);
 
@@ -406,7 +406,7 @@ public class ChemiCraftAPI {
         * @param result 結果
         */
        @Deprecated
-       public void addToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
+       public static void addToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
                toolAndWeaponMaterials.add(materials);
                toolAndWeaponResult.add(result);
                toolAndWeaponSharpless.add(false);
@@ -421,7 +421,7 @@ public class ChemiCraftAPI {
         * @param result 結果
         */
        @Deprecated
-       public void addSharplessToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
+       public static void addSharplessToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
                toolAndWeaponMaterials.add(materials);
                toolAndWeaponResult.add(result);
                toolAndWeaponSharpless.add(true);
@@ -431,25 +431,25 @@ public class ChemiCraftAPI {
 
        //以下システム関連//////////////////////////////////////////////////////
 
-       public ArrayList<Integer[]> getChemicalCombinationAmounts() {
+       public static ArrayList<Integer[]> getChemicalCombinationAmounts() {
                return chemicalCombinationAmounts;
        }
 
 
 
-       public ArrayList<String[]> getChemicalCombinationAtoms() {
+       public static ArrayList<String[]> getChemicalCombinationAtoms() {
                return chemicalCombinationAtoms;
        }
 
 
 
-       public ArrayList<ItemStack> getChemicalCombinationResult() {
+       public static ArrayList<ItemStack> getChemicalCombinationResult() {
                return chemicalCombinationResult;
        }
 
 
 
-       public int getCompound(String key) {
+       public static int getCompound(String key) {
                if (compoundHash.get(key) != null) {
                        return compoundHash.get(key);
                } else {
@@ -459,75 +459,75 @@ public class ChemiCraftAPI {
 
 
 
-       public ArrayList<ICompoundHandler> getCompoundHandler() {
+       public static ArrayList<ICompoundHandler> getCompoundHandler() {
                compoundHandlers.trimToSize();
                return compoundHandlers;
        }
 
 
 
-       public ArrayList<String> getCompoundHandlerItemName() {
+       public static ArrayList<String> getCompoundHandlerItemName() {
                compoundHandlerItemNames.trimToSize();
                return compoundHandlerItemNames;
        }
 
 
 
-       public ListHash<String, String> getCompoundsName() {
+       public static ListHash<String, String> getCompoundsName() {
                return compoundsNameListHash;
        }
 
 
 
-       public ChemiCraftCraftingManager getCraftingManager() {
+       public static ChemiCraftCraftingManager getCraftingManager() {
                return chemiCraftCraftingManager;
        }
 
 
 
-       public HashMap<ItemStack, Integer> getElectrolysisFuelList() {
+       public static HashMap<ItemStack, Integer> getElectrolysisFuelList() {
                return electrolysisFuelList;
        }
 
 
 
-       public HashMap<ItemStack, ItemStack[]> getElectrolysisRecipeList() {
+       public static HashMap<ItemStack, ItemStack[]> getElectrolysisRecipeList() {
                return electrolysisRecipeList;
        }
 
 
 
-       public ArrayList<MaterialRecipe> getMaterialRecipe() {
+       public static ArrayList<MaterialRecipe> getMaterialRecipe() {
                return materialRecipe;
        }
 
 
 
-       public HashMap<ItemStack, Integer> getPyrolysisFuelList() {
+       public static HashMap<ItemStack, Integer> getPyrolysisFuelList() {
                return pyrolysisFuelList;
        }
 
 
 
-       public HashMap<ItemStack, ItemStack[]> getPyrolysisRecipeList() {
+       public static HashMap<ItemStack, ItemStack[]> getPyrolysisRecipeList() {
                return pyrolysisRecipeList;
        }
 
 
 
-       public ArrayList<ItemStack[]> getToolAndWeaponMaterials() {
+       public static ArrayList<ItemStack[]> getToolAndWeaponMaterials() {
                return toolAndWeaponMaterials;
        }
 
 
 
-       public ArrayList<ItemStack> getToolAndWeaponResult() {
+       public static ArrayList<ItemStack> getToolAndWeaponResult() {
                return toolAndWeaponResult;
        }
 
 
 
-       public ArrayList<Boolean> getToolAndWeaponSharpless() {
+       public static ArrayList<Boolean> getToolAndWeaponSharpless() {
                return toolAndWeaponSharpless;
        }
 

diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java
index 9ade64f..6f78a71 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@ -91,11 +91,6 @@ public class ChemiCraftCore extends ChemiCraft{
        public static final CreativeTabs creativeTabChemiCraft = new CreativeTabChemiCraft("ChemiCraft");
 
        /**
-        * API Instance.
-        */
-       public ChemiCraftAPI api = ChemiCraftAPI.instance();
-
-       /**
         * the ItemID.
         */
        public int atomsID;
@@ -154,6 +149,7 @@ public class ChemiCraftCore extends ChemiCraft{
        public static final ChemiCraftLogging logger = new ChemiCraftLogging(System.getProperty("user.dir"));
 
        public ChemiCraftCore() {
+               ChemiCraftAPI.getCompoundsName().entrySet();
                this.api.getCompoundsName().createHash("en_US");
                this.registerItem = new ChemiCraftRegisterItem(this);
                this.registerBlock = new ChemiCraftRegisterBlock(this);

diff --git a/common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableResult.java b/common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableResult.java
index 85f7c49..5e78a15 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableResult.java
@@ -112,13 +112,13 @@ public class InventoryChemicalCombinationTableResult implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingMaterial.java b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingMaterial.java
index 61efd9a..6141618 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingMaterial.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingMaterial.java
@@ -92,13 +92,13 @@ public class InventoryChemicalCraftingMaterial implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingNBT.java b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingNBT.java
index 13a48ea..d63e7cf 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingNBT.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingNBT.java
@@ -92,13 +92,13 @@ public class InventoryChemicalCraftingNBT implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingResult.java b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingResult.java
index d1e401c..dce1fa1 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingResult.java
@@ -92,13 +92,13 @@ public class InventoryChemicalCraftingResult implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
index 063565f..3a0f57c 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
@@ -97,13 +97,13 @@ public class InventoryElectrolysisFuel implements IInventory
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
index ee13c37..b4fbd1f 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
@@ -97,13 +97,13 @@ public class InventoryElectrolysisMaterial implements IInventory
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
index 0b0f381..dbf35f8 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
@@ -97,13 +97,13 @@ public class InventoryElectrolysisResult implements IInventory
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableFuel.java b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableFuel.java
index 84c1e33..d566259 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableFuel.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableFuel.java
@@ -112,13 +112,13 @@ public class InventoryPyrolysisTableFuel implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 }

diff --git a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableMaterial.java b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableMaterial.java
index c19c6ea..7e8af07 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableMaterial.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableMaterial.java
@@ -112,13 +112,13 @@ public class InventoryPyrolysisTableMaterial implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableResult.java b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableResult.java
index f6c3839..6187ce2 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableResult.java
@@ -111,13 +111,13 @@ public class InventoryPyrolysisTableResult implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableMaterial.java b/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
index 3dacd3e..ec4f31d 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
@@ -112,13 +112,13 @@ public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableResult.java b/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableResult.java
index 2cbe844..609e1d0 100644 (file)
--- a/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableResult.java
+++ b/common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableResult.java
@@ -112,13 +112,13 @@ public class InventoryToolAndWeaponCraftingTableResult implements IInventory {
 
        @Override
        public boolean isInvNameLocalized() {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 
        @Override
        public boolean isStackValidForSlot(int i, ItemStack itemstack) {
-               // TODO 自動生成されたメソッド・スタブ
+
                return false;
        }
 

diff --git a/common/pcc/chemicraft/util/FormulaPart.java b/common/pcc/chemicraft/util/FormulaPart.java
index 61a2a86..2e8bd4a 100644 (file)
--- a/common/pcc/chemicraft/util/FormulaPart.java
+++ b/common/pcc/chemicraft/util/FormulaPart.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.util;
 
+import pcc.chemicraft.ChemiCraftData;
+
 /**
  * 元素情報を格納するクラスです
  * @author mozipi
@@ -35,4 +37,9 @@ public class FormulaPart {
                return false;
        }
 
+       @Override
+       public int hashCode() {
+               return ChemiCraftData.toAtoms(this.atom) + this.amount * 200;
+       }
+
 }

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn1.png b/resources/mods/ChemicalCrops/textures/blocks/Corn1.png
new file mode 100644 (file)
index 0000000..bf2912a
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn1.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn2.png b/resources/mods/ChemicalCrops/textures/blocks/Corn2.png
new file mode 100644 (file)
index 0000000..ca8894e
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn2.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn3.png b/resources/mods/ChemicalCrops/textures/blocks/Corn3.png
new file mode 100644 (file)
index 0000000..0bf7375
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn3.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn4.png b/resources/mods/ChemicalCrops/textures/blocks/Corn4.png
new file mode 100644 (file)
index 0000000..390959a
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn4.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn5.png b/resources/mods/ChemicalCrops/textures/blocks/Corn5.png
new file mode 100644 (file)
index 0000000..6bdeb27
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn5.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn6.png b/resources/mods/ChemicalCrops/textures/blocks/Corn6.png
new file mode 100644 (file)
index 0000000..634bad9
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn6.png differ

diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn7.png b/resources/mods/ChemicalCrops/textures/blocks/Corn7.png
new file mode 100644 (file)
index 0000000..694b06d
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn7.png differ