From: lilly <lillyo_o@users.sourceforge.jp>
Date: Tue, 11 Dec 2012 04:19:30 +0000 (+0900)
Subject: guiの微調整　タブの同期
X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=e9b218e8292b231ce674ec71f8620eb2f0e4b779;hp=0a77d4dc7d937464e0ba65a32839e81012b2a88c

guiの微調整　タブの同期

Signed-off-by: lilly <lillyo_o@users.sourceforge.jp>
---

diff --git a/ChemiCraft/guis/Decomposition.png b/ChemiCraft/guis/Decomposition.png
deleted file mode 100644
index 223f226..0000000
Binary files a/ChemiCraft/guis/Decomposition.png and /dev/null differ
diff --git a/ChemiCraft/guis/tabs.png b/ChemiCraft/guis/tabs.png
deleted file mode 100644
index 9382578..0000000
Binary files a/ChemiCraft/guis/tabs.png and /dev/null differ
diff --git a/common/chemicraft/CommonProxy.java b/common/chemicraft/CommonProxy.java
index 0d392e8..71db967 100644
--- a/common/chemicraft/CommonProxy.java
+++ b/common/chemicraft/CommonProxy.java
@@ -3,7 +3,9 @@ package chemicraft;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.server.FMLServerHandler;
 
 public class CommonProxy implements IGuiHandler {
 
@@ -35,5 +37,4 @@ public class CommonProxy implements IGuiHandler {
 	public World getClientWorld(){
 		return null;
 	}
-
 }
\ No newline at end of file
diff --git a/common/chemicraft/PacketHandler.java b/common/chemicraft/PacketHandler.java
index 53cdc38..0fc00bf 100644
--- a/common/chemicraft/PacketHandler.java
+++ b/common/chemicraft/PacketHandler.java
@@ -8,6 +8,8 @@ import java.io.IOException;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet;
 import net.minecraft.src.Packet250CustomPayload;
@@ -18,95 +20,88 @@ import cpw.mods.fml.common.network.Player;
 
 /**
  * サーバーとクライアントのデータの同期に必要なクラス
- *
+ * 
  * @author Lilly
- *
+ * 
  */
 public class PacketHandler implements IPacketHandler {
 
-	@Override
-	public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) {
-		if (packet.channel.equals("chemicraft")) {
-			ByteArrayDataInput var1 = ByteStreams.newDataInput(packet.data);
-
-			//TileEntityのx, y, z座標
-			int x, y, z;
-<<<<<<< HEAD
-			//activeTab
-			String activeTab;
-=======
-			String tab;
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-
-			//座標読み込み
-			x = var1.readInt();
-			y = var1.readInt();
-			z = var1.readInt();
-<<<<<<< HEAD
-			//activeTab読み込み
-			activeTab = var1.readUTF();
-=======
-			tab = var1.readUTF();
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-
-			// TileEntityを取得し読み込んだデータを送る
-			World world = ChemiCraft.proxy.getClientWorld();
-			TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-			if (tileEntity instanceof TileEntityScienceCraftingTable) {
-				TileEntityScienceCraftingTable var2 = (TileEntityScienceCraftingTable) tileEntity;
-<<<<<<< HEAD
-				var2.setActiveTab(activeTab);
-=======
-				var2.handlePacket(new Object[]{tab});
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-			}
-		}
+    @Override
+    public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) {
+	if (packet.channel.equals("chemicraft")) {
+	    ByteArrayDataInput var1 = ByteStreams.newDataInput(packet.data);
+
+	    World world;
+	    TileEntity tileEntity;
+	    TileEntityScienceCraftingTable var2;
+
+	    // TileEntityのx, y, z座標
+	    int x, y, z;
+
+	    // activeTab
+	    String activeTab;
+
+	    // 座標読み込み
+	    x = var1.readInt();
+	    y = var1.readInt();
+	    z = var1.readInt();
+	    // activeTab読み込み
+	    activeTab = var1.readUTF();
+
+	    // TileEntityを取得し読み込んだデータを送る
+	    // from Server to Client
+	    world = ChemiCraft.proxy.getClientWorld();
+	    tileEntity = world.getBlockTileEntity(x, y, z);
+	    if (tileEntity instanceof TileEntityScienceCraftingTable) {
+		var2 = (TileEntityScienceCraftingTable) tileEntity;
+		
+	    }
+	    // from Client to Server
+	    world = ((EntityPlayer) player).worldObj;
+	    tileEntity = world.getBlockTileEntity(x, y, z);
+	    if (tileEntity instanceof TileEntityScienceCraftingTable) {
+		var2 = (TileEntityScienceCraftingTable) tileEntity;
+		var2.handlePacket(new Object[] { activeTab });
+	    }
 	}
+    }
+
 
+    public static Packet getPacket(TileEntityScienceCraftingTable tileEntity) {
+	ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
+	DataOutputStream var2 = new DataOutputStream(var1);
 
-	public static Packet getPacket(TileEntityScienceCraftingTable tileEntity) {
-		ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
-		DataOutputStream var2 = new DataOutputStream(var1);
-
-		//Blockのx, y, z座標
-		int x, y, z;
-<<<<<<< HEAD
-		//activeTab
-		String activeTab;
-=======
-		String tab;
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-
-		// x, y, z座標を代入
-		x = tileEntity.xCoord;
-		y = tileEntity.yCoord;
-		z = tileEntity.zCoord;
-<<<<<<< HEAD
-		//activeTabに代入
-		activeTab = tileEntity.getActiveTab();
-=======
-		tab = tileEntity.getActiveTab();
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-
-		try {
-			var2.writeInt(x);
-			var2.writeInt(y);
-			var2.writeInt(z);
-<<<<<<< HEAD
-			var2.writeUTF(activeTab);
-=======
-			var2.writeUTF(tab);
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		// パケットの作成
-		Packet250CustomPayload packet = new Packet250CustomPayload();
-		packet.channel = "chemicraft";
-		packet.data = var1.toByteArray();
-		packet.length = var1.size();
-		packet.isChunkDataPacket = true;
-		return packet;
+	// Blockのx, y, z座標
+	int x, y, z;
+
+	// activeTab
+	String activeTab;
+
+	// x, y, z座標を代入
+	x = tileEntity.xCoord;
+	y = tileEntity.yCoord;
+	z = tileEntity.zCoord;
+
+	// activeTabに代入
+	activeTab = tileEntity.getActiveTab();
+
+	try {
+	    // 座標書き込み
+	    var2.writeInt(x);
+	    var2.writeInt(y);
+	    var2.writeInt(z);
+	    // activeTab書き込み
+	    var2.writeUTF(activeTab);
+	} catch (IOException e) {
+	    e.printStackTrace();
 	}
+
+	// パケットの作成
+	Packet250CustomPayload packet = new Packet250CustomPayload();
+	packet.channel = "chemicraft";
+	packet.data = var1.toByteArray();
+	packet.length = var1.size();
+	packet.isChunkDataPacket = true;
+	return packet;
+    }
 }
diff --git a/common/chemicraft/TileEntityScienceCraftingTable.java b/common/chemicraft/TileEntityScienceCraftingTable.java
index 428b675..243ddd2 100644
--- a/common/chemicraft/TileEntityScienceCraftingTable.java
+++ b/common/chemicraft/TileEntityScienceCraftingTable.java
@@ -12,137 +12,130 @@ import net.minecraftforge.common.ISidedInventory;
 
 public class TileEntityScienceCraftingTable extends TileEntity implements IInventory, ISidedInventory {
 
-	/**
-	 * InventorySlotのItemStack配列
-	 */
-	private ItemStack[] inventory = new ItemStack[17];
+    /**
+     * InventorySlotのItemStack配列
+     */
+    private ItemStack[] inventory = new ItemStack[17];
 
+    /**
+     * ActiveなTabの名前
+     */
+    private String activeTab;
 
-	/**
-	 * ActiveなTabの名前
-	 */
-	private String activeTab;
 
+    public TileEntityScienceCraftingTable() {
+	super();
+	// ActiveTabのデフォルトを設定
+	this.activeTab = "Decomposition";
+    }
 
 
-	public TileEntityScienceCraftingTable() {
-		super();
-		//ActiveTabのデフォルトを設定
-		this.activeTab = "Decomposition";
-	}
+    @Override
+    public void updateEntity() {
+	super.updateEntity();
+    }
 
 
-	@Override
-	public void updateEntity() {
-		super.updateEntity();
-		System.out.println(this.activeTab);
-	}
+    @Override
+    public void readFromNBT(NBTTagCompound par1) {
+	super.readFromNBT(par1);
+	this.activeTab = par1.getString("activeTab");
+    }
 
 
-	@Override
-	public void readFromNBT(NBTTagCompound par1) {
-		super.readFromNBT(par1);
-		this.activeTab = par1.getString("activeTab");
-	}
+    @Override
+    public void writeToNBT(NBTTagCompound par1) {
+	super.writeToNBT(par1);
+	par1.setString("activeTab", this.activeTab);
+    }
 
 
-	@Override
-	public void writeToNBT(NBTTagCompound par1) {
-		super.writeToNBT(par1);
-		par1.setString("activeTab", this.activeTab);
-	}
+    public String getActiveTab() {
+	return this.activeTab;
+    }
 
 
-	public String getActiveTab(){
-		return this.activeTab;
-	}
+    public void setActiveTab(String activeTab) {
+	this.activeTab = activeTab;
+    }
 
 
-	public void setActiveTab(String activeTab){
-		PacketDispatcher.sendPacketToServer(this.getDescriptionPacket());
-		this.activeTab = activeTab;
-	}
+    @Override
+    public int getSizeInventory() {
+	return inventory.length;
+    }
 
 
-	@Override
-	public int getSizeInventory() {
-		return inventory.length;
-	}
+    @Override
+    public ItemStack getStackInSlot(int var1) {
+	return inventory[var1];
+    }
 
 
-	@Override
-	public ItemStack getStackInSlot(int var1) {
-		return inventory[var1];
-	}
+    @Override
+    public ItemStack decrStackSize(int var1, int var2) {
+	return null;
+    }
 
 
-	@Override
-	public ItemStack decrStackSize(int var1, int var2) {
-		return null;
-	}
+    @Override
+    public ItemStack getStackInSlotOnClosing(int var1) {
+	return null;
+    }
 
 
-	@Override
-	public ItemStack getStackInSlotOnClosing(int var1) {
-		return null;
-	}
+    @Override
+    public void setInventorySlotContents(int var1, ItemStack var2) {
+    }
 
 
-	@Override
-	public void setInventorySlotContents(int var1, ItemStack var2) {
-	}
+    @Override
+    public String getInvName() {
+	return null;
+    }
 
 
-	@Override
-	public String getInvName() {
-		return null;
-	}
+    @Override
+    public int getInventoryStackLimit() {
+	return 64;
+    }
 
 
-	@Override
-	public int getInventoryStackLimit() {
-		return 64;
-	}
+    @Override
+    public boolean isUseableByPlayer(EntityPlayer var1) {
+	return false;
+    }
 
 
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer var1) {
-		return false;
-	}
+    @Override
+    public void openChest() {
+    }
 
 
-	@Override
-	public void openChest() {
-	}
+    @Override
+    public void closeChest() {
+    }
 
 
-	@Override
-	public void closeChest() {
-	}
+    @Override
+    public Packet getDescriptionPacket() {
+	return PacketHandler.getPacket(this);
+    }
 
 
-	@Override
-	public Packet getDescriptionPacket() {
-		return PacketHandler.getPacket(this);
-	}
+    public void handlePacket(Object[] data) {
+	this.activeTab = (String) data[0];
+    }
 
 
-<<<<<<< HEAD
-=======
-	public void handlePacket(Object[] data) {
-	    this.activeTab = (String) data[0];
-	}
+    @Override
+    public int getStartInventorySide(ForgeDirection side) {
+	return 0;
+    }
 
->>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
 
-	@Override
-	public int getStartInventorySide(ForgeDirection side) {
-		return 0;
-	}
-
-
-	@Override
-	public int getSizeInventorySide(ForgeDirection side) {
-		return 0;
-	}
+    @Override
+    public int getSizeInventorySide(ForgeDirection side) {
+	return 0;
+    }
 }
diff --git a/resources/chemicraft/guis/Decomposition.png b/resources/chemicraft/guis/Decomposition.png
new file mode 100644
index 0000000..15de09e
Binary files /dev/null and b/resources/chemicraft/guis/Decomposition.png differ
diff --git a/resources/chemicraft/guis/tabs.png b/resources/chemicraft/guis/tabs.png
new file mode 100644
index 0000000..50422c4
Binary files /dev/null and b/resources/chemicraft/guis/tabs.png differ
diff --git a/ChemiCraft/items/Atoms.png b/resources/chemicraft/items/Atoms.png
similarity index 100%
rename from ChemiCraft/items/Atoms.png
rename to resources/chemicraft/items/Atoms.png