From 806a5c1e8e46503c69ed0cea958c79bc6f3b49d9 Mon Sep 17 00:00:00 2001 From: KitsuShadow Date: Mon, 22 Feb 2016 05:41:52 -0500 Subject: [PATCH] cannon mods --- bin/com/kitsu/medievalcraft/Main.class | Bin 7202 -> 7034 bytes bin/mcmod.info | 2 +- .../java/com/kitsu/medievalcraft/Main.java | 8 ++---- .../medievalcraft/block/cannon/Cannon_28.java | 16 +++++------ .../entity/EntityCannonBall.java | 17 ++++++++---- .../packethandle/cannon/MsgHandleCannon.java | 16 ----------- .../packethandle/cannon/MsgPacketCannon.java | 26 ------------------ .../models/cannon_mount.obj | 24 ++++++++-------- src/main/resources/mcmod.info | 2 +- 9 files changed, 36 insertions(+), 75 deletions(-) delete mode 100644 src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgHandleCannon.java delete mode 100644 src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgPacketCannon.java diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index f25bc97ad6cd39a5d4233e0c2c8500bb2d2843b3..13033c70623853a4d9278b2327ea4c29047916c1 100644 GIT binary patch delta 1731 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 aAyZBm4$5VU!lXRPr+ztRD&+s(9P@ux=H2T6 diff --git a/bin/mcmod.info b/bin/mcmod.info index f521f3fd..3c6b70a8 100644 --- a/bin/mcmod.info +++ b/bin/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.4.0}", + "version": "{2.4.1}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index cced2ea8..b8853116 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -15,8 +15,6 @@ import com.kitsu.medievalcraft.events.BucketHandle; import com.kitsu.medievalcraft.events.EventHandle; import com.kitsu.medievalcraft.gui.GuiHandler; import com.kitsu.medievalcraft.item.ModItems; -import com.kitsu.medievalcraft.packethandle.cannon.MsgHandleCannon; -import com.kitsu.medievalcraft.packethandle.cannon.MsgPacketCannon; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgHandleCuredLeatherX; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgHandleCuredLeatherY; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgHandleCuredLeatherZ; @@ -60,7 +58,7 @@ public class Main { public static final String MODID = "kitsumedievalcraft"; public static final String MODNAME = "ForgeCraft"; - public static final String VERSION = "2.4.0"; + public static final String VERSION = "2.4.1"; public static SimpleNetworkWrapper sNet; @@ -90,8 +88,8 @@ public class Main { 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); - sNet.registerMessage(MsgHandleCannon.class, MsgPacketCannon.class, 11, Side.CLIENT); - sNet.registerMessage(MsgHandleCannon.class, MsgPacketCannon.class, 12, Side.SERVER); + //sNet.registerMessage(MsgHandleCannon.class, MsgPacketCannon.class, 11, Side.CLIENT); + //sNet.registerMessage(MsgHandleCannon.class, MsgPacketCannon.class, 12, Side.SERVER); //sNet.registerMessage(MsgHandleCannonX.class, MsgPacketCannonX.class, 12, Side.CLIENT); //sNet.registerMessage(MsgHandleCannonY.class, MsgPacketCannonY.class, 13, Side.CLIENT); //sNet.registerMessage(MsgHandleCannonZ.class, MsgPacketCannonZ.class, 14, Side.CLIENT); diff --git a/src/main/java/com/kitsu/medievalcraft/block/cannon/Cannon_28.java b/src/main/java/com/kitsu/medievalcraft/block/cannon/Cannon_28.java index 0b47889f..b0f6776d 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/cannon/Cannon_28.java +++ b/src/main/java/com/kitsu/medievalcraft/block/cannon/Cannon_28.java @@ -63,8 +63,8 @@ public class Cannon_28 extends BlockContainer implements CannonUtil{ //this.isFlammable(world, x, y, z, face); //(xmin, ymin, zmin, // xmax, ymax, zmax) - this.setBlockBounds(0.0F, 0.00F, 0.0F, - 1.0F, 1.00F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, + 1.0F, 0.85F, 1.0F); } @Override @@ -97,13 +97,13 @@ public class Cannon_28 extends BlockContainer implements CannonUtil{ if(tile.getStackInSlot(1)!=null){ if(tile.getStackInSlot(1).getItem()==ball){ tile.decrStackSize(1, 1); - cannonball = new EntityCannonBall(world, (double)x+(2*(Math.sin(Math.toRadians(angles[world.getBlockMetadata(x, y, z)])))), (double)y+0.5, (double)z+(2*(Math.cos(Math.toRadians(angles[world.getBlockMetadata(x, y, z)])))), null); + cannonball = new EntityCannonBall(world, (double)x+((Math.sin(Math.toRadians(angles[world.getBlockMetadata(x, y, z)])))/2), (double)y+0.5, (double)z+((Math.cos(Math.toRadians(angles[world.getBlockMetadata(x, y, z)])))/2), null); //System.out.println(angles[world.getBlockMetadata(x, y, z)]); //System.out.println(Math.cos(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))); //System.out.println(Math.sin(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))); //cannonball.setVelocity(((tile.getStackInSlot(0).stackSize*(Math.sin(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))))-(world.rand.nextFloat()/4)),0.25, ((tile.getStackInSlot(0).stackSize*(Math.cos(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))))-(world.rand.nextFloat()/4))); cannonball.motionX = ((tile.getStackInSlot(0).stackSize*(Math.sin(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))))-(world.rand.nextFloat()/4)); - cannonball.motionY = 0.25; + cannonball.motionY = 0.02; cannonball.motionZ = ((tile.getStackInSlot(0).stackSize*(Math.cos(Math.toRadians(angles[world.getBlockMetadata(x, y, z)]))))-(world.rand.nextFloat()/4)); tile.setInventorySlotContents(0, null); tile.markForUpdate(); @@ -161,7 +161,7 @@ public class Cannon_28 extends BlockContainer implements CannonUtil{ /** * Updates the blocks bounds based on its current state. Args: world, x, y, z */ - @Override + /*@Override public void setBlockBoundsBasedOnState(IBlockAccess iBlock, int x, int y, int z) { int l = iBlock.getBlockMetadata(x, y, z) & 7; @@ -184,18 +184,18 @@ public class Cannon_28 extends BlockContainer implements CannonUtil{ case 5: this.setBlockBounds(0F, 0.0F, 0F, 1F, 1F, 1F); } - } + }*/ /** * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been * cleared to be reused) */ - @Override + /*@Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { this.setBlockBoundsBasedOnState(world, x, y, z); return super.getCollisionBoundingBoxFromPool(world, x, y, z); - } + }*/ /** * Called when the block is placed in the world. */ diff --git a/src/main/java/com/kitsu/medievalcraft/entity/EntityCannonBall.java b/src/main/java/com/kitsu/medievalcraft/entity/EntityCannonBall.java index eea946dc..c25e0a8f 100644 --- a/src/main/java/com/kitsu/medievalcraft/entity/EntityCannonBall.java +++ b/src/main/java/com/kitsu/medievalcraft/entity/EntityCannonBall.java @@ -31,6 +31,7 @@ public class EntityCannonBall extends Entity implements CannonUtil{ private int field_145791_d = -1; private int field_145792_e = -1; private int field_145789_f = -1; + private int h; public Entity shootingEntity; private boolean smoke = true; @@ -39,7 +40,7 @@ public class EntityCannonBall extends Entity implements CannonUtil{ this.preventEntitySpawning = true; this.setSize(0.5F, 0.5F); //this.yOffset = this.height / 2.0F; - this.boundingBox.setBounds(0.3, 0.3, 0.3, 0.7, 0.7, 0.7); + this.boundingBox.setBounds(0.49, 0.49, 0.49, 0.51, 0.51, 0.51); } @@ -49,7 +50,7 @@ public class EntityCannonBall extends Entity implements CannonUtil{ this.setPosition(x, y, z); float f = (float)(Math.random() * Math.PI * 2.0D); this.motionX = (double)(-((float)Math.sin((double)f)) * 0.02F); - this.motionY = 0.20000000298023224D; + this.motionY = 0.05D; this.motionZ = (double)(-((float)Math.cos((double)f)) * 0.02F); this.prevPosX = x; this.prevPosY = y; @@ -61,12 +62,16 @@ public class EntityCannonBall extends Entity implements CannonUtil{ public void onUpdate() { - if(this.smoke==true){ - for(int g = 0; g < 20; g++){ - this.worldObj.spawnParticle("explode", this.posX + worldObj.rand.nextFloat()*2 - 1, this.posY + worldObj.rand.nextFloat()*2 - 1, this.posZ + worldObj.rand.nextFloat()*2 - 1,0.0, 0.0, 0.0); + + if(h > 0 && h < 2){ + if(this.smoke==true){ + for(int g = 0; g < 50; g++){ + this.worldObj.spawnParticle("explode", this.posX + (worldObj.rand.nextFloat()*2 - 1), this.posY + (worldObj.rand.nextFloat()*2 - 1), (this.posZ + worldObj.rand.nextFloat()*2 - 1),0.0, 0.0, 0.0); + } + this.smoke=false; } - this.smoke=false; } + h++; /*double x = this.posX; double y = this.posY; double z = this.posZ; diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgHandleCannon.java b/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgHandleCannon.java deleted file mode 100644 index e72cdd15..00000000 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgHandleCannon.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kitsu.medievalcraft.packethandle.cannon; - -import com.kitsu.medievalcraft.tileents.cannon.TileCannon_28; - -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 MsgHandleCannon implements IMessageHandler{ - - @Override - public IMessage onMessage(MsgPacketCannon message, MessageContext ctx) { - TileCannon_28.smoke = message.fired; - return null; - } -} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgPacketCannon.java b/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgPacketCannon.java deleted file mode 100644 index 41591c47..00000000 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/cannon/MsgPacketCannon.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.kitsu.medievalcraft.packethandle.cannon; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import io.netty.buffer.ByteBuf; - -public class MsgPacketCannon implements IMessage { - - public boolean fired; - - public MsgPacketCannon() {} - - public MsgPacketCannon(boolean x){ - this.fired = x; - } - - @Override - public void fromBytes(ByteBuf buf) { - this.fired = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(this.fired); - } - -} diff --git a/src/main/resources/assets/kitsumedievalcraft/models/cannon_mount.obj b/src/main/resources/assets/kitsumedievalcraft/models/cannon_mount.obj index 69f9e1dc..c9500b58 100644 --- a/src/main/resources/assets/kitsumedievalcraft/models/cannon_mount.obj +++ b/src/main/resources/assets/kitsumedievalcraft/models/cannon_mount.obj @@ -3,21 +3,21 @@ mtllib cannon_mount.mtl o Cube v -0.413288 -0.407050 0.966262 -v -0.413288 -0.407050 -0.666261 +v -0.413288 -0.407050 -0.448567 v 0.400811 -0.407050 0.966262 v -0.413288 -0.342950 0.966262 v 0.400811 -0.342950 0.966262 -v -0.291173 -0.342950 -0.666261 +v -0.291173 -0.342950 -0.448567 v -0.291173 -0.342950 0.966262 v -0.413288 -0.066373 0.966262 -v -0.413288 -0.066373 -0.666261 -v -0.291173 -0.066373 -0.666261 +v -0.413288 -0.066373 -0.448567 +v -0.291173 -0.066373 -0.448567 v -0.291173 -0.066373 0.966262 v -0.413288 -0.066373 -0.055968 v -0.291173 -0.066373 0.074468 v -0.291173 -0.066373 -0.055968 -v -0.413288 0.058627 -0.666261 -v -0.291173 0.058627 -0.666261 +v -0.413288 0.058627 -0.448567 +v -0.291173 0.058627 -0.448567 v -0.413288 0.058627 -0.055968 v -0.291173 0.058627 -0.055968 v -0.413288 -0.066373 0.074468 @@ -26,18 +26,18 @@ v -0.413288 -0.066373 0.074468 v -0.291173 0.058627 0.074468 v -0.413288 0.058627 0.074468 v 0.278889 -0.342950 0.966262 -v 0.278889 -0.342950 -0.666261 -v 0.401004 -0.407050 -0.666261 +v 0.278889 -0.342950 -0.448567 +v 0.401004 -0.407050 -0.448567 v 0.401004 -0.342950 0.966262 v 0.278889 -0.066373 0.966262 -v 0.278889 -0.066373 -0.666261 -v 0.401004 -0.066373 -0.666261 +v 0.278889 -0.066373 -0.448567 +v 0.401004 -0.066373 -0.448567 v 0.401004 -0.066373 0.966262 v 0.278889 -0.066373 -0.055968 v 0.401004 -0.066373 0.074468 v 0.401004 -0.066373 -0.055968 -v 0.278889 0.058627 -0.666261 -v 0.401004 0.058627 -0.666261 +v 0.278889 0.058627 -0.448567 +v 0.401004 0.058627 -0.448567 v 0.278889 0.058627 -0.055968 v 0.401004 0.058627 -0.055968 v 0.278889 -0.066373 0.074468 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f521f3fd..3c6b70a8 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.4.0}", + "version": "{2.4.1}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",