From 9abc111ecdef99be67aadc1792c16ecceb6f7442 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 12 Jul 2014 22:34:58 -0400 Subject: [PATCH] Baby Skeletons, started work on Flamethrower --- .../java/mekanism/client/ClientProxy.java | 4 + .../client/model/ModelFlamethrower.java | 215 ++++++++++++++++++ .../render/item/ItemRenderingHandler.java | 12 + .../java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 23 ++ .../common/entity/EntityBabySkeleton.java | 85 +++++++ .../common/item/ItemFlamethrower.java | 172 ++++++++++++++ .../resources/assets/mekanism/lang/en_US.lang | 1 + .../assets/mekanism/render/Flamethrower.png | Bin 0 -> 6750 bytes 9 files changed, 513 insertions(+) create mode 100644 src/main/java/mekanism/client/model/ModelFlamethrower.java create mode 100644 src/main/java/mekanism/common/entity/EntityBabySkeleton.java create mode 100644 src/main/java/mekanism/common/item/ItemFlamethrower.java create mode 100644 src/main/resources/assets/mekanism/render/Flamethrower.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 38a2e1aa2..c80848efa 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -87,6 +87,7 @@ import mekanism.common.IElectricChest; import mekanism.common.IInvConfiguration; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; @@ -133,6 +134,7 @@ import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.entity.RenderSkeleton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -313,6 +315,7 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new RenderObsidianTNTPrimed()); RenderingRegistry.registerEntityRenderingHandler(EntityRobit.class, new RenderRobit()); RenderingRegistry.registerEntityRenderingHandler(EntityBalloon.class, new RenderBalloon()); + RenderingRegistry.registerEntityRenderingHandler(EntityBabySkeleton.class, new RenderSkeleton()); //Register item handler ItemRenderingHandler handler = new ItemRenderingHandler(); @@ -334,6 +337,7 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(Mekanism.FreeRunners, handler); MinecraftForgeClient.registerItemRenderer(Mekanism.AtomicDisassembler, handler); MinecraftForgeClient.registerItemRenderer(Mekanism.GlowPanel, handler); + MinecraftForgeClient.registerItemRenderer(Mekanism.Flamethrower, handler); //Register block handlers RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); diff --git a/src/main/java/mekanism/client/model/ModelFlamethrower.java b/src/main/java/mekanism/client/model/ModelFlamethrower.java new file mode 100644 index 000000000..e882a69c8 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelFlamethrower.java @@ -0,0 +1,215 @@ +package mekanism.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelFlamethrower extends ModelBase +{ + ModelRenderer RingButtom; + ModelRenderer RingTop; + ModelRenderer Ring; + ModelRenderer Axle; + ModelRenderer AxleBLeft; + ModelRenderer AxleBRight; + ModelRenderer AxleTRight; + ModelRenderer AxleTLeft; + ModelRenderer Grasp; + ModelRenderer GraspRod; + ModelRenderer SupportCentre; + ModelRenderer SupportFront; + ModelRenderer SupportRear; + ModelRenderer LargeBarrel; + ModelRenderer LargeBarrelDecor; + ModelRenderer LargeBarrelDecor2; + ModelRenderer Barrel; + ModelRenderer BarrelRing; + ModelRenderer BarrelRing2; + ModelRenderer Flame; + ModelRenderer FlameStrut; + ModelRenderer HydrogenDecor; + ModelRenderer Hydrogen; + + public ModelFlamethrower() + { + textureWidth = 64; + textureHeight = 64; + + RingButtom = new ModelRenderer(this, 19, 14); + RingButtom.addBox(0F, 0F, 0F, 3, 1, 3); + RingButtom.setRotationPoint(-2F, 19.5F, 1.5F); + RingButtom.setTextureSize(64, 64); + RingButtom.mirror = true; + setRotation(RingButtom, 0F, 0F, 0F); + RingTop = new ModelRenderer(this, 19, 14); + RingTop.addBox(0F, 0F, 0F, 3, 1, 3); + RingTop.setRotationPoint(-2F, 13.5F, 1.466667F); + RingTop.setTextureSize(64, 64); + RingTop.mirror = true; + setRotation(RingTop, 0F, 0F, 0F); + Ring = new ModelRenderer(this, 0, 14); + Ring.addBox(0F, 0F, 0F, 5, 6, 4); + Ring.setRotationPoint(-3F, 14F, 1F); + Ring.setTextureSize(64, 64); + Ring.mirror = true; + setRotation(Ring, 0F, 0F, 0F); + Axle = new ModelRenderer(this, 32, 12); + Axle.addBox(0F, 0F, 0F, 4, 4, 7); + Axle.setRotationPoint(-2.5F, 15F, -6.5F); + Axle.setTextureSize(64, 64); + Axle.mirror = true; + setRotation(Axle, 0F, 0F, 0F); + AxleBLeft = new ModelRenderer(this, 0, 25); + AxleBLeft.addBox(-0.5F, -0.5F, 0F, 1, 1, 8); + AxleBLeft.setRotationPoint(-2F, 19F, -7F); + AxleBLeft.setTextureSize(64, 64); + AxleBLeft.mirror = true; + setRotation(AxleBLeft, 0F, 0F, 0.2094395F); + AxleBRight = new ModelRenderer(this, 0, 25); + AxleBRight.addBox(-0.5F, -0.5F, 0F, 1, 1, 8); + AxleBRight.setRotationPoint(1F, 19F, -7F); + AxleBRight.setTextureSize(64, 64); + AxleBRight.mirror = true; + setRotation(AxleBRight, 0.0174533F, 0F, -0.2094395F); + AxleTRight = new ModelRenderer(this, 0, 25); + AxleTRight.addBox(-0.5F, -0.5F, 0F, 1, 1, 8); + AxleTRight.setRotationPoint(1F, 15F, -7F); + AxleTRight.setTextureSize(64, 64); + AxleTRight.mirror = true; + setRotation(AxleTRight, 0F, 0F, 0.2094395F); + AxleTLeft = new ModelRenderer(this, 0, 25); + AxleTLeft.addBox(-0.5F, -0.5F, 0F, 1, 1, 8); + AxleTLeft.setRotationPoint(-2F, 15F, -7F); + AxleTLeft.setTextureSize(64, 64); + AxleTLeft.mirror = true; + setRotation(AxleTLeft, 0F, 0F, -0.2094395F); + Grasp = new ModelRenderer(this, 24, 19); + Grasp.addBox(0F, 0F, 0F, 2, 1, 1); + Grasp.setRotationPoint(-1.5F, 13F, -1.1F); + Grasp.setTextureSize(64, 64); + Grasp.mirror = true; + setRotation(Grasp, 0.7807508F, 0F, 0F); + Grasp.mirror = false; + GraspRod = new ModelRenderer(this, 19, 19); + GraspRod.addBox(0F, 0F, 0F, 1, 3, 1); + GraspRod.setRotationPoint(-1F, 13F, -1F); + GraspRod.setTextureSize(64, 64); + GraspRod.mirror = true; + setRotation(GraspRod, 0.2230717F, 0F, 0F); + SupportCentre = new ModelRenderer(this, 0, 40); + SupportCentre.addBox(0F, 0F, 0F, 2, 1, 6); + SupportCentre.setRotationPoint(-1.5F, 12.4F, 6.6F); + SupportCentre.setTextureSize(64, 64); + SupportCentre.mirror = true; + setRotation(SupportCentre, -0.1115358F, 0F, 0F); + SupportFront = new ModelRenderer(this, 19, 24); + SupportFront.addBox(0F, 0F, 0F, 1, 1, 4); + SupportFront.setRotationPoint(-1F, 13.1F, 12.5F); + SupportFront.setTextureSize(64, 64); + SupportFront.mirror = true; + setRotation(SupportFront, -1.226894F, 0F, 0F); + SupportRear = new ModelRenderer(this, 0, 35); + SupportRear.addBox(0F, 0F, 0F, 3, 1, 3); + SupportRear.setRotationPoint(-2F, 14F, 4F); + SupportRear.setTextureSize(64, 64); + SupportRear.mirror = true; + setRotation(SupportRear, 0.5424979F, 0F, 0F); + LargeBarrel = new ModelRenderer(this, 19, 48); + LargeBarrel.addBox(0F, 0F, 0F, 2, 3, 7); + LargeBarrel.setRotationPoint(-1.5F, 16F, 4F); + LargeBarrel.setTextureSize(64, 64); + LargeBarrel.mirror = true; + setRotation(LargeBarrel, 0F, 0F, 0F); + LargeBarrelDecor = new ModelRenderer(this, 0, 48); + LargeBarrelDecor.addBox(0F, 0F, 0F, 3, 3, 6); + LargeBarrelDecor.setRotationPoint(-2F, 15F, 4F); + LargeBarrelDecor.setTextureSize(64, 64); + LargeBarrelDecor.mirror = true; + setRotation(LargeBarrelDecor, -0.1115358F, 0F, 0F); + LargeBarrelDecor2 = new ModelRenderer(this, 17, 41); + LargeBarrelDecor2.addBox(0F, 0F, 0F, 4, 2, 4); + LargeBarrelDecor2.setRotationPoint(-2.5F, 16F, 4F); + LargeBarrelDecor2.setTextureSize(64, 64); + LargeBarrelDecor2.mirror = true; + setRotation(LargeBarrelDecor2, 0F, 0F, 0F); + Barrel = new ModelRenderer(this, 19, 30); + Barrel.addBox(0F, 0F, 0F, 2, 2, 8); + Barrel.setRotationPoint(-1.5F, 16.5F, 11F); + Barrel.setTextureSize(64, 64); + Barrel.mirror = true; + setRotation(Barrel, 0F, 0F, 0F); + BarrelRing = new ModelRenderer(this, 30, 25); + BarrelRing.addBox(0F, 0F, 0F, 3, 3, 1); + BarrelRing.setRotationPoint(-2F, 16F, 13F); + BarrelRing.setTextureSize(64, 64); + BarrelRing.mirror = true; + setRotation(BarrelRing, 0F, 0F, 0F); + BarrelRing2 = new ModelRenderer(this, 30, 25); + BarrelRing2.addBox(0F, 0F, 0F, 3, 3, 1); + BarrelRing2.setRotationPoint(-2F, 16F, 17F); + BarrelRing2.setTextureSize(64, 64); + BarrelRing2.mirror = true; + setRotation(BarrelRing2, 0F, 0F, 0F); + Flame = new ModelRenderer(this, 38, 0); + Flame.addBox(0F, 0F, 0F, 1, 1, 2); + Flame.setRotationPoint(-1F, 19.5F, 19F); + Flame.setTextureSize(64, 64); + Flame.mirror = true; + setRotation(Flame, 0.7063936F, 0F, 0F); + FlameStrut = new ModelRenderer(this, 27, 0); + FlameStrut.addBox(0F, 0F, 0F, 2, 1, 3); + FlameStrut.setRotationPoint(-1.466667F, 18.5F, 17F); + FlameStrut.setTextureSize(64, 64); + FlameStrut.mirror = true; + setRotation(FlameStrut, -0.2602503F, 0F, 0F); + HydrogenDecor = new ModelRenderer(this, 27, 5); + HydrogenDecor.addBox(0F, 0F, 0F, 3, 1, 5); + HydrogenDecor.setRotationPoint(1.5F, 15.66667F, -4.933333F); + HydrogenDecor.setTextureSize(64, 64); + HydrogenDecor.mirror = true; + setRotation(HydrogenDecor, 0F, 0F, 0.4438713F); + Hydrogen = new ModelRenderer(this, 0, 0); + Hydrogen.addBox(0F, 0F, 0F, 3, 3, 10); + Hydrogen.setRotationPoint(1.5F, 16F, -5.5F); + Hydrogen.setTextureSize(64, 64); + Hydrogen.mirror = true; + setRotation(Hydrogen, 0F, 0F, 0.4438713F); + } + + public void render(float size) + { + RingButtom.render(size); + RingTop.render(size); + Ring.render(size); + Axle.render(size); + AxleBLeft.render(size); + AxleBRight.render(size); + AxleTRight.render(size); + AxleTLeft.render(size); + Grasp.render(size); + GraspRod.render(size); + SupportCentre.render(size); + SupportFront.render(size); + SupportRear.render(size); + LargeBarrel.render(size); + LargeBarrelDecor.render(size); + LargeBarrelDecor2.render(size); + Barrel.render(size); + BarrelRing.render(size); + BarrelRing2.render(size); + Flame.render(size); + FlameStrut.render(size); + HydrogenDecor.render(size); + Hydrogen.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 0eb054eaa..acc5564bc 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -8,6 +8,7 @@ import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; +import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelGasTank; @@ -31,6 +32,7 @@ import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemRobit; @@ -83,6 +85,7 @@ public class ItemRenderingHandler implements IItemRenderer public ModelFreeRunners freeRunners = new ModelFreeRunners(); public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); public ModelPortableTank portableTank = new ModelPortableTank(); + public ModelFlamethrower flamethrower = new ModelFlamethrower(); private final RenderBalloon balloonRenderer = new RenderBalloon(); private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); @@ -435,6 +438,15 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopAttrib(); } + else if(item.getItem() instanceof ItemFlamethrower) + { + GL11.glPushMatrix(); + GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); + + flamethrower.render(0.0625F); + GL11.glPopMatrix(); + } else if(MachineType.get(item) == MachineType.PORTABLE_TANK) { GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index d8232099f..d740ce3ac 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -189,6 +189,7 @@ public class CommonProxy Mekanism.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(true); Mekanism.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(true); Mekanism.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(false); + Mekanism.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(true); Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); Mekanism.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 1b0bd7584..e49e182ce 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -49,6 +49,7 @@ import mekanism.common.block.BlockOre; import mekanism.common.block.BlockPlastic; import mekanism.common.block.BlockPlasticFence; import mekanism.common.block.BlockSalt; +import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; @@ -73,6 +74,7 @@ import mekanism.common.item.ItemDust; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemEnergized; import mekanism.common.item.ItemFilterCard; +import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemHDPE; @@ -111,6 +113,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; import net.minecraft.block.Block; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -120,6 +123,8 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.WorldChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.event.world.ChunkDataEvent; @@ -258,6 +263,7 @@ public class Mekanism public static ItemJetpack Jetpack; public static ItemScubaTank ScubaTank; public static ItemGasMask GasMask; + public static ItemFlamethrower Flamethrower; public static Item Dictionary; public static Item Balloon; public static Item ElectrolyticCore; @@ -309,6 +315,7 @@ public class Mekanism public static boolean cardboardSpawners = true; public static boolean machineEffects = true; public static boolean enableWorldRegeneration = true; + public static boolean spawnBabySkeletons = true; public static int obsidianTNTBlastRadius = 12; public static int osmiumPerChunk = 12; public static int copperPerChunk = 16; @@ -967,6 +974,7 @@ public class Mekanism Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack"); FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners"); + Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower"); BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket"); Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust"); Salt = new ItemMekanism().setUnlocalizedName("Salt"); @@ -1033,6 +1041,7 @@ public class Mekanism GameRegistry.registerItem(Polyethene, "Polyethene"); GameRegistry.registerItem(BioFuel, "BioFuel"); GameRegistry.registerItem(GlowPanel, "GlowPanel"); + GameRegistry.registerItem(Flamethrower, "Flamethrower"); } /** @@ -1237,11 +1246,13 @@ public class Mekanism EntityRegistry.registerGlobalEntityID(EntityObsidianTNT.class, "ObsidianTNT", EntityRegistry.findGlobalUniqueEntityId()); EntityRegistry.registerGlobalEntityID(EntityRobit.class, "Robit", EntityRegistry.findGlobalUniqueEntityId()); EntityRegistry.registerGlobalEntityID(EntityBalloon.class, "Balloon", EntityRegistry.findGlobalUniqueEntityId()); + EntityRegistry.registerGlobalEntityID(EntityBabySkeleton.class, "BabySkeleton", EntityRegistry.findGlobalUniqueEntityId()); //Registrations EntityRegistry.registerModEntity(EntityObsidianTNT.class, "ObsidianTNT", 0, this, 40, 5, true); EntityRegistry.registerModEntity(EntityRobit.class, "Robit", 1, this, 40, 2, true); EntityRegistry.registerModEntity(EntityBalloon.class, "Balloon", 2, this, 40, 1, true); + EntityRegistry.registerModEntity(EntityBabySkeleton.class, "BabySkeleton", 3, this, 64, 5, true); //Tile entities GameRegistry.registerTileEntity(TileEntityBoundingBlock.class, "BoundingBlock"); @@ -1379,6 +1390,18 @@ public class Mekanism //Load configuration proxy.loadConfiguration(); + + //Add baby skeleton spawner + if(spawnBabySkeletons) + { + for(BiomeGenBase biome : WorldChunkManager.allowedBiomes) + { + if(biome.getSpawnableList(EnumCreatureType.monster) != null && biome.getSpawnableList(EnumCreatureType.monster).size() > 0) + { + EntityRegistry.addSpawn(EntityBabySkeleton.class, 6, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] {biome}); + } + } + } //Load this module addItems(); diff --git a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java new file mode 100644 index 000000000..afee33af3 --- /dev/null +++ b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java @@ -0,0 +1,85 @@ +package mekanism.common.entity; + +import java.util.UUID; + +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +public class EntityBabySkeleton extends EntitySkeleton +{ + private static final UUID babySpeedBoostUUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); + private static final AttributeModifier babySpeedBoostModifier = new AttributeModifier(babySpeedBoostUUID, "Baby speed boost", 0.5D, 1); + + public EntityBabySkeleton(World world) + { + super(world); + + setChild(true); + System.out.println("Spawned"); + } + + @Override + protected void entityInit() + { + super.entityInit(); + + getDataWatcher().addObject(12, new Byte((byte)0)); + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + System.out.println(posX + " " + posY + " " + posZ); + } + + public void setChild(boolean child) + { + getDataWatcher().updateObject(12, Byte.valueOf((byte)(child ? 1 : 0))); + + if(worldObj != null && !worldObj.isRemote) + { + IAttributeInstance iattributeinstance = this.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + iattributeinstance.removeModifier(babySpeedBoostModifier); + + if(child) + { + iattributeinstance.applyModifier(babySpeedBoostModifier); + } + } + + updateChildSize(child); + } + + @Override + public boolean isChild() + { + return getDataWatcher().getWatchableObjectByte(12) == 1; + } + + @Override + protected int getExperiencePoints(EntityPlayer p_70693_1_) + { + if(isChild()) + { + experienceValue = (int)((float)experienceValue * 2.5F); + } + + return super.getExperiencePoints(p_70693_1_); + } + + public void updateChildSize(boolean child) + { + updateSize(child ? 0.5F : 1.0F); + } + + protected final void updateSize(float size) + { + super.setSize(size, size); + } +} diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java new file mode 100644 index 000000000..c21259f35 --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -0,0 +1,172 @@ +package mekanism.common.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasItem; +import mekanism.common.item.ItemJetpack.JetpackMode; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class ItemFlamethrower extends ItemMekanism implements IGasItem +{ + public int MAX_GAS = 24000; + public int TRANSFER_RATE = 16; + + public ItemFlamethrower() + { + setMaxStackSize(1); + setMaxDamage(100); + setNoRepair(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) {} + + public void useGas(ItemStack stack) + { + setGas(stack, new GasStack(getGas(stack).getGas(), getGas(stack).amount-1)); + } + + @Override + public int getMaxGas(ItemStack itemstack) + { + return MAX_GAS; + } + + @Override + public int getRate(ItemStack itemstack) + { + return TRANSFER_RATE; + } + + @Override + public int addGas(ItemStack itemstack, GasStack stack) + { + if(getGas(itemstack) != null && getGas(itemstack).getGas() != stack.getGas()) + { + return 0; + } + + if(stack.getGas() != GasRegistry.getGas("hydrogen")) + { + return 0; + } + + int toUse = Math.min(getMaxGas(itemstack)-getStored(itemstack), Math.min(getRate(itemstack), stack.amount)); + setGas(itemstack, new GasStack(stack.getGas(), getStored(itemstack)+toUse)); + + return toUse; + } + + @Override + public GasStack removeGas(ItemStack itemstack, int amount) + { + if(getGas(itemstack) == null) + { + return null; + } + + Gas type = getGas(itemstack).getGas(); + + int gasToUse = Math.min(getStored(itemstack), Math.min(getRate(itemstack), amount)); + setGas(itemstack, new GasStack(type, getStored(itemstack)-gasToUse)); + + return new GasStack(type, gasToUse); + } + + public int getStored(ItemStack itemstack) + { + return getGas(itemstack) != null ? getGas(itemstack).amount : 0; + } + + @Override + public boolean canReceiveGas(ItemStack itemstack, Gas type) + { + return type == GasRegistry.getGas("hydrogen"); + } + + @Override + public boolean canProvideGas(ItemStack itemstack, Gas type) + { + return false; + } + + @Override + public GasStack getGas(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return null; + } + + GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); + + if(stored == null) + { + itemstack.setItemDamage(100); + } + else { + itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); + } + + return stored; + } + + @Override + public boolean isMetadataSpecific(ItemStack itemStack) + { + return false; + } + + @Override + public void setGas(ItemStack itemstack, GasStack stack) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + if(stack == null || stack.amount == 0) + { + itemstack.setItemDamage(100); + itemstack.stackTagCompound.removeTag("stored"); + } + else { + int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); + GasStack gasStack = new GasStack(stack.getGas(), amount); + + itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); + itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); + } + } + + public ItemStack getEmptyItem() + { + ItemStack empty = new ItemStack(this); + setGas(empty, null); + empty.setItemDamage(100); + return empty; + } + + @Override + public void getSubItems(Item item, CreativeTabs tabs, List list) + { + ItemStack empty = new ItemStack(this); + setGas(empty, null); + empty.setItemDamage(100); + list.add(empty); + + ItemStack filled = new ItemStack(this); + setGas(filled, new GasStack(GasRegistry.getGas("hydrogen"), ((IGasItem)filled.getItem()).getMaxGas(filled))); + list.add(filled); + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 8758a0994..855986a14 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -40,6 +40,7 @@ item.HDPERod.name=HDPE Rod item.HDPESheet.name=HDPE Sheet item.PlaStick.name=PlaStick item.Substrate.name=Substrate +item.Flamethrower.name=Flamethrower //Control Circuits item.BasicControlCircuit.name=Basic Control Circuit diff --git a/src/main/resources/assets/mekanism/render/Flamethrower.png b/src/main/resources/assets/mekanism/render/Flamethrower.png new file mode 100644 index 0000000000000000000000000000000000000000..63b4cdbea21a97010a4edcaf837c832dc0ed4531 GIT binary patch literal 6750 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 literal 0 HcmV?d00001