OSDN Git Service

エラー大半修正
authormozipi <mozipi_2@yahoo.co.jp>
Tue, 2 Apr 2013 16:01:34 +0000 (01:01 +0900)
committermozipi <mozipi_2@yahoo.co.jp>
Tue, 2 Apr 2013 16:01:34 +0000 (01:01 +0900)
42 files changed:
common/pcc/addon/crops/BlockChemicalCrops.java [deleted file]
common/pcc/addon/crops/ChemicalBlockAPI.java [deleted file]
common/pcc/addon/crops/ChemicalCrops.java
common/pcc/addon/crops/blocks/BlockChemicalCrops1.java [new file with mode: 0644]
common/pcc/addon/crops/blocks/Types [new file with mode: 0644]
common/pcc/addon/crops/util/MultiBlockData.java [moved from common/pcc/addon/crops/PlantData.java with 74% similarity]
common/pcc/addon/crops/util/MultiBlockDataStream.java [moved from common/pcc/addon/crops/PlantDataStream.java with 53% similarity]
common/pcc/addon/crops/util/WorldEventHandler.java [moved from common/pcc/addon/crops/WorldEventHandler.java with 91% similarity]
common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java
common/pcc/chemicraft/core/block/BlockElectrolysisTable.java
common/pcc/chemicraft/core/block/BlockPyrolysisTable.java
common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java
common/pcc/chemicraft/core/client/ClientProxy.java
common/pcc/chemicraft/core/creativetab/CreativeTabChemiCraft.java
common/pcc/chemicraft/core/debug/DebugTick.java
common/pcc/chemicraft/core/debug/SetBlockSupport.java
common/pcc/chemicraft/core/gui/GuiChemicalCombinationTable.java
common/pcc/chemicraft/core/gui/GuiChemicalCraftingTable.java
common/pcc/chemicraft/core/gui/GuiElectrolysisTable.java
common/pcc/chemicraft/core/gui/GuiPyrolysisTable.java
common/pcc/chemicraft/core/gui/GuiToolAndWeaponCraftingTable.java
common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableMaterial.java
common/pcc/chemicraft/core/inventory/InventoryChemicalCombinationTableResult.java
common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingMaterial.java
common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingNBT.java
common/pcc/chemicraft/core/inventory/InventoryChemicalCraftingResult.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableFuel.java
common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableMaterial.java
common/pcc/chemicraft/core/inventory/InventoryPyrolysisTableResult.java
common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
common/pcc/chemicraft/core/inventory/InventoryToolAndWeaponCraftingTableResult.java
common/pcc/chemicraft/core/item/ItemAtoms.java
common/pcc/chemicraft/core/item/ItemChemiCell.java
common/pcc/chemicraft/core/item/ItemCompounds.java
common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
common/pcc/chemicraft/core/other/ChunkProviderChemical.java
resources/mods/ChemicalCrops/textures/blocks/Corn0.png [new file with mode: 0644]

diff --git a/common/pcc/addon/crops/BlockChemicalCrops.java b/common/pcc/addon/crops/BlockChemicalCrops.java
deleted file mode 100644 (file)
index 55fc0bc..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-package pcc.addon.crops;
-
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.world.World;
-import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.IPlantable;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class BlockChemicalCrops extends Block implements IPlantable {
-
-       private int plantID;
-       private int plantMetadata;
-       private String textureFile;
-
-       public BlockChemicalCrops(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
-               this.setCreativeTab(CreativeTabs.tabBlock);
-               this.setTickRandomly(true);
-       }
-
-       @Override
-       public EnumPlantType getPlantType(World world, int x, int y, int z) {
-               return EnumPlantType.Crop;
-       }
-
-       @Override
-       public int getPlantID(World world, int x, int y, int z) {
-               return ChemicalCrops.dataStream.getID(world.getWorldInfo().getWorldName(), world.getWorldInfo().getDimension(), x, y, z);
-       }
-
-       @Override
-       public int getPlantMetadata(World world, int x, int y, int z) {
-               return ChemicalCrops.dataStream.getMeta(world.getWorldInfo().getWorldName(), world.getWorldInfo().getDimension(), x, y, z);
-       }
-
-       @Override
-       public String getTextureFile() {
-               return "";
-       }
-
-       public void setPlantIDAndMetadata(String worldName, int dimID, int x, int y, int z, int id, int meta) {
-               ChemicalCrops.dataStream.setData(worldName, dimID, x, y, z, id, meta);
-       }
-
-       @Override
-       public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-               super.updateTick(par1World, par2, par3, par4, par5Random);
-       }
-
-       @Override
-       public void breakBlock(World par1World, int par2, int par3, int par4,
-                       int par5, int par6) {
-               super.breakBlock(par1World, par2, par3, par4, par5, par6);
-               ChemicalCrops.dataStream.remove(par1World.getWorldInfo().getWorldName(), par1World.getWorldInfo().getDimension(), par2, par3, par4);
-       }
-
-}
diff --git a/common/pcc/addon/crops/ChemicalBlockAPI.java b/common/pcc/addon/crops/ChemicalBlockAPI.java
deleted file mode 100644 (file)
index 6382635..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-package pcc.addon.crops;
-
-import net.minecraft.world.World;
-
-public class ChemicalBlockAPI {
-
-       public static void setBlock(World par1World, int x, int y, int z, int id, int meta, int pID, int pMeta) {
-               par1World.setBlock(x, y, z, ChemicalCrops.instance.cropsID);
-               if (!par1World.isRemote) {
-                       ChemicalCrops.instance.getCrops().setPlantIDAndMetadata(par1World.getWorldInfo().getWorldName(), par1World.getWorldInfo().getDimension(), x, y, z, pID, pMeta);
-               }
-       }
-
-}
index 2adff52..38ce993 100644 (file)
@@ -3,6 +3,10 @@ package pcc.addon.crops;
 import java.awt.Canvas;
 import java.io.IOException;
 
+import pcc.addon.crops.blocks.BlockChemicalCrops1;
+import pcc.addon.crops.util.MultiBlockDataStream;
+import pcc.addon.crops.util.WorldEventHandler;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
@@ -31,18 +35,23 @@ public class ChemicalCrops {
        /**
         * CropsのBlockID
         */
-       public int cropsID;
+       public int crops1ID;
 
        /**
         * ChemicalCropsの変数。<br>
         * ここに入るインスタンスはBlockChemicalCropsと保証されます。
         */
-       private Block blockCrops;
+       private Block blockCrops1;
 
        /**
         * プラントデータ書き込み&読み込みのストリーム
         */
-       public static final PlantDataStream dataStream = new PlantDataStream(System.getProperty("user.dir") + "/saves/", "ChemicalCrops.dat");
+       public static final MultiBlockDataStream dataStream = new MultiBlockDataStream(System.getProperty("user.dir") + "/saves/", "ChemicalCrops.dat");
+
+       /**
+        * Texture Domain.
+        */
+       public static final String TEXTURE = "ChemicalCrops:";
 
        /**
         * プラントデータ自動セーブ用のスレッド
@@ -75,7 +84,7 @@ public class ChemicalCrops {
        public void preInit(FMLPreInitializationEvent event) {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
                cfg.load();
-               this.cropsID = cfg.getBlock("CropsID", 2700).getInt();
+               this.crops1ID = cfg.getBlock("CropsID", 2700).getInt();
                cfg.save();
        }
 
@@ -85,14 +94,10 @@ public class ChemicalCrops {
                MinecraftForge.EVENT_BUS.register(new WorldEventHandler());
 
                //Blockのインスタンス作成
-               this.blockCrops = new BlockChemicalCrops(this.cropsID, 1, Material.glass).setBlockName("BlockCrops");
+               this.blockCrops1 = new BlockChemicalCrops1(this.crops1ID, Material.glass).setUnlocalizedName("BlockCrops");
 
                //Minecraftに登録
-               GameRegistry.registerBlock(this.blockCrops, "BlockCrops");
-       }
-
-       public BlockChemicalCrops getCrops() {
-               return (BlockChemicalCrops) this.blockCrops;
+               GameRegistry.registerBlock(this.blockCrops1, "BlockCrops");
        }
 
        /**
diff --git a/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java b/common/pcc/addon/crops/blocks/BlockChemicalCrops1.java
new file mode 100644 (file)
index 0000000..3bc3ddb
--- /dev/null
@@ -0,0 +1,74 @@
+package pcc.addon.crops.blocks;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.Icon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.EnumPlantType;
+import net.minecraftforge.common.IPlantable;
+import pcc.addon.crops.ChemicalCrops;
+
+public class BlockChemicalCrops1 extends BlockFlower {
+
+       private int plantID;
+       private int plantMetadata;
+       private Icon[] iconList;
+
+       public BlockChemicalCrops1(int par1, Material par2Material) {
+               super(par1, par2Material);
+               this.setCreativeTab(CreativeTabs.tabBlock);
+               float f = 0.5F;
+               this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.25F, 0.5F + f);
+               this.setTickRandomly(true);
+               this.setHardness(0.0F);
+               this.disableStats();
+       }
+
+       @Override
+       public boolean canBlockStay(World par1World, int par2, int par3, int par4) {
+               if (par1World.getBlockId(par2, par3 - 1, par4) == Block.tilledField.blockID) {
+                       return true;
+               } else {
+                       return false;
+               }
+       }
+
+       @Override
+       public void breakBlock(World par1World, int par2, int par3, int par4,
+                       int par5, int par6) {
+               super.breakBlock(par1World, par2, par3, par4, par5, par6);
+               ChemicalCrops.dataStream.remove(par1World.getWorldInfo().getWorldName(), par1World.getWorldInfo().getDimension(), par2, par3, par4);
+       }
+
+       @Override
+       public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
+               super.updateTick(par1World, par2, par3, par4, par5Random);
+       }
+
+       @Override
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.iconList = new Icon[16];
+               for (int i = 0; i < 8; i++) {
+                       this.iconList[i] = par1IconRegister.registerIcon(ChemicalCrops.TEXTURE + "Corn" + i);
+               }
+               for (int i = 8; i < 16; i++) {
+                       this.iconList[i] = par1IconRegister.registerIcon(ChemicalCrops.TEXTURE + "Tomato" + (i - 8));
+               }
+       }
+
+       @Override
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+               return this.iconList[par2];
+       }
+
+       @Override
+       public int getRenderType() {
+               return 6;
+       }
+
+}
diff --git a/common/pcc/addon/crops/blocks/Types b/common/pcc/addon/crops/blocks/Types
new file mode 100644 (file)
index 0000000..601eee6
--- /dev/null
@@ -0,0 +1 @@
+1:とうもろこし&とまと
\ No newline at end of file
similarity index 74%
rename from common/pcc/addon/crops/PlantData.java
rename to common/pcc/addon/crops/util/MultiBlockData.java
index 4fb8fae..d979621 100644 (file)
@@ -1,27 +1,23 @@
-package pcc.addon.crops;
+package pcc.addon.crops.util;
 
 import java.util.ArrayList;
 
-public class PlantData {
+public class MultiBlockData {
 
        private String worldName;
        private int dimID;
        private int x;
        private int y;
        private int z;
-       private int id;
-       private int meta;
        private ArrayList<String> others = new ArrayList<String>();
 
-       public PlantData(String worldName, int dimID, int x, int y, int z, int id, int meta) {
+       public MultiBlockData(String worldName, int dimID, int x, int y, int z) {
                super();
                this.worldName = worldName;
                this.dimID = dimID;
                this.x = x;
                this.y = y;
                this.z = z;
-               this.id = id;
-               this.meta = meta;
        }
 
        public void setWorldName(String worldName) {
@@ -44,14 +40,6 @@ public class PlantData {
                this.z = z;
        }
 
-       public void setId(int id) {
-               this.id = id;
-       }
-
-       public void setMeta(int meta) {
-               this.meta = meta;
-       }
-
        public String getWorldName() {
                return worldName;
        }
@@ -72,14 +60,6 @@ public class PlantData {
                return z;
        }
 
-       public int getId() {
-               return id;
-       }
-
-       public int getMeta() {
-               return meta;
-       }
-
        public ArrayList<String> getOthers() {
                return others;
        }
@@ -94,7 +74,7 @@ public class PlantData {
 
        @Override
        public boolean equals(Object obj) {
-               PlantData p = (PlantData) obj;
+               MultiBlockData p = (MultiBlockData) obj;
                if (p.getWorldName().equals(this.worldName)
                                && p.getDimID() == this.dimID
                                && p.getX() == this.x
@@ -1,4 +1,4 @@
-package pcc.addon.crops;
+package pcc.addon.crops.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 
-public class PlantDataStream {
+public class MultiBlockDataStream {
 
        private String dirPath;
        private String filePath;
@@ -20,9 +20,9 @@ public class PlantDataStream {
 
        private File file;
 
-       private HashSet<PlantData> plantDataHash = new HashSet<PlantData>();
+       private HashSet<MultiBlockData> plantDataHash = new HashSet<MultiBlockData>();
 
-       public PlantDataStream(String dirPath, String filePath) {
+       public MultiBlockDataStream(String dirPath, String filePath) {
                this.dirPath = dirPath;
                this.filePath = filePath;
        }
@@ -77,10 +77,8 @@ public class PlantDataStream {
                        int x = Integer.parseInt(datas[2]);
                        int y = Integer.parseInt(datas[3]);
                        int z = Integer.parseInt(datas[4]);
-                       int id = Integer.parseInt(datas[5]);
-                       int meta = Integer.parseInt(datas[6]);
-                       PlantData p = new PlantData(worldName, dimID, x, y, z, id, meta);
-                       for (int i = 0; i < datas.length - 7; i++) {
+                       MultiBlockData p = new MultiBlockData(worldName, dimID, x, y, z);
+                       for (int i = 0; i < datas.length - 5; i++) {
                                p.add(datas[7 + i]);
                        }
                        this.plantDataHash.add(p);
@@ -90,15 +88,13 @@ public class PlantDataStream {
 
        public void write() throws IOException {
                try {
-                       for (PlantData p: this.plantDataHash) {
+                       for (MultiBlockData p: this.plantDataHash) {
                                String result = "";
                                String worldName = p.getWorldName();
                                int dimID = p.getDimID();
                                int x = p.getX();
                                int y = p.getY();
                                int z = p.getZ();
-                               int id = p.getId();
-                               int meta = p.getMeta();
                                ArrayList<String> others = p.getOthers();
 
                                result = result + worldName + "#";
@@ -106,8 +102,6 @@ public class PlantDataStream {
                                result = result + x + "#";
                                result = result + y + "#";
                                result = result + z + "#";
-                               result = result + id + "#";
-                               result = result + meta + "#";
                                for (int i = 0; i < others.size(); i++) {
                                        result = result + others.get(i) + "#";
                                }
@@ -121,8 +115,8 @@ public class PlantDataStream {
        }
 
        public String get(String worldName, int dimID, int x, int y, int z, int dataID) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
+               for (MultiBlockData p: this.plantDataHash) {
+                       MultiBlockData newPlantData = new MultiBlockData(worldName, dimID, x, y, z);
                        if (p.equals(newPlantData)) {
                                return p.getOthers().get(dataID);
                        }
@@ -131,81 +125,22 @@ public class PlantDataStream {
                return null;
        }
 
-       public int getID(String worldName, int dimID, int x, int y, int z) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
-                       if (p.equals(newPlantData)) {
-                               return p.getId();
-                       }
-               }
-               System.out.println("ID not found");
-               return -1;
-       }
-
-       public int getMeta(String worldName, int dimID, int x, int y, int z) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
-                       if (p.equals(newPlantData)) {
-                               return p.getMeta();
-                       }
-               }
-               System.out.println("Meta not found");
-               return -1;
-       }
-
        public void set(String worldName, int dimID, int x, int y, int z, String data) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
+               for (MultiBlockData p: this.plantDataHash) {
+                       MultiBlockData newPlantData = new MultiBlockData(worldName, dimID, x, y, z);
                        if (p.equals(newPlantData)) {
                                p.add(data);
                                return;
                        }
                }
-               PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
+               MultiBlockData newPlantData = new MultiBlockData(worldName, dimID, x, y, z);
                newPlantData.add(data);
                this.plantDataHash.add(newPlantData);
        }
 
-       public void setID(String worldName, int dimID, int x, int y, int z, int id) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
-                       if (p.equals(newPlantData)) {
-                               p.setId(id);
-                               return;
-                       }
-               }
-               PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, id, 0);
-               this.plantDataHash.add(newPlantData);
-       }
-
-       public void setMeta(String worldName, int dimID, int x, int y, int z, int meta) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
-                       if (p.equals(newPlantData)) {
-                               p.setMeta(meta);
-                               return;
-                       }
-               }
-               PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, meta);
-               this.plantDataHash.add(newPlantData);
-       }
-
-       public void setData(String worldName, int dimID, int x, int y, int z, int id, int meta) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
-                       if (p.equals(newPlantData)) {
-                               p.setId(id);
-                               p.setMeta(meta);
-                               return;
-                       }
-               }
-               PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, id, meta);
-               this.plantDataHash.add(newPlantData);
-       }
-
        public void remove(String worldName, int dimID, int x, int y, int z) {
-               for (PlantData p: this.plantDataHash) {
-                       PlantData newPlantData = new PlantData(worldName, dimID, x, y, z, 0, 0);
+               for (MultiBlockData p: this.plantDataHash) {
+                       MultiBlockData newPlantData = new MultiBlockData(worldName, dimID, x, y, z);
                        if (p.equals(newPlantData)) {
                                this.plantDataHash.remove(p);
                                return;
@@ -1,7 +1,9 @@
-package pcc.addon.crops;
+package pcc.addon.crops.util;
 
 import java.io.IOException;
 
+import pcc.addon.crops.ChemicalCrops;
+
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.world.WorldEvent.Load;
 import net.minecraftforge.event.world.WorldEvent.Save;
index 51068a0..613667a 100644 (file)
@@ -22,17 +22,17 @@ public class ChemiCraftRegisterBlock extends ChemiCraftCoreRegister {
        @Override
        public void start() {
                //Blockを変数に代入
-               this.mod.blockPyrolysisTable = new BlockPyrolysisTable(this.mod.pyrolysisTableID, 0, Material.ground).
+               this.mod.blockPyrolysisTable = new BlockPyrolysisTable(this.mod.pyrolysisTableID, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
                                setUnlocalizedName("PyrolysisTable");
-               this.mod.blockElectrolysisTable = new BlockElectrolysisTable(this.mod.electrolysisTableID, 1, Material.ground).
+               this.mod.blockElectrolysisTable = new BlockElectrolysisTable(this.mod.electrolysisTableID, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
                                setUnlocalizedName("ElectrolysisTable");
-               this.mod.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.mod.chemicalConbinationTableID, 2, Material.ground).
+               this.mod.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.mod.chemicalConbinationTableID, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
@@ -44,7 +44,7 @@ public class ChemiCraftRegisterBlock extends ChemiCraftCoreRegister {
                                setStepSound(Block.soundStoneFootstep).
                                setUnlocalizedName("ToolAndWeaponCraftingTable");
                */
-               this.mod.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.mod.chemicalCraftingTableID, 4, Material.ground).
+               this.mod.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.mod.chemicalCraftingTableID, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
index 8e1b0e2..19d0ec9 100644 (file)
@@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
+import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.tileentity.TileEntityChemicalCombinationTable;
 
@@ -31,6 +32,9 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
        @Override
        public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableTop");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableBottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTable");
        }
 
 
index 60a4b87..e396f45 100644 (file)
@@ -2,8 +2,10 @@ package pcc.chemicraft.core.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
@@ -11,8 +13,12 @@ import pcc.chemicraft.core.tileentity.TileEntityChemicalCraftingTable;
 
 public class BlockChemicalCraftingTable extends BlockContainer {
 
-       public BlockChemicalCraftingTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
+       public Icon topIcon;
+       public Icon bottomIcon;
+       public Icon globalIcon;
+
+       public BlockChemicalCraftingTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
@@ -26,21 +32,22 @@ public class BlockChemicalCraftingTable extends BlockContainer {
 
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableTop");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableBottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTable");
        }
 
 
 
        @Override
-       public int getBlockTextureFromSide(int par1)
-       {
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
                if(par1 == 0){
-                       return 17;
+                       return this.topIcon;
                }else if(par1 == 1){
-                       return this.blockIndexInTexture;
+                       return this.bottomIcon;
                }else{
-                       return 16;
+                       return this.globalIcon;
                }
        }
 
index 7084edb..52fc2b7 100644 (file)
@@ -2,39 +2,42 @@ package pcc.chemicraft.core.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.debug.DebugTick;
 import pcc.chemicraft.core.tileentity.TileEntityElectrolysisTable;
 
-public class BlockElectrolysisTable extends BlockContainer
-{
+public class BlockElectrolysisTable extends BlockContainer {
 
-       public BlockElectrolysisTable(int par1, int par2, Material par3Material)
-       {
-               super(par1, par2, par3Material);
+       public Icon topIcon;
+       public Icon bottomIcon;
+       public Icon globalIcon;
+
+       public BlockElectrolysisTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
        @Override
-       public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
-       {
+       public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
                par5EntityPlayer.openGui(ChemiCraftCore.instance, ChemiCraftCore.instance.guiElectrolysisTableID, par1World, par2, par3, par4);
                return true;
        }
 
        @Override
-       public String getTextureFile()
-       {
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableTop");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableBottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTable");
        }
 
        @Override
-       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6)
-       {
+       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) {
                TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4);
                if (tileentity != null) {
                        DebugTick.removeDebugData("ElectrolysisTable" + "(x:" + tileentity.xCoord + " y:" + tileentity.yCoord + " z:" + tileentity.zCoord + ")");
@@ -43,20 +46,18 @@ public class BlockElectrolysisTable extends BlockContainer
        }
 
        @Override
-       public int getBlockTextureFromSide(int par1)
-       {
-               if (par1 == 0) {
-                       return 17;
-               } else if (par1 == 1) {
-                       return this.blockIndexInTexture;
-               } else {
-                       return 16;
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+               if(par1 == 0){
+                       return this.topIcon;
+               }else if(par1 == 1){
+                       return this.bottomIcon;
+               }else{
+                       return this.globalIcon;
                }
        }
 
        @Override
-       public TileEntity createNewTileEntity(World var1)
-       {
+       public TileEntity createNewTileEntity(World var1) {
                return new TileEntityElectrolysisTable();
        }
 
index bea2c3a..06944cd 100644 (file)
@@ -2,8 +2,10 @@ package pcc.chemicraft.core.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
@@ -12,8 +14,12 @@ import pcc.chemicraft.core.tileentity.TileEntityPyrolysisTable;
 
 public class BlockPyrolysisTable extends BlockContainer {
 
-       public BlockPyrolysisTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
+       public Icon topIcon;
+       public Icon bottomIcon;
+       public Icon globalIcon;
+
+       public BlockPyrolysisTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
@@ -26,8 +32,10 @@ public class BlockPyrolysisTable extends BlockContainer {
 
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableTop");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableBottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTable");
        }
 
 
@@ -47,14 +55,13 @@ public class BlockPyrolysisTable extends BlockContainer {
 
 
        @Override
-       public int getBlockTextureFromSide(int par1)
-       {
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
                if(par1 == 0){
-                       return 17;
+                       return this.topIcon;
                }else if(par1 == 1){
-                       return this.blockIndexInTexture;
+                       return this.bottomIcon;
                }else{
-                       return 16;
+                       return this.globalIcon;
                }
        }
 
index ca147b5..3f1ddd0 100644 (file)
@@ -2,8 +2,10 @@ package pcc.chemicraft.core.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
@@ -11,8 +13,12 @@ import pcc.chemicraft.core.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
-       public BlockToolAndWeaponCraftingTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
+       public Icon topIcon;
+       public Icon bottomIcon;
+       public Icon globalIcon;
+
+       public BlockToolAndWeaponCraftingTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
@@ -25,21 +31,22 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableTop");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableBottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTable");
        }
 
 
 
        @Override
-       public int getBlockTextureFromSide(int par1)
-       {
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
                if(par1 == 0){
-                       return 17;
+                       return this.topIcon;
                }else if(par1 == 1){
-                       return this.blockIndexInTexture;
+                       return this.bottomIcon;
                }else{
-                       return 16;
+                       return this.globalIcon;
                }
        }
 
index a46334e..aea2503 100644 (file)
@@ -26,10 +26,6 @@ public class ClientProxy extends CommonProxy {
 
        @Override
        public void registerRenderInformation() {
-               MinecraftForgeClient.preloadTexture(ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.BLOCK_ATOMS_ORE_TEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.ITEM_ATOMS_TEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.ITEM_COMPOUNDS_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.GUI_PYROLYSIS_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.GUI_ELECTROLYSIS_TEXTURE);
index cb8b8ca..ff44b18 100644 (file)
@@ -16,7 +16,7 @@ public class CreativeTabChemiCraft extends CreativeTabs {
        @Override
        @SideOnly(Side.CLIENT)
        public int getTabIconItemIndex(){
-               return ChemiCraftCore.instance.itemGasCollectingBottle.shiftedIndex;
+               return ChemiCraftCore.instance.itemGasCollectingBottle.itemID;
        }
 
 
index 309ab7d..2fbd8c0 100644 (file)
@@ -39,7 +39,7 @@ public class DebugTick extends JPanel implements ITickHandler {
 
        @Override
        public EnumSet<TickType> ticks() {
-               return EnumSet.of(TickType.GUI, TickType.CLIENT);
+               return EnumSet.of(TickType.CLIENT, TickType.CLIENT);
        }
 
        @Override
index b84ca70..db1a13c 100644 (file)
@@ -30,16 +30,14 @@ public class SetBlockSupport
                {
                        switch(Direction)
                        {
-                       default:
-
                        case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z, Block, meta);
+                               DataBox = par1World.setBlock(X, Y, Z, Block, meta, 0x02);
                                break;
                        case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X-(Length-1)+loop2,Y,Z,Block,meta);
+                               DataBox = par1World.setBlock(X-(Length-1)+loop2,Y,Z,Block,meta, 0x02);
                                break;
                        case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X+loop2, Y, Z, Block,meta);
+                               DataBox = par1World.setBlock(X+loop2, Y, Z, Block,meta, 0x02);
                                break;
                        }
                }
@@ -68,16 +66,14 @@ public class SetBlockSupport
                {
                        switch(Direction)
                        {
-                       default:
-
                        case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y-loop2, Z, Block,meta);
+                               DataBox = par1World.setBlock(X, Y-loop2, Z, Block,meta, 0x02);
                                break;
                        case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y-(Length-1)+loop2,Z,Block,meta);
+                               DataBox = par1World.setBlock(X,Y-(Length-1)+loop2,Z,Block,meta, 0x02);
                                break;
                        case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y+loop2, Z, Block,meta);
+                               DataBox = par1World.setBlock(X, Y+loop2, Z, Block,meta, 0x02);
                                break;
                        }
                }
@@ -106,16 +102,14 @@ public class SetBlockSupport
                {
                        switch(Direction)
                        {
-                       default:
-
                        case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z-loop2, Block,meta);
+                               DataBox = par1World.setBlock(X, Y, Z-loop2, Block,meta, 0x02);
                                break;
                        case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y,Z-(Length-1)+loop2,Block,meta);
+                               DataBox = par1World.setBlock(X,Y,Z-(Length-1)+loop2,Block,meta, 0x02);
                                break;
                        case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z+loop2, Block,meta);
+                               DataBox = par1World.setBlock(X, Y, Z+loop2, Block,meta, 0x02);
                                break;
                        }
                }
@@ -383,16 +377,10 @@ public class SetBlockSupport
        public static Object fillBox(World par1World , int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
        {
                Object DataBox = null;
-               DataBox = square(par1World, X, Y, Z, Block,meta, LengthX,LengthZ);
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);
 
-               for(int i = 0; i < LengthX - 1; i++)
+               for(int i = 0; i < height; i++)
                {
-                       DataBox = wallZ(par1World,X + 1 - LengthX / 2 + i, Y , Z , Block ,meta,LengthZ, height);
+                       DataBox = square(par1World,X,Y+i,Z,Block,meta,LengthX,LengthZ);
                }
 
                return DataBox;
@@ -416,7 +404,7 @@ public class SetBlockSupport
        public static Object fineSetBlock(World par1World,int X,int Y,int Z,int[] Block,int[] meta,int[] XPosition,int[] YPosition,int[] ZPosition,Object[] Option){
                Object DataBox = null;
                for(int i=0;i<Block.length;i++){
-                       DataBox = par1World.setBlockAndMetadata(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i]);
+                       DataBox = par1World.setBlock(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i], 0x02);
                }
 
                if(Option!=null){
@@ -441,8 +429,8 @@ public class SetBlockSupport
         * @param height 高さ
         * @return Object
         */
-       public static Object trapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
+       public static Object TrapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object DataBox = null;
                int Rate=0;
                int Math=0;
                int XRate=0;
@@ -465,9 +453,9 @@ public class SetBlockSupport
                                }
                        }
 
-                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+                       DataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
                }
-               return dataBox;
+               return DataBox;
        }
 
        /**
@@ -484,8 +472,8 @@ public class SetBlockSupport
         * @param height 高さ
         * @return Object
         */
-       public static Object trapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
+       public static Object TrapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object DataBox = null;
                int Rate=0;
                int Math=0;
                int YRate = 0;
@@ -506,9 +494,9 @@ public class SetBlockSupport
                                }
                        }
 
-                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+                       DataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
                }
-               return dataBox;
+               return DataBox;
        }
 
        /**
@@ -525,8 +513,8 @@ public class SetBlockSupport
         * @param height 高さ
         * @return Object
         */
-       public static Object trapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
+       public static Object TrapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object DataBox = null;
                int Rate=0;
                int Math=0;
                int YRate = 0;
@@ -547,9 +535,9 @@ public class SetBlockSupport
                                }
                        }
 
-                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+                       DataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
                }
-               return dataBox;
+               return DataBox;
        }
 
        /**
@@ -567,7 +555,7 @@ public class SetBlockSupport
         * @return Object
         */
        public static Object TrapezoidZ(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
+               Object DataBox = null;
                int Rate=0;
                int Math=0;
                int ZRate=0;
@@ -588,9 +576,9 @@ public class SetBlockSupport
                                }
                        }
 
-                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);
+                       DataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);
                }
-               return dataBox;
+               return DataBox;
        }
 
 }
\ No newline at end of file
index 4abfbbb..b14641c 100644 (file)
@@ -27,13 +27,13 @@ public class GuiChemicalCombinationTable extends GuiContainer {
                this.atomList = new GuiTextField(this.fontRenderer, 9, 103, 160, 15);
                this.atomList.setFocused(false);
                this.atomList.setMaxStringLength(25);
-               this.controlList.add(new GuiButton(0, this.guiLeft + 172 - 41, this.guiTop + 80 - 21, 40, 20, "Add"));
-               this.controlList.add(new GuiButton(1, this.guiLeft + 172 - 41, this.guiTop + 80, 40, 20, "Eject"));
+               this.buttonList.add(new GuiButton(0, this.guiLeft + 172 - 41, this.guiTop + 80 - 21, 40, 20, "Add"));
+               this.buttonList.add(new GuiButton(1, this.guiLeft + 172 - 41, this.guiTop + 80, 40, 20, "Eject"));
        }
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraftCore.instance.GUI_CHEMICALCOMBINATION_TEXTURE));
+               this.mc.renderEngine.bindTexture(ChemiCraftCore.instance.GUI_CHEMICALCOMBINATION_TEXTURE);
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index 10ed96e..d26ebec 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(ChemiCraftCore.instance.GUI_CHEMICALCRAFTING_TEXTURE));
+               this.mc.renderEngine.bindTexture(ChemiCraftCore.instance.GUI_CHEMICALCRAFTING_TEXTURE);
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index 35ba814..4c5d0b8 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(ChemiCraftCore.instance.GUI_ELECTROLYSIS_TEXTURE));
+               this.mc.renderEngine.bindTexture(ChemiCraftCore.instance.GUI_ELECTROLYSIS_TEXTURE);
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index 25427d3..ede85b1 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(ChemiCraftCore.instance.GUI_PYROLYSIS_TEXTURE));
+               this.mc.renderEngine.bindTexture(ChemiCraftCore.instance.GUI_PYROLYSIS_TEXTURE);
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
                System.out.println((int) (13F / this.tileentity.getFuelRestTime()));
                System.out.println(this.tileentity.getFuelRestTime());
index 8d5c511..5182891 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(ChemiCraftCore.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE));
+               this.mc.renderEngine.bindTexture(ChemiCraftCore.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE);
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
index 74c351c..2e3741e 100644 (file)
@@ -110,4 +110,14 @@ public class InventoryChemicalCombinationTableMaterial implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               return false;
+       }
+
 }
index d7f26b8..85f7c49 100644 (file)
@@ -110,5 +110,17 @@ public class InventoryChemicalCombinationTableResult implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 
 }
index fbb434d..61efd9a 100644 (file)
@@ -90,4 +90,16 @@ public class InventoryChemicalCraftingMaterial implements IInventory {
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index 9c80bef..13a48ea 100644 (file)
@@ -90,4 +90,16 @@ public class InventoryChemicalCraftingNBT implements IInventory {
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index d28d099..d1e401c 100644 (file)
@@ -90,5 +90,17 @@ public class InventoryChemicalCraftingResult implements IInventory {
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 
 }
index cbc324d..063565f 100644 (file)
@@ -95,4 +95,16 @@ public class InventoryElectrolysisFuel implements IInventory
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index 919b8b4..ee13c37 100644 (file)
@@ -95,4 +95,16 @@ public class InventoryElectrolysisMaterial implements IInventory
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index ced603a..0b0f381 100644 (file)
@@ -95,4 +95,16 @@ public class InventoryElectrolysisResult implements IInventory
 
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index 33c2fe7..84c1e33 100644 (file)
@@ -109,4 +109,16 @@ public class InventoryPyrolysisTableFuel implements IInventory {
        @Override
        public void closeChest() {
        }
+
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
 }
index 73c240b..c19c6ea 100644 (file)
@@ -110,4 +110,16 @@ public class InventoryPyrolysisTableMaterial implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index 7ea0479..f6c3839 100644 (file)
@@ -109,4 +109,16 @@ public class InventoryPyrolysisTableResult implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index 77bbf5d..3dacd3e 100644 (file)
@@ -110,4 +110,16 @@ public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 }
index e4e6814..2cbe844 100644 (file)
@@ -110,5 +110,17 @@ public class InventoryToolAndWeaponCraftingTableResult implements IInventory {
        public void closeChest() {
        }
 
+       @Override
+       public boolean isInvNameLocalized() {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
+       @Override
+       public boolean isStackValidForSlot(int i, ItemStack itemstack) {
+               // TODO 自動生成されたメソッド・スタブ
+               return false;
+       }
+
 
 }
index b3ee9a3..072fd8d 100644 (file)
@@ -59,6 +59,7 @@ public class ItemAtoms extends Item {
 
 
 
+       /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
        @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
@@ -91,5 +92,6 @@ public class ItemAtoms extends Item {
        public int getIconFromDamage(int par1){
                return par1;
        }
+       */
 
 }
\ No newline at end of file
index 25982b8..f943bf8 100644 (file)
@@ -2,6 +2,7 @@ package pcc.chemicraft.core.item;
 
 import java.util.List;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -23,8 +24,8 @@ public class ItemChemiCell extends Item
 
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemChemicalCell");
        }
 
 }
index d6220d2..3941a2f 100644 (file)
@@ -71,6 +71,7 @@ public class ItemCompounds extends Item {
 
 
 
+       /*めんどくさいから発案者やって(´・ω・`) --WIP--
        @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
@@ -116,5 +117,6 @@ public class ItemCompounds extends Item {
                }
                return 0;
        }
+       */
 
 }
index 1417bac..39599e0 100644 (file)
@@ -2,6 +2,7 @@ package pcc.chemicraft.core.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFire;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -92,9 +93,8 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
        }
 
        @Override
-       public String getTextureFile()
-       {
-               return ChemiCraft.TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemGasCollectingBottle");
        }
 
 }
index 07d287e..5c321fa 100644 (file)
@@ -603,12 +603,12 @@ public class ChunkProviderChemical implements IChunkProvider
 
                                if (this.worldObj.isBlockFreezable(var12 + var4, var14 - 1, var13 + var5))
                                {
-                                       this.worldObj.setBlockWithNotify(var12 + var4, var14 - 1, var13 + var5, Block.ice.blockID);
+                                       this.worldObj.setBlock(var12 + var4, var14 - 1, var13 + var5, Block.ice.blockID);
                                }
 
                                if (this.worldObj.canSnowAt(var12 + var4, var14, var13 + var5))
                                {
-                                       this.worldObj.setBlockWithNotify(var12 + var4, var14, var13 + var5, Block.snow.blockID);
+                                       this.worldObj.setBlock(var12 + var4, var14, var13 + var5, Block.snow.blockID);
                                }
                        }
                }
@@ -684,4 +684,9 @@ public class ChunkProviderChemical implements IChunkProvider
                        this.scatteredFeatureGenerator.generate(this, this.worldObj, par1, par2, (byte[])null);
                }
        }
+
+       @Override
+       public boolean unloadQueuedChunks() {
+               return false;
+       }
 }
diff --git a/resources/mods/ChemicalCrops/textures/blocks/Corn0.png b/resources/mods/ChemicalCrops/textures/blocks/Corn0.png
new file mode 100644 (file)
index 0000000..166b114
Binary files /dev/null and b/resources/mods/ChemicalCrops/textures/blocks/Corn0.png differ