OSDN Git Service

英語の間違い全部修正
authormozipi <mozipi@users.sourceforge.jp>
Sat, 15 Dec 2012 04:52:16 +0000 (13:52 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sat, 15 Dec 2012 04:52:16 +0000 (13:52 +0900)
common/chemicraft/BlockChemicalCraftingTable.java [moved from common/chemicraft/BlockScienceCraftingTable.java with 72% similarity]
common/chemicraft/ChemiCraft.java
common/chemicraft/CommonProxy.java
common/chemicraft/ContainerChemicalCraftingTable.java [moved from common/chemicraft/ContainerScienceCraftingTable.java with 83% similarity]
common/chemicraft/GuiChemicalCraftingTable.java [moved from common/chemicraft/GuiScienceCraftingTable.java with 87% similarity]
common/chemicraft/ItemAtoms.java
common/chemicraft/PacketHandler.java
common/chemicraft/TileEntityChemicalCraftingTable.java [moved from common/chemicraft/TileEntityScienceCraftingTable.java with 96% similarity]
src/chemicraft/client/ClientProxy.java

@@ -7,9 +7,9 @@ import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 
-public class BlockScienceCraftingTable extends BlockContainer {
+public class BlockChemicalCraftingTable extends BlockContainer {
 
-       public BlockScienceCraftingTable(int par1, int par2, Material par3Material){
+       public BlockChemicalCraftingTable(int par1, int par2, Material par3Material){
                super(par1, par2, par3Material);
                this.setCreativeTab(CreativeTabs.tabBlock);
        }
@@ -18,7 +18,7 @@ public class BlockScienceCraftingTable extends BlockContainer {
 
        @Override
        public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
-               par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiScienceCraftingTableID, par1World, par2, par3, par4);
+               par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiChemicalCraftingTableID, par1World, par2, par3, par4);
                return true;
        }
 
@@ -26,7 +26,7 @@ public class BlockScienceCraftingTable extends BlockContainer {
 
        @Override
        public TileEntity createNewTileEntity(World var1){
-               return new TileEntityScienceCraftingTable();
+               return new TileEntityChemicalCraftingTable();
        }
 
 }
index 2220c75..67993ad 100644 (file)
@@ -83,19 +83,19 @@ public class ChemiCraft {
        /**\r
         * BlockID\r
         */\r
-       public static int scienceCraftingTableID;\r
+       public static int chemicalCraftingTableID;\r
 \r
 \r
        /**\r
         * GUIID\r
         */\r
-       public static int guiScienceCraftingTableID;\r
+       public static int guiChemicalCraftingTableID;\r
 \r
 \r
        /**\r
         * Block型変数\r
         */\r
-       public static Block blockScienceCraftingTable;\r
+       public static Block blockChemicalCraftingTable;\r
 \r
 \r
        /**\r
@@ -119,17 +119,17 @@ public class ChemiCraft {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property scienceCraftingTableIDProp = cfg.getBlock("scienceCraftingTable", 200);\r
+               Property chemicalCraftingTableIDProp = cfg.getBlock("chemicalCraftingTable", 200);\r
                Property atomsIDProp = cfg.getItem("atomsID", 25000);\r
                Property compoundsIDProp = cfg.getItem("compoundsID", 25001);\r
                Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
-               Property guiScienceCraftingTableIDProp = cfg.get("GUI", "GUIScienceCraftingTableID", 1000);\r
+               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\r
 \r
-               scienceCraftingTableID = scienceCraftingTableIDProp.getInt();\r
+               chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
                atomsID = atomsIDProp.getInt();\r
                compoundsID = compoundsIDProp.getInt();\r
                gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
-               guiScienceCraftingTableID = guiScienceCraftingTableIDProp.getInt();\r
+               guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
 \r
                cfg.save();\r
        }\r
@@ -143,8 +143,8 @@ public class ChemiCraft {
                NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());\r
 \r
                // Blockを追加します\r
-               blockScienceCraftingTable = new BlockScienceCraftingTable(scienceCraftingTableID, Block.workbench.blockIndexInTexture, Material.ground)\r
-               .setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ScienceCraftingTable");\r
+               blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, Block.workbench.blockIndexInTexture, Material.ground)\r
+               .setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCraftingTable");\r
 \r
                // Itemを追加します\r
                itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");\r
@@ -152,11 +152,11 @@ public class ChemiCraft {
                itemGasCollectingBottle = new ItemGasCollectingBottle(gasCollectingBottleID).setItemName("gasCollectingBottle");\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(blockScienceCraftingTable);\r
+               GameRegistry.registerBlock(blockChemicalCraftingTable);\r
 \r
                // Blockの名前を設定します\r
-               NameAuxiliary.addName(blockScienceCraftingTable, "ScienceCraftingTable");\r
-               NameAuxiliary.addName(blockScienceCraftingTable, "ja_JP", "科学作業台");\r
+               NameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");\r
+               NameAuxiliary.addName(blockChemicalCraftingTable, "ja_JP", "科学作業台");\r
 \r
                // Itemの名前を設定します\r
                NameAuxiliary.addName(itemAtoms, atomsName);\r
@@ -168,7 +168,7 @@ public class ChemiCraft {
                ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "塩");\r
 \r
                // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityScienceCraftingTable.class, "TileEntityScienceCraftingTable");\r
+               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
 \r
                // GUIを追加します\r
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
index 6ecb323..fd85bef 100644 (file)
@@ -18,8 +18,8 @@ public class CommonProxy implements IGuiHandler {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityScienceCraftingTable) {
-                       return new ContainerScienceCraftingTable(player, (TileEntityScienceCraftingTable) tileEntity);
+               if (tileEntity instanceof TileEntityChemicalCraftingTable) {
+                       return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                }
                return null;
        }
@@ -10,7 +10,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.World;
 
-public class ContainerScienceCraftingTable extends Container {
+public class ContainerChemicalCraftingTable extends Container {
 
        /**
         * Worldのインスタンス
@@ -29,11 +29,11 @@ public class ContainerScienceCraftingTable extends Container {
        /**
         * the TileEntity.
         */
-       private TileEntityScienceCraftingTable tileEntity;
+       private TileEntityChemicalCraftingTable tileEntity;
 
 
 
-       public ContainerScienceCraftingTable(EntityPlayer par1EntityPlayer, TileEntityScienceCraftingTable par2)
+       public ContainerChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2)
        {
                super();
                this.worldObj = par2.worldObj;
@@ -76,7 +76,7 @@ public class ContainerScienceCraftingTable extends Container {
 
        @Override
        public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.scienceCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
+               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.chemicalCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
        }
 
 
-package chemicraft;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import net.minecraft.src.Block;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryBasic;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.ItemStack;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.PacketDispatcher;
-import cpw.mods.fml.common.network.Player;
-
-@SideOnly(Side.CLIENT)
-public class GuiScienceCraftingTable extends GuiContainer {
-
-       /**
-        * 分解機GUIのInventoryBasicクラス
-        */
-       private static InventoryBasic decompositionSlots = new InventoryBasic("Decomposition", 17);
-
-
-       /**
-        * TabListのArrayList
-        */
-       private ArrayList<ChemiCraftTab> tabList = new ArrayList<ChemiCraftTab>();
-
-
-       /**
-        * Gui画像のHashMap
-        * キーの名前は拡張子を除くファイル名にする
-        */
-       private HashMap<String, Integer> guiImageMap = new HashMap<String, Integer>();
-
-
-       /**
-        * 画像のHashMap
-        * キーの名前は拡張子を除くファイル名にする
-        */
-       private HashMap<String, Integer> otherImageMap = new HashMap<String, Integer>();
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityScienceCraftingTable tileEntity;
-
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerScienceCraftingTable container;
-
-
-
-       public GuiScienceCraftingTable(EntityPlayer par1EntityPlayer, TileEntityScienceCraftingTable par2){
-               super(new ContainerScienceCraftingTable(par1EntityPlayer, par2));
-               //TileEntityを設定
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerScienceCraftingTable) this.inventorySlots;
-               //TabListにTabを追加する
-               this.addTabs(0, "Decomposition", new ItemStack(Block.tnt.blockID, 1, 1));
-               this.addTabs(1, "Test", new ItemStack(Block.bedrock.blockID, 1, 1));
-               //ActiveTabの初期化
-               for(int i = 0;i < tabList.size();i++){
-                       String field_00001 = this.tabList.get(i).getTabName();
-                       String field_00002 = this.tileEntity.getActiveTab();
-                       if(field_00001.equals(field_00002)){
-                               this.tileEntity.setActiveTab(this.tabList.get(i).getTabName());
-                       }
-               }
-       }
-
-
-
-       @Override
-       protected void mouseClicked(int par1, int par2, int par3){
-               super.mouseClicked(par1, par2, par3);
-
-               int var1 = par1 - this.guiLeft;
-               int var2 = par2 - this.guiTop;
-               if(var1 < this.tabList.size() * 28 && var1 >= 0 && var2 < 0){
-                       String var3 = this.tabList.get(var1 / 28).getTabName();
-                       if(!var3.equals(this.tileEntity.getActiveTab())){
-                               this.tileEntity.setActiveTab(var3);
-                               this.inventoryPlayer.player.openGui(ChemiCraft.instance, ChemiCraft.instance.guiScienceCraftingTableID, this.tileEntity.worldObj, this.tileEntity.xCoord, this.tileEntity.yCoord, this.tileEntity.zCoord);
-                               this.onGuiClosed();
-                       }
-               }
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               //ActiveTab Reset.
-               this.func_00003();
-               //Texture Load.
-               this.func_00002();
-               //Draw Tabs.
-               this.func_00001(par1, par2, par3);
-               //Draw GUI
-               if(this.tileEntity.getActiveTab().equals("Decomposition")){
-                       this.mc.renderEngine.bindTexture(this.guiImageMap.get("Decomposition"));
-                       this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-               }
-       }
-
-
-
-       private void func_00001(float par1, int par2, int par3){
-               int var1 = this.guiLeft;
-               int var2 = this.guiTop - 32;
-               for(int i = 0;i < this.tabList.size();i++){
-                       if(!this.tabList.get(i).isActive()){
-                               this.mc.renderEngine.bindTexture(this.otherImageMap.get("tabs"));
-                               this.drawTexturedModalRect(var1 + (28 * i), var2, 0, 0, 28, 32);
-                               this.itemRenderer.renderItemIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);
-                               this.itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);
-                       }else{
-                               this.mc.renderEngine.bindTexture(this.otherImageMap.get("tabs"));
-                               this.drawTexturedModalRect(var1 + (28 * i), var2, 0, 32, 28, 32);
-                               this.itemRenderer.renderItemIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);
-                               this.itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);
-                       }
-               }
-       }
-
-
-
-       private void func_00002(){
-               //guiImageMapに画像を格納する
-               guiImageMap.put("Decomposition", this.mc.renderEngine.getTexture("/resources/chemicraft/guis/Decomposition.png"));
-               //otherImageMapに画像を格納する
-               otherImageMap.put("tabs", this.mc.renderEngine.getTexture("/resources/chemicraft/guis/tabs.png"));
-       }
-
-
-
-       private void func_00003(){
-               for(int i = 0;i < this.tabList.size();i++){
-                       if(!this.tabList.get(i).getTabName().equals(this.tileEntity.getActiveTab())){
-                               this.tabList.get(i).setActive(false);
-                       }else{
-                               this.tabList.get(i).setActive(true);
-                       }
-               }
-       }
-
-
-
-       /**
-        * ChemiCraftTabを追加します。
-        * @param id TabのID
-        * @param texture OverlayするTextureID
-        * @param name Tabの名前
-        * @throws Exception IDが重複している場合にスローされます
-        */
-       private void addTabs(int id, String name, ItemStack renderItemStack){
-               for(int i = 0;i < this.tabList.size();i++){
-                       if(id == this.tabList.get(i).getID()){
-                               try {
-                                       throw new Exception("ChemiCraft内でエラー:ChemiCraftTabのIDが重複しています");
-                               } catch (Exception e) {
-                                       e.printStackTrace();
-                               }
-                       }
-               }
-               this.tabList.add(new ChemiCraftTab(id, name, renderItemStack));
-       }
-
-}
+package chemicraft;\r
+\r
+import java.util.ArrayList;\r
+import java.util.HashMap;\r
+\r
+import net.minecraft.src.Block;\r
+import net.minecraft.src.EntityPlayer;\r
+import net.minecraft.src.GuiContainer;\r
+import net.minecraft.src.InventoryBasic;\r
+import net.minecraft.src.InventoryPlayer;\r
+import net.minecraft.src.ItemStack;\r
+import cpw.mods.fml.common.Side;\r
+import cpw.mods.fml.common.asm.SideOnly;\r
+import cpw.mods.fml.common.network.PacketDispatcher;\r
+import cpw.mods.fml.common.network.Player;\r
+\r
+@SideOnly(Side.CLIENT)\r
+public class GuiChemicalCraftingTable extends GuiContainer {\r
+\r
+       /**\r
+        * 分解機GUIのInventoryBasicクラス\r
+        */\r
+       private static InventoryBasic decompositionSlots = new InventoryBasic("Decomposition", 17);\r
+\r
+\r
+       /**\r
+        * TabListのArrayList\r
+        */\r
+       private ArrayList<ChemiCraftTab> tabList = new ArrayList<ChemiCraftTab>();\r
+\r
+\r
+       /**\r
+        * Gui画像のHashMap\r
+        * キーの名前は拡張子を除くファイル名にする\r
+        */\r
+       private HashMap<String, Integer> guiImageMap = new HashMap<String, Integer>();\r
+\r
+\r
+       /**\r
+        * 画像のHashMap\r
+        * キーの名前は拡張子を除くファイル名にする\r
+        */\r
+       private HashMap<String, Integer> otherImageMap = new HashMap<String, Integer>();\r
+\r
+\r
+       /**\r
+        * the TileEntity.\r
+        */\r
+       private TileEntityChemicalCraftingTable tileEntity;\r
+\r
+\r
+       /**\r
+        * the InventoryPlayer.\r
+        */\r
+       private InventoryPlayer inventoryPlayer;\r
+\r
+\r
+       /**\r
+        * the Container\r
+        */\r
+       private ContainerChemicalCraftingTable container;\r
+\r
+\r
+\r
+       public GuiChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2){\r
+               super(new ContainerChemicalCraftingTable(par1EntityPlayer, par2));\r
+               //TileEntityを設定\r
+               this.inventoryPlayer = par1EntityPlayer.inventory;\r
+               this.tileEntity = par2;\r
+               this.container = (ContainerChemicalCraftingTable) this.inventorySlots;\r
+               //TabListにTabを追加する\r
+               this.addTabs(0, "Decomposition", new ItemStack(Block.tnt.blockID, 1, 1));\r
+               this.addTabs(1, "Test", new ItemStack(Block.bedrock.blockID, 1, 1));\r
+               //ActiveTabの初期化\r
+               for(int i = 0;i < tabList.size();i++){\r
+                       String field_00001 = this.tabList.get(i).getTabName();\r
+                       String field_00002 = this.tileEntity.getActiveTab();\r
+                       if(field_00001.equals(field_00002)){\r
+                               this.tileEntity.setActiveTab(this.tabList.get(i).getTabName());\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+\r
+       @Override\r
+       protected void mouseClicked(int par1, int par2, int par3){\r
+               super.mouseClicked(par1, par2, par3);\r
+\r
+               int var1 = par1 - this.guiLeft;\r
+               int var2 = par2 - this.guiTop;\r
+               if(var1 < this.tabList.size() * 28 && var1 >= 0 && var2 < 0){\r
+                       String var3 = this.tabList.get(var1 / 28).getTabName();\r
+                       if(!var3.equals(this.tileEntity.getActiveTab())){\r
+                               this.tileEntity.setActiveTab(var3);\r
+                               this.inventoryPlayer.player.openGui(ChemiCraft.instance, ChemiCraft.instance.guiChemicalCraftingTableID, this.tileEntity.worldObj, this.tileEntity.xCoord, this.tileEntity.yCoord, this.tileEntity.zCoord);\r
+                               this.onGuiClosed();\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+\r
+       @Override\r
+       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){\r
+               //ActiveTab Reset.\r
+               this.func_00003();\r
+               //Texture Load.\r
+               this.func_00002();\r
+               //Draw Tabs.\r
+               this.func_00001(par1, par2, par3);\r
+               //Draw GUI\r
+               if(this.tileEntity.getActiveTab().equals("Decomposition")){\r
+                       this.mc.renderEngine.bindTexture(this.guiImageMap.get("Decomposition"));\r
+                       this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);\r
+               }\r
+       }\r
+\r
+\r
+\r
+       private void func_00001(float par1, int par2, int par3){\r
+               int var1 = this.guiLeft;\r
+               int var2 = this.guiTop - 32;\r
+               for(int i = 0;i < this.tabList.size();i++){\r
+                       if(!this.tabList.get(i).isActive()){\r
+                               this.mc.renderEngine.bindTexture(this.otherImageMap.get("tabs"));\r
+                               this.drawTexturedModalRect(var1 + (28 * i), var2, 0, 0, 28, 32);\r
+                               this.itemRenderer.renderItemIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);\r
+                               this.itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);\r
+                       }else{\r
+                               this.mc.renderEngine.bindTexture(this.otherImageMap.get("tabs"));\r
+                               this.drawTexturedModalRect(var1 + (28 * i), var2, 0, 32, 28, 32);\r
+                               this.itemRenderer.renderItemIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);\r
+                               this.itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, this.tabList.get(i).getRenderItemStack(), var1 + (28 * i) + 6, var2 + 9);\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+\r
+       private void func_00002(){\r
+               //guiImageMapに画像を格納する\r
+               guiImageMap.put("Decomposition", this.mc.renderEngine.getTexture("/resources/chemicraft/guis/Decomposition.png"));\r
+               //otherImageMapに画像を格納する\r
+               otherImageMap.put("tabs", this.mc.renderEngine.getTexture("/resources/chemicraft/guis/tabs.png"));\r
+       }\r
+\r
+\r
+\r
+       private void func_00003(){\r
+               for(int i = 0;i < this.tabList.size();i++){\r
+                       if(!this.tabList.get(i).getTabName().equals(this.tileEntity.getActiveTab())){\r
+                               this.tabList.get(i).setActive(false);\r
+                       }else{\r
+                               this.tabList.get(i).setActive(true);\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+\r
+       /**\r
+        * ChemiCraftTabを追加します。\r
+        * @param id TabのID\r
+        * @param texture OverlayするTextureID\r
+        * @param name Tabの名前\r
+        * @throws Exception IDが重複している場合にスローされます\r
+        */\r
+       private void addTabs(int id, String name, ItemStack renderItemStack){\r
+               for(int i = 0;i < this.tabList.size();i++){\r
+                       if(id == this.tabList.get(i).getID()){\r
+                               try {\r
+                                       throw new Exception("ChemiCraft内でエラー:ChemiCraftTabのIDが重複しています");\r
+                               } catch (Exception e) {\r
+                                       e.printStackTrace();\r
+                               }\r
+                       }\r
+               }\r
+               this.tabList.add(new ChemiCraftTab(id, name, renderItemStack));\r
+       }\r
+\r
+}\r
index 4b94bbb..d115044 100644 (file)
@@ -18,6 +18,7 @@ public class ItemAtoms extends Item {
                this.setHasSubtypes(true);
                this.setMaxDamage(0);
                this.setCreativeTab(ChemiCraft.instance.creativeTab);
+               ItemStack itemStack = new ItemStack(this);
        }
 
 
index a3a072f..d5d530a 100644 (file)
@@ -33,7 +33,7 @@ public class PacketHandler implements IPacketHandler {
                        World worldClient;\r
                        World worldServer;\r
                        TileEntity tileEntity;\r
-                       TileEntityScienceCraftingTable var2;\r
+                       TileEntityChemicalCraftingTable var2;\r
 \r
                        // TileEntityのx, y, z座標\r
                        int x, y, z;\r
@@ -47,16 +47,16 @@ public class PacketHandler implements IPacketHandler {
                        worldServer = ((EntityPlayer)player).worldObj;\r
                        if(worldClient != null){\r
                                tileEntity = worldClient.getBlockTileEntity(x, y, z);\r
-                               if (tileEntity instanceof TileEntityScienceCraftingTable) {\r
-                                       var2 = (TileEntityScienceCraftingTable) tileEntity;\r
+                               if (tileEntity instanceof TileEntityChemicalCraftingTable) {\r
+                                       var2 = (TileEntityChemicalCraftingTable) tileEntity;\r
                                        var2.readPacket(var1);\r
                                }\r
                                return;\r
                        }\r
                        if(worldServer != null){\r
                                tileEntity = worldServer.getBlockTileEntity(x, y, z);\r
-                               if (tileEntity instanceof TileEntityScienceCraftingTable) {\r
-                                       var2 = (TileEntityScienceCraftingTable) tileEntity;\r
+                               if (tileEntity instanceof TileEntityChemicalCraftingTable) {\r
+                                       var2 = (TileEntityChemicalCraftingTable) tileEntity;\r
                                        var2.readPacket(var1);\r
                                }\r
                                return;\r
@@ -65,7 +65,7 @@ public class PacketHandler implements IPacketHandler {
        }\r
 \r
 \r
-       public static Packet getPacket(TileEntityScienceCraftingTable tileEntity) {\r
+       public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
 \r
@@ -15,7 +15,7 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.PacketDispatcher;
 
-public class TileEntityScienceCraftingTable extends TileEntity {
+public class TileEntityChemicalCraftingTable extends TileEntity {
 
        /**
         * DecompositionのInventory
@@ -28,7 +28,7 @@ public class TileEntityScienceCraftingTable extends TileEntity {
        private String activeTab;
 
 
-       public TileEntityScienceCraftingTable() {
+       public TileEntityChemicalCraftingTable() {
                super();
                // ActiveTabのデフォルトを設定
                this.activeTab = "Decomposition";
index c5c4805..2266d51 100644 (file)
@@ -4,8 +4,8 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import chemicraft.CommonProxy;
-import chemicraft.GuiScienceCraftingTable;
-import chemicraft.TileEntityScienceCraftingTable;
+import chemicraft.GuiChemicalCraftingTable;
+import chemicraft.TileEntityChemicalCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class ClientProxy extends CommonProxy {
@@ -20,8 +20,8 @@ public class ClientProxy extends CommonProxy {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityScienceCraftingTable) {
-                       return new GuiScienceCraftingTable(player, (TileEntityScienceCraftingTable) tileEntity);
+               if (tileEntity instanceof TileEntityChemicalCraftingTable) {
+                       return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                }
                return null;
        }