From e2b674153deb31981a67b89d88f69324b33c26cd Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 5 May 2013 11:46:58 -0700 Subject: [PATCH] Tweaks --- mods/tinker/resources/lang/en_US.xml | 2 +- mods/tinker/tconstruct/TConstruct.java | 8 +- .../tconstruct/blocks/OreberryBush.java | 4 +- mods/tinker/tconstruct/client/TControls.java | 2 +- .../tconstruct/client/TProxyClient.java | 3 +- .../tconstruct/client/gui/GuiButtonTool.java | 2 +- .../tconstruct/client/gui/ToolStationGui.java | 4 +- mods/tinker/tconstruct/common/TContent.java | 12 + .../tconstruct/items/armor/TArmorBase.java | 118 +++++ .../tinker/tconstruct/items/tools/Chisel.java | 5 + .../library/tools/DualHarvestTool.java | 254 +++++---- .../tconstruct/library/tools/HarvestTool.java | 5 +- .../tconstruct/library/tools/ToolCore.java | 90 +++- .../tconstruct/library/tools/Weapon.java | 6 + mods/tinker/tconstruct/util/PHConstruct.java | 12 +- .../tinker/tconstruct/util/TEventHandler.java | 16 +- .../util/player/TPlayerHandler.java | 489 +++++++++--------- .../worldgen/OverworldProvider.java | 12 +- mods/tinker/textures/armor/wood_1.png | Bin 1880 -> 1852 bytes mods/tinker/textures/entity/wagon.png | Bin 2564 -> 0 bytes mods/tinker/textures/entity/wagontexture.png | Bin 2603 -> 0 bytes mods/tinker/textures/gui/icons.png | Bin 4892 -> 5028 bytes mods/tinker/textures/gui/toolparts.png | Bin 3708 -> 3814 bytes mods/tinker/textures/gui/toolstation.png | Bin 1116 -> 1221 bytes .../textures/items/armor/wood_boots.png | Bin 0 -> 592 bytes .../textures/items/armor/wood_chestplate.png | Bin 0 -> 569 bytes .../textures/items/armor/wood_helmet.png | Bin 0 -> 380 bytes .../textures/items/armor/wood_pants.png | Bin 0 -> 531 bytes 28 files changed, 657 insertions(+), 387 deletions(-) create mode 100644 mods/tinker/tconstruct/items/armor/TArmorBase.java delete mode 100644 mods/tinker/textures/entity/wagon.png delete mode 100644 mods/tinker/textures/entity/wagontexture.png create mode 100644 mods/tinker/textures/items/armor/wood_boots.png create mode 100644 mods/tinker/textures/items/armor/wood_chestplate.png create mode 100644 mods/tinker/textures/items/armor/wood_helmet.png create mode 100644 mods/tinker/textures/items/armor/wood_pants.png diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml index 16fd1041..676822cb 100644 --- a/mods/tinker/resources/lang/en_US.xml +++ b/mods/tinker/resources/lang/en_US.xml @@ -176,6 +176,6 @@ Blue Slime Nitro Creeper - Armor Gui + Armor Gui \ No newline at end of file diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index dd355394..e1d5d25c 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -10,10 +10,12 @@ import mods.tinker.tconstruct.util.PHConstruct; import mods.tinker.tconstruct.util.TCraftingHandler; import mods.tinker.tconstruct.util.TEventHandler; import mods.tinker.tconstruct.util.player.TPlayerHandler; +import mods.tinker.tconstruct.worldgen.OverworldProvider; import mods.tinker.tconstruct.worldgen.TBaseWorldGenerator; import mods.tinker.tconstruct.worldgen.village.TVillageTrades; import mods.tinker.tconstruct.worldgen.village.VillageSmelteryHandler; import mods.tinker.tconstruct.worldgen.village.VillageToolStationHandler; +import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; @@ -35,7 +37,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.2", dependencies = "required-after:Forge@[7.7.1.675,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.2.15", dependencies = "required-after:Forge@[7.7.1.675,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -88,8 +90,8 @@ public class TConstruct VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); } - //DimensionManager.unregisterProviderType(0); - //DimensionManager.registerProviderType(0, OverworldProvider.class, true); + DimensionManager.unregisterProviderType(0); + DimensionManager.registerProviderType(0, OverworldProvider.class, true); } @Init diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java index 41660c01..e41acad8 100644 --- a/mods/tinker/tconstruct/blocks/OreberryBush.java +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -198,8 +198,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable int meta = world.getBlockMetadata(x, y, z); if (meta >= 12) { - if (world.isRemote) - return true; + /*if (world.isRemote) + return true;*/ world.setBlock(x, y, z, blockID, meta - 4, 3); AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat)); diff --git a/mods/tinker/tconstruct/client/TControls.java b/mods/tinker/tconstruct/client/TControls.java index 3e39a805..a99d485f 100644 --- a/mods/tinker/tconstruct/client/TControls.java +++ b/mods/tinker/tconstruct/client/TControls.java @@ -19,7 +19,7 @@ public class TControls extends TKeyHandler { //static KeyBinding grabKey = new KeyBinding("key.grab", 29); //static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46); - public static KeyBinding armorKey = new KeyBinding("key.armor", 23); + public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24); static KeyBinding jumpKey; static KeyBinding invKey; static Minecraft mc; diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index dd4b6fe4..82dfd2aa 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -23,6 +23,7 @@ import mods.tinker.tconstruct.library.*; import mods.tinker.tconstruct.library.client.*; import mods.tinker.tconstruct.library.crafting.*; import mods.tinker.tconstruct.library.tools.*; +import mods.tinker.tconstruct.util.PHConstruct; import mods.tinker.tconstruct.util.player.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -140,7 +141,7 @@ public class TProxyClient extends TProxyCommon public void registerTickHandler () { - TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT); + //TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT); //TickRegistry.registerTickHandler(new TCommonTickHandler(), Side.CLIENT); } diff --git a/mods/tinker/tconstruct/client/gui/GuiButtonTool.java b/mods/tinker/tconstruct/client/gui/GuiButtonTool.java index e472435e..70a0ced3 100644 --- a/mods/tinker/tconstruct/client/gui/GuiButtonTool.java +++ b/mods/tinker/tconstruct/client/gui/GuiButtonTool.java @@ -40,7 +40,7 @@ public class GuiButtonTool extends GuiButton this.field_82253_i = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_82253_i); int index = 18 * getHoverState(field_82253_i); - this.drawTexturedModalRect(this.xPosition, this.yPosition, index, 0, 18, 18); + this.drawTexturedModalRect(this.xPosition, this.yPosition, 144 + index*2, 216, 18, 18); this.drawTexturedModalRect(this.xPosition, this.yPosition, textureX*18, textureY*18, 18, 18); } } diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java index c8d99465..181412c7 100644 --- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -328,7 +328,7 @@ public class ToolStationGui extends NewContainerGui if (active) { - this.drawTexturedModalRect(cornerX+68, cornerY+6, 0, this.ySize, 102, 12); + this.drawTexturedModalRect(cornerX+62, cornerY, 0, this.ySize, 112, 22); } //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/icons.png"); @@ -339,7 +339,7 @@ public class ToolStationGui extends NewContainerGui for (int i = 0; i < slotX.length; i++) { - this.drawTexturedModalRect(cornerX + slotX[i], cornerY + slotY[i], 0, 0, 18, 18); + this.drawTexturedModalRect(cornerX + slotX[i]-4, cornerY + slotY[i]-4, 140, 212, 28, 28); if (!logic.isStackInSlot(i + 1)) { this.drawTexturedModalRect(cornerX + slotX[i], cornerY + slotY[i], 18 * iconX[i], 18 * iconY[i], 18, 18); diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java index fc52fb4f..7fcd15c1 100644 --- a/mods/tinker/tconstruct/common/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -8,6 +8,7 @@ import mods.tinker.tconstruct.entity.projectile.*; import mods.tinker.tconstruct.items.*; import mods.tinker.tconstruct.items.blocks.*; import mods.tinker.tconstruct.items.tools.*; +import mods.tinker.tconstruct.items.armor.*; import mods.tinker.tconstruct.library.*; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.crafting.*; @@ -149,6 +150,11 @@ public class TContent implements IFuelHandler public static Item note; //Wearaables + public static Item heavyHelmet; + public static Item heavyChestplate; + public static Item heavyPants; + public static Item heavyBoots; + public static Item heartContainer; public TContent() @@ -352,6 +358,7 @@ public class TContent implements IFuelHandler //lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setUnlocalizedName("tconstruct.LumberHead"); //Wearables + //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); //heartContainer = new HeartContainer(PHConstruct.heartContainer).setUnlocalizedName("tconstruct.canister"); //Vanilla stack sizes @@ -363,6 +370,11 @@ public class TContent implements IFuelHandler Item.minecartCrate.setMaxStackSize(3); Item.minecartPowered.setMaxStackSize(3); Block.torchWood.setTickRandomly(false); + if (PHConstruct.clearWater) + { + Block.waterMoving.setLightOpacity(1); + Block.waterStill.setLightOpacity(1); + } } void registerMaterials () diff --git a/mods/tinker/tconstruct/items/armor/TArmorBase.java b/mods/tinker/tconstruct/items/armor/TArmorBase.java new file mode 100644 index 00000000..cfe2d41f --- /dev/null +++ b/mods/tinker/tconstruct/items/armor/TArmorBase.java @@ -0,0 +1,118 @@ +package mods.tinker.tconstruct.items.armor; + +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class TArmorBase extends ItemArmor + //implements ISpecialArmor +{ + Icon[] icons; + String[] iconNames = { "wood_helmet" }; + + public TArmorBase(int id, int armorSlot) + { + super(id, EnumArmorMaterial.CLOTH, 0, armorSlot); + this.maxStackSize = 1; + this.setMaxDamage(100); + setNoRepair(); + canRepair = false; + this.setCreativeTab(CreativeTabs.tabMisc); + //this.setCreativeTab(TConstructRegistry.toolTab); + } + + public void onArmorTickUpdate(World world, EntityPlayer player, ItemStack itemStack) + { + + } + + /** + * Called by RenderBiped and RenderPlayer to determine the armor texture that + * should be use for the currently equiped item. + * This will only be called on instances of ItemArmor. + * + * Returning null from this function will use the default value. + * + * @param stack ItemStack for the equpt armor + * @param entity The entity wearing the armor + * @param slot The slot the armor is in + * @param layer The render layer, either 1 or 2, 2 is only used for CLOTH armor by default + * @return Path of texture to bind, or null to use default + */ + public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) + { + return "/mods/tinker/textures/armor/wood_1.png"; + } + + /** + * Override this method to have an item handle its own armor rendering. + * + * @param entityLiving The entity wearing the armor + * @param itemStack The itemStack to render the model of + * @param armorSlot 0=head, 1=torso, 2=legs, 3=feet + * + * @return A ModelBiped to render instead of the default + */ + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLiving entityLiving, ItemStack itemStack, int armorSlot) + { + return null; + } + + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + public Icon getIconFromDamage(int meta) + { + return icons[0]; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IconRegister iconRegister) + { + this.icons = new Icon[iconNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:armor/"+iconNames[i]); + } + } + + /*@Override + public ArmorProperties getProperties (EntityLiving player, ItemStack armor, DamageSource source, double damage, int slot) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getArmorDisplay (EntityPlayer player, ItemStack armor, int slot) + { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void damageArmor (EntityLiving entity, ItemStack stack, DamageSource source, int damage, int slot) + { + // TODO Auto-generated method stub + + }*/ +} diff --git a/mods/tinker/tconstruct/items/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java index 3d3da7f8..b347ef3e 100644 --- a/mods/tinker/tconstruct/items/tools/Chisel.java +++ b/mods/tinker/tconstruct/items/tools/Chisel.java @@ -43,6 +43,11 @@ public class Chisel extends ToolCore boolean detailed = false; return detailed; } + + public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) + { + return false; + } @Override public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer entityplayer) diff --git a/mods/tinker/tconstruct/library/tools/DualHarvestTool.java b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java index 9ce513ce..88fbbb7b 100644 --- a/mods/tinker/tconstruct/library/tools/DualHarvestTool.java +++ b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java @@ -2,8 +2,11 @@ package mods.tinker.tconstruct.library.tools; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -14,116 +17,144 @@ import net.minecraftforge.common.MinecraftForge; public abstract class DualHarvestTool extends HarvestTool { - public DualHarvestTool(int itemID, int baseDamage) - { - super(itemID, baseDamage); - } - - @Override - public int getHeadType () - { - return 3; - } - - @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - World world = player.worldObj; - int bID = player.worldObj.getBlockId(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - Block block = Block.blocksList[bID]; - if (block == null || bID < 1) - return false; - int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); - int shlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getSecondHarvestType()); - - if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2")) - { - if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) - { - ItemStack smeltStack = new ItemStack(block.idDropped(block.blockID, random, 0), 1, block.damageDropped(meta)); + public DualHarvestTool(int itemID, int baseDamage) + { + super(itemID, baseDamage); + } + + @Override + public int getHeadType () + { + return 3; + } + + @Override + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + World world = player.worldObj; + int bID = player.worldObj.getBlockId(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + Block block = Block.blocksList[bID]; + if (block == null || bID < 1) + return false; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int shlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getSecondHarvestType()); + + if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2")) + { + if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) + { + ItemStack smeltStack = new ItemStack(block.idDropped(block.blockID, random, 0), 1, block.damageDropped(meta)); if (smeltStack.itemID < 0 || smeltStack.itemID >= 32000 || smeltStack.getItem() == null) return false; ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack); - if (result != null) - { - //System.out.println("Woo~"); - world.setBlockToAir(x, y, z); - if (!player.capabilities.isCreativeMode) - onBlockDestroyed(stack, world, bID, x, y, z, player); - if (!world.isRemote) - { - EntityItem entityitem = new EntityItem(world, x+0.5, y+0.5, z+0.5, result.copy()); - - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); - } - return true; - } - } - return false; - } - else - { - if (!player.capabilities.isCreativeMode) - onBlockDestroyed(stack, world, bID, x, y, z, player); - world.setBlockToAir(x, y, z); - if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); - return true; - } - } + if (result != null) + { + world.setBlockToAir(x, y, z); + if (!player.capabilities.isCreativeMode) + onBlockDestroyed(stack, world, bID, x, y, z, player); + if (!world.isRemote) + { + ItemStack spawnme = result.copy(); + if (!(result.getItem() instanceof ItemBlock)) + { + int loot = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); + if (loot > 0) + { + spawnme.stackSize *= (random.nextInt(loot + 1) + 1); + } + } + EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, spawnme); - @Override - public float getStrVsBlock(ItemStack stack, Block block, int meta) - { + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; - - Material[] materials = getEffectiveMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.blockMaterial ) - { - float speed = tags.getInteger("MiningSpeed"); - speed /= 100f; - int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); - int durability = tags.getInteger("Damage"); - - float shoddy = tags.getFloat("Shoddy"); - speed += shoddy*durability/100f; - - if (hlvl <= tags.getInteger("HarvestLevel")) - return speed; - return 0.1f; - } - } - materials = getEffectiveSecondaryMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.blockMaterial ) - { - float speed = tags.getInteger("MiningSpeed2"); - speed /= 100f; - int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); - int durability = tags.getInteger("Damage"); - - float shoddy = tags.getFloat("Shoddy"); - speed += shoddy*durability/100f; - - if (hlvl <= tags.getInteger("HarvestLevel2")) - return speed; - return 0.1f; - } - } - return super.getStrVsBlock(stack, block, meta); - } - - public boolean canHarvestBlock (Block block) + } + for (int i = 0; i < 6; i++) + { + float f = (float) x + random.nextFloat(); + float f1 = (float) y + random.nextFloat(); + float f2 = (float) z + random.nextFloat(); + float f3 = 0.52F; + float f4 = random.nextFloat() * 0.6F - 0.3F; + world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + } + return true; + } + } + return false; + } + else + { + if (!player.capabilities.isCreativeMode) + onBlockDestroyed(stack, world, bID, x, y, z, player); + world.setBlockToAir(x, y, z); + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); + return true; + } + } + + @Override + public float getStrVsBlock (ItemStack stack, Block block, int meta) + { + + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (tags.getBoolean("Broken")) + return 0.1f; + + Material[] materials = getEffectiveMaterials(); + for (int i = 0; i < materials.length; i++) + { + if (materials[i] == block.blockMaterial) + { + float speed = tags.getInteger("MiningSpeed"); + speed /= 100f; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float shoddy = tags.getFloat("Shoddy"); + speed += shoddy * durability / 100f; + + if (hlvl <= tags.getInteger("HarvestLevel")) + return speed; + return 0.1f; + } + } + materials = getEffectiveSecondaryMaterials(); + for (int i = 0; i < materials.length; i++) + { + if (materials[i] == block.blockMaterial) + { + float speed = tags.getInteger("MiningSpeed2"); + speed /= 100f; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float shoddy = tags.getFloat("Shoddy"); + speed += shoddy * durability / 100f; + + if (hlvl <= tags.getInteger("HarvestLevel2")) + return speed; + return 0.1f; + } + } + return super.getStrVsBlock(stack, block, meta); + } + + public boolean canHarvestBlock (Block block) { if (block.blockMaterial.isToolNotRequired()) { @@ -141,13 +172,14 @@ public abstract class DualHarvestTool extends HarvestTool } return false; } - - @Override - public String[] toolCategories() + + @Override + public String[] toolCategories () { return new String[] { "harvest", "dualharvest" }; } - - protected abstract Material[] getEffectiveSecondaryMaterials(); - protected abstract String getSecondHarvestType(); + + protected abstract Material[] getEffectiveSecondaryMaterials (); + + protected abstract String getSecondHarvestType (); } diff --git a/mods/tinker/tconstruct/library/tools/HarvestTool.java b/mods/tinker/tconstruct/library/tools/HarvestTool.java index 762dd128..6433d482 100644 --- a/mods/tinker/tconstruct/library/tools/HarvestTool.java +++ b/mods/tinker/tconstruct/library/tools/HarvestTool.java @@ -28,7 +28,8 @@ public abstract class HarvestTool extends ToolCore public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { TContent.modL.midStreamModify(stack); - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + return super.onBlockStartBreak(stack, x, y, z, player); + /*NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; int bID = player.worldObj.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); @@ -80,7 +81,7 @@ public abstract class HarvestTool extends ToolCore if (!world.isRemote) world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); return true; - } + }*/ } @Override diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java index 96c6b341..7e7d64ec 100644 --- a/mods/tinker/tconstruct/library/tools/ToolCore.java +++ b/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -14,11 +14,14 @@ import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -187,8 +190,8 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox Map.Entry pairs = (Map.Entry) iter.next(); effectIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); } - - emptyIcon = iconRegister.registerIcon("tinker:blankface"); + + emptyIcon = iconRegister.registerIcon("tinker:blankface"); } @Override @@ -450,7 +453,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox { return TConstructRegistry.toolRod; } - + /* Updating */ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) @@ -464,17 +467,17 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox int check = world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150; if (random.nextInt(check) < chance) { - AbilityHelper.healTool(stack, 1, (EntityLiving) entity, true, !((EntityLiving)entity).isSwingInProgress); + AbilityHelper.healTool(stack, 1, (EntityLiving) entity, true, !((EntityLiving) entity).isSwingInProgress); } } } } /* Tool uses */ - + //Types - public abstract String[] toolCategories(); - + public abstract String[] toolCategories (); + //Mining @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) @@ -484,10 +487,12 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox int bID = player.worldObj.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); Block block = Block.blocksList[bID]; + if (block == null || bID < 1 || bID > 4095) + return false; if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) { - ItemStack smeltStack = new ItemStack(block.idDropped(block.blockID, random, 0), 1, block.damageDropped(meta)); + ItemStack smeltStack = new ItemStack(block.idDropped(meta, random, 0), 1, block.damageDropped(meta)); if (smeltStack.itemID < 0 || smeltStack.itemID >= 32000 || smeltStack.getItem() == null) return false; ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack); @@ -498,12 +503,40 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) { - EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, result.copy()); + ItemStack spawnme = result.copy(); + if (!(result.getItem() instanceof ItemBlock)) + { + int loot = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); + if (loot > 0) + { + spawnme.stackSize *= (random.nextInt(loot + 1) + 1); + } + } + EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, spawnme); entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); } + for (int i = 0; i < 6; i++) + { + float f = (float) x + random.nextFloat(); + float f1 = (float) y + random.nextFloat(); + float f2 = (float) z + random.nextFloat(); + float f3 = 0.52F; + float f4 = random.nextFloat() * 0.6F - 0.3F; + world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + + world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + } return true; } } @@ -560,8 +593,35 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox { return 1f; } - /* - * IC2 Support + + //Right-click + public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) + { + int hotbarSlot = player.inventory.currentItem; + if (hotbarSlot == 0) + { + ItemStack next = player.inventory.getStackInSlot(8); + if (next != null && next.getItem() instanceof ItemBlock) + { + next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); + if (next.stackSize < 1) + player.inventory.setInventorySlotContents(8, null); + } + } + else if (hotbarSlot < 8) + { + ItemStack next = player.inventory.getStackInSlot(hotbarSlot + 1); + if (next != null && next.getItem() instanceof ItemBlock) + { + next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); + if (next.stackSize < 1) + player.inventory.setInventorySlotContents(hotbarSlot + 1, null); + } + } + return false; + } + + /* IC2 Support * Every tool can be an electric tool if you modify it right */ @Override @@ -713,17 +773,17 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox { return false; } - - public boolean isRepairable() + + public boolean isRepairable () { return false; } - + public int getItemEnchantability () { return 0; } - + public boolean isFull3D () { return true; diff --git a/mods/tinker/tconstruct/library/tools/Weapon.java b/mods/tinker/tconstruct/library/tools/Weapon.java index 7a184050..30f0e50f 100644 --- a/mods/tinker/tconstruct/library/tools/Weapon.java +++ b/mods/tinker/tconstruct/library/tools/Weapon.java @@ -6,6 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -68,6 +69,11 @@ public abstract class Weapon extends ToolCore return stack; } + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) + { + return false; + } + /** * Returns if the item (tool) can harvest results from the block type. */ diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java index f5787079..c4d8fa12 100644 --- a/mods/tinker/tconstruct/util/PHConstruct.java +++ b/mods/tinker/tconstruct/util/PHConstruct.java @@ -44,6 +44,8 @@ public class PHConstruct //removeToolRecipes = config.get("Diffuclty Changes", "Remove vanilla tool recipes", false).getBoolean(false); keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); + clearWater = config.get("Difficulty Changes", "Turn water clear", true).getBoolean(true); + voidFog = config.get("Difficulty Changes", "Remove Overworld void fog", true).getBoolean(true); /*disableWoodTools = config.get("Difficulty Changes", "Disable vanilla wooden tools", false).getBoolean(false); disableStoneTools = config.get("Difficulty Changes", "Disable vanilla stone tools", true).getBoolean(true); @@ -141,6 +143,7 @@ public class PHConstruct oreChunks = config.getItem("Patterns and Misc", "Ore Chunks", 14104).getInt(14104); heartContainer = config.getItem("Equipables", "Heart Canister", 14105).getInt(14105); + heavyHelmet = config.getItem("Equipables", "Heavy Helmet", 14106).getInt(14106); boolean ic2 = true; boolean xycraft = true; @@ -321,7 +324,12 @@ public class PHConstruct public static int binding; - //Equipables + //Wearables + public static int heavyHelmet; + public static int heavyChestplate; + public static int heavyPants; + public static int heavyBoots; + public static int heartContainer; //Ore values @@ -397,6 +405,8 @@ public class PHConstruct //Difficulty modifiers public static boolean keepHunger; public static boolean keepLevels; + public static boolean clearWater; + public static boolean voidFog; public static boolean disableWoodTools; public static boolean disableStoneTools; diff --git a/mods/tinker/tconstruct/util/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java index ce3a7dcb..a59d2d30 100644 --- a/mods/tinker/tconstruct/util/TEventHandler.java +++ b/mods/tinker/tconstruct/util/TEventHandler.java @@ -10,14 +10,20 @@ import mods.tinker.tconstruct.entity.NitroCreeper; import mods.tinker.tconstruct.library.crafting.PatternBuilder; import mods.tinker.tconstruct.library.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.util.IFacingLogic; import mods.tinker.tconstruct.modifiers.ModAttack; +import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.passive.EntityCow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EnumMovingObjectType; +import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.Event.Result; @@ -25,6 +31,8 @@ import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; @@ -112,6 +120,11 @@ public class TEventHandler skeleton.entityDropItem(new ItemStack(TContent.materials, 1, 8), 0f); } } + + else if (event.entityLiving.getClass() == EntityGhast.class) + { + event.entityLiving.entityDropItem(new ItemStack(Item.ghastTear), 0); + } } /* Ore Dictionary */ @@ -642,10 +655,9 @@ public class TEventHandler int hitY = evt.target.blockY; int hitZ = evt.target.blockZ; - if (!evt.entityPlayer.canPlayerEdit(hitX, hitY, hitZ, evt.target.sideHit, evt.current)) + if (evt.entityPlayer != null && !evt.entityPlayer.canPlayerEdit(hitX, hitY, hitZ, evt.target.sideHit, evt.current)) { return; - //return evt.current; } int bID = evt.world.getBlockId(hitX, hitY, hitZ); diff --git a/mods/tinker/tconstruct/util/player/TPlayerHandler.java b/mods/tinker/tconstruct/util/player/TPlayerHandler.java index 882f09dd..e0979037 100644 --- a/mods/tinker/tconstruct/util/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/util/player/TPlayerHandler.java @@ -28,287 +28,290 @@ import cpw.mods.fml.relauncher.Side; public class TPlayerHandler implements IPlayerTracker { - /* Player */ - //public int hunger; - public ConcurrentHashMap playerStats = new ConcurrentHashMap(); + /* Player */ + //public int hunger; + public ConcurrentHashMap playerStats = new ConcurrentHashMap(); - @Override - public void onPlayerLogin (EntityPlayer entityplayer) - { - //Lookup player - TFoodStats food = new TFoodStats(); - food.readStats(entityplayer.foodStats); - entityplayer.foodStats = food; - NBTTagCompound tags = entityplayer.getEntityData(); - if (!tags.hasKey("TConstruct")) - { - tags.setCompoundTag("TConstruct", new NBTTagCompound()); - } - TPlayerStats stats = new TPlayerStats(); - stats.player = new WeakReference(entityplayer); + @Override + public void onPlayerLogin (EntityPlayer entityplayer) + { + //Lookup player + TFoodStats food = new TFoodStats(); + food.readStats(entityplayer.foodStats); + entityplayer.foodStats = food; + NBTTagCompound tags = entityplayer.getEntityData(); + if (!tags.hasKey("TConstruct")) + { + tags.setCompoundTag("TConstruct", new NBTTagCompound()); + } + TPlayerStats stats = new TPlayerStats(); + stats.player = new WeakReference(entityplayer); stats.armor = new ArmorExtended(); stats.armor.init(entityplayer); stats.armor.loadFromNBT(entityplayer); - - stats.level = entityplayer.experienceLevel; - stats.health = entityplayer.maxHealth; - stats.hunger = entityplayer.getFoodStats().getFoodLevel(); - stats.beginnerManual = tags.getCompoundTag("TConstruct").getBoolean("beginnerManual"); - stats.materialManual = tags.getCompoundTag("TConstruct").getBoolean("materialManual"); - stats.smelteryManual = tags.getCompoundTag("TConstruct").getBoolean("smelteryManual"); - if (!stats.beginnerManual) - { - tags.getCompoundTag("TConstruct").setBoolean("beginnerManual", true); - ItemStack diary = new ItemStack(TContent.manualBook); - if (!entityplayer.inventory.addItemStackToInventory(diary)) - { - AbilityHelper.spawnItemAtPlayer(entityplayer, diary); - } - } - playerStats.put(entityplayer.username, stats); - } + stats.level = entityplayer.experienceLevel; + stats.health = entityplayer.maxHealth; + stats.hunger = entityplayer.getFoodStats().getFoodLevel(); + stats.beginnerManual = tags.getCompoundTag("TConstruct").getBoolean("beginnerManual"); + stats.materialManual = tags.getCompoundTag("TConstruct").getBoolean("materialManual"); + stats.smelteryManual = tags.getCompoundTag("TConstruct").getBoolean("smelteryManual"); + if (!stats.beginnerManual) + { + tags.getCompoundTag("TConstruct").setBoolean("beginnerManual", true); + ItemStack diary = new ItemStack(TContent.manualBook); + if (!entityplayer.inventory.addItemStackToInventory(diary)) + { + AbilityHelper.spawnItemAtPlayer(entityplayer, diary); + } + } - @Override - public void onPlayerLogout (EntityPlayer entityplayer) - { - getPlayerStats(entityplayer.username).armor.saveToNBT(entityplayer); - playerStats.remove(entityplayer.username); - } + playerStats.put(entityplayer.username, stats); + } - @Override - public void onPlayerChangedDimension (EntityPlayer entityplayer) - { - //Nothing? + @Override + public void onPlayerLogout (EntityPlayer entityplayer) + { + if (entityplayer != null) + { + getPlayerStats(entityplayer.username).armor.saveToNBT(entityplayer); + playerStats.remove(entityplayer.username); + } + } - } + @Override + public void onPlayerChangedDimension (EntityPlayer entityplayer) + { + //Nothing? - @Override - public void onPlayerRespawn (EntityPlayer entityplayer) - { - //Boom! - TPlayerStats stats = getPlayerStats(entityplayer.username); - stats.player = new WeakReference(entityplayer); + } + + @Override + public void onPlayerRespawn (EntityPlayer entityplayer) + { + //Boom! + TPlayerStats stats = getPlayerStats(entityplayer.username); + stats.player = new WeakReference(entityplayer); TFoodStats food = new TFoodStats(); entityplayer.foodStats = food; - - if (PHConstruct.keepLevels) - entityplayer.experienceLevel = stats.level; - if (PHConstruct.keepHunger) - entityplayer.getFoodStats().addStats(-1*(20 - stats.hunger), 0); - NBTTagCompound tags = entityplayer.getEntityData(); - NBTTagCompound tTag = new NBTTagCompound(); - tTag.setBoolean("beginnerManual", stats.beginnerManual); - tTag.setBoolean("materialManual", stats.materialManual); - tTag.setBoolean("smelteryManual", stats.smelteryManual); - tags.setCompoundTag("TConstruct", tTag); - Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (side == Side.CLIENT) - { - //TProxyClient.controlInstance.resetControls(); - if (PHConstruct.keepHunger) - entityplayer.getFoodStats().setFoodLevel(stats.hunger); - } - } + if (PHConstruct.keepLevels) + entityplayer.experienceLevel = stats.level; + if (PHConstruct.keepHunger) + entityplayer.getFoodStats().addStats(-1 * (20 - stats.hunger), 0); + NBTTagCompound tags = entityplayer.getEntityData(); + NBTTagCompound tTag = new NBTTagCompound(); + tTag.setBoolean("beginnerManual", stats.beginnerManual); + tTag.setBoolean("materialManual", stats.materialManual); + tTag.setBoolean("smelteryManual", stats.smelteryManual); + tags.setCompoundTag("TConstruct", tTag); - @ForgeSubscribe - public void livingFall (LivingFallEvent evt) //Only for negating fall damage - { - if (evt.entityLiving instanceof EntityPlayer) - { - /*Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (side == Side.CLIENT) - { - TProxyClient.controlInstance.landOnGround(); - }*/ - //else - //System.out.println("Server side"); + Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side == Side.CLIENT) + { + //TProxyClient.controlInstance.resetControls(); + if (PHConstruct.keepHunger) + entityplayer.getFoodStats().setFoodLevel(stats.hunger); + } + } - evt.distance -= 1; - //evt.distance = 0; - //TPlayerStats stats = playerStats.get(((EntityPlayer)evt.entityLiving).username); - //stats.prevMotionY = evt.entityLiving.motionY; - //evt.entityLiving.motionY = 10.2; - } - } + @ForgeSubscribe + public void livingFall (LivingFallEvent evt) //Only for negating fall damage + { + if (evt.entityLiving instanceof EntityPlayer) + { + /*Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side == Side.CLIENT) + { + TProxyClient.controlInstance.landOnGround(); + }*/ + //else + //System.out.println("Server side"); - /*@ForgeSubscribe - public void livingUpdate (LivingUpdateEvent evt) - { - Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (side == Side.CLIENT && evt.entityLiving instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer) evt.entityLiving; - TPlayerStats stats = playerStats.get(player.username); - if (player.onGround != stats.prevOnGround) - { - if (player.onGround)// && -stats.prevMotionY > 0.1) - //player.motionY = 0.5; - player.motionY = -stats.prevMotionY * 0.8; - //player.motionY *= -1.2; - stats.prevOnGround = player.onGround; - //if () - - //System.out.println("Fall: "+player.fallDistance); - } - } - }*/ + evt.distance -= 1; + //evt.distance = 0; + //TPlayerStats stats = playerStats.get(((EntityPlayer)evt.entityLiving).username); + //stats.prevMotionY = evt.entityLiving.motionY; + //evt.entityLiving.motionY = 10.2; + } + } - @ForgeSubscribe - public void playerDrops (PlayerDropsEvent evt) - { - TPlayerStats stats = getPlayerStats(evt.entityPlayer.username); - stats.level = evt.entityPlayer.experienceLevel / 2; - //stats.health = 20; - int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); - if (hunger < 6) - stats.hunger = 6; - else - stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); - } + /*@ForgeSubscribe + public void livingUpdate (LivingUpdateEvent evt) + { + Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side == Side.CLIENT && evt.entityLiving instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) evt.entityLiving; + TPlayerStats stats = playerStats.get(player.username); + if (player.onGround != stats.prevOnGround) + { + if (player.onGround)// && -stats.prevMotionY > 0.1) + //player.motionY = 0.5; + player.motionY = -stats.prevMotionY * 0.8; + //player.motionY *= -1.2; + stats.prevOnGround = player.onGround; + //if () + + //System.out.println("Fall: "+player.fallDistance); + } + } + }*/ - /* Find the right player */ - public TPlayerStats getPlayerStats (String username) - { - TPlayerStats stats = playerStats.get(username); + @ForgeSubscribe + public void playerDrops (PlayerDropsEvent evt) + { + TPlayerStats stats = getPlayerStats(evt.entityPlayer.username); + stats.level = evt.entityPlayer.experienceLevel / 2; + //stats.health = 20; + int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + if (hunger < 6) + stats.hunger = 6; + else + stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + } + + /* Find the right player */ + public TPlayerStats getPlayerStats (String username) + { + TPlayerStats stats = playerStats.get(username); //System.out.println("Stats: "+stats); - if (stats == null) - { - stats = new TPlayerStats(); - playerStats.put(username, stats); - } - return stats; - } + if (stats == null) + { + stats = new TPlayerStats(); + playerStats.put(username, stats); + } + return stats; + } - public EntityPlayer getEntityPlayer (String username) - { - TPlayerStats stats = playerStats.get(username); - if (stats == null) - { - return null; - } - else - { - return stats.player.get(); - } - } + public EntityPlayer getEntityPlayer (String username) + { + TPlayerStats stats = playerStats.get(username); + if (stats == null) + { + return null; + } + else + { + return stats.player.get(); + } + } - /* Modify Player */ - public void updateSize (String user, float offset) - { - /*EntityPlayer player = getEntityPlayer(user); - setEntitySize(0.6F, offset, player); - player.yOffset = offset - 0.18f;*/ - } + /* Modify Player */ + public void updateSize (String user, float offset) + { + /*EntityPlayer player = getEntityPlayer(user); + setEntitySize(0.6F, offset, player); + player.yOffset = offset - 0.18f;*/ + } - public static void setEntitySize (float width, float height, Entity entity) - { - //System.out.println("Size: " + height); - if (width != entity.width || height != entity.height) - { - entity.width = width; - entity.height = height; - entity.boundingBox.maxX = entity.boundingBox.minX + (double) entity.width; - entity.boundingBox.maxZ = entity.boundingBox.minZ + (double) entity.width; - entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height; - } + public static void setEntitySize (float width, float height, Entity entity) + { + //System.out.println("Size: " + height); + if (width != entity.width || height != entity.height) + { + entity.width = width; + entity.height = height; + entity.boundingBox.maxX = entity.boundingBox.minX + (double) entity.width; + entity.boundingBox.maxZ = entity.boundingBox.minZ + (double) entity.width; + entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height; + } - float que = width % 2.0F; + float que = width % 2.0F; - if ((double) que < 0.375D) - { - entity.myEntitySize = EnumEntitySize.SIZE_1; - } - else if ((double) que < 0.75D) - { - entity.myEntitySize = EnumEntitySize.SIZE_2; - } - else if ((double) que < 1.0D) - { - entity.myEntitySize = EnumEntitySize.SIZE_3; - } - else if ((double) que < 1.375D) - { - entity.myEntitySize = EnumEntitySize.SIZE_4; - } - else if ((double) que < 1.75D) - { - entity.myEntitySize = EnumEntitySize.SIZE_5; - } - else - { - entity.myEntitySize = EnumEntitySize.SIZE_6; - } - //entity.yOffset = height; - } + if ((double) que < 0.375D) + { + entity.myEntitySize = EnumEntitySize.SIZE_1; + } + else if ((double) que < 0.75D) + { + entity.myEntitySize = EnumEntitySize.SIZE_2; + } + else if ((double) que < 1.0D) + { + entity.myEntitySize = EnumEntitySize.SIZE_3; + } + else if ((double) que < 1.375D) + { + entity.myEntitySize = EnumEntitySize.SIZE_4; + } + else if ((double) que < 1.75D) + { + entity.myEntitySize = EnumEntitySize.SIZE_5; + } + else + { + entity.myEntitySize = EnumEntitySize.SIZE_6; + } + //entity.yOffset = height; + } - Random rand = new Random(); + Random rand = new Random(); - /* Bows */ - /*@ForgeSubscribe - public void arrowShoot (ArrowLooseEvent event) - { - event.setCanceled(true); - int j = event.charge; + /* Bows */ + /*@ForgeSubscribe + public void arrowShoot (ArrowLooseEvent event) + { + event.setCanceled(true); + int j = event.charge; - boolean flag = event.entityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, event.bow) > 0; + boolean flag = event.entityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, event.bow) > 0; - if (flag || event.entityPlayer.inventory.hasItem(Item.arrow.itemID)) - { - float f = (float) j / 20.0F; - f = (f * f + f * 2.0F) / 3.0F; + if (flag || event.entityPlayer.inventory.hasItem(Item.arrow.itemID)) + { + float f = (float) j / 20.0F; + f = (f * f + f * 2.0F) / 3.0F; - if ((double) f < 0.1D) - { - return; - } + if ((double) f < 0.1D) + { + return; + } - if (f > 1.0F) - { - f = 1.0F; - } + if (f > 1.0F) + { + f = 1.0F; + } - EntityArrow entityarrow = new EntityArrow(event.entityPlayer.worldObj, event.entityPlayer, f * 2.0F); + EntityArrow entityarrow = new EntityArrow(event.entityPlayer.worldObj, event.entityPlayer, f * 2.0F); - if (f == 1.0F) - { - entityarrow.setIsCritical(true); - } + if (f == 1.0F) + { + entityarrow.setIsCritical(true); + } - int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, event.bow); + int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, event.bow); - entityarrow.setDamage(1.5D + k * 0.45D); + entityarrow.setDamage(1.5D + k * 0.45D); - int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, event.bow); + int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, event.bow); - if (l > 0) - { - entityarrow.setKnockbackStrength(l); - } + if (l > 0) + { + entityarrow.setKnockbackStrength(l); + } - if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, event.bow) > 0) - { - entityarrow.setFire(100); - } + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, event.bow) > 0) + { + entityarrow.setFire(100); + } - event.bow.damageItem(1, event.entityPlayer); - event.entityPlayer.worldObj.playSoundAtEntity(event.entityPlayer, "random.bow", 1.0F, 1.0F / (rand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + event.bow.damageItem(1, event.entityPlayer); + event.entityPlayer.worldObj.playSoundAtEntity(event.entityPlayer, "random.bow", 1.0F, 1.0F / (rand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); - if (flag) - { - entityarrow.canBePickedUp = 2; - } - else - { - event.entityPlayer.inventory.consumeInventoryItem(Item.arrow.itemID); - } + if (flag) + { + entityarrow.canBePickedUp = 2; + } + else + { + event.entityPlayer.inventory.consumeInventoryItem(Item.arrow.itemID); + } - if (!event.entityPlayer.worldObj.isRemote) - { - event.entityPlayer.worldObj.spawnEntityInWorld(entityarrow); - } - } - }*/ + if (!event.entityPlayer.worldObj.isRemote) + { + event.entityPlayer.worldObj.spawnEntityInWorld(entityarrow); + } + } + }*/ } diff --git a/mods/tinker/tconstruct/worldgen/OverworldProvider.java b/mods/tinker/tconstruct/worldgen/OverworldProvider.java index e8b8f9a7..0edcd6d8 100644 --- a/mods/tinker/tconstruct/worldgen/OverworldProvider.java +++ b/mods/tinker/tconstruct/worldgen/OverworldProvider.java @@ -1,5 +1,6 @@ package mods.tinker.tconstruct.worldgen; +import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.world.WorldProvider; public class OverworldProvider extends WorldProvider @@ -11,7 +12,14 @@ public class OverworldProvider extends WorldProvider return "Overworld"; } - public float calculateCelestialAngle(long worldtime, float par3) + public boolean getWorldHasVoidParticles() + { + if (PHConstruct.voidFog) + return false; + return this.terrainType.hasVoidParticles(this.hasNoSky); + } + + /*public float calculateCelestialAngle(long worldtime, float par3) { int timeOfDay = (int)(worldtime % 43200L); float f1 = ((float)timeOfDay + par3) / 43200.0F - 0.25F; @@ -35,5 +43,5 @@ public class OverworldProvider extends WorldProvider public int getMoonPhase(long par1) { return (int)(par1 / 43200L) % 8; - } + }*/ } diff --git a/mods/tinker/textures/armor/wood_1.png b/mods/tinker/textures/armor/wood_1.png index 0b6d4d68a55080097089be6866253d5fc0ac04f6..d599ecbcba6b3afab2f7b9251719219c89aaffc0 100644 GIT binary patch delta 1810 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 D;h&@0 diff --git a/mods/tinker/textures/entity/wagon.png b/mods/tinker/textures/entity/wagon.png deleted file mode 100644 index e67e29e46f6e3f874938f91e2a9918296a13c432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2564 zcmV+f3j6hmP)VGd000McNliru-2oa2EI58r)1?3a36V)e zK~!ko?U`$A99I>`e>;zzeP!dd-FqBmJk0K~ z(IzVDkw$xG=FYwMobx~bbMD;?kvuZl>GYMLItzWe(H?myJaPygQL?2D6d^fB0dKpnC<7<~eK4|aVR_Pm!*-cjL+=NI_g z$9s9JN@mRObdFBJ(u%x%aS03qHkV;rAB3S0(DEQ}>la|f)vq5RWuOcPZ--wUgNB)YP-D+=7t3ra+svOhg|*{G{8j+K#vX^B zqRrVCC)u=XhsZvFSax%KOoRE!)5`6VHxp6>{#}q5EBf^7et7;DK}o#v(YJ`W8$JM;-(_k8Ne(=MT_4`3kgG z@qhLJoPG|<{qW0g$q>JN3jX>-^0ooR3L6XJ(pmsLMYwT5kghI@OXeEz?qM0?&K**G zpbU-;@9a03sloJ|`dxJcgh0*)0uQ_v^Dmu&_k9Zf`IMOd_D{fV_o%(^AZ+M^tOIV7 zb5B15FZ_h%@mJW^2L%(Ft_)go!1JZ(v1z5yQ|CpneyFf}xfhtGQdhP|V=XxO`XJ3OtD3ej%^*Wu- zbBluRkqP+DGb_|v0f+W&;I5ru8e;M-JDqbPJ26>6C#2(gdGUIZo@f6-FvGTMr7C+Nn378$TKa0rz>M<;b9{Wia3M^EK*!gZrXx>VSs|#o2(we_vwg3Ax9t&6%}(hG zl2Epe|0{K{QRvmct-5I0j$Q<9xZF$(6B{G`ZPkih%CKzter3GdCGHZ zL>YM98~{>2)*)VBzMNzeCn-5C+f*K=yjhTTn=-^gRUHkZn-ew<>%F%s5{glgCP%kH zbs;(wiDNqLsaWEa=e3e{9K)s^&FdvGZ5R-wjAEEjJFB#|ZI9*{7>+_`3Ff9@%MPuv zI(}u!1gw))=r2cc?UWK&+c_!el;pWM-aS_+iSvJBUW>DHLWL2o)dRH#A{@g2XG4|j9*Y4%+`oJ)BZ5@HvPQb;}@Q$5{cW1^F3T8A{+fCBsVzs*x ztS+K7W7_hv?I_QiS-3Qnc;9wpfXZM3rTVnq2OeZhS=`LBr3Wr7rQq6_lQ+FqqG;^N zHD+JZ9I^5-#J#9qNPp)x_}{8v}L)tA`Bx%25(NnB4|r- z!xC$UKC2#_nT=T5$|`J38!{Pr*xI1BVI>~LPvXDRNh-S6lgl+-v83w(I|ubyg>gC? zwB7DBSa0b>cr89Vfh=TY1sk^+m8mwA2NFJrNpJQ{_o8|S!F0&k$$ty@Z5g6GAP=nN z@{YV@Sb~1K2yzO#3cZox)|J6gE&o672K!6VVWzhVE6Yh5ym&gb8S%yL89-ZgyO)x@`(G~Sa+$qz6c83*I#8^Ew10yy^-euYZ6yu zZCA!{ics1lxO=Nfd{`@BZ0000S(NMwWVa&TDP{SrPy@ddH;j=w|Ad;KF??7nR$-+%slg4BYL{Z$*9Tz z03he?=Hw+}jtE$YxG2s;ay&!?4s-Bu0Dzxzj(ny|0Dw3^JV$mGvwl8B*QPQ1OO7 zcthW_Mt)uP3pIk+W>lpXyNo+&96)m{3-gUgOIcORZ`f)) zJb>EdVJ%oH_t)3g6*e3H6w--Lp3ZE~Xl76qDjz;LB`Xi+h(X=Bofw~Ad%866Q3R-2 zMM?LgwMP#i=Hwp@G9kc``p(}jOCPFAC6rgxDRSADw^BqcJ;!B1*QM7^93*(K*FF`pLvr9suX(nYH$0$@%qSET54XMl1w+N~9w8Rv;u-@P3 zFbMtn3}^u<3)`UG12eZ+1< z#jYAQ#Y+4nw>P<}Ht-SGQ+jV-7u=`%j+E;iuOwXE(sQcXU5wvl4+HfYN<-;q`NC|X+LYbp~KKzf|UM(W&FecCMNpPiIG-JSN? z(CT#Im9epmrgX1hymKQ#StkmTegnf@h)hw%RL@9>cA1aXLt#(PN4GVp3B7%9zN1HInt+H}oy^Y0VMh*!Y5ShBf zEb@yaZL6EQKH>eh{#xQIuhkfq0$Bw@oq_MN%Wo3FyVL$M*jeI}XjJ!b#;oaFL&xZ5 zerS^|_o`)Ld%sl(xKcL!twePBz`o0ge(kFr=&{w8Hw0Kt!+26#cl-2#U#R;X_V!Mn z!=eEu=^@_O4V2#$dpNAzS&7K$_4ts2*hzw0HTf$Tl!N2p+@e8;Amr`AP>{Muaw2%H zD<@rgY;7;4ojZl16>2?viaMlsLsuxcYo~JzDi{#^cU%$!;c2MECX2SdG(hn zN;`fNbm!K0K=oj?M=ef5>xGRotId>R^5==oFt-aXu#Ag!xq>3zv?}R=nM6bc_Py8f zt9m9N(~XB$&hL}J-&)h66n8D5uLC6Q3Zfq!aurOhWKz^17mda5zHAw{cbfg^tQ9*Qr}UkRNh{oT9^Q|7MFyxIQq(#a}2 z)=+K^ZEVCpkM+-Yo`BtWkfBs$}huvn&0}62W_~%nW!;9Mx5RN^d zCbkfl4Cd;z=xG=lXyc#OPQ%0&LfByLP)}~0)|O*_lK(GvIqb)19-v>2uPn#AhV4kB z^!d7w!9TxGM&0^h`o#$IsN;36=FD@mfi?ZvV&)C4jWqesDrji$#9>T!pBO$eYl3cZ zTe1S0d1!7_oDsW6Re$$;L@VPB`_0=Vm+&Ehb+u%TJCu<#igRU1&FiOk>chnUQ^oM$ zVUvqBtsRq}D-!+K0+xDn@8Uh(Mi0>UFFrOX{EcLJ!zg@HihZE!pr}|4OheFQ{3L__ ksIsfJ46RO`scSiq;AwVX?xvqU`Q>f8J9|3SI?{Om0Jx<4^Z)<= diff --git a/mods/tinker/textures/gui/icons.png b/mods/tinker/textures/gui/icons.png index 187e88723d8be2ad8fb0d497aa3694d66d70bfa5..4048ff91c742cf5677f68f75a23b1814bf1a1a38 100644 GIT binary patch literal 5028 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 literal 3708 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 literal 1116 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z;_UY8Fx&~ehU<2FY)wsWxvZJE@Z7}>ipz90|WC*PZ!6Kid%2*`sUqokZ5?A zziLjqs>T8@TgP29Wmqzcn!J8S{#1A-H6eND>|JYDIH~rWl(0X)>eVA>sW;oVxgOX2 z_kwAe;@A3!wPDTux91ew*xD|&)K9rydahor=)$ruzi-5@4U0Wjd0|hG*OGYW=g+z) z&tGXN!?!L%|H-=_`uFbNU&|GmJxfhaUVd?IwBU{dq79SfSr}&g)onO^`j}Ek+Rm6` zX`43+Fcs`&?yH&-bZ6c!Rt6RZ0R{(97{D2JkES=cPdlADB}nIp%ab{^@yttpWZN^? zZ%^U+^?&`vZMpS4kHs)_F>YW{U}#`qU}E54P+&OFyGj0lOYZjD7wwgwznL1tZ#@n)IGm5{-jfWXozFd==1 zLT<31;hsljFePw0Ff>S7?UZ*oXX&NcY=1n{>;c0vFaDcy`6$ zc|~}_I+2Ed+!BY@ZGXly_wmCm*n<|$aj}hO!H&~5n4BD*07(M}-st_`*|WRDLv!i7 z0*i>4881a0qSjvzYd-mb;e%11_=e3YK3{G;o#XoF*W32V`;1=ycHOhLro5qeYC6Nl zeen^UU3={8kKFDqeNY9=eMkuy8h@O-qwniK`ug*r7Xwwnoh9@6_WpV|vEk4%khz|& KelF{r5}E)dw`=?W diff --git a/mods/tinker/textures/items/armor/wood_boots.png b/mods/tinker/textures/items/armor/wood_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..ecea7e6418ea895fb79921c7c095cbbcdea7c014 GIT binary patch literal 592 zcmV-W0WFU8GbZ8()Nlj2>E@cM*00Fc~L_t(I%cYY~YZFlv z#eeV3<0TVO5QPqwRuHw;(bCXVX6dF&G2#~xV>liAu^zpXsxMTn+0$q1W_0`-}mu64`U2cX1vB2K79IK$QcfYIOlk9 zXPGDr+(-q^Ijpsm%VnOtNC3o*a3(iYJbd~JYb{br27|%4gkG;lvbIH>e5O&a34o;4 zp;RgXaPL-C7-M*|y20b;@5j0z;$~X_qB=h<@;)o2Sh$=GOw#J0wHAOlg#SCr|FZ{2 e?Sq(fo&Nx?7P`uDZ&6?X0000=G`P)9bGlt};p03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00EszL_t(I%cYZDYZE~f zhM!qxCu7t?ZLyn*7R8#{MH9u3z4S)B6}9QLq6CG!25SQn#p>wq%o?WcPSc zT@n(k()Vt@o;mM3XOxI=7I~aeGk_=zBnkuh*Lgj;0pMv=pB$^-%X07b6`JcS<-WL` zsIr164CLXRHJTf%Q}pJ>Dvul2PfGPXJkP@z!>i{HN|2sBAR=4~F7m$fl}5crYkOY+ zj4_A^{eB;%6nn|>YzCk9dl+NL^Bm_Kp6B8FJ};kzhzLsy=XtyRoh-{{LyX&r`u5`x z5kYHB_wyn5>ot7e$68BK6aXBjjz+!4>$o$W!5{g)PnKn9t=Za15D{A41FW^IEE;-8 zDaM%j<B8^=9iMoi9hccyg1@?oT#vETfcSFc_2pzWcCS-aZo|Q2HMZhdAfh+3T^s zcA09mT3Y#QBUx+FT4Sx{QFs;S8~{a8kmvd7fbnmG|3ijA4ENywcYsT8|8P`s6)bvjlm?-nE{ISu!Od?Tgjg zD`hKrrUWS{aVQ$Zz6)3{cJR!KDO@wo@c-h`IejRrm`RY4f$i{z;J2);r z{`s{38262BYu6WUwEe&4OrebJgS}PL9$ENRx_#2zAMAJS>uK|U|Mj1+?P0hPmQwdd Q$_^X~p00i_>zopr0DRbz0ssI2 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/armor/wood_pants.png b/mods/tinker/textures/items/armor/wood_pants.png new file mode 100644 index 0000000000000000000000000000000000000000..20b98c9b0c267df8c95a50f332c5fdeb0ee9ea97 GIT binary patch literal 531 zcmV+u0_^>XP)WFU8GbZ8()Nlj2>E@cM*00DPNL_t(I%cYY$O9Md^ zg}<3>CSgTE3}zb@#0MA^!3QaAtQGtR`q%sq7Is!a5Cw^^G`>kt(WntJo7u5gc1_Hx zMNTygGw0rO?mfaV_=A#0lRIYwYC>A`H=f*lJ%};q)YdO7sK`Dil5-CH)+Z#(!!EO&my?&nRA84&f zrBWDU@O>X^EsaJ4fSc-jw}h*QR{)GLXsuC7aag_uAe~M#G|Z9G@DHvCv41G%Wm1`u6$z9z={6 zcW-R2P5>}7o