OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

ChemiCraftNext: Commit


Commit MetaInfo

Revisión81b3d517580129f8c25e52e5f8df20acd58e8416 (tree)
Tiempo2013-01-01 21:37:27
Autormozipi <mozipi@user...>
Commitermozipi

Log Message

ts

Cambiar Resumen

Diferencia incremental

--- a/common/chemicraft/container/ContainerChemicalCombinationTable.java
+++ b/common/chemicraft/container/ContainerChemicalCombinationTable.java
@@ -1,6 +1,5 @@
11 package chemicraft.container;
22
3-import net.minecraft.src.Block;
43 import net.minecraft.src.Container;
54 import net.minecraft.src.EntityPlayer;
65 import net.minecraft.src.ItemStack;
--- a/common/chemicraft/gui/GuiChemicalCombinationTable.java
+++ b/common/chemicraft/gui/GuiChemicalCombinationTable.java
@@ -11,8 +11,9 @@ import net.minecraft.src.ItemStack;
1111 import chemicraft.ChemiCraft;
1212 import chemicraft.container.ContainerChemicalCombinationTable;
1313 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
14-import chemicraft.util.Auxiliary.ArrayAuxiliary;
1514 import chemicraft.util.ComparatorItemStack;
15+import cpw.mods.fml.common.Side;
16+import cpw.mods.fml.common.asm.SideOnly;
1617 import cpw.mods.fml.common.network.PacketDispatcher;
1718
1819 public class GuiChemicalCombinationTable extends GuiContainer {
@@ -43,6 +44,7 @@ public class GuiChemicalCombinationTable extends GuiContainer {
4344 }
4445
4546 @Override
47+ @SideOnly(Side.CLIENT)
4648 protected void actionPerformed(GuiButton par1GuiButton) {
4749 if(par1GuiButton.id == 0){
4850 this.field_00001(this.tileentity);
@@ -53,6 +55,7 @@ public class GuiChemicalCombinationTable extends GuiContainer {
5355 return;
5456 }
5557
58+ @SideOnly(Side.CLIENT)
5659 protected void field_00001(TileEntityChemicalCombinationTable par1){
5760 IInventory inv = par1.getInvMaterial();
5861 ItemStack[] stacks = new ItemStack[inv.getSizeInventory()];
@@ -66,11 +69,16 @@ public class GuiChemicalCombinationTable extends GuiContainer {
6669
6770 for(int i = 0;i < stacks.length;i++){
6871 if(stacks[i].stackSize > 1){
69- par1.setAtoms(ChemiCraft.atomsList[stacks[i].getItemDamage()] + stacks[i].stackSize);
72+ par1.setAtoms(ChemiCraft.atomsList[stacks[i].getItemDamage()], stacks[i].stackSize);
7073 }else{
71- par1.setAtoms(ChemiCraft.atomsList[stacks[i].getItemDamage()]);
74+ par1.setAtoms(ChemiCraft.atomsList[stacks[i].getItemDamage()], 1);
7275 }
7376 }
77+
78+ for(int i = 0;i < stacks.length;i++){
79+ inv.setInventorySlotContents(i, null);
80+ }
81+
7482 }
7583
7684 @Override
--- a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
+++ b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
@@ -8,12 +8,17 @@ import net.minecraft.src.NBTTagCompound;
88 import net.minecraft.src.NBTTagList;
99 import net.minecraft.src.Packet;
1010 import net.minecraft.src.TileEntity;
11+import net.minecraft.src.WorldServer;
1112 import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
1213 import chemicraft.inventory.InventoryChemicalCombinationTableResult;
1314 import chemicraft.system.PacketHandler;
1415
1516 import com.google.common.io.ByteArrayDataInput;
1617
18+import cpw.mods.fml.common.Side;
19+import cpw.mods.fml.common.asm.SideOnly;
20+import cpw.mods.fml.common.network.PacketDispatcher;
21+
1722 public class TileEntityChemicalCombinationTable extends TileEntity {
1823
1924 private InventoryChemicalCombinationTableMaterial invm = new InventoryChemicalCombinationTableMaterial();
@@ -23,6 +28,19 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
2328 private ArrayList<Integer> atomsAmountList = new ArrayList<Integer>();
2429 private int atomsListSize = 0;
2530
31+ int t = 0;
32+
33+ @Override
34+ public void updateEntity(){
35+ super.updateEntity();
36+ t++;
37+ if(t % 5 == 0 && this.worldObj instanceof WorldServer){
38+ System.out.println(this.atomsListSize);
39+ System.out.println(this.atomsList);
40+ System.out.println(this.atomsAmountList);
41+ }
42+ }
43+
2644 @Override
2745 public void readFromNBT(NBTTagCompound par1){
2846 super.readFromNBT(par1);
@@ -51,11 +69,9 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
5169 }
5270
5371 this.atomsListSize = par1.getInteger("atomsListSize");
54-
5572 for(int i = 0;i < this.atomsListSize;i++){
5673 this.atomsList.add(par1.getString("atomsList") + i);
5774 }
58-
5975 for(int i = 0;i < this.atomsListSize;i++){
6076 this.atomsAmountList.add(par1.getInteger("atomsAmountList") + i);
6177 }
@@ -101,7 +117,7 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
101117
102118 this.atomsListSize = this.atomsList.size();
103119 par1.setInteger("atomsListSize", this.atomsListSize);
104-
120+ //System.out.println();
105121 }
106122
107123 @Override
@@ -133,6 +149,15 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
133149 }
134150 }
135151
152+ this.atomsListSize = data.readInt();
153+ this.atomsList.clear();
154+ this.atomsAmountList.clear();
155+ for(int i = 0;i < this.atomsListSize;i++){
156+ this.atomsList.add(data.readUTF());
157+ }
158+ for(int i = 0;i < this.atomsListSize;i++){
159+ this.atomsAmountList.add(data.readInt());
160+ }
136161 } catch (Exception e) {
137162 e.printStackTrace();
138163 }
@@ -178,17 +203,40 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
178203 }
179204 }
180205
206+ dos.writeInt(this.atomsList.size());
207+ for(int i = 0;i < this.atomsList.size();i++){
208+ dos.writeUTF(this.atomsList.get(i));
209+ }
210+ for(int i = 0;i < this.atomsAmountList.size();i++){
211+ dos.writeInt(this.atomsAmountList.get(i));
212+ }
181213 } catch (Exception e) {
182214 e.printStackTrace();
183215 }
184216 }
185217
186- public void setAtoms(String par1){
187-
218+ @SideOnly(Side.CLIENT)
219+ public void setAtoms(String par1, int par2){
220+ if(this.atomsList.indexOf(par1) != -1){
221+ int var1 = this.atomsList.indexOf(par1);
222+ this.atomsAmountList.set(var1, this.atomsAmountList.get(var1) + par2);
223+ }else{
224+ this.atomsList.add(par1);
225+ this.atomsAmountList.add(par2);
226+ }
227+ PacketDispatcher.sendPacketToServer(this.getDescriptionPacket());
188228 }
189229
190230 public String getAtoms(){
191- return this.atomsList;
231+ StringBuffer var1 = new StringBuffer();
232+ for(int i = 0;i < this.atomsList.size();i++){
233+ if(this.atomsAmountList.get(i) != 1){
234+ var1.append(this.atomsList.get(i) + this.atomsAmountList.get(i));
235+ }else{
236+ var1.append(this.atomsList.get(i));
237+ }
238+ }
239+ return var1.toString();
192240 }
193241
194242 public ArrayList<String> getAtomsList(){
@@ -199,6 +247,7 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
199247 return this.atomsAmountList;
200248 }
201249
250+ @SuppressWarnings("unused")
202251 protected boolean isNumber(String par1){
203252 try {
204253 int var1 = Integer.valueOf(new String(par1));
Show on old repository browser