OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Sat, 23 Feb 2013 10:14:03 +0000 (19:14 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sat, 23 Feb 2013 10:14:03 +0000 (19:14 +0900)
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/client/ClientProxy.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java

common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/client/ClientProxy.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java

index b8f54cc..7b35bd9 100644 (file)
@@ -366,10 +366,6 @@ public class ChemiCraft {
                api.addAtomOresLanguage("Spodumene", "リチア輝石", "ja_JP");
 
                // ベリリウム
-               api.addAtomsOre("Beryl", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Be3Al2Si6O18
-               api.addAtomsOreLanguage("Beryl", "緑柱石", "ja_JP");
-               api.addAtomsOre("Chrysoberyl", this.atomsOreID[api.getAtomsOreIndex()], 5, 200, 50); // BeAl2O4
-               api.addAtomsOreLanguage("Chrysoberyl", "金緑石", "ja_JP");
                api.addAtomOres("Beryl", new String[]{"Be", "Al", "Si", "O"}, new Integer[]{3, 2, 6, 18}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Be3Al2Si6O18
                api.addAtomOresLanguage("Beryl", "緑柱石", "ja_JP");
                api.addAtomOres("Chrysoberyl", new String[]{"Be", "Al", "O"}, new Integer[]{1, 2, 4}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // BeAl2O4
index 5b76945..f2f2748 100644 (file)
@@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerElectrolysisTable;
 import pcc.chemicraft.debug.DebugTick;
 import pcc.chemicraft.entity.EntityAtomsGrenade;
 import pcc.chemicraft.gui.GuiChemicalCombinationTable;
@@ -58,6 +59,8 @@ public class ClientProxy extends CommonProxy {
                        return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               } else if (tileEntity instanceof TileEntityElectrolysisTable) {
+                       return new ContainerElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity);
                }
                return null;
        }
index 79c722f..493692d 100644 (file)
@@ -8,13 +8,14 @@ import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
 import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
 import pcc.chemicraft.inventory.InventoryElectrolysisResult;
-import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
-import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
+import pcc.chemicraft.slot.SlotElectrolysisFuel;
+import pcc.chemicraft.slot.SlotElectrolysisMaterial;
+import pcc.chemicraft.slot.SlotElectrolysisResult;
 import pcc.chemicraft.slot.SlotPyrolysisTableResult;
 import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
-public class ContainerElectrolysisTable extends Container
-{
+
+public class ContainerElectrolysisTable extends Container {
 
        private World worldObj;
 
@@ -22,12 +23,12 @@ public class ContainerElectrolysisTable extends Container
        private int posY;
        private int posZ;
 
+       private TileEntityElectrolysisTable tileentity;
+
        private InventoryElectrolysisMaterial invm;
        private InventoryElectrolysisResult invr;
        private InventoryElectrolysisFuel invf;
 
-       private TileEntityElectrolysisTable tileentity;
-
        public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
                super();
                this.tileentity = par2;
@@ -44,11 +45,11 @@ public class ContainerElectrolysisTable extends Container
 
                for (int i = 0; i < 4; i++) {
                        for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.invr, i*4 + j, 88+i*18, 17+j*18));
+                               this.addSlotToContainer(new SlotElectrolysisResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
                        }
                }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.invm, 0, 27, 20));
-               this.addSlotToContainer(new SlotPyrolysisTableFuel(this.invf, 0, 27, 63));
+               this.addSlotToContainer(new SlotElectrolysisMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
+               this.addSlotToContainer(new SlotElectrolysisFuel(this.tileentity.getInvFuel(), 0, 27, 63));
 
                int var3;
                for (var3 = 0; var3 < 3; ++var3)
@@ -63,7 +64,6 @@ public class ContainerElectrolysisTable extends Container
                {
                        this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
                }
-
        }
 
        @Override
index 00e2277..9f751dd 100644 (file)
@@ -5,11 +5,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import pcc.chemicraft.container.ContainerChemicalCombinationTable;
 import pcc.chemicraft.container.ContainerChemicalCraftingTable;
+import pcc.chemicraft.container.ContainerElectrolysisTable;
 import pcc.chemicraft.container.ContainerPyrolysisTable;
 import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
 import pcc.chemicraft.debug.DebugTick;
 import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
@@ -40,6 +42,8 @@ public class CommonProxy implements IGuiHandler {
                        return new ContainerToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               } else if (tileEntity instanceof TileEntityElectrolysisTable) {
+                       return new ContainerElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity);
                }
                return null;
        }
index 70a78ce..eab33b4 100644 (file)
@@ -39,7 +39,7 @@ public class TileEntityElectrolysisTable extends TileEntity
        /**
         * 電池の残り電力時間
         */
-       private float fuelRestTime = 0; 
+       private float fuelRestTime = 0;
 
        /**
         * 最大熱量