修正・変更

・追加アイテムテクスチャの分割
(元素、化合物は未分割)
・類似Slotクラスの統合
・素材製作台のShift対応・GUI閉扉時ドロップ対応

diff --git a/common/pcc/addon/crops/ChemicalCrops.java b/common/pcc/addon/crops/ChemicalCrops.java
index 5d734a5..13f7087 100644 (file)
--- a/common/pcc/addon/crops/ChemicalCrops.java
+++ b/common/pcc/addon/crops/ChemicalCrops.java
@@ -1,17 +1,14 @@
 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;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
+import pcc.addon.crops.blocks.BlockChemicalCrops1;
+import pcc.addon.crops.util.MultiBlockDataStream;
+import pcc.addon.crops.util.WorldEventHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.Mod.Instance;

diff --git a/common/pcc/addon/crops/util/MultiBlockDataStream.java b/common/pcc/addon/crops/util/MultiBlockDataStream.java
index 7d0c21b..7b905dd 100644 (file)
--- a/common/pcc/addon/crops/util/MultiBlockDataStream.java
+++ b/common/pcc/addon/crops/util/MultiBlockDataStream.java
@@ -8,7 +8,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 
 public class MultiBlockDataStream {
 

diff --git a/common/pcc/addon/crops/util/WorldEventHandler.java b/common/pcc/addon/crops/util/WorldEventHandler.java
index 9ccbdd3..d4558c4 100644 (file)
--- a/common/pcc/addon/crops/util/WorldEventHandler.java
+++ b/common/pcc/addon/crops/util/WorldEventHandler.java
@@ -2,11 +2,10 @@ 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;
+import pcc.addon.crops.ChemicalCrops;
 
 public class WorldEventHandler {
 

diff --git a/common/pcc/chemicraft/ChemiCraftLogging.java b/common/pcc/chemicraft/ChemiCraftLogging.java
index 6afb0c8..2bd7917 100644 (file)
--- a/common/pcc/chemicraft/ChemiCraftLogging.java
+++ b/common/pcc/chemicraft/ChemiCraftLogging.java
@@ -1,10 +1,7 @@
 package pcc.chemicraft;
 
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 

diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
index d90cb71..a9e5163 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
@@ -4,7 +4,7 @@ import pcc.chemicraft.base.item.ItemAtomsGrenade;
 import pcc.chemicraft.base.item.ItemBlackSmoke;
 import pcc.chemicraft.base.item.ItemDust;
 import pcc.chemicraft.base.item.ItemOreSerarcher;
-import pcc.chemicraft.base.item.ItemRadiationBallet;
+import pcc.chemicraft.base.item.ItemRadiationBullet;
 import pcc.chemicraft.base.item.ItemRadiationGun;
 
 /**
@@ -23,7 +23,7 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setUnlocalizedName("AtomsGrenade");
                this.mod.itemDust = new ItemDust(this.mod.dustID).setUnlocalizedName("dust");
                this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun");
-               this.mod.itemRadiationBallet = new ItemRadiationBallet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBallet");
+               this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet");
                this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
                this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
 

diff --git a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
index a6d0747..e6d78db 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
@@ -80,7 +80,7 @@ public class ItemAtomsGrenade extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemAtomsGrenade");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "atoms_grenade");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
index 3ac27e0..1d58522 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
+++ b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
@@ -56,7 +56,7 @@ public class ItemBlackSmoke extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemBlackSmoke");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "black_smoke");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
index c418de8..a809839 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
+++ b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
@@ -64,7 +64,7 @@ public class ItemOreSerarcher extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemOreSearcher");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ore_searcher");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationBallet.java b/common/pcc/chemicraft/base/item/ItemRadiationBullet.java
similarity index 80%
rename from common/pcc/chemicraft/base/item/ItemRadiationBallet.java
rename to common/pcc/chemicraft/base/item/ItemRadiationBullet.java
index 732c514..5d0dd59 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationBallet.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationBullet.java
@@ -9,9 +9,9 @@ import pcc.chemicraft.core.ChemiCraftCore;
  * 放射線中の弾です
  * @author mozipi
  */
-public class ItemRadiationBallet extends Item {
+public class ItemRadiationBullet extends Item {
 
-       public ItemRadiationBallet(int par1) {
+       public ItemRadiationBullet(int par1) {
                super(par1);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
                this.maxStackSize = 16;
@@ -19,6 +19,6 @@ public class ItemRadiationBallet extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemRadiationBullet");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_bullet");
        }
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationGun.java b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
index 8b7d9d1..afa7475 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationGun.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
@@ -33,7 +33,7 @@ public class ItemRadiationGun extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemRadiationGun");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_gun");
        }
 
        @Override

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

diff --git a/common/pcc/chemicraft/base/render/RenderDust.java b/common/pcc/chemicraft/base/render/RenderDust.java
index 67fe6c6..91b4205 100644 (file)
--- a/common/pcc/chemicraft/base/render/RenderDust.java
+++ b/common/pcc/chemicraft/base/render/RenderDust.java
@@ -7,11 +7,10 @@ import net.minecraft.entity.Entity;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import pcc.chemicraft.base.entity.EntityDust;
 import pcc.chemicraft.core.ChemiCraftCore;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * 粉塵のRenderです

diff --git a/common/pcc/chemicraft/core/ChemiCraftAPI.java b/common/pcc/chemicraft/core/ChemiCraftAPI.java
index 5f4d1cb..d3118fa 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftAPI.java
+++ b/common/pcc/chemicraft/core/ChemiCraftAPI.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import pcc.chemicraft.ChemiCraftData;
 import pcc.chemicraft.EnumLoggingType;

diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java b/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
index 613667a..02d1512 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
+++ b/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
@@ -6,7 +6,6 @@ import pcc.chemicraft.core.block.BlockChemicalCombinationTable;
 import pcc.chemicraft.core.block.BlockChemicalCraftingTable;
 import pcc.chemicraft.core.block.BlockElectrolysisTable;
 import pcc.chemicraft.core.block.BlockPyrolysisTable;
-import pcc.chemicraft.core.block.BlockToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 /**

diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
index 4106ec7..6d26999 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
@@ -1,12 +1,13 @@
 package pcc.chemicraft.core;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
+import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.item.ItemAtoms;
-import pcc.chemicraft.core.item.ItemChemiCell;
+import pcc.chemicraft.core.item.ItemChemicalCell;
 import pcc.chemicraft.core.item.ItemCompounds;
 import pcc.chemicraft.core.item.ItemGasCollectingBottle;
-import pcc.chemicraft.util.OldItemFood;
 
 /**
  * アイテムを追加します
@@ -24,12 +25,12 @@ public class ChemiCraftRegisterItem extends ChemiCraftCoreRegister {
                this.mod.itemAtoms = new ItemAtoms(this.mod.atomsID).setUnlocalizedName("atoms");
                this.mod.itemCompounds = new ItemCompounds(this.mod.compoundsID).setUnlocalizedName("compounds");
                this.mod.itemGasCollectingBottle = new ItemGasCollectingBottle(this.mod.gasCollectingBottleID).setUnlocalizedName("gasCollectingBottle");
-               this.mod.itemChemicalCells = new ItemChemiCell(this.mod.chemicalCellsID).setUnlocalizedName("chemiCell");
-               this.mod.itemPear = new OldItemFood(this.mod.pearID, 4, 0.4F, false){
+               this.mod.itemChemicalCells = new ItemChemicalCell(this.mod.chemicalCellsID).setUnlocalizedName("chemicalCell");
+               this.mod.itemPear = new ItemFood(this.mod.pearID, 4, 0.4F, false){
                        public int getColorFromItemStack(ItemStack par1ItemStack,int par2){
                                return 0x66FF66;
                                }
-                       }.setCreativeTab(CreativeTabs.tabFood).setUnlocalizedName("Pear");
+                       }.setCreativeTab(CreativeTabs.tabFood).setUnlocalizedName(ChemiCraft.TEXTURE + "Pear");
 
                        //名前登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtoms, ChemiCraftCore.ATOMSNAME);

diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
index 1c23482..e5898a2 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.core.block;
 
+import java.util.Random;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -16,11 +18,15 @@ public class BlockChemicalCombinationTable extends BlockContainer {
        public Icon bottomIcon;
        public Icon globalIcon;
 
+       private final Random random = new Random();
+
        public BlockChemicalCombinationTable(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) {
                par5EntityPlayer.openGui(ChemiCraftCore.instance, ChemiCraftCore.instance.guiChemicalCombinationTableID, par1World, par2, par3, par4);

diff --git a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
index 5e566ac..1cd8386 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
@@ -10,8 +10,8 @@ import pcc.chemicraft.core.ChemiCraftAPI;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.inventory.InventoryChemicalCombinationTableMaterial;
 import pcc.chemicraft.core.inventory.InventoryChemicalCombinationTableResult;
-import pcc.chemicraft.core.slot.SlotChemicalCombinationTableMaterial;
-import pcc.chemicraft.core.slot.SlotChemicalCombinationTableResult;
+import pcc.chemicraft.core.slot.SlotAtoms;
+import pcc.chemicraft.core.slot.SlotResult;
 import pcc.chemicraft.core.tileentity.TileEntityChemicalCombinationTable;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
@@ -58,10 +58,10 @@ public class ContainerChemicalCombinationTable extends Container {
 
                for(int i = 0;i < 5;i++){
                        for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new SlotChemicalCombinationTableMaterial(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
+                               this.addSlotToContainer(new SlotAtoms(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
                        }
                }
-               this.addSlotToContainer(new SlotChemicalCombinationTableResult(invr, 0, 123, 34));
+               this.addSlotToContainer(new SlotResult(invr, 0, 123, 34));
 
 
                int var3;
@@ -92,6 +92,11 @@ public class ContainerChemicalCombinationTable extends Container {
                }
        }
 
+       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
+       {
+               super.onCraftGuiClosed(par1EntityPlayer);
+       }
+
        @Override
        public boolean canInteractWith(EntityPlayer par1EntityPlayer){
                return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraftCore.instance.chemicalConbinationTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
@@ -148,9 +153,4 @@ public class ContainerChemicalCombinationTable extends Container {
                return super.slotClick(par1, par2, par3, par4EntityPlayer);
        }
 
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
-       {
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
 }

diff --git a/common/pcc/chemicraft/core/container/ContainerChemicalCraftingTable.java b/common/pcc/chemicraft/core/container/ContainerChemicalCraftingTable.java
index 8fffd67..5e6dcdd 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerChemicalCraftingTable.java
@@ -12,7 +12,8 @@ import pcc.chemicraft.core.inventory.InventoryChemicalCraftingMaterial;
 import pcc.chemicraft.core.inventory.InventoryChemicalCraftingNBT;
 import pcc.chemicraft.core.inventory.InventoryChemicalCraftingResult;
 import pcc.chemicraft.core.nbt.ChemicalNBTRecipe;
-import pcc.chemicraft.core.slot.SlotChemicalCraftingTableResult;
+import pcc.chemicraft.core.slot.SlotAtom;
+import pcc.chemicraft.core.slot.SlotResult;
 import pcc.chemicraft.core.tileentity.TileEntityChemicalCraftingTable;
 
 public class ContainerChemicalCraftingTable extends Container {
@@ -88,8 +89,22 @@ public class ContainerChemicalCraftingTable extends Container {
        }
 
        @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
+       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
+       {
                super.onCraftGuiClosed(par1EntityPlayer);
+
+               if (!this.worldObj.isRemote)
+               {
+                       for (int i = 0; i < 9; ++i)
+                       {
+                               ItemStack itemstack = this.invm.getStackInSlotOnClosing(i);
+
+                               if (itemstack != null)
+                               {
+                                       par1EntityPlayer.dropPlayerItem(itemstack);
+                               }
+                       }
+               }
        }
 
        @Override
@@ -141,15 +156,22 @@ public class ContainerChemicalCraftingTable extends Container {
                if (var4 != null && var4.getHasStack()) {
                        ItemStack var5 = var4.getStack();
                        var3 = var5.copy();
-                       if (par2 >= 0 && par2 < 13) {
-                               if (!this.mergeItemStack(var5, 13, 13+36, false)) {
+                       if (par2 >= 0 && par2 < 3) {
+                               if (!this.mergeItemStack(var5, 13,49, false)) {
+                                       return null;
+                               }
+                       }
+                       if (par2 >= 3 && par2 < 13) {
+                               if (!this.mergeItemStack(var5, 13, 49, false)) {
                                        return null;
                                }
-                       } else if (par2 >= 16 && par2 < 53) {
+                       } else if (par2 >= 13 && par2 < 49) {
                                if (var6.isItemValid(var3)) {
-                                       if (!this.mergeItemStack(var5, 3, 13, false)) {
+                                       if (!this.mergeItemStack(var5, 0, 2, false)) {
                                                return null;
                                        }
+                               } else if (!this.mergeItemStack(var5, 3, 13, false)) {
+                                       return null;
                                }
                        }
 
@@ -173,13 +195,13 @@ public class ContainerChemicalCraftingTable extends Container {
 
        private void generateSlots(IInventory materialInv, IInventory resultInv, IInventory nbtInv){
                for(int i = 0;i < 3;i++){
-                       this.addSlotToContainer(new Slot(invn, i, 30 + 18 * i, 7));
+                       this.addSlotToContainer(new SlotAtom(invn, i, 30 + 18 * i, 7));
                }
                for(int i = 0;i < 3;i++){
                        for(int j = 0;j < 3;j++){
                                this.addSlotToContainer(new Slot(invm, i * 3 + j, 30 + 18 * j, 27 + 18 * i));
                        }
                }
-               this.addSlotToContainer(new SlotChemicalCraftingTableResult(invr, 0, 123, 33));
+               this.addSlotToContainer(new SlotResult(invr, 0, 123, 33));
        }
 }

diff --git a/common/pcc/chemicraft/core/container/ContainerElectrolysisTable.java b/common/pcc/chemicraft/core/container/ContainerElectrolysisTable.java
index 7187028..4c984fa 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerElectrolysisTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerElectrolysisTable.java
@@ -10,8 +10,7 @@ import pcc.chemicraft.core.inventory.InventoryElectrolysisFuel;
 import pcc.chemicraft.core.inventory.InventoryElectrolysisMaterial;
 import pcc.chemicraft.core.inventory.InventoryElectrolysisResult;
 import pcc.chemicraft.core.slot.SlotElectrolysisFuel;
-import pcc.chemicraft.core.slot.SlotElectrolysisMaterial;
-import pcc.chemicraft.core.slot.SlotElectrolysisResult;
+import pcc.chemicraft.core.slot.SlotResult;
 import pcc.chemicraft.core.tileentity.TileEntityElectrolysisTable;
 
 
@@ -45,10 +44,10 @@ public class ContainerElectrolysisTable extends Container {
 
                for (int i = 0; i < 4; i++) {
                        for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotElectrolysisResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
+                               this.addSlotToContainer(new SlotResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
                        }
                }
-               this.addSlotToContainer(new SlotElectrolysisMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
+               this.addSlotToContainer(new Slot(this.tileentity.getInvMaterial(), 0, 27, 20));
                this.addSlotToContainer(new SlotElectrolysisFuel(this.tileentity.getInvFuel(), 0, 27, 63));
 
                int var3;

diff --git a/common/pcc/chemicraft/core/container/ContainerPyrolysisTable.java b/common/pcc/chemicraft/core/container/ContainerPyrolysisTable.java
index 141b36d..62f7f3d 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerPyrolysisTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerPyrolysisTable.java
@@ -10,8 +10,7 @@ import pcc.chemicraft.core.inventory.InventoryPyrolysisTableFuel;
 import pcc.chemicraft.core.inventory.InventoryPyrolysisTableMaterial;
 import pcc.chemicraft.core.inventory.InventoryPyrolysisTableResult;
 import pcc.chemicraft.core.slot.SlotPyrolysisTableFuel;
-import pcc.chemicraft.core.slot.SlotPyrolysisTableMaterial;
-import pcc.chemicraft.core.slot.SlotPyrolysisTableResult;
+import pcc.chemicraft.core.slot.SlotResult;
 import pcc.chemicraft.core.tileentity.TileEntityPyrolysisTable;
 
 
@@ -45,10 +44,10 @@ public class ContainerPyrolysisTable extends Container {
 
                for (int i = 0; i < 4; i++) {
                        for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
+                               this.addSlotToContainer(new SlotResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
                        }
                }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
+               this.addSlotToContainer(new Slot(this.tileentity.getInvMaterial(), 0, 27, 20));
                this.addSlotToContainer(new SlotPyrolysisTableFuel(this.tileentity.getInvFuel(), 0, 27, 63));
 
                int var3;

diff --git a/common/pcc/chemicraft/core/item/ItemChemiCell.java b/common/pcc/chemicraft/core/item/ItemChemicalCell.java
similarity index 65%
rename from common/pcc/chemicraft/core/item/ItemChemiCell.java
rename to common/pcc/chemicraft/core/item/ItemChemicalCell.java
index f943bf8..516a672 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemChemiCell.java
+++ b/common/pcc/chemicraft/core/item/ItemChemicalCell.java
@@ -1,20 +1,15 @@
 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;
 import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.core.ChemiCraftAPI;
 import pcc.chemicraft.core.ChemiCraftCore;
 
 
-public class ItemChemiCell extends Item
+public class ItemChemicalCell extends Item
 {
 
-       public ItemChemiCell(int par1)
+       public ItemChemicalCell(int par1)
        {
                super(par1);
                this.maxStackSize = 64;
@@ -25,7 +20,7 @@ public class ItemChemiCell extends Item
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemChemicalCell");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "chemical_cell");
        }
 
 }

diff --git a/common/pcc/chemicraft/core/item/ItemCompounds.java b/common/pcc/chemicraft/core/item/ItemCompounds.java
index 3941a2f..2a36838 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemCompounds.java
+++ b/common/pcc/chemicraft/core/item/ItemCompounds.java
@@ -1,18 +1,12 @@
 package pcc.chemicraft.core.item;
 
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftAPI;
 import pcc.chemicraft.core.ChemiCraftCore;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemCompounds extends Item {
 

diff --git a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
index 39599e0..eb0095e 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
+++ b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
@@ -94,7 +94,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemGasCollectingBottle");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "gas_collecting_bottle");
        }
 
 }

diff --git a/common/pcc/chemicraft/core/other/ChunkProviderChemical.java b/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
index 5c321fa..57c9358 100644 (file)
--- a/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
+++ b/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
@@ -1,15 +1,7 @@
 package pcc.chemicraft.core.other;
 
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.STRONGHOLD;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.DUNGEON;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA;
+import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.*;
+import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.*;
 
 import java.util.List;
 import java.util.Random;

diff --git a/common/pcc/chemicraft/core/slot/SlotAtom.java b/common/pcc/chemicraft/core/slot/SlotAtom.java
new file mode 100644 (file)
index 0000000..aae4998
--- /dev/null
+++ b/common/pcc/chemicraft/core/slot/SlotAtom.java
@@ -0,0 +1,16 @@
+package pcc.chemicraft.core.slot;
+
+import net.minecraft.inventory.IInventory;
+
+public class SlotAtom extends SlotAtoms {
+
+       public SlotAtom(IInventory par1iInventory, int par2, int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+       @Override
+       public int getSlotStackLimit() {
+               return 1;
+       }
+
+}

diff --git a/common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableMaterial.java b/common/pcc/chemicraft/core/slot/SlotAtoms.java
similarity index 53%
rename from common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableMaterial.java
rename to common/pcc/chemicraft/core/slot/SlotAtoms.java
index 92cd8ba..3416857 100644 (file)
--- a/common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableMaterial.java
+++ b/common/pcc/chemicraft/core/slot/SlotAtoms.java
@@ -6,18 +6,15 @@ import net.minecraft.item.ItemStack;
 import pcc.chemicraft.core.ChemiCraftCore;
 
 
-public class SlotChemicalCombinationTableMaterial extends Slot {
+public class SlotAtoms extends Slot {
 
-       public SlotChemicalCombinationTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
+       public SlotAtoms(IInventory par1iInventory, int par2, int par3, int par4) {
                super(par1iInventory, par2, par3, par4);
        }
 
        @Override
        public boolean isItemValid(ItemStack par1ItemStack){
-               if(par1ItemStack.itemID == ChemiCraftCore.instance.atomsID + 256){
-                       return true;
-               }
-               return false;
+               return par1ItemStack == null ? false : par1ItemStack.itemID == ChemiCraftCore.instance.atomsID + 256;
        }
 
 }

diff --git a/common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableResult.java b/common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableResult.java
deleted file mode 100644 (file)
index 6ca8929..0000000
--- a/common/pcc/chemicraft/core/slot/SlotChemicalCombinationTableResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotChemicalCombinationTableResult extends Slot {
-
-       public SlotChemicalCombinationTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotChemicalCraftingTableResult.java b/common/pcc/chemicraft/core/slot/SlotChemicalCraftingTableResult.java
deleted file mode 100644 (file)
index e2b1dd3..0000000
--- a/common/pcc/chemicraft/core/slot/SlotChemicalCraftingTableResult.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotChemicalCraftingTableResult extends Slot {
-
-       public SlotChemicalCraftingTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotDecompositionTableMaterial.java b/common/pcc/chemicraft/core/slot/SlotDecompositionTableMaterial.java
deleted file mode 100644 (file)
index 1f9da51..0000000
--- a/common/pcc/chemicraft/core/slot/SlotDecompositionTableMaterial.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotDecompositionTableMaterial extends Slot {
-
-       public SlotDecompositionTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotDecompositionTableResult.java b/common/pcc/chemicraft/core/slot/SlotDecompositionTableResult.java
deleted file mode 100644 (file)
index 8c085b9..0000000
--- a/common/pcc/chemicraft/core/slot/SlotDecompositionTableResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotDecompositionTableResult extends Slot {
-
-       public SlotDecompositionTableResult(IInventory par1iInventory, int par2,        int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotElectrolysisMaterial.java b/common/pcc/chemicraft/core/slot/SlotElectrolysisMaterial.java
deleted file mode 100644 (file)
index 6e0363d..0000000
--- a/common/pcc/chemicraft/core/slot/SlotElectrolysisMaterial.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotElectrolysisMaterial extends Slot
-{
-
-       public SlotElectrolysisMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableMaterial.java b/common/pcc/chemicraft/core/slot/SlotPyrolysisTableMaterial.java
deleted file mode 100644 (file)
index cbddd5c..0000000
--- a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableMaterial.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotPyrolysisTableMaterial extends Slot {
-
-       public SlotPyrolysisTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableResult.java b/common/pcc/chemicraft/core/slot/SlotPyrolysisTableResult.java
deleted file mode 100644 (file)
index c66ab9b..0000000
--- a/common/pcc/chemicraft/core/slot/SlotPyrolysisTableResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pcc.chemicraft.core.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotPyrolysisTableResult extends Slot {
-
-       public SlotPyrolysisTableResult(IInventory par1iInventory, int par2,    int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}

diff --git a/common/pcc/chemicraft/core/slot/SlotElectrolysisResult.java b/common/pcc/chemicraft/core/slot/SlotResult.java
similarity index 67%
rename from common/pcc/chemicraft/core/slot/SlotElectrolysisResult.java
rename to common/pcc/chemicraft/core/slot/SlotResult.java
index 7e2e46e..e7cc656 100644 (file)
--- a/common/pcc/chemicraft/core/slot/SlotElectrolysisResult.java
+++ b/common/pcc/chemicraft/core/slot/SlotResult.java
@@ -4,10 +4,9 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-public class SlotElectrolysisResult extends Slot
-{
+public class SlotResult extends Slot {
 
-       public SlotElectrolysisResult(IInventory par1iInventory, int par2, int par3, int par4) {
+       public SlotResult(IInventory par1iInventory, int par2, int par3, int par4) {
                super(par1iInventory, par2, par3, par4);
        }
 

diff --git a/common/pcc/chemicraft/util/AtomInfo.java b/common/pcc/chemicraft/util/AtomInfo.java
index ec3f7a7..34d0928 100644 (file)
--- a/common/pcc/chemicraft/util/AtomInfo.java
+++ b/common/pcc/chemicraft/util/AtomInfo.java
@@ -1,10 +1,8 @@
 package pcc.chemicraft.util;
 
-import pcc.chemicraft.util.Auxiliary.Probability;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
-import cpw.mods.fml.common.registry.LanguageRegistry;
+import pcc.chemicraft.util.Auxiliary.Probability;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/common/pcc/chemicraft/util/MaterialRecipe.java b/common/pcc/chemicraft/util/MaterialRecipe.java
index c404739..d1c3ba4 100644 (file)
--- a/common/pcc/chemicraft/util/MaterialRecipe.java
+++ b/common/pcc/chemicraft/util/MaterialRecipe.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import net.minecraft.item.ItemStack;
-import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.inventory.InventoryChemicalCraftingMaterial;
 import pcc.chemicraft.core.nbt.ChemicalNBTRecipe;
 import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary;

diff --git a/common/pcc/chemicraft/util/OldItem.java b/common/pcc/chemicraft/util/OldItem.java
deleted file mode 100644 (file)
index 2a2ef8c..0000000
--- a/common/pcc/chemicraft/util/OldItem.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pcc.chemicraft.util;
-
-import net.minecraft.item.Item;
-
-public class OldItem extends Item {
-
-       public OldItem(int par1) {
-               super(par1);
-       }
-
-}

diff --git a/common/pcc/chemicraft/util/OldItemFood.java b/common/pcc/chemicraft/util/OldItemFood.java
deleted file mode 100644 (file)
index 046c475..0000000
--- a/common/pcc/chemicraft/util/OldItemFood.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pcc.chemicraft.util;
-
-import net.minecraft.item.ItemFood;
-
-public class OldItemFood extends ItemFood {
-
-       public OldItemFood(int par1, int par2, float par3, boolean par4) {
-               super(par1, par2, par3, par4);
-       }
-
-       public OldItemFood(int par1, int par2, boolean par3) {
-               super(par1, par2, par3);
-       }
-
-}

diff --git a/resources/mods/ChemiCraft/textures/items/atoms_grenade.png b/resources/mods/ChemiCraft/textures/items/atoms_grenade.png
new file mode 100644 (file)
index 0000000..5c53b84
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/atoms_grenade.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/black_smoke.png b/resources/mods/ChemiCraft/textures/items/black_smoke.png
new file mode 100644 (file)
index 0000000..cd44569
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/black_smoke.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/chemical_cell.png b/resources/mods/ChemiCraft/textures/items/chemical_cell.png
new file mode 100644 (file)
index 0000000..ef658b7
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/chemical_cell.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/gas_collecting_bottle.png b/resources/mods/ChemiCraft/textures/items/gas_collecting_bottle.png
new file mode 100644 (file)
index 0000000..82a8549
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/gas_collecting_bottle.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/items.png b/resources/mods/ChemiCraft/textures/items/items.png
deleted file mode 100644 (file)
index 4e49d67..0000000
Binary files a/resources/mods/ChemiCraft/textures/items/items.png and /dev/null differ

diff --git a/resources/mods/ChemiCraft/textures/items/radiation_bullet.png b/resources/mods/ChemiCraft/textures/items/radiation_bullet.png
new file mode 100644 (file)
index 0000000..16cedd5
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/radiation_bullet.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/radiation_gun.png b/resources/mods/ChemiCraft/textures/items/radiation_gun.png
new file mode 100644 (file)
index 0000000..ca9b9c5
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/items/radiation_gun.png differ

diff --git a/resources/mods/ChemiCraft/textures/items/Atoms.png b/resources/mods/ChemiCraft/textures/items/未カット/Atoms.png
similarity index 100%
rename from resources/mods/ChemiCraft/textures/items/Atoms.png
rename to resources/mods/ChemiCraft/textures/items/未カット/Atoms.png

diff --git a/resources/mods/ChemiCraft/textures/items/Compounds.png b/resources/mods/ChemiCraft/textures/items/未カット/Compounds.png
similarity index 100%
rename from resources/mods/ChemiCraft/textures/items/Compounds.png
rename to resources/mods/ChemiCraft/textures/items/未カット/Compounds.png