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 f8fb0c42..04c2ea59 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 779d2016..da91365f 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 26818e44..cd82bb50 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 3879d84e..df7c8d83 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 72d74314..970f888d 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -5,33 +5,11 @@ R4wk, ZeuX, IngisKahn, bspkrs MCP Data version : unknown **************************** -:compileApiJava UP-TO-DATE -:processApiResources UP-TO-DATE -:apiClasses UP-TO-DATE -:sourceMainJava -:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6 -Note: Some input files use or override a deprecated API. -Note: Recompile with -Xlint:deprecation for details. -Note: Some input files use unchecked or unsafe operations. -Note: Recompile with -Xlint:unchecked for details. -1 warning - -:processResources -:classes -:jar -:compileTestJava UP-TO-DATE -:processTestResources UP-TO-DATE -:testClasses UP-TO-DATE -:test UP-TO-DATE -:extractMcpData UP-TO-DATE -:getVersionJson -:extractUserDev UP-TO-DATE -:genSrgs SKIPPED -:reobf -:assemble -:check UP-TO-DATE -:build +:eclipseClasspath +:eclipseJdt +:eclipseProject +:eclipse BUILD SUCCESSFUL -Total time: 9.173 secs +Total time: 9.254 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index c7d4e8b0..15ed9034 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Sun Jul 05 08:31:31 EDT 2015 +#Mon Jul 06 01:21:49 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/assets/kitsumedievalcraft/textures/items/leatherShears.png b/bin/assets/kitsumedievalcraft/textures/items/leatherShears.png index 0f214fcf..c8580767 100644 Binary files a/bin/assets/kitsumedievalcraft/textures/items/leatherShears.png and b/bin/assets/kitsumedievalcraft/textures/items/leatherShears.png differ diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index 15ed1dc9..0ffdddfb 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 d90ea3fc..8e3e331a 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/crafting/ModCrafting$1.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$1.class index 6cf98085..a3b0fde9 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$1.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$1.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$2.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$2.class index f7829984..524de8ef 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$2.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$2.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$3.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$3.class index 78b582f9..e7139430 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$3.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$3.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$4.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$4.class index c048d2dc..da95718e 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting$4.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting$4.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index 12baa308..691c7692 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class b/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class index dfff88bb..f15dd847 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/FireBow.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.class b/bin/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.class index caab18a1..1406b28e 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class index babefe72..f75e07b7 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.class new file mode 100644 index 00000000..88c10ebb Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.class new file mode 100644 index 00000000..1303533b Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.class new file mode 100644 index 00000000..017bdb99 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class index b456f0eb..547357e6 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.class new file mode 100644 index 00000000..61ed3385 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.class new file mode 100644 index 00000000..b4509fce Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.class new file mode 100644 index 00000000..7a054b1b Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class index 1fa69e05..5a17f64c 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class differ diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index 57f1c030..f8033a79 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -19,18 +19,26 @@ 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.MsgHandleBurning; import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForgeX; +import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForgeY; +import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForgeZ; import com.kitsu.medievalcraft.packethandle.forge.MsgHandleOn; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketBurning; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeX; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeY; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeZ; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandle; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocX; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocZ; -import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocX; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocZ; -import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX; import com.kitsu.medievalcraft.packethandle.sandFilterRender.MsgHandleSandFilterRender; import com.kitsu.medievalcraft.packethandle.sandFilterRender.MsgPacketSandFilterRender; import com.kitsu.medievalcraft.packethandle.shelf.MsgHandleShelfCase; @@ -88,6 +96,10 @@ public class Main { sNet.registerMessage(MsgHandleShelfCase.class, MsgPacketShelfCase.class, 9, Side.SERVER); sNet.registerMessage(MsgHandleForge.class, MsgPacketForge.class, 10, Side.SERVER); sNet.registerMessage(MsgHandleOn.class, MsgPacketOn.class, 11, Side.CLIENT); + sNet.registerMessage(MsgHandleBurning.class, MsgPacketBurning.class, 12, Side.CLIENT); + sNet.registerMessage(MsgHandleForgeX.class, MsgPacketForgeX.class, 13, Side.CLIENT); + sNet.registerMessage(MsgHandleForgeY.class, MsgPacketForgeY.class, 14, Side.CLIENT); + sNet.registerMessage(MsgHandleForgeZ.class, MsgPacketForgeZ.class, 15, Side.CLIENT); CustomTab.MedievalTab(); ModBlocks.init(); ModItems.init(); @@ -95,9 +107,6 @@ public class Main { NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); } - /** - * Do your mod setup. Build whatever data structures you care about. Register recipes. - */ @Mod.EventHandler public void init(FMLInitializationEvent e) { 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 196a6657..d5512853 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -26,11 +26,13 @@ import net.minecraft.world.World; 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.MsgPacketBurning; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeX; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeY; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeZ; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; -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; @@ -43,8 +45,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class Forge extends BlockContainer implements TileForgePlaceables{ private final Random random = new Random(); - public static int sideMeta; - public static boolean furnaceParts; + public static int sideMeta, locX, locY, locZ; + public static boolean furnaceParts, coalParts; private int c; public Forge(String unlocalizedName, Material material) { @@ -59,7 +61,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ //this.isFlammable(world, x, y, z, face); //(xmin, ymin, zmin, // xmax, ymax, zmax) - this.setBlockBounds(0.0F, 0.00F, 0.0F, + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @@ -74,21 +76,44 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ public void randomDisplayTick(World world, int x, int y, int z, Random rand) { super.randomDisplayTick(world, x, y, z, random); - if(furnaceParts == true){ - int l; - float f; - float f1; - float f2; - for (l = 0; l < 3; ++l) - { - f = (float)(x+0.25) + (rand.nextFloat()/2); - f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; - f2 = (float)(z+0.25) + (rand.nextFloat()/2); - world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - } + if(this.furnaceParts==true){ + world.spawnParticle("fire", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); } + //if(x==locX&&y==locY&&z==locZ){ + /*if(this.furnaceParts == true){ + int l; + float f; + float f1; + float f2; + for (l = 0; l < 3; ++l) + { + f = (float)(locX+0.25) + (rand.nextFloat()/2); + f1 = (float)locY + rand.nextFloat() * 0.4F + 0.3F; + f2 = (float)(locZ+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + } + } + if(this.coalParts == true){ + int l; + float f; + float f1; + float f2; + for (l = 0; l < 3; ++l) + { + f = (float)(locX+0.25) + (rand.nextFloat()/2); + //f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; + f1 = locY; + f2 = (float)(locZ+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + } + }*/ + //} } public static int determineOrientation(World p_150071_0_, int p_150071_1_, int p_150071_2_, int p_150071_3_, EntityLivingBase p_150071_4_) @@ -136,8 +161,12 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ ){ tileEnt.isBurning=true; Main.sNet.sendToAll(new MsgPacketOn(tileEnt.isBurning)); + Main.sNet.sendToAll(new MsgPacketForgeX(tileEnt.xCoord)); + Main.sNet.sendToAll(new MsgPacketForgeY(tileEnt.yCoord)); + Main.sNet.sendToAll(new MsgPacketForgeZ(tileEnt.zCoord)); if(tileEnt.getStackInSlot(1)!=null){ tileEnt.isOn=true; + Main.sNet.sendToAll(new MsgPacketBurning(tileEnt.isOn)); } } } diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index 57ff883d..a45b6084 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -19,8 +19,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public final class ModCrafting { - - public static final Hashtable pickheads = new Hashtable (){{ put(0, ModItems.unbreakingOneHead); diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java index 05169d52..a498c74e 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/FireBow.java @@ -38,13 +38,12 @@ public class FireBow extends Item { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_){ - - if(rand.nextInt(5) == 0){ - world.setBlock(x, y + 1, z , Blocks.fire); - //item.setDamage(new ItemStack(item), +1); - stack.damageItem(1, player); + if(!world.isRemote){ + if(rand.nextInt(5) == 0){ + world.setBlock(x, y + 1, z , Blocks.fire); + stack.damageItem(1, player); + } } - return true; } diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.java index 0420d5a4..49f4fcbc 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/LeatherShears.java @@ -1,6 +1,7 @@ package com.kitsu.medievalcraft.item.craftingtools; import net.minecraft.item.Item; +import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import com.kitsu.medievalcraft.Main; @@ -8,46 +9,34 @@ import com.kitsu.medievalcraft.util.CustomTab; import cpw.mods.fml.common.registry.GameRegistry; -public class LeatherShears extends Item { +public class LeatherShears extends ItemShears { private String name = "leatherShears"; private Item item; public LeatherShears() { - setMaxStackSize(1); setUnlocalizedName(name); setCreativeTab(CustomTab.MedievalCraftTab); setTextureName(Main.MODID + ":" + name); setMaxDamage(64); setNoRepair(); - item = this; - GameRegistry.registerItem(this, name); - - } @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemstack) { - return false; - } @Override - public Item getContainerItem() - { + public Item getContainerItem(){ item.setDamage(new ItemStack(item), +1); - //itemStack.setItemDamage(itemStack.getItemDamage() + 1); return item; } - public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) - { + public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_){ return false; } - - -} +} \ No newline at end of file diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java index a374415a..9ad2f2af 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java @@ -1,5 +1,16 @@ package com.kitsu.medievalcraft.packethandle.forge; -public class MsgHandleBurning { +import com.kitsu.medievalcraft.block.machines.Forge; +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 MsgHandleBurning implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketBurning message, MessageContext ctx) { + Forge.coalParts = message.packetOn; + return null; + } } diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.java new file mode 100644 index 00000000..69e705c5 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeX.java @@ -0,0 +1,25 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import com.kitsu.medievalcraft.block.ingots.IngotBase; +import com.kitsu.medievalcraft.block.machines.Forge; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX; + +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 MsgHandleForgeX implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketForgeX message, MessageContext ctx) { + + //IngotBase.locX = message.locx; + Forge.locX = message.locx; + //ItemRendererLongbow.tick = message.lTick; + + //System.out.println(message.lTick); + //ctx.getClientHandler().addToSendQueue(new MsgPacket(message.useme)); + + return null; + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.java new file mode 100644 index 00000000..9eee1be3 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeY.java @@ -0,0 +1,23 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import com.kitsu.medievalcraft.block.machines.Forge; + +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 MsgHandleForgeY implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketForgeY message, MessageContext ctx) { + + //IngotBase.locX = message.locx; + Forge.locY = message.locy; + //ItemRendererLongbow.tick = message.lTick; + + //System.out.println(message.lTick); + //ctx.getClientHandler().addToSendQueue(new MsgPacket(message.useme)); + + return null; + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.java new file mode 100644 index 00000000..83029e7b --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForgeZ.java @@ -0,0 +1,23 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import com.kitsu.medievalcraft.block.machines.Forge; + +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 MsgHandleForgeZ implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketForgeZ message, MessageContext ctx) { + + //IngotBase.locX = message.locx; + Forge.locZ = message.locz; + //ItemRendererLongbow.tick = message.lTick; + + //System.out.println(message.lTick); + //ctx.getClientHandler().addToSendQueue(new MsgPacket(message.useme)); + + return null; + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java index 797ddf06..46823626 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java @@ -1,5 +1,26 @@ package com.kitsu.medievalcraft.packethandle.forge; -public class MsgPacketBurning { +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketBurning implements IMessage { + + public boolean packetOn; + + public MsgPacketBurning() {} + + public MsgPacketBurning(boolean x){ + this.packetOn = x; + } + + @Override + public void fromBytes(ByteBuf buf) { + this.packetOn = buf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(this.packetOn); + } } diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.java new file mode 100644 index 00000000..0fae0d6d --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeX.java @@ -0,0 +1,28 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketForgeX implements IMessage { + + public int locx; + + public MsgPacketForgeX() {} + + public MsgPacketForgeX(int x){ + this.locx = x; + } + + + @Override + public void fromBytes(ByteBuf buf) { + + this.locx = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(this.locx); + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.java new file mode 100644 index 00000000..ad83cbd4 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeY.java @@ -0,0 +1,28 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketForgeY implements IMessage { + + public int locy; + + public MsgPacketForgeY() {} + + public MsgPacketForgeY(int y){ + this.locy = y; + } + + + @Override + public void fromBytes(ByteBuf buf) { + + this.locy = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(this.locy); + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.java new file mode 100644 index 00000000..36487de7 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketForgeZ.java @@ -0,0 +1,28 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketForgeZ implements IMessage { + + public int locz; + + public MsgPacketForgeZ() {} + + public MsgPacketForgeZ(int z){ + this.locz = z; + } + + + @Override + public void fromBytes(ByteBuf buf) { + + this.locz = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(this.locz); + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java index e44cdac0..6d6c1150 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java @@ -1,6 +1,7 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; import com.kitsu.medievalcraft.block.ingots.IngotBase; +import com.kitsu.medievalcraft.block.machines.Forge; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -12,7 +13,7 @@ public class MsgHandleLocX implements IMessageHandler{ public IMessage onMessage(MsgPacketLocX message, MessageContext ctx) { IngotBase.locX = message.locx; - //HotIronPlate.locX = message.locx; + //Forge.locX = message.locx; //ItemRendererLongbow.tick = message.lTick; //System.out.println(message.lTick); diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/leatherShears.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/leatherShears.png index 0f214fcf..c8580767 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/items/leatherShears.png and b/src/main/resources/assets/kitsumedievalcraft/textures/items/leatherShears.png differ