From 28459b134e3cbf765942a065c09dff448eb7c508 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Mon, 10 Feb 2014 21:10:30 -0500 Subject: [PATCH] =?UTF-8?q?Armored=20Jetpack=E2=80=A6done.=20Also=20made?= =?UTF-8?q?=20Charcoal=20Blocks=20fuel=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/render/ModelCustomArmor.java | 2 +- .../render/item/ItemRenderingHandler.java | 2 +- common/mekanism/common/Mekanism.java | 15 +++++++ common/mekanism/common/item/ItemJetpack.java | 37 +++++++++++++++++- .../assets/mekanism/render/ArmoredJetpack.png | Bin 1151 -> 0 bytes 5 files changed, 53 insertions(+), 3 deletions(-) delete mode 100644 resources/assets/mekanism/render/ArmoredJetpack.png diff --git a/common/mekanism/client/render/ModelCustomArmor.java b/common/mekanism/client/render/ModelCustomArmor.java index 70f912311..615870e39 100644 --- a/common/mekanism/client/render/ModelCustomArmor.java +++ b/common/mekanism/client/render/ModelCustomArmor.java @@ -200,7 +200,7 @@ public class ModelCustomArmor extends ModelBiped public static enum ArmorModel { JETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")), - ARMOREDJETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "ArmoredJetpack.png")), + ARMOREDJETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")), SCUBATANK(1, MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")), GASMASK(0, MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")), FREERUNNERS(3, MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); diff --git a/common/mekanism/client/render/item/ItemRenderingHandler.java b/common/mekanism/client/render/item/ItemRenderingHandler.java index 178c9ac6b..bac909f2b 100644 --- a/common/mekanism/client/render/item/ItemRenderingHandler.java +++ b/common/mekanism/client/render/item/ItemRenderingHandler.java @@ -338,7 +338,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.2F, -0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ArmoredJetpack.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); armoredJetpack.render(0.0625F); } else if(item.getItem() instanceof ItemGasMask) diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 7ccf586c9..a313b984b 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -139,6 +139,7 @@ import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import codechicken.multipart.handler.MultipartProxy; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -754,6 +755,20 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100)); InfuseRegistry.registerInfuseObject(new ItemStack(Block.mushroomRed), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Block.mushroomBrown), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + + //Fuels + GameRegistry.registerFuelHandler(new IFuelHandler() { + @Override + public int getBurnTime(ItemStack fuel) + { + if(fuel.isItemEqual(new ItemStack(BasicBlock, 1, 3))) + { + return 1800; + } + + return 0; + } + }); } /** diff --git a/common/mekanism/common/item/ItemJetpack.java b/common/mekanism/common/item/ItemJetpack.java index 7b4c03006..8f010887a 100644 --- a/common/mekanism/common/item/ItemJetpack.java +++ b/common/mekanism/common/item/ItemJetpack.java @@ -20,11 +20,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; import net.minecraftforge.common.EnumHelper; +import net.minecraftforge.common.ISpecialArmor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemJetpack extends ItemArmor implements IGasItem +public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { public int MAX_GAS = 24000; public int TRANSFER_RATE = 16; @@ -270,4 +272,37 @@ public class ItemJetpack extends ItemArmor implements IGasItem return color + MekanismUtils.localize(unlocalized); } } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) + { + if(this == Mekanism.Jetpack) + { + return new ArmorProperties(0, 0, 0); + } + else if(this == Mekanism.ArmoredJetpack) + { + return new ArmorProperties(1, 0.8, 5); + } + + return new ArmorProperties(0, 0, 0); + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) + { + if(armor.getItem() == Mekanism.Jetpack) + { + return 0; + } + else if(armor.getItem() == Mekanism.ArmoredJetpack) + { + return 12; + } + + return 0; + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {} } diff --git a/resources/assets/mekanism/render/ArmoredJetpack.png b/resources/assets/mekanism/render/ArmoredJetpack.png deleted file mode 100644 index 13ddd671cfcf19919c0f8bc5c6d1521eb347d832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1151 zcmV-_1c3XAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Qba`K~#8N?VPc0 z+b|G@DbIa?3|%tz0Xo=Y{1{z}!Ui(Bb6p_llA==rdFW)ItH*9JGQ~rI0$o}lL%jAS zD)vqiZHXd9$+9gu{6Cl$Lz6T`-W`vmoItpED`Xlo^D@2Km`PRA%Ewm04vu!T7*e@txJ1;K^g8wJzFOb0>F4I0DuXu zV_(V6dqFu$kd&j0?J~qhH#Nf-_TmJB)1@~I!%`Iu!=aRNLW`)0==aYGc_S{*D=Z4p zdR_QD3?nL^EW$XRCWDSp$pQqy=QylZf6eBatavmSNb&TPCgfowzg$Lg-mPr{KvWU{ z*8cVStzCOby?YN2fmkfkggmVM{Lxjnwg~_c3&4a%h{IXGZyaRS{`2#%c4v)MoWo=y zB1;`NH@)ETG5rH{2CM=+2deZmEeO;o$Nn<4%+%p8ACFmwL z=k{gf&-BaKZ7RhS&=NFS{Bj0<)6>jhHy{9>Q&*na11vEq5RfEgCx$1Y< zx4U*61)Cpmq^S%Rz;pI40IstG9h?=^fUQN7VBjDYzs=&`K zs*uT2I)F_%hyXax4m9{SaaPa{dv^j~gg@nYd}q~sy}nuaPmV^tIR9)GQQ0J}cy3N0 zwJz7dY%G01sqoo~A!O$xK(60$ivim>yiz z&EFER04{8U=W_b03_7p>4VWxI9rIo%Z?n$vftmt9ndAJbsUe&|&w&6K zAeCa3jzcE8jZnx$DV#14fCHi=WGg6JA=;$1{0}AC{dNygeu2W}q-FgM#+5%2EC2ui zzzODywmI|