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

Conflicts:
	common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
	common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index d93ddc0..bce1fc9 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -134,7 +134,6 @@ public class ChemiCraftBase extends ChemiCraft {
                while (true) {
                        if (proxy != null && instance != null) {
                                this.settingProcessing((FMLPostInitializationEvent) event);
-                               this.apiProcessing((FMLPostInitializationEvent) event);
                                break;
                        }
                }
@@ -209,7 +208,7 @@ public class ChemiCraftBase extends ChemiCraft {
                                                EnumLoggingType.INFO);
 
                                LanguageRegistry.instance().addNameForObject(
-                                               new ItemStack(this.blockAtomOres[i / 16], 1, i - i / 16 * 16),
+                                               new ItemStack(this.atomOresID[i / 16], 1, i % 16),
                                                lang,
                                                names.get(i));
                        }

diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 54b6613..02cd35c 100644 (file)
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -6,8 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
+import net.minecraft.world.World;
 import pcc.chemicraft.base.ChemiCraftBase;
 import pcc.chemicraft.base.ChemiCraftBaseAPI;
 import pcc.chemicraft.core.ChemiCraftCore;

diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java
index 989e9d7..1c27401 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@ -154,7 +154,6 @@ public class ChemiCraftCore extends ChemiCraft{
        public static final String CCTABLE = ChemiCraft.TEXTURE + "ChemiCraftTable_";
 
        public ChemiCraftCore() {
-               ChemiCraftAPI.getCompoundsName().entrySet();
                this.api.getCompoundsName().createHash("en_US");
                this.registerItem = new ChemiCraftRegisterItem(this);
                this.registerBlock = new ChemiCraftRegisterBlock(this);

diff --git a/仕様書/ChemicalCropsTexturesList.ods b/仕様書/ChemicalCropsTexturesList.ods
new file mode 100644 (file)
index 0000000..2257080
Binary files /dev/null and b/仕様書/ChemicalCropsTexturesList.ods differ