diff --git a/.classpath b/.classpath index c3151cc0..770a4f99 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index e0f1080a..90d970ed 100644 Binary files a/.gradle/2.0/taskArtifacts/cache.properties.lock and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin index 13852f24..2cdb94e1 100644 Binary files a/.gradle/2.0/taskArtifacts/fileHashes.bin and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index 9fc1cc01..d78eb81a 100644 Binary files a/.gradle/2.0/taskArtifacts/fileSnapshots.bin and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 0be4239c..f5ece64c 100644 Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 07b0c3aa..e613cc41 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 10.091 secs +Total time: 8.953 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 722a5155..44b0da0c 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Thu Jul 02 09:36:46 EDT 2015 +#Fri Jul 03 01:51:44 EDT 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index 8eb4b6f3..4940351d 100644 Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index 441ff177..aafeb109 100644 Binary files a/bin/com/kitsu/medievalcraft/block/machines/Forge.class and b/bin/com/kitsu/medievalcraft/block/machines/Forge.class differ diff --git a/bin/com/kitsu/medievalcraft/contain/ContainerForge.class b/bin/com/kitsu/medievalcraft/contain/ContainerForge.class index f85071b9..f9dd33b8 100644 Binary files a/bin/com/kitsu/medievalcraft/contain/ContainerForge.class and b/bin/com/kitsu/medievalcraft/contain/ContainerForge.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.class b/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.class deleted file mode 100644 index 76c895be..00000000 Binary files a/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.class b/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.class deleted file mode 100644 index cdf52772..00000000 Binary files a/bin/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.class new file mode 100644 index 00000000..042304f5 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.class new file mode 100644 index 00000000..1eb7e947 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.class b/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.class index f5ce3174..8433f86f 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.class and b/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgPacketShelfCase.class b/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgPacketShelfCase.class index c37c358d..5154c04e 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgPacketShelfCase.class and b/bin/com/kitsu/medievalcraft/packethandle/shelf/MsgPacketShelfCase.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class index b7e4268c..81b72953 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class and b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 690b4b2d..b64f0fff 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class differ diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index 4a7e036f..71a1477f 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -19,6 +19,8 @@ import com.kitsu.medievalcraft.packethandle.curedLeather.MsgHandleCuredLeatherZ; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherX; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherY; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherZ; +import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandle; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocZ; @@ -82,6 +84,7 @@ public class Main { sNet.registerMessage(MsgHandleCuredLeatherY.class, MsgPacketCuredLeatherY.class, 7, Side.SERVER); sNet.registerMessage(MsgHandleCuredLeatherZ.class, MsgPacketCuredLeatherZ.class, 8, Side.SERVER); sNet.registerMessage(MsgHandleShelfCase.class, MsgPacketShelfCase.class, 9, Side.SERVER); + sNet.registerMessage(MsgHandleForge.class, MsgPacketForge.class, 10, Side.SERVER); CustomTab.MedievalTab(); ModBlocks.init(); ModItems.init(); diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java index a27f2031..6eb56998 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -28,6 +28,8 @@ import net.minecraftforge.common.util.ForgeDirection; import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.item.ModItems; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; +import com.kitsu.medievalcraft.packethandle.shelf.MsgPacketShelfCase; import com.kitsu.medievalcraft.renderer.RenderId; import com.kitsu.medievalcraft.tileents.machine.TileForge; import com.kitsu.medievalcraft.util.CustomTab; @@ -40,14 +42,14 @@ import cpw.mods.fml.relauncher.SideOnly; public class Forge extends BlockContainer implements TileForgePlaceables{ private final Random random = new Random(); - private float mopX, mopY, mopZ, mopBlockX, mopBlockY, mopBlockZ; - private int sideMeta, c; + private int sideMeta; + public static int c; public Forge(String unlocalizedName, Material material) { super(material.rock); this.setBlockName(unlocalizedName); this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - //this.setCreativeTab(CustomTab.MedievalCraftTab); + this.setCreativeTab(CustomTab.MedievalCraftTab); this.setHardness(3.0F); this.setResistance(5.0F); this.setHarvestLevel("pickaxe", 1, 0); @@ -76,6 +78,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack p_149689_6_) { if(!world.isRemote){ world.setBlockMetadataWithNotify(x, y, z, (MathHelper.floor_double((player.rotationYaw * 4F) / 360F + 0.5D) & 3), 2); + System.out.println(world.getBlockMetadata(x, y, z)); } world.markBlockForUpdate(x, y, z); } @@ -94,13 +97,18 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ if(world.isRemote){ MovingObjectPosition mop = Minecraft.getMinecraft().renderViewEntity.rayTrace(5, 1.0F); - sideMeta = mop.sideHit; - //c = sideMeta; + c = (int)mop.sideHit; + + Main.sNet.sendToServer(new MsgPacketForge((int) c)); + System.out.println("Client"); System.out.println(c); System.out.println(world.getBlockMetadata(x, y, z)); } if(!world.isRemote){ + System.out.println("Server"); + System.out.println(c); + System.out.println(world.getBlockMetadata(x, y, z)); if(player.inventory.getCurrentItem()!=null){ if((player.inventory.getCurrentItem().getItem()==Item.getItemFromBlock(Blocks.torch))|| (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| @@ -109,30 +117,25 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ tileEnt.isOn=true; } } + if(c==1){ if(player.inventory.getCurrentItem()!=null){ - if(tileEnt.getStackInSlot(1)==null){ - if(player.inventory.getCurrentItem()!=null){ - if(player.inventory.getCurrentItem().getItem()==Items.coal){ + if(player.inventory.getCurrentItem().getItem()==Items.coal){ + if(tileEnt.getStackInSlot(1)==null){ + if(player.inventory.getCurrentItem()!=null){ tileEnt.setInventorySlotContents(1, player.inventory.getCurrentItem()); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } - } - if(tileEnt.getStackInSlot(0)!=null){ - if(player.inventory.getCurrentItem()!=null){ - if(player.inventory.getCurrentItem()!=null){ - if(player.inventory.getCurrentItem().getItem()==Items.coal){ - ItemStack pStack = player.inventory.getCurrentItem().copy(); - ItemStack sStack = tileEnt.getStackInSlot(1).copy(); - ItemStack sStackTemp = tileEnt.getStackInSlot(1).copy(); - if(tileEnt.getStackInSlot(0).stackSize < 64){ - sStackTemp.stackSize++; - if ((sStack.getItem().equals(pStack.getItem())) && (sStack.getItemDamage() == pStack.getItemDamage()) ){ - tileEnt.setInventorySlotContents(1, sStackTemp); - player.inventory.decrStackSize(player.inventory.currentItem, 1); - } - } + if(tileEnt.getStackInSlot(1)!=null){ + ItemStack pStack = player.inventory.getCurrentItem().copy(); + ItemStack sStack = tileEnt.getStackInSlot(1).copy(); + ItemStack sStackTemp = tileEnt.getStackInSlot(1).copy(); + if(tileEnt.getStackInSlot(1).stackSize < 64){ + sStackTemp.stackSize++; + if ((sStack.getItem().equals(pStack.getItem())) && (sStack.getItemDamage() == pStack.getItemDamage()) ){ + tileEnt.setInventorySlotContents(1, sStackTemp); + player.inventory.decrStackSize(player.inventory.currentItem, 1); } } } @@ -161,6 +164,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ if(c!=0 && c!=1){ if(player.inventory.getCurrentItem()!=null){ if(tileEnt.getStackInSlot(0)==null){ + System.out.println(); if(isItemFuel(player.inventory.getCurrentItem())==true){ tileEnt.setInventorySlotContents(0, player.inventory.getCurrentItem()); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); @@ -184,14 +188,14 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ } return true; } - if (player.isSneaking() && player.inventory.getCurrentItem()==null) { + if(player.isSneaking() && player.inventory.getCurrentItem()==null) { if(tileEnt.getStackInSlot(0)!=null){ world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, tileEnt.getStackInSlot(0))); tileEnt.setInventorySlotContents(0, null); } return true; } - if (!player.isSneaking()) { + if(!player.isSneaking()) { if((player.inventory.getCurrentItem()==null)){ if(tileEnt.getStackInSlot(0)!=null){ ItemStack pStack = tileEnt.getStackInSlot(0).copy(); @@ -206,7 +210,6 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ } tileEnt.markForUpdate(); tileEnt.markDirty(); - //System.out.println(player.inventory.getCurrentItem()); return true; } diff --git a/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java b/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java index 673f6d2f..b9b06b10 100644 --- a/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java +++ b/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java @@ -29,7 +29,7 @@ public class ContainerForge extends Container { } }*/ addSlotToContainer(new Slot(tileEnt, 0, 80, 34)); - addSlotToContainer(new Slot(tileEnt, 1, 81, 34)); + addSlotToContainer(new Slot(tileEnt, 0, 81, 34)); //commonly used vanilla code that adds the player's inventory bindPlayerInventory(inventoryPlayer); } diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.java b/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.java deleted file mode 100644 index a3931e20..00000000 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgHandleFirebox.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.kitsu.medievalcraft.packethandle.firebox; - -public class MsgHandleFirebox { - -} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.java b/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.java deleted file mode 100644 index 0b792b1f..00000000 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/firebox/MsgPacketFirebox.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.kitsu.medievalcraft.packethandle.firebox; - -public class MsgPacketFirebox { - -} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java new file mode 100644 index 00000000..9cd5962d --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java @@ -0,0 +1,18 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import com.kitsu.medievalcraft.block.machines.Forge; +import com.kitsu.medievalcraft.block.wood.ShelfFour; +import com.kitsu.medievalcraft.packethandle.shelf.MsgPacketShelfCase; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class MsgHandleForge implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketForge message, MessageContext ctx) { + Forge.c = message.caseType; + return null; + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.java new file mode 100644 index 00000000..9103a826 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForge.java @@ -0,0 +1,26 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketForge implements IMessage { + + public int caseType; + + public MsgPacketForge() {} + + public MsgPacketForge(int x){ + this.caseType = x; + } + + @Override + public void fromBytes(ByteBuf buf) { + this.caseType = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(this.caseType); + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.java b/src/main/java/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.java index 9dedeb4a..b302365d 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/shelf/MsgHandleShelfCase.java @@ -12,15 +12,7 @@ public class MsgHandleShelfCase implements IMessageHandler