OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Mon, 11 Feb 2013 08:34:28 +0000 (17:34 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Mon, 11 Feb 2013 08:34:28 +0000 (17:34 +0900)
Conflicts:
common/pcc/chemicraft/ChemiCraft.java

19 files changed:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftAPI.java
common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
common/pcc/chemicraft/block/BlockElectrolysisTable.java
common/pcc/chemicraft/block/BlockPyrolysisTable.java
common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
common/pcc/chemicraft/client/ClientProxy.java
common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
common/pcc/chemicraft/gui/GuiElectrolysisTable.java
common/pcc/chemicraft/gui/GuiPyrolysisTable.java
common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
common/pcc/chemicraft/item/ItemAtoms.java
common/pcc/chemicraft/item/ItemCompounds.java
common/pcc/chemicraft/item/ItemGasCollectingBottle.java
common/pcc/chemicraft/ore/BlockAtomsOre.java [new file with mode: 0644]
common/pcc/chemicraft/render/RenderAtomsGrenade.java
resources/pcc/chemicraft/blocks/AtomsOre.png [new file with mode: 0644]

index e0981e9..b32dd60 100644 (file)
@@ -22,6 +22,7 @@ import pcc.chemicraft.item.ItemAtoms;
 import pcc.chemicraft.item.ItemAtomsGrenade;
 import pcc.chemicraft.item.ItemCompounds;
 import pcc.chemicraft.item.ItemGasCollectingBottle;
+import pcc.chemicraft.ore.BlockAtomsOre;
 import pcc.chemicraft.system.CommonProxy;
 import pcc.chemicraft.system.PacketHandler;
 import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
@@ -103,6 +104,8 @@ public class ChemiCraft {
        public int toolAndWeaponCraftingTableID;
        public int chemicalCraftingTableID;
 
+       public int atomsOreID;
+
        /**
         * GUIID.
         */
@@ -121,6 +124,8 @@ public class ChemiCraft {
        public Block blockToolAndWeaponCraftingTable;
        public Block blockChemicalCraftingTable;
 
+       public Block blockAtomsOre;
+
        /**
         * Item型変数.
         */
@@ -132,15 +137,16 @@ public class ChemiCraft {
        /**
         * このmodで使用するTextureのパス.
         */
-       public final String ITEMATOMSTEXTURE = "/pcc/chemicraft/items/Atoms.png";
-       public final String ITEMCOMPOUNDSTEXTURE = "/pcc/chemicraft/items/Compounds.png";
-       public final String ITEMTEXTURE = "/pcc/chemicraft/items/items.png";
-       public final String BLOCKCHEMICALCRAFTINGTABLETEXTURE = "/pcc/chemicraft/blocks/cctable.png";
-       public final String GUIPYROLYSISTEXTURE = "/pcc/chemicraft/guis/Pyrolysis.png";
-       public final String GUIELECTROLYSISTEXTURE = "/pcc/chemicraft/guis/Electrolysis.png";
-       public final String GUICHEMICALCOMBINATIONTEXTURE = "/pcc/chemicraft/guis/ChemicalCombination.png";
-       public final String GUITOOLANDWEAPONCRAFTINGTEXTURE = "/pcc/chemicraft/guis/ToolAndWeaponCrafting.png";
-       public final String GUICHEMICALCRAFTINGTEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png";
+       public final String ITEM_ATOMS_TEXTURE = "/pcc/chemicraft/items/Atoms.png";
+       public final String ITEM_COMPOUNDS_TEXTURE = "/pcc/chemicraft/items/Compounds.png";
+       public final String ITEM_TEXTURE = "/pcc/chemicraft/items/items.png";
+       public final String BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE = "/pcc/chemicraft/blocks/cctable.png";
+       public final String BLOCK_ATOMS_ORE_TEXTURE = "/pcc/chemicraft/blocks/AtomsOres.png";
+       public final String GUI_PYROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Pyrolysis.png";
+       public final String GUI_ELECTROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Electrolysis.png";
+       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/pcc/chemicraft/guis/ChemicalCombination.png";
+       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/pcc/chemicraft/guis/ToolAndWeaponCrafting.png";
+       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png";
 
        /**
         * このmodに必要な補助クラスのインスタンス.
@@ -163,6 +169,8 @@ public class ChemiCraft {
                Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2403);
                Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2404);
 
+               Property atomsOreIDProp = cfg.getBlock("AtomsOreID", 2500);
+
                Property atomsIDProp = cfg.getItem("AtomsID", 25000);
                Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
                Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
@@ -180,6 +188,7 @@ public class ChemiCraft {
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
                this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
+               this.atomsOreID = atomsOreIDProp.getInt();
                this.atomsID = atomsIDProp.getInt();
                this.compoundsID = compoundsIDProp.getInt();
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
@@ -215,6 +224,11 @@ public class ChemiCraft {
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
                                setBlockName("PyrolysisTable");
+               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ElectrolysisTable");
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
@@ -230,11 +244,6 @@ public class ChemiCraft {
                                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");
@@ -316,6 +325,23 @@ public class ChemiCraft {
                        Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
                });
 
+               //鉱石の登録
+               for (int i = 0; i < api.getAtomsOreIDList().size(); i++) {
+                       this.blockAtomsOre = new BlockAtomsOre(api.getAtomsOreIDList().get(i)).
+                                       setHardness(3.0F).setResistance(5.0F).
+                                       setStepSound(Block.soundStoneFootstep).
+                                       setBlockName("AtomsOre" + "." + api.getAtomsOreIDList().get(i));
+                       GameRegistry.registerBlock(this.blockAtomsOre, "AtomsOre");
+               }
+
+               //鉱石を追加します
+               api.addAtomsOre("Test", Block.blockDiamond.blockID, 0, 5, 5, 20); //テスト用
+
+               //鉱石の生成
+               for (int i = 0; i < api.getAtomsOreIDList().size(); i++) {
+                       GameRegistry.registerWorldGenerator(new WorldGenAtomsOre(api.getAtomsOreIDList().get(i), api.getAtomsOreMetaList().get(i), api.getAtomsOreSizeList().get(i), api.getAtomsOreFrequencyList().get(i), api.getAtomsOrePosYList().get(i)));
+               }
+
                //化合物を追加します
                api.addLangCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
 
@@ -365,12 +391,6 @@ public class ChemiCraft {
                for (int i = 0; i < api.getCompoundsLang().size(); i++) {
                        this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getCompoundsLangName().toArray());
                }
-
-               //鉱石の生成
-               for (int i = 0; i < api.getAtomsOreIDList().size(); i++) {
-                       GameRegistry.registerWorldGenerator(new WorldGenAtomsOre(api.getAtomsOreIDList().get(i), api.getAtomsOreMetaList().get(i), api.getAtomsOreSizeList().get(i), api.getAtomsOreFrequencyList().get(i), api.getAtomsOrePosYList().get(i)));
-               }
-
        }
 
        private void debug(final FMLPostInitializationEvent event) {
@@ -386,9 +406,6 @@ public class ChemiCraft {
                                new ItemStack(Block.stone, 1, 1)
                },
                new ItemStack(Block.dirt, 1, 0));
-
-               //鉱石を追加します
-               api.addAtomsOre(Block.blockDiamond.blockID, 0, 5, 5, 20);
        }
 
 }
index 39e38cf..84a25c6 100644 (file)
@@ -92,18 +92,39 @@ public class ChemiCraftAPI {
 
 
 
+       /**
+        * 鉱石名リスト
+        */
+       private ArrayList<String> atomsOreNameList = new ArrayList<String>();
+
+
+       /**
+        * 鉱石IDリスト
+        */
        private ArrayList<Integer> atomsOreIDList = new ArrayList<Integer>();
 
 
+       /**
+        * 鉱石メタデータリスト
+        */
        private ArrayList<Integer> atomsOreMetaList = new ArrayList<Integer>();
 
 
+       /**
+        * 鉱石量リスト
+        */
        private ArrayList<Integer> atomsOreSizeList = new ArrayList<Integer>();
 
 
+       /**
+        * 鉱石頻度リスト
+        */
        private ArrayList<Integer> atomsOreFrequencyList = new ArrayList<Integer>();
 
 
+       /**
+        * 鉱石Y座標リスト
+        */
        private ArrayList<Integer> atomsOrePosYList = new ArrayList<Integer>();
 
 
@@ -263,18 +284,31 @@ public class ChemiCraftAPI {
 
 
 
-       public void addAtomsOre(int id, int size, int frequency, int posY){
-               addAtomsOre(id, 0, size, frequency, posY);
+       /**
+        * 鉱石を追加します
+        * @param name 鉱石名
+        * @param id 鉱石ID
+        * @param meta 鉱石メタデータ
+        * @param size 一度に生成される量
+        * @param frequency 生成頻度
+        * @param posY Y座標
+        */
+       public void addAtomsOre(String name, int id, int size, int frequency, int posY){
+               addAtomsOre(name, id, 0, size, frequency, posY);
        }
 
 
-       public void addAtomsOre(int id, int meta, int size, int frequency, int posY){
+       public void addAtomsOre(String name, int id, int meta, int size, int frequency, int posY){
+               atomsOreNameList.add(name);
                atomsOreIDList.add(id);
                atomsOreMetaList.add(meta);
                atomsOreSizeList.add(size);
                atomsOreFrequencyList.add(frequency);
                atomsOrePosYList.add(posY);
        }
+
+
+       
        //以下システム関連//////////////////////////////////////////////////////
 
        public ArrayList<ICompoundHandler> getCompoundHandler(){
@@ -361,6 +395,12 @@ public class ChemiCraftAPI {
 
 
 
+       public ArrayList<String> getAtomsOreNameList(){
+               return atomsOreNameList;
+       }
+
+
+
        public ArrayList<Integer> getAtomsOreIDList(){
                return atomsOreIDList;
        }
index 56bcb66..23c328d 100644 (file)
@@ -25,7 +25,7 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
        @Override
        public String getTextureFile() {
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
        }
 
 
index 64fb2bc..01f759a 100644 (file)
@@ -26,7 +26,7 @@ public class BlockChemicalCraftingTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
        }
 
 
index f0b41f4..c5ffb4b 100644 (file)
@@ -28,7 +28,7 @@ public class BlockElectrolysisTable extends BlockContainer
        @Override
        public String getTextureFile()
        {
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
        }
 
        @Override
index cb0c4fe..f0718e4 100644 (file)
@@ -26,7 +26,7 @@ public class BlockPyrolysisTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
        }
 
 
index 399bca8..1623219 100644 (file)
@@ -25,7 +25,7 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
        }
 
 
index 128a4fd..5b76945 100644 (file)
@@ -28,15 +28,16 @@ public class ClientProxy extends CommonProxy {
 
        @Override
        public void registerRenderInformation() {
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEMATOMSTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEMCOMPOUNDSTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEMTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUIPYROLYSISTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUIELECTROLYSISTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUICHEMICALCOMBINATIONTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUICHEMICALCRAFTINGTEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUITOOLANDWEAPONCRAFTINGTEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.BLOCK_ATOMS_ORE_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_ATOMS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_COMPOUNDS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_PYROLYSIS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_ELECTROLYSIS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCOMBINATION_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCRAFTING_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE);
                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 
index 3305f12..ded47bf 100644 (file)
@@ -33,7 +33,7 @@ public class GuiChemicalCombinationTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUICHEMICALCOMBINATIONTEXTURE));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_CHEMICALCOMBINATION_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index dfad5cd..7f16e7e 100644 (file)
@@ -19,7 +19,7 @@ public class GuiChemicalCraftingTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUICHEMICALCRAFTINGTEXTURE));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_CHEMICALCRAFTING_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index a8062c8..4ed9dcd 100644 (file)
@@ -21,7 +21,7 @@ public class GuiElectrolysisTable extends GuiContainer
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
        {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUIELECTROLYSISTEXTURE));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_ELECTROLYSIS_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index 7777a5d..6a68008 100644 (file)
@@ -18,7 +18,7 @@ public class GuiPyrolysisTable extends GuiContainer{
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUIPYROLYSISTEXTURE));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_PYROLYSIS_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index d305318..5917df5 100644 (file)
@@ -14,7 +14,7 @@ public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUITOOLANDWEAPONCRAFTINGTEXTURE));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index ad2ae60..0a32c3b 100644 (file)
@@ -43,7 +43,7 @@ public class ItemAtoms extends Item {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.ITEMATOMSTEXTURE;
+               return ChemiCraft.instance.ITEM_ATOMS_TEXTURE;
        }
 
 
index e34c3d6..6eb6531 100644 (file)
@@ -97,7 +97,7 @@ public class ItemCompounds extends Item {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.ITEMCOMPOUNDSTEXTURE;
+               return ChemiCraft.instance.ITEM_COMPOUNDS_TEXTURE;
        }
 
 
index 2e3d061..d87042a 100644 (file)
@@ -93,7 +93,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
        @Override
        public String getTextureFile()
        {
-               return ChemiCraft.instance.ITEMTEXTURE;
+               return ChemiCraft.instance.ITEM_TEXTURE;
        }
 
 }
diff --git a/common/pcc/chemicraft/ore/BlockAtomsOre.java b/common/pcc/chemicraft/ore/BlockAtomsOre.java
new file mode 100644 (file)
index 0000000..a1ac1af
--- /dev/null
@@ -0,0 +1,62 @@
+package pcc.chemicraft.ore;
+
+import java.util.List;
+import java.util.Random;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import pcc.chemicraft.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;
+
+public class BlockAtomsOre extends Block
+{
+
+       public BlockAtomsOre(int id)
+       {
+               super(id, Material.rock);
+               this.setCreativeTab(ChemiCraft.instance.creativeTab);
+       }
+
+       @Override
+       public int getBlockTextureFromSideAndMetadata(int par1, int par2)
+       {
+               return this.blockID * 16 + par2;
+       }
+
+       @Override
+       public int damageDropped(int par1)
+       {
+               return par1;
+       }
+
+       public static int getBlockFromDye(int par0)
+       {
+               return ~par0 & 15;
+       }
+
+       public static int getDyeFromBlock(int par0)
+       {
+               return ~par0 & 15;
+       }
+
+       @Override
+       @SideOnly(Side.CLIENT)
+       public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
+       {
+               for (int var4 = 0; var4 < 16; ++var4) {
+                       par3List.add(new ItemStack(par1, 1, var4));
+               }
+       }
+
+       @Override
+       public String getTextureFile()
+       {
+               return ChemiCraft.instance.BLOCK_ATOMS_ORE_TEXTURE;
+       }
+
+}
index b9be2fb..bdfa3a6 100644 (file)
@@ -30,7 +30,7 @@ public class RenderAtomsGrenade extends Render {
                float var10 = this.field_77002_a;
                GL11.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
                byte var11 = 1;
-               this.loadTexture(ChemiCraft.instance.ITEMTEXTURE);
+               this.loadTexture(ChemiCraft.instance.ITEM_TEXTURE);
                Tessellator var12 = Tessellator.instance;
                float var13 = (float)(var11 % 16 * 16 + 0) / 256.0F;
                float var14 = (float)(var11 % 16 * 16 + 16) / 256.0F;
diff --git a/resources/pcc/chemicraft/blocks/AtomsOre.png b/resources/pcc/chemicraft/blocks/AtomsOre.png
new file mode 100644 (file)
index 0000000..5160d53
Binary files /dev/null and b/resources/pcc/chemicraft/blocks/AtomsOre.png differ