From cdeece329a6412e286b1985ff0e9b2d50ff31d3e Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 10 Jul 2013 04:39:53 -0700 Subject: [PATCH] Basic arrows --- mods/tinker/resources/lang/en_US.xml | 6 +- mods/tinker/resources/manuals/materials.xml | 2 +- mods/tinker/resources/manuals/smeltery.xml | 2 +- mods/tinker/tconstruct/TConstruct.java | 15 +- .../tconstruct/blocks/LightCrystalBase.java | 4 +- .../tconstruct/blocks/MultiBrickFancy.java | 2 +- .../tconstruct/blocks/OreberryBush.java | 6 +- .../blocks/OreberryBushEssence.java | 71 ++ .../tconstruct/blocks/SmelteryBlock.java | 4 +- .../blocks/logic/SmelteryLogic.java | 4 +- .../tconstruct/client/CustomBowRenderer.java | 4 +- .../tconstruct/client/TClientEvents.java | 1 + .../tconstruct/client/TProxyClient.java | 18 +- .../tconstruct/client/block/SearedRender.java | 23 +- .../client/entity/MiniGardyRender.java | 177 +++++ .../client/entity/ModelBoxDegrees.java | 114 ++++ .../client/entity/ModelMiniGardy.java | 208 ++++++ .../client/entity/ModelRendererDegrees.java | 321 +++++++++ .../client/entity/projectile/ArrowRender.java | 479 ++++++++++++++ .../tconstruct/client/gui/ToolForgeGui.java | 4 + .../tconstruct/client/gui/ToolStationGui.java | 61 +- mods/tinker/tconstruct/common/TContent.java | 91 +-- .../tconstruct/common/TProxyCommon.java | 17 +- mods/tinker/tconstruct/entity/GolemBase.java | 24 +- mods/tinker/tconstruct/entity/MiniGardy.java | 46 ++ .../tconstruct/entity/ai/GAIFellTree.java | 237 +++++++ .../tconstruct/entity/ai/GAIFindTarget.java | 29 - .../tconstruct/entity/ai/GAIFollowOwner.java | 8 - .../entity/projectile/ArrowEntity.java | 619 ++++++++++++++++++ mods/tinker/tconstruct/items/Fletching.java | 46 ++ .../tinker/tconstruct/items/MaterialItem.java | 4 +- .../tinker/tconstruct/items/MetalPattern.java | 31 +- mods/tinker/tconstruct/items/OreBerries.java | 6 +- mods/tinker/tconstruct/items/Pattern.java | 207 +++--- .../items/blocks/OreberryBushSecondItem.java | 12 +- mods/tinker/tconstruct/items/tools/Arrow.java | 102 +++ .../tconstruct/items/tools/Battleaxe.java | 19 +- .../tconstruct/items/tools/Broadsword.java | 22 + .../tinker/tconstruct/items/tools/Chisel.java | 19 + .../tconstruct/items/tools/Excavator.java | 4 +- .../tinker/tconstruct/items/tools/Hammer.java | 4 +- .../tconstruct/items/tools/Longsword.java | 21 + .../items/tools/PotionLauncher.java | 280 ++++---- .../tconstruct/items/tools/Shortbow.java | 23 + .../library/TConstructRegistry.java | 103 ++- .../library/crafting/PatternBuilder.java | 11 +- .../library/tools/AbilityHelper.java | 35 +- .../library/tools/ArrowMaterial.java | 15 + .../tconstruct/library/tools/BowBase.java | 162 +++-- .../library/tools/BowstringMaterial.java | 11 +- .../library/tools/CustomMaterial.java | 26 + .../library/tools/FletchingMaterial.java | 15 + .../tconstruct/library/tools/ToolCore.java | 1 + .../tconstruct/library/tools/Weapon.java | 21 + mods/tinker/tconstruct/util/PHConstruct.java | 20 +- .../tinker/tconstruct/util/TEventHandler.java | 90 ++- .../worldgen/TBaseWorldGenerator.java | 2 +- .../blocks/crops/berry_essence_fancy.png | Bin 0 -> 641 bytes .../blocks/crops/berry_essence_fast.png | Bin 0 -> 821 bytes .../blocks/crops/berry_essence_ripe_fancy.png | Bin 0 -> 2290 bytes .../blocks/crops/berry_essence_ripe_fancy.txt | 12 + .../blocks/crops/berry_essence_ripe_fast.png | Bin 0 -> 2719 bytes .../blocks/crops/berry_essence_ripe_fast.txt | 12 + .../textures/blocks/repeaterDust_cross.png | Bin 161 -> 0 bytes .../blocks/repeaterDust_cross_overlay.png | Bin 75 -> 0 bytes .../textures/blocks/repeaterDust_line.png | Bin 127 -> 0 bytes .../blocks/repeaterDust_line_overlay.png | Bin 75 -> 0 bytes mods/tinker/textures/gui/icons.png | Bin 7106 -> 7538 bytes mods/tinker/textures/items/Credits.txt | 1 + .../items/arrow/alumite_arrow_head.png | Bin 0 -> 107 bytes .../items/arrow/alumite_arrow_shaft.png | Bin 0 -> 100 bytes .../items/arrow/ardite_arrow_head.png | Bin 0 -> 105 bytes .../items/arrow/ardite_arrow_shaft.png | Bin 0 -> 94 bytes .../items/arrow/beheading_arrow_effect.png | Bin 0 -> 133 bytes .../items/arrow/blaze_arrow_effect.png | Bin 0 -> 126 bytes .../items/arrow/blueslime_arrow_fletching.png | Bin 0 -> 119 bytes .../items/arrow/blueslime_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/blueslime_arrow_shaft.png | Bin 0 -> 99 bytes .../textures/items/arrow/bone_arrow_head.png | Bin 0 -> 107 bytes .../textures/items/arrow/bone_arrow_shaft.png | Bin 0 -> 101 bytes .../items/arrow/bronze_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/bronze_arrow_shaft.png | Bin 0 -> 99 bytes .../items/arrow/cactus_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/cactus_arrow_shaft.png | Bin 0 -> 114 bytes .../items/arrow/cobalt_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/cobalt_arrow_shaft.png | Bin 0 -> 96 bytes .../items/arrow/copper_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/copper_arrow_shaft.png | Bin 0 -> 96 bytes .../items/arrow/diamond_arrow_effect.png | Bin 0 -> 90 bytes .../items/arrow/electric_arrow_effect.png | Bin 0 -> 119 bytes .../items/arrow/emerald_arrow_effect.png | Bin 0 -> 100 bytes .../items/arrow/feather_arrow_fletching.png | Bin 0 -> 118 bytes .../textures/items/arrow/flint_arrow_head.png | Bin 0 -> 110 bytes .../items/arrow/flint_arrow_shaft.png | Bin 0 -> 101 bytes .../textures/items/arrow/ice_arrow_effect.png | Bin 0 -> 112 bytes .../textures/items/arrow/iron_arrow_head.png | Bin 0 -> 104 bytes .../textures/items/arrow/iron_arrow_shaft.png | Bin 0 -> 99 bytes .../items/arrow/lapis_arrow_effect.png | Bin 0 -> 96 bytes .../items/arrow/lava_arrow_effect.png | Bin 0 -> 101 bytes .../items/arrow/leaf_arrow_fletching.png | Bin 0 -> 119 bytes .../items/arrow/manyullyn_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/manyullyn_arrow_shaft.png | Bin 0 -> 96 bytes .../items/arrow/moss_arrow_effect.png | Bin 0 -> 102 bytes .../items/arrow/necrotic_arrow_effect.png | Bin 0 -> 108 bytes .../items/arrow/netherrack_arrow_head.png | Bin 0 -> 116 bytes .../items/arrow/netherrack_arrow_shaft.png | Bin 0 -> 126 bytes .../items/arrow/obsidian_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/obsidian_arrow_shaft.png | Bin 0 -> 105 bytes .../textures/items/arrow/paper_arrow_head.png | Bin 0 -> 109 bytes .../items/arrow/paper_arrow_shaft.png | Bin 0 -> 111 bytes .../items/arrow/piston_arrow_effect.png | Bin 0 -> 118 bytes .../items/arrow/quartz_arrow_effect.png | Bin 0 -> 109 bytes .../items/arrow/redstone_arrow_effect.png | Bin 0 -> 93 bytes .../items/arrow/reinforced_arrow_effect.png | Bin 0 -> 100 bytes .../items/arrow/silk_arrow_effect.png | Bin 0 -> 110 bytes .../items/arrow/slime_arrow_fletching.png | Bin 0 -> 119 bytes .../textures/items/arrow/slime_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/slime_arrow_shaft.png | Bin 0 -> 100 bytes .../items/arrow/smite_arrow_effect.png | Bin 0 -> 164 bytes .../items/arrow/spider_arrow_effect.png | Bin 0 -> 97 bytes .../textures/items/arrow/steel_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/steel_arrow_shaft.png | Bin 0 -> 96 bytes .../textures/items/arrow/stone_arrow_head.png | Bin 0 -> 106 bytes .../items/arrow/stone_arrow_shaft.png | Bin 0 -> 96 bytes .../textures/items/arrow/wood_arrow_head.png | Bin 0 -> 106 bytes .../textures/items/arrow/wood_arrow_shaft.png | Bin 0 -> 100 bytes mods/tinker/textures/items/friedEgg.png | Bin 0 -> 289 bytes .../items/materials/cast_arrowhead.png | Bin 0 -> 560 bytes .../items/materials/cast_bowstring.png | Bin 414 -> 0 bytes .../textures/items/materials/cast_spike.png | Bin 414 -> 0 bytes .../materials/material_essencecrystal.png | Bin 0 -> 1260 bytes .../materials/material_essencecrystal.txt | 12 + .../items/materials/pattern_arrowhead.png | Bin 0 -> 452 bytes .../items/materials/pattern_fletching.png | Bin 0 -> 452 bytes .../items/oreberries/oreberry_essence.png | Bin 0 -> 1965 bytes .../items/oreberries/oreberry_essence.txt | 12 + .../items/parts/alumite_arrowhead.png | Bin 0 -> 230 bytes .../textures/items/parts/ardite_arrowhead.png | Bin 0 -> 226 bytes .../items/parts/blueslime_arrowhead.png | Bin 0 -> 217 bytes .../items/parts/blueslime_fletching.png | Bin 0 -> 259 bytes .../textures/items/parts/bone_arrowhead.png | Bin 0 -> 247 bytes .../textures/items/parts/bronze_arrowhead.png | Bin 0 -> 237 bytes .../textures/items/parts/cactus_arrowhead.png | Bin 0 -> 273 bytes .../textures/items/parts/cobalt_arrowhead.png | Bin 0 -> 242 bytes .../textures/items/parts/copper_arrowhead.png | Bin 0 -> 244 bytes .../items/parts/feather_fletching.png | Bin 0 -> 409 bytes .../textures/items/parts/flint_arrowhead.png | Bin 0 -> 225 bytes .../textures/items/parts/iron_arrowhead.png | Bin 0 -> 220 bytes .../textures/items/parts/leaf_fletching.png | Bin 0 -> 282 bytes .../items/parts/manyullyn_arrowhead.png | Bin 0 -> 238 bytes .../items/parts/netherrack_arrowhead.png | Bin 0 -> 282 bytes .../items/parts/obsidian_arrowhead.png | Bin 0 -> 246 bytes .../textures/items/parts/paper_arrowhead.png | Bin 0 -> 262 bytes .../textures/items/parts/slime_arrowhead.png | Bin 0 -> 217 bytes .../textures/items/parts/slime_fletching.png | Bin 0 -> 260 bytes .../textures/items/parts/steel_arrowhead.png | Bin 0 -> 221 bytes .../textures/items/parts/stone_arrowhead.png | Bin 0 -> 218 bytes .../textures/items/parts/wood_arrowhead.png | Bin 0 -> 245 bytes mods/tinker/textures/mob/googirl.png | Bin 0 -> 1888 bytes sounds/launcher_clank.ogg | Bin 0 -> 11398 bytes spritesheets/arrows.png | Bin 5302 -> 3458 bytes spritesheets/arrows.txt | 58 ++ spritesheets/baseheads.png | Bin 27627 -> 7248 bytes spritesheets/bows.png | Bin 11007 -> 11173 bytes test/XinStick.java | 13 +- 165 files changed, 3511 insertions(+), 518 deletions(-) create mode 100644 mods/tinker/tconstruct/blocks/OreberryBushEssence.java create mode 100644 mods/tinker/tconstruct/client/entity/MiniGardyRender.java create mode 100644 mods/tinker/tconstruct/client/entity/ModelBoxDegrees.java create mode 100644 mods/tinker/tconstruct/client/entity/ModelMiniGardy.java create mode 100644 mods/tinker/tconstruct/client/entity/ModelRendererDegrees.java create mode 100644 mods/tinker/tconstruct/client/entity/projectile/ArrowRender.java create mode 100644 mods/tinker/tconstruct/entity/MiniGardy.java create mode 100644 mods/tinker/tconstruct/entity/ai/GAIFellTree.java create mode 100644 mods/tinker/tconstruct/entity/projectile/ArrowEntity.java create mode 100644 mods/tinker/tconstruct/items/Fletching.java create mode 100644 mods/tinker/tconstruct/items/tools/Arrow.java create mode 100644 mods/tinker/tconstruct/library/tools/ArrowMaterial.java create mode 100644 mods/tinker/tconstruct/library/tools/CustomMaterial.java create mode 100644 mods/tinker/tconstruct/library/tools/FletchingMaterial.java create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_fancy.png create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_fast.png create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_ripe_fancy.txt create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/crops/berry_essence_ripe_fast.txt delete mode 100644 mods/tinker/textures/blocks/repeaterDust_cross.png delete mode 100644 mods/tinker/textures/blocks/repeaterDust_cross_overlay.png delete mode 100644 mods/tinker/textures/blocks/repeaterDust_line.png delete mode 100644 mods/tinker/textures/blocks/repeaterDust_line_overlay.png create mode 100644 mods/tinker/textures/items/Credits.txt create mode 100644 mods/tinker/textures/items/arrow/alumite_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/alumite_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/ardite_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/ardite_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/beheading_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/blaze_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/blueslime_arrow_fletching.png create mode 100644 mods/tinker/textures/items/arrow/blueslime_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/blueslime_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/bone_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/bone_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/bronze_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/bronze_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/cactus_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/cactus_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/cobalt_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/cobalt_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/copper_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/copper_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/diamond_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/electric_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/emerald_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/feather_arrow_fletching.png create mode 100644 mods/tinker/textures/items/arrow/flint_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/flint_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/ice_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/iron_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/iron_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/lapis_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/lava_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/leaf_arrow_fletching.png create mode 100644 mods/tinker/textures/items/arrow/manyullyn_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/manyullyn_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/moss_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/necrotic_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/netherrack_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/netherrack_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/obsidian_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/obsidian_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/paper_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/paper_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/piston_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/quartz_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/redstone_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/reinforced_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/silk_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/slime_arrow_fletching.png create mode 100644 mods/tinker/textures/items/arrow/slime_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/slime_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/smite_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/spider_arrow_effect.png create mode 100644 mods/tinker/textures/items/arrow/steel_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/steel_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/stone_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/stone_arrow_shaft.png create mode 100644 mods/tinker/textures/items/arrow/wood_arrow_head.png create mode 100644 mods/tinker/textures/items/arrow/wood_arrow_shaft.png create mode 100644 mods/tinker/textures/items/friedEgg.png create mode 100644 mods/tinker/textures/items/materials/cast_arrowhead.png delete mode 100644 mods/tinker/textures/items/materials/cast_bowstring.png delete mode 100644 mods/tinker/textures/items/materials/cast_spike.png create mode 100644 mods/tinker/textures/items/materials/material_essencecrystal.png create mode 100644 mods/tinker/textures/items/materials/material_essencecrystal.txt create mode 100644 mods/tinker/textures/items/materials/pattern_arrowhead.png create mode 100644 mods/tinker/textures/items/materials/pattern_fletching.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_essence.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_essence.txt create mode 100644 mods/tinker/textures/items/parts/alumite_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/ardite_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/blueslime_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/blueslime_fletching.png create mode 100644 mods/tinker/textures/items/parts/bone_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/bronze_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/cactus_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/cobalt_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/copper_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/feather_fletching.png create mode 100644 mods/tinker/textures/items/parts/flint_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/iron_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/leaf_fletching.png create mode 100644 mods/tinker/textures/items/parts/manyullyn_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/netherrack_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/obsidian_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/paper_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/slime_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/slime_fletching.png create mode 100644 mods/tinker/textures/items/parts/steel_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/stone_arrowhead.png create mode 100644 mods/tinker/textures/items/parts/wood_arrowhead.png create mode 100644 mods/tinker/textures/mob/googirl.png create mode 100644 sounds/launcher_clank.ogg create mode 100644 spritesheets/arrows.txt diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml index 0dacbadb..c66be4b8 100644 --- a/mods/tinker/resources/lang/en_US.xml +++ b/mods/tinker/resources/lang/en_US.xml @@ -41,7 +41,7 @@ Copper Oreberry Bush Tin Oreberry Bush Aluminum Oreberry Bush - Silver Oreberry Bush + Essence Oreberry Bush Iron Gravel Ore Gold Gravel Ore @@ -95,7 +95,7 @@ Copper Oreberry Tin Oreberry Aluminum Oreberry - Silver Oreberry + Concentrated Essence Berry Golden Head Spawn @@ -123,7 +123,7 @@ Copper Nugget Tin Nugget Aluminum Nugget - Silver Nugget + Essence Crystal Aluminum Brass Nugget Silky Cloth Silky Jewel diff --git a/mods/tinker/resources/manuals/materials.xml b/mods/tinker/resources/manuals/materials.xml index 980fa78e..9be2af4d 100644 --- a/mods/tinker/resources/manuals/materials.xml +++ b/mods/tinker/resources/manuals/materials.xml @@ -442,7 +442,7 @@ Class: Heavy Melee Weapon - Reinforced: 10% chance per level of not using durability - Stonebound: The tool mines faster as it wears out, but does less damage -- Spiny: The tool attacks with does more damage as it wears out, but mines slower +- Jagged: The tool attacks with does more damage as it wears out, but mines slower - Writable: One extra modifier per piece diff --git a/mods/tinker/resources/manuals/smeltery.xml b/mods/tinker/resources/manuals/smeltery.xml index 5076be17..a1037e6a 100644 --- a/mods/tinker/resources/manuals/smeltery.xml +++ b/mods/tinker/resources/manuals/smeltery.xml @@ -130,7 +130,7 @@ Other liquid removal objects will work, but are frowned upon. An example picture Blank casts are made by pouring aluminum brass or gold into an empty casting table. These can be turned into ingot casts in the Stencil Table. -Other part casts must be created by pouring metal around existing parts, like a pickaxe head, or on the wooden patterns. +Other part casts must be created by pouring metal around existing parts, like a pickaxe head. diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index b0ae4839..d18ba7a6 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -17,6 +17,7 @@ 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.MinecraftForge; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -37,7 +38,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.12", dependencies = "required-after:Forge@[7.7.1.675,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.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 { @@ -54,7 +55,17 @@ public class TConstruct public TConstruct() { - System.out.println("[TConstruct] Preparing to take over the world"); + if (Loader.isModLoaded("Natura")) + { + System.out.println("[TConstruct] Natura, what are we going to do tomorrow night?"); + System.out.println("[Natura] TConstruct, we're going to take over the world!"); + /*System.out.println("[TConstruct] They're Pinky, they're Pinky and"); + System.out.println("[Natura] the Brain Brain Brain Brain Brain~");*/ + } + else + { + System.out.println("[TConstruct] Preparing to take over the world"); + } } @PreInit diff --git a/mods/tinker/tconstruct/blocks/LightCrystalBase.java b/mods/tinker/tconstruct/blocks/LightCrystalBase.java index 9479d936..c1a874b5 100644 --- a/mods/tinker/tconstruct/blocks/LightCrystalBase.java +++ b/mods/tinker/tconstruct/blocks/LightCrystalBase.java @@ -58,10 +58,10 @@ public class LightCrystalBase extends Block @Override public void getSubBlocks (int id, CreativeTabs tab, List list) { - /*for (int iter = 0; iter < 15; iter++) + for (int iter = 0; iter < 15; iter++) { list.add(new ItemStack(id, 1, iter)); - }*/ + } } @Override diff --git a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java index 8503413d..40e5c7e4 100644 --- a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java +++ b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java @@ -111,7 +111,7 @@ public class MultiBrickFancy extends TConstructBlock @Override public boolean canProvidePower() { - return true; + return false; } @Override diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java index dcfa33fe..dae91d32 100644 --- a/mods/tinker/tconstruct/blocks/OreberryBush.java +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -260,18 +260,18 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <= 8) { - int meta = world.getBlockMetadata(x, y, z); if (world.getFullBlockLightValue(x, y, z) < 10) { + int meta = world.getBlockMetadata(x, y, z); if (meta < 12) { world.setBlock(x, y, z, blockID, meta + 4, 3); } } - else if (meta < 8) + /*else if (meta < 8) { world.setBlock(x, y, z, blockID, meta + 4, 3); - } + }*/ } } diff --git a/mods/tinker/tconstruct/blocks/OreberryBushEssence.java b/mods/tinker/tconstruct/blocks/OreberryBushEssence.java new file mode 100644 index 00000000..22de8a53 --- /dev/null +++ b/mods/tinker/tconstruct/blocks/OreberryBushEssence.java @@ -0,0 +1,71 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; +import java.util.Random; + +import mods.tinker.tconstruct.client.block.OreberryRender; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class OreberryBushEssence extends OreberryBush implements IPlantable +{ + public OreberryBushEssence(int id, String[] textureNames, int meta, int sub, String[] oreTypes) + { + super(id, textureNames, meta, sub, oreTypes); + } + + /* Bush growth */ + + @Override + public void updateTick (World world, int x, int y, int z, Random random1) + { + if (world.isRemote) + { + return; + } + + if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <= 8) + { + int meta = world.getBlockMetadata(x, y, z); + if (world.getFullBlockLightValue(x, y, z) < 10 || meta % 4 == 1) + { + if (meta < 12) + { + world.setBlock(x, y, z, blockID, meta + 4, 3); + } + } + /*else if (meta < 8) + { + world.setBlock(x, y, z, blockID, meta + 4, 3); + }*/ + } + } + + public boolean canPlaceBlockAt (World world, int x, int y, int z) + { + return true; + /*if (world.getFullBlockLightValue(x, y, z) < 13) + return super.canPlaceBlockAt(world, x, y, z); + return false;*/ + } +} diff --git a/mods/tinker/tconstruct/blocks/SmelteryBlock.java b/mods/tinker/tconstruct/blocks/SmelteryBlock.java index 5b3619bf..17d1e0d4 100644 --- a/mods/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/mods/tinker/tconstruct/blocks/SmelteryBlock.java @@ -134,11 +134,11 @@ public class SmelteryBlock extends InventoryBlock } - @Override + /*@Override public int getRenderBlockPass() { return 1; - } + }*/ public int damageDropped (int meta) { diff --git a/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java index 8aa05c3a..17898e73 100644 --- a/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java @@ -327,7 +327,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } } - boolean itemAdded = false; + /*boolean itemAdded = false; if (o instanceof EntityItem) { EntityItem item = (EntityItem) o; @@ -359,7 +359,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } while (canContinue); } if (itemAdded) - this.needsUpdate = true; + this.needsUpdate = true;*/ } } diff --git a/mods/tinker/tconstruct/client/CustomBowRenderer.java b/mods/tinker/tconstruct/client/CustomBowRenderer.java index 2faa1bce..83540960 100644 --- a/mods/tinker/tconstruct/client/CustomBowRenderer.java +++ b/mods/tinker/tconstruct/client/CustomBowRenderer.java @@ -56,8 +56,8 @@ public class CustomBowRenderer implements IItemRenderer if (living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer)living; - if (player.itemInUse != null) - icon = stack.getItem().getIcon(stack, renderPass, player, player.itemInUse, player.getItemInUseCount()); + if (player.getItemInUse() != null) + icon = stack.getItem().getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount()); } if (icon == null) diff --git a/mods/tinker/tconstruct/client/TClientEvents.java b/mods/tinker/tconstruct/client/TClientEvents.java index ec2e8457..b79a637e 100644 --- a/mods/tinker/tconstruct/client/TClientEvents.java +++ b/mods/tinker/tconstruct/client/TClientEvents.java @@ -47,6 +47,7 @@ public class TClientEvents { event.manager.soundPoolSounds.addSound("sounds/frypan_hit.ogg", TConstruct.class.getResource("/sounds/frypan_hit.ogg")); event.manager.soundPoolSounds.addSound("sounds/little_saw.ogg", TConstruct.class.getResource("/sounds/little_saw.ogg")); + event.manager.soundPoolSounds.addSound("sounds/launcher_clank.ogg", TConstruct.class.getResource("/sounds/launcher_clank.ogg")); System.out.println("[TConstruct] Successfully loaded sounds."); } catch (Exception e) diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 61ddd73f..2ee59429 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -267,7 +267,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new TankRender()); RenderingRegistry.registerBlockHandler(new SearedRender()); RenderingRegistry.registerBlockHandler(new FluidRender()); - RenderingRegistry.registerBlockHandler(new GolemCoreRender()); + //RenderingRegistry.registerBlockHandler(new GolemCoreRender()); RenderingRegistry.registerBlockHandler(new OreberryRender()); RenderingRegistry.registerBlockHandler(new BarricadeRender()); RenderingRegistry.registerBlockHandler(new CrystalBlockRender()); @@ -292,8 +292,10 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRender()); RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); // RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new SkylaRender()); + RenderingRegistry.registerEntityRenderingHandler(MiniGardy.class, new MiniGardyRender()); RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender()); RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); + RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRender()); //RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo! MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer()); @@ -604,12 +606,6 @@ public class TProxyClient extends TProxyCommon return null; } - @Override - public File getLocation () - { - return Minecraft.getMinecraftDir(); - } - static int[][] itemIcons = { new int[] { 0, 3, 0 }, //Repair new int[] { 1, 4, 0 }, //Pickaxe new int[] { 2, 5, 0 }, //Shovel @@ -673,6 +669,8 @@ public class TProxyClient extends TProxyCommon addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", "The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod"); + addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow", + "Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching"); addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", "The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High"); addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", @@ -733,6 +731,12 @@ public class TProxyClient extends TProxyCommon { TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); } + + String[] fletching = { "feather", "leaf", "slime", "blueslime" }; + for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++) + { + TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true); + } } /* Keybindings */ diff --git a/mods/tinker/tconstruct/client/block/SearedRender.java b/mods/tinker/tconstruct/client/block/SearedRender.java index 301ac5c9..3da6dc96 100644 --- a/mods/tinker/tconstruct/client/block/SearedRender.java +++ b/mods/tinker/tconstruct/client/block/SearedRender.java @@ -63,18 +63,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - //Outside - renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); - TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); - TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); - TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); - TProxyClient.renderStandardInvBlock(renderer, block, metadata); - - //Details - + //Details renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); @@ -119,6 +108,16 @@ public class SearedRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); + TProxyClient.renderStandardInvBlock(renderer, block, metadata); + + //Outside + renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); + TProxyClient.renderStandardInvBlock(renderer, block, metadata); + renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); + TProxyClient.renderStandardInvBlock(renderer, block, metadata); + renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); + TProxyClient.renderStandardInvBlock(renderer, block, metadata); + renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } else diff --git a/mods/tinker/tconstruct/client/entity/MiniGardyRender.java b/mods/tinker/tconstruct/client/entity/MiniGardyRender.java new file mode 100644 index 00000000..de9b32cd --- /dev/null +++ b/mods/tinker/tconstruct/client/entity/MiniGardyRender.java @@ -0,0 +1,177 @@ +package mods.tinker.tconstruct.client.entity; + +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; + +import org.lwjgl.opengl.GL11; + +import mods.tinker.tconstruct.entity.MiniGardy; +import net.minecraft.block.Block; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; +import net.minecraft.entity.EntityLiving; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class MiniGardyRender extends RenderLiving +{ + public MiniGardyRender() + { + super(new ModelMiniGardy(), 0.5F); + } + + @Override + protected void renderEquippedItems(EntityLiving par1EntityLiving, float par2) + { + float f1 = 1.0F; + GL11.glColor3f(f1, f1, f1); + super.renderEquippedItems(par1EntityLiving, par2); + ItemStack heldItem = par1EntityLiving.getHeldItem(); + ItemStack helmetItem = par1EntityLiving.getCurrentArmor(3); + float f2; + + ModelMiniGardy model = (ModelMiniGardy) this.mainModel; + if (helmetItem != null) + { + GL11.glPushMatrix(); + model.head.postRender(0.0625F); + + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(helmetItem, EQUIPPED); + boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, helmetItem, BLOCK_3D)); + + if (helmetItem.getItem() instanceof ItemBlock) + { + if (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[helmetItem.itemID].getRenderType())) + { + f2 = 0.625F; + GL11.glTranslatef(0.0F, -0.25F, 0.0F); + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(f2, -f2, -f2); + } + + this.renderManager.itemRenderer.renderItem(par1EntityLiving, helmetItem, 0); + } + else if (helmetItem.getItem().itemID == Item.skull.itemID) + { + f2 = 1.0625F; + GL11.glScalef(f2, -f2, -f2); + String s = ""; + + if (helmetItem.hasTagCompound() && helmetItem.getTagCompound().hasKey("SkullOwner")) + { + s = helmetItem.getTagCompound().getString("SkullOwner"); + } + + TileEntitySkullRenderer.skullRenderer.func_82393_a(-0.5F, 0.0F, -0.5F, 1, 180.0F, helmetItem.getItemDamage(), s); + } + + GL11.glPopMatrix(); + } + + if (heldItem != null) + { + GL11.glPushMatrix(); + + //if (this.mainModel.isChild) + { + f2 = 0.5F; + GL11.glTranslatef(0.0F, 0.75F, 0.0F); + GL11.glRotatef(-10.0F, 0F, 0.0F, 1.0F); + GL11.glScalef(f2, f2, f2); + } + + model.torso.postRender(0.0625F); + model.rightArm.postRender(0.0625F); + model.rightHand.postRender(0.0625F); + GL11.glTranslatef(-0.125F, 1F, 0F); + + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(heldItem, EQUIPPED); + boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, heldItem, BLOCK_3D)); + + if (heldItem.getItem() instanceof ItemBlock && (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[heldItem.itemID].getRenderType()))) + { + f2 = 0.5F; + GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); + f2 *= 0.75F; + GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(-f2, -f2, f2); + } + else if (heldItem.itemID == Item.bow.itemID) + { + f2 = 0.625F; + GL11.glTranslatef(-0.175F, 0.125F, 0.3125F); + GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(f2, -f2, f2); + GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + } + else //if (Item.itemsList[heldItem.itemID].isFull3D()) + { + f2 = 0.625F; + + if (Item.itemsList[heldItem.itemID].shouldRotateAroundWhenRendering()) + { + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.0F, -0.125F, 0.0F); + } + + this.translateItem(); + GL11.glScalef(f2, -f2, f2); + GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + } + /*else + { + f2 = 0.375F; + GL11.glTranslatef(0.25F, 0.1875F, -0.1875F); + GL11.glScalef(f2, f2, f2); + GL11.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); + }*/ + + float f6; + float f11; + int j; + float f12; + + if (heldItem.getItem().requiresMultipleRenderPasses()) + { + for (j = 0; j < heldItem.getItem().getRenderPasses(heldItem.getItemDamage()); j++) + { + int k = heldItem.getItem().getColorFromItemStack(heldItem, j); + f12 = (float)(k >> 16 & 255) / 255.0F; + f11 = (float)(k >> 8 & 255) / 255.0F; + f6 = (float)(k & 255) / 255.0F; + GL11.glColor4f(f12, f11, f6, 1.0F); + this.renderManager.itemRenderer.renderItem(par1EntityLiving, heldItem, j); + } + } + else + { + j = heldItem.getItem().getColorFromItemStack(heldItem, 0); + f6 = (float)(j >> 16 & 255) / 255.0F; + f12 = (float)(j >> 8 & 255) / 255.0F; + f11 = (float)(j & 255) / 255.0F; + GL11.glColor4f(f6, f12, f11, 1.0F); + this.renderManager.itemRenderer.renderItem(par1EntityLiving, heldItem, 0); + } + + GL11.glPopMatrix(); + } + } + + protected void translateItem() + { + GL11.glTranslatef(0.0F, 0.1875F, 0.0F); + } +} diff --git a/mods/tinker/tconstruct/client/entity/ModelBoxDegrees.java b/mods/tinker/tconstruct/client/entity/ModelBoxDegrees.java new file mode 100644 index 00000000..c3e91a25 --- /dev/null +++ b/mods/tinker/tconstruct/client/entity/ModelBoxDegrees.java @@ -0,0 +1,114 @@ +package mods.tinker.tconstruct.client.entity; + +import net.minecraft.client.model.PositionTextureVertex; +import net.minecraft.client.model.TexturedQuad; +import net.minecraft.client.renderer.Tessellator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ModelBoxDegrees +{ + /** + * The (x,y,z) vertex positions and (u,v) texture coordinates for each of the 8 points on a cube + */ + private PositionTextureVertex[] vertexPositions; + + /** An array of 6 TexturedQuads, one for each face of a cube */ + private TexturedQuad[] quadList; + + /** X vertex coordinate of lower box corner */ + public final float posX1; + + /** Y vertex coordinate of lower box corner */ + public final float posY1; + + /** Z vertex coordinate of lower box corner */ + public final float posZ1; + + /** X vertex coordinate of upper box corner */ + public final float posX2; + + /** Y vertex coordinate of upper box corner */ + public final float posY2; + + /** Z vertex coordinate of upper box corner */ + public final float posZ2; + public String field_78247_g; + + public ModelBoxDegrees(ModelRendererDegrees par1ModelRenderer, int par2, int par3, float par4, float par5, float par6, int par7, int par8, int par9, float par10) + { + this.posX1 = par4; + this.posY1 = par5; + this.posZ1 = par6; + this.posX2 = par4 + (float)par7; + this.posY2 = par5 + (float)par8; + this.posZ2 = par6 + (float)par9; + this.vertexPositions = new PositionTextureVertex[8]; + this.quadList = new TexturedQuad[6]; + float f4 = par4 + (float)par7; + float f5 = par5 + (float)par8; + float f6 = par6 + (float)par9; + par4 -= par10; + par5 -= par10; + par6 -= par10; + f4 += par10; + f5 += par10; + f6 += par10; + + if (par1ModelRenderer.mirror) + { + float f7 = f4; + f4 = par4; + par4 = f7; + } + + PositionTextureVertex positiontexturevertex = new PositionTextureVertex(par4, par5, par6, 0.0F, 0.0F); + PositionTextureVertex positiontexturevertex1 = new PositionTextureVertex(f4, par5, par6, 0.0F, 8.0F); + PositionTextureVertex positiontexturevertex2 = new PositionTextureVertex(f4, f5, par6, 8.0F, 8.0F); + PositionTextureVertex positiontexturevertex3 = new PositionTextureVertex(par4, f5, par6, 8.0F, 0.0F); + PositionTextureVertex positiontexturevertex4 = new PositionTextureVertex(par4, par5, f6, 0.0F, 0.0F); + PositionTextureVertex positiontexturevertex5 = new PositionTextureVertex(f4, par5, f6, 0.0F, 8.0F); + PositionTextureVertex positiontexturevertex6 = new PositionTextureVertex(f4, f5, f6, 8.0F, 8.0F); + PositionTextureVertex positiontexturevertex7 = new PositionTextureVertex(par4, f5, f6, 8.0F, 0.0F); + this.vertexPositions[0] = positiontexturevertex; + this.vertexPositions[1] = positiontexturevertex1; + this.vertexPositions[2] = positiontexturevertex2; + this.vertexPositions[3] = positiontexturevertex3; + this.vertexPositions[4] = positiontexturevertex4; + this.vertexPositions[5] = positiontexturevertex5; + this.vertexPositions[6] = positiontexturevertex6; + this.vertexPositions[7] = positiontexturevertex7; + this.quadList[0] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex5, positiontexturevertex1, positiontexturevertex2, positiontexturevertex6}, par2 + par9 + par7, par3 + par9, par2 + par9 + par7 + par9, par3 + par9 + par8, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + this.quadList[1] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex, positiontexturevertex4, positiontexturevertex7, positiontexturevertex3}, par2, par3 + par9, par2 + par9, par3 + par9 + par8, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + this.quadList[2] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex5, positiontexturevertex4, positiontexturevertex, positiontexturevertex1}, par2 + par9, par3, par2 + par9 + par7, par3 + par9, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + this.quadList[3] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex2, positiontexturevertex3, positiontexturevertex7, positiontexturevertex6}, par2 + par9 + par7, par3 + par9, par2 + par9 + par7 + par7, par3, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + this.quadList[4] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex1, positiontexturevertex, positiontexturevertex3, positiontexturevertex2}, par2 + par9, par3 + par9, par2 + par9 + par7, par3 + par9 + par8, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + this.quadList[5] = new TexturedQuad(new PositionTextureVertex[] {positiontexturevertex4, positiontexturevertex5, positiontexturevertex6, positiontexturevertex7}, par2 + par9 + par7 + par9, par3 + par9, par2 + par9 + par7 + par9 + par7, par3 + par9 + par8, par1ModelRenderer.textureWidth, par1ModelRenderer.textureHeight); + + if (par1ModelRenderer.mirror) + { + for (int j1 = 0; j1 < this.quadList.length; ++j1) + { + this.quadList[j1].flipFace(); + } + } + } + + /** + * Draw the six sided box defined by this ModelBox + */ + @SideOnly(Side.CLIENT) + public void render(Tessellator par1Tessellator, float par2) + { + for (int i = 0; i < this.quadList.length; ++i) + { + this.quadList[i].draw(par1Tessellator, par2); + } + } + + public ModelBoxDegrees func_78244_a(String par1Str) + { + this.field_78247_g = par1Str; + return this; + } +} diff --git a/mods/tinker/tconstruct/client/entity/ModelMiniGardy.java b/mods/tinker/tconstruct/client/entity/ModelMiniGardy.java new file mode 100644 index 00000000..48c7e7ba --- /dev/null +++ b/mods/tinker/tconstruct/client/entity/ModelMiniGardy.java @@ -0,0 +1,208 @@ +package mods.tinker.tconstruct.client.entity; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; + +public class ModelMiniGardy extends ModelBase +{ + ModelRendererDegrees body; + ModelRendererDegrees torso; + ModelRendererDegrees head; + ModelRendererDegrees rightArm; + ModelRendererDegrees rightHand; + ModelRendererDegrees leftArm; + ModelRendererDegrees leftHand; + ModelRendererDegrees hairTop; + ModelRendererDegrees hairRight; + ModelRendererDegrees lockLeft; + ModelRendererDegrees lockRight; + ModelRendererDegrees hairLeft; + ModelRendererDegrees hairBack; + ModelRendererDegrees hairFront; + ModelRendererDegrees hairTopFront; + ModelRendererDegrees hairTopBack; + ModelRendererDegrees lockInsideRight; + ModelRendererDegrees lockInsideLeft; + + public ModelMiniGardy() + { + body = new ModelRendererDegrees(this, 0, 0); + body.addBox(-3F, 0F, -3F, 6, 6, 6); + body.setRotationPoint(0F, 18F, 0F); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + + torso = new ModelRendererDegrees(this, 16, 12); + torso.addBox(-1F, -5F, -1F, 2, 5, 2); + torso.setRotationPoint(0F, 0F, 0F); + torso.mirror = true; + setRotation(torso, 0F, 0F, 0F); + body.addChild(torso); + + rightArm = new ModelRendererDegrees(this, 24, 0); + rightArm.addBox(-1F, -1F, -1F, 2, 4, 2); + rightArm.setRotationPoint(-2F, -3F, 0F); + rightArm.mirror = true; + setRotation(rightArm, 0F, 0F, 15F);//convertDegrees(30.0f));//0.2617994F); + torso.addChild(rightArm); + + rightHand = new ModelRendererDegrees(this, 24, 6); + rightHand.addBox(-1F, 0F, -2F, 2, 4, 2); + rightHand.setRotationPoint(0F, 3F, 1F); + rightHand.setTextureSize(64, 32); + rightHand.mirror = true; + setRotation(rightHand, 0F, 0F, 0F); + rightArm.addChild(rightHand); + + leftArm = new ModelRendererDegrees(this, 32, 0); + leftArm.addBox(-1F, -1F, -1F, 2, 4, 2); + leftArm.setRotationPoint(2F, -3F, 0F); + leftArm.mirror = true; + setRotation(leftArm, 0F, 0F, -15F); + torso.addChild(leftArm); + + leftHand = new ModelRendererDegrees(this, 32, 6); + leftHand.addBox(-1F, 0F, -2F, 2, 4, 2); + leftHand.setRotationPoint(0F, 3F, 1F); + leftHand.mirror = true; + setRotation(leftHand, 0F, 0F, 0F); + leftArm.addChild(leftHand); + + //Head + head = new ModelRendererDegrees(this, 0, 12); + head.addBox(-2F, -4F, -2F, 4, 4, 4); + head.setRotationPoint(0F, -5F, 0F); + head.mirror = true; + setRotation(head, 0F, 0F, 0F); + torso.addChild(head); + + hairTop = new ModelRendererDegrees(this, 40, 2); + hairTop.addBox(-3F, 0F, -2F, 6, 1, 4); + hairTop.setRotationPoint(0F, -5F, 0F); + hairTop.mirror = true; + setRotation(hairTop, 0F, 0F, 0F); + head.addChild(hairTop); + + hairRight = new ModelRendererDegrees(this, 40, 7); + hairRight.addBox(0F, 0F, 0F, 2, 5, 4); + hairRight.setRotationPoint(-3F, -4F, -1F); + hairRight.mirror = true; + setRotation(hairRight, 0F, 0F, 0F); + head.addChild(hairRight); + + lockLeft = new ModelRendererDegrees(this, 46, 19); + lockLeft.addBox(0F, 0F, 0F, 1, 2, 2); + lockLeft.setRotationPoint(2F, -1F, -3F); + lockLeft.mirror = true; + setRotation(lockLeft, 0F, 0F, 0F); + head.addChild(lockLeft); + + lockRight = new ModelRendererDegrees(this, 40, 19); + lockRight.addBox(-1F, 0F, 0F, 1, 2, 2); + lockRight.setRotationPoint(-2F, -1F, -3F); + lockRight.mirror = true; + setRotation(lockRight, 0F, 0F, 0F); + head.addChild(lockRight); + + hairLeft = new ModelRendererDegrees(this, 52, 7); + hairLeft.addBox(0F, 0F, 0F, 2, 5, 4); + hairLeft.setRotationPoint(1F, -4F, -1F); + hairLeft.mirror = true; + setRotation(hairLeft, 0F, 0F, 0F); + head.addChild(hairLeft); + + hairBack = new ModelRendererDegrees(this, 56, 16); + hairBack.addBox(-1F, 0F, 0F, 2, 4, 1); + hairBack.setRotationPoint(0F, -4F, 2F); + hairBack.mirror = true; + setRotation(hairBack, 0F, 0F, 0F); + head.addChild(hairBack); + + hairFront = new ModelRendererDegrees(this, 40, 16); + hairFront.addBox(0F, 0F, 0F, 6, 1, 2); + hairFront.setRotationPoint(-3F, -4F, -3F); + hairFront.mirror = true; + setRotation(hairFront, 0F, 0F, 0F); + head.addChild(hairFront); + + hairTopFront = new ModelRendererDegrees(this, 50, 0); + hairTopFront.addBox(0F, 0F, 0F, 4, 1, 1); + hairTopFront.setRotationPoint(-2F, -5F, -3F); + hairTopFront.mirror = true; + setRotation(hairTopFront, 0F, 0F, 0F); + head.addChild(hairTopFront); + + hairTopBack = new ModelRendererDegrees(this, 40, 0); + hairTopBack.addBox(0F, 0F, 0F, 4, 1, 1); + hairTopBack.setRotationPoint(-2F, -5F, 2F); + hairTopBack.mirror = true; + setRotation(hairTopBack, 0F, 0F, 0F); + head.addChild(hairTopBack); + + lockInsideRight = new ModelRendererDegrees(this, 40, 23); + lockInsideRight.addBox(0F, 0F, 0F, 1, 1, 2); + lockInsideRight.setRotationPoint(-2F, 0F, -3F); + lockInsideRight.mirror = true; + setRotation(lockInsideRight, 0F, 0F, 0F); + head.addChild(lockInsideRight); + + lockInsideLeft = new ModelRendererDegrees(this, 46, 23); + lockInsideLeft.addBox(-1F, 0F, 0F, 1, 1, 2); + lockInsideLeft.setRotationPoint(2F, 0F, -3F); + lockInsideLeft.mirror = true; + setRotation(lockInsideLeft, 0F, 0F, 0F); + head.addChild(lockInsideLeft); + } + + @Override + public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + body.render(f5); + } + + private void setRotation (ModelRendererDegrees model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + private float convertDegrees (float f) + { + return f * ((float) Math.PI / 180F); + } + + private float convertRadians (float f) + { + return f * (180F / (float) Math.PI); + } + + @Override + public void setRotationAngles (float limbSwing, float limbDelta, float ticksExisted, float rotation, float rotationDelta, float par6, Entity entity) + { + float bodyRotation = convertRadians(MathHelper.cos(limbSwing * 0.6662F + (float) Math.PI) * 2.0F * limbDelta * 0.5F); + this.rightArm.rotateAngleX = bodyRotation; + this.leftArm.rotateAngleX = -bodyRotation; + this.torso.rotateAngleY = bodyRotation / 2; + this.head.rotateAngleY = rotation - bodyRotation / 2; + this.head.rotateAngleX = rotationDelta; + if (bodyRotation <= 0) + { + this.rightHand.rotateAngleX = bodyRotation; + } + if (-bodyRotation <= 0) + { + this.leftHand.rotateAngleX = -bodyRotation; + } + this.rightArm.rotateAngleZ = 15F; + this.leftArm.rotateAngleZ = -15F; + this.torso.rotationPointY = 0F; + this.rightArm.rotateAngleZ += convertRadians(MathHelper.cos(ticksExisted * 0.09F) * 0.05F + 0.05F); + this.leftArm.rotateAngleZ -= convertRadians(MathHelper.cos(ticksExisted * 0.09F) * 0.05F + 0.05F); + this.torso.rotationPointY += convertRadians(MathHelper.cos(ticksExisted * 0.09F) * 0.01F + 0.01F); + } + +} diff --git a/mods/tinker/tconstruct/client/entity/ModelRendererDegrees.java b/mods/tinker/tconstruct/client/entity/ModelRendererDegrees.java new file mode 100644 index 00000000..b204d8bb --- /dev/null +++ b/mods/tinker/tconstruct/client/entity/ModelRendererDegrees.java @@ -0,0 +1,321 @@ +package mods.tinker.tconstruct.client.entity; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.TextureOffset; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.Tessellator; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ModelRendererDegrees +{ + /** The size of the texture file's width in pixels. */ + public float textureWidth; + + /** The size of the texture file's height in pixels. */ + public float textureHeight; + + /** The X offset into the texture used for displaying this model */ + private int textureOffsetX; + + /** The Y offset into the texture used for displaying this model */ + private int textureOffsetY; + public float rotationPointX; + public float rotationPointY; + public float rotationPointZ; + public float rotateAngleX; + public float rotateAngleY; + public float rotateAngleZ; + private boolean compiled; + + /** The GL display list rendered by the Tessellator for this model */ + private int displayList; + public boolean mirror; + public boolean showModel; + + /** Hides the model. */ + public boolean isHidden; + public List cubeList; + public List childModels; + public final String boxName; + private ModelBase baseModel; + public float field_82906_o; + public float field_82908_p; + public float field_82907_q; + + public ModelRendererDegrees(ModelBase par1ModelBase, String par2Str) + { + this.textureWidth = 64.0F; + this.textureHeight = 32.0F; + this.compiled = false; + this.displayList = 0; + this.mirror = false; + this.showModel = true; + this.isHidden = false; + this.cubeList = new ArrayList(); + this.baseModel = par1ModelBase; + par1ModelBase.boxList.add(this); + this.boxName = par2Str; + this.setTextureSize(par1ModelBase.textureWidth, par1ModelBase.textureHeight); + } + + public ModelRendererDegrees(ModelBase par1ModelBase) + { + this(par1ModelBase, (String)null); + } + + public ModelRendererDegrees(ModelBase par1ModelBase, int par2, int par3) + { + this(par1ModelBase); + this.setTextureOffset(par2, par3); + } + + /** + * Sets the current box's rotation points and rotation angles to another box. + */ + public void addChild(ModelRendererDegrees par1ModelRenderer) + { + if (this.childModels == null) + { + this.childModels = new ArrayList(); + } + + this.childModels.add(par1ModelRenderer); + } + + public ModelRendererDegrees setTextureOffset(int par1, int par2) + { + this.textureOffsetX = par1; + this.textureOffsetY = par2; + return this; + } + + public ModelRendererDegrees addBox(String par1Str, float par2, float par3, float par4, int par5, int par6, int par7) + { + par1Str = this.boxName + "." + par1Str; + TextureOffset textureoffset = this.baseModel.getTextureOffset(par1Str); + this.setTextureOffset(textureoffset.textureOffsetX, textureoffset.textureOffsetY); + this.cubeList.add((new ModelBoxDegrees(this, this.textureOffsetX, this.textureOffsetY, par2, par3, par4, par5, par6, par7, 0.0F)).func_78244_a(par1Str)); + return this; + } + + public ModelRendererDegrees addBox(float par1, float par2, float par3, int par4, int par5, int par6) + { + this.cubeList.add(new ModelBoxDegrees(this, this.textureOffsetX, this.textureOffsetY, par1, par2, par3, par4, par5, par6, 0.0F)); + return this; + } + + /** + * Creates a textured box. Args: originX, originY, originZ, width, height, depth, scaleFactor. + */ + public void addBox(float par1, float par2, float par3, int par4, int par5, int par6, float par7) + { + this.cubeList.add(new ModelBoxDegrees(this, this.textureOffsetX, this.textureOffsetY, par1, par2, par3, par4, par5, par6, par7)); + } + + public void setRotationPoint(float par1, float par2, float par3) + { + this.rotationPointX = par1; + this.rotationPointY = par2; + this.rotationPointZ = par3; + } + + @SideOnly(Side.CLIENT) + public void render(float par1) + { + if (!this.isHidden) + { + if (this.showModel) + { + if (!this.compiled) + { + this.compileDisplayList(par1); + } + + GL11.glTranslatef(this.field_82906_o, this.field_82908_p, this.field_82907_q); + int i; + + if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) + { + if (this.rotationPointX == 0.0F && this.rotationPointY == 0.0F && this.rotationPointZ == 0.0F) + { + GL11.glCallList(this.displayList); + + if (this.childModels != null) + { + for (i = 0; i < this.childModels.size(); ++i) + { + ((ModelRendererDegrees)this.childModels.get(i)).render(par1); + } + } + } + else + { + GL11.glTranslatef(this.rotationPointX * par1, this.rotationPointY * par1, this.rotationPointZ * par1); + GL11.glCallList(this.displayList); + + if (this.childModels != null) + { + for (i = 0; i < this.childModels.size(); ++i) + { + ((ModelRendererDegrees)this.childModels.get(i)).render(par1); + } + } + + GL11.glTranslatef(-this.rotationPointX * par1, -this.rotationPointY * par1, -this.rotationPointZ * par1); + } + } + else + { + GL11.glPushMatrix(); + GL11.glTranslatef(this.rotationPointX * par1, this.rotationPointY * par1, this.rotationPointZ * par1); + + if (this.rotateAngleZ != 0.0F) + { + GL11.glRotatef(this.rotateAngleZ, 0.0F, 0.0F, 1.0F); + } + + if (this.rotateAngleY != 0.0F) + { + GL11.glRotatef(this.rotateAngleY, 0.0F, 1.0F, 0.0F); + } + + if (this.rotateAngleX != 0.0F) + { + GL11.glRotatef(this.rotateAngleX, 1.0F, 0.0F, 0.0F); + } + + GL11.glCallList(this.displayList); + + if (this.childModels != null) + { + for (i = 0; i < this.childModels.size(); ++i) + { + ((ModelRendererDegrees)this.childModels.get(i)).render(par1); + } + } + + GL11.glPopMatrix(); + } + + GL11.glTranslatef(-this.field_82906_o, -this.field_82908_p, -this.field_82907_q); + } + } + } + + @SideOnly(Side.CLIENT) + public void renderWithRotation(float par1) + { + if (!this.isHidden) + { + if (this.showModel) + { + if (!this.compiled) + { + this.compileDisplayList(par1); + } + + GL11.glPushMatrix(); + GL11.glTranslatef(this.rotationPointX * par1, this.rotationPointY * par1, this.rotationPointZ * par1); + + if (this.rotateAngleY != 0.0F) + { + GL11.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + } + + if (this.rotateAngleX != 0.0F) + { + GL11.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + } + + if (this.rotateAngleZ != 0.0F) + { + GL11.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + } + + GL11.glCallList(this.displayList); + GL11.glPopMatrix(); + } + } + } + + /** + * Allows the changing of Angles after a box has been rendered + */ + @SideOnly(Side.CLIENT) + public void postRender(float par1) + { + if (!this.isHidden) + { + if (this.showModel) + { + if (!this.compiled) + { + this.compileDisplayList(par1); + } + + if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) + { + if (this.rotationPointX != 0.0F || this.rotationPointY != 0.0F || this.rotationPointZ != 0.0F) + { + GL11.glTranslatef(this.rotationPointX * par1, this.rotationPointY * par1, this.rotationPointZ * par1); + } + } + else + { + GL11.glTranslatef(this.rotationPointX * par1, this.rotationPointY * par1, this.rotationPointZ * par1); + + if (this.rotateAngleZ != 0.0F) + { + GL11.glRotatef(this.rotateAngleZ, 0.0F, 0.0F, 1.0F); + } + + if (this.rotateAngleY != 0.0F) + { + GL11.glRotatef(this.rotateAngleY, 0.0F, 1.0F, 0.0F); + } + + if (this.rotateAngleX != 0.0F) + { + GL11.glRotatef(this.rotateAngleX, 1.0F, 0.0F, 0.0F); + } + } + } + } + } + + /** + * Compiles a GL display list for this model + */ + @SideOnly(Side.CLIENT) + private void compileDisplayList(float par1) + { + this.displayList = GLAllocation.generateDisplayLists(1); + GL11.glNewList(this.displayList, GL11.GL_COMPILE); + Tessellator tessellator = Tessellator.instance; + + for (int i = 0; i < this.cubeList.size(); ++i) + { + ((ModelBoxDegrees)this.cubeList.get(i)).render(tessellator, par1); + } + + GL11.glEndList(); + this.compiled = true; + } + + /** + * Returns the model renderer with the new texture parameters. + */ + public ModelRendererDegrees setTextureSize(int par1, int par2) + { + this.textureWidth = (float)par1; + this.textureHeight = (float)par2; + return this; + } +} diff --git a/mods/tinker/tconstruct/client/entity/projectile/ArrowRender.java b/mods/tinker/tconstruct/client/entity/projectile/ArrowRender.java new file mode 100644 index 00000000..ece954e2 --- /dev/null +++ b/mods/tinker/tconstruct/client/entity/projectile/ArrowRender.java @@ -0,0 +1,479 @@ +package mods.tinker.tconstruct.client.entity.projectile; + +import java.util.Random; + +import mods.tinker.tconstruct.entity.projectile.ArrowEntity; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraftforge.client.ForgeHooksClient; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ArrowRender extends Render +{ + + /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ + private Random random = new Random(); + public boolean renderWithColor = true; + + /** Defines the zLevel of rendering of item on GUI. */ + public float zLevel = 0.0F; + + public ArrowRender() + { + this.shadowSize = 0.15F; + this.shadowOpaque = 0.75F; + } + + /** + * Renders the item + */ + public void doRenderItem (ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) + { + this.random.setSeed(187L); + ItemStack itemstack = arrow.getEntityItem(); + + if (itemstack.getItem() != null) + { + GL11.glPushMatrix(); + float f2 = shouldBob() ? MathHelper.sin(((float) 0 + par9 * 0.2f) / 10.0F + 0) * 0.1F + 0.1F : 0F; + float f3 = (((float) 0 + par9 * 0.2f) / 20.0F + 0) * (180F / (float) Math.PI); + byte b0 = getMiniBlockCount(itemstack); + + GL11.glTranslatef((float) par2, (float) par4 + f2, (float) par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + int i; + float f4; + float f5; + float f6; + + float f8; + + if (itemstack.getItem().requiresMultipleRenderPasses()) + { + //GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + + this.loadTexture("/gui/items.png"); + + for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) + { + this.random.setSeed(187L); + Icon icon = itemstack.getItem().getIcon(itemstack, k); + f8 = 1.0F; + + if (this.renderWithColor) + { + i = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, k); + f5 = (float) (i >> 16 & 255) / 255.0F; + f4 = (float) (i >> 8 & 255) / 255.0F; + f6 = (float) (i & 255) / 255.0F; + GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); + this.renderDroppedItem(arrow, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8); + } + else + { + this.renderDroppedItem(arrow, icon, b0, par9, 1.0F, 1.0F, 1.0F); + } + GL11.glScalef(1.005f, 1.005f, 1.005f); + //GL11.glTranslatef(0F, -0.0025F, 0.0F); + } + } + else + { + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + + Icon icon1 = itemstack.getIconIndex(); + + if (itemstack.getItemSpriteNumber() == 0) + { + this.loadTexture("/terrain.png"); + } + else + { + this.loadTexture("/gui/items.png"); + } + + if (this.renderWithColor) + { + int l = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, 0); + f8 = (float) (l >> 16 & 255) / 255.0F; + float f9 = (float) (l >> 8 & 255) / 255.0F; + f5 = (float) (l & 255) / 255.0F; + f4 = 1.0F; + this.renderDroppedItem(arrow, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); + } + else + { + this.renderDroppedItem(arrow, icon1, b0, par9, 1.0F, 1.0F, 1.0F); + } + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + } + + /** + * Renders a dropped item + */ + private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) + { + Tessellator tessellator = Tessellator.instance; + + if (par2Icon == null) + { + par2Icon = this.renderManager.renderEngine.getMissingIcon(arrow.getEntityItem().getItemSpriteNumber()); + } + + float f4 = par2Icon.getMinU(); + float f5 = par2Icon.getMaxU(); + float f6 = par2Icon.getMinV(); + float f7 = par2Icon.getMaxV(); + float f8 = 1.0F; + float f9 = 0.5F; + float f10 = 0.25F; + float f11; + + GL11.glPushMatrix(); + /*float rotation = dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par7; + GL11.glRotatef(dagger.rotationYaw + 90, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-rotation * 15, 0.0F, 0.0F, 1.0F);*/ + GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par4 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par4 - 30.0F, 0.0F, 0.0F, 1.0F); + float f12 = 0.0625F; + f11 = 0.021875F; + ItemStack itemstack = arrow.getEntityItem(); + int j = itemstack.stackSize; + byte b0 = getMiniItemCount(itemstack); + + GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); + + for (int k = 0; k < b0; ++k) + { + GL11.glTranslatef(0f, 0f, f12 + f11); + + if (itemstack.getItemSpriteNumber() == 0) + { + this.loadTexture("/terrain.png"); + } + else + { + this.loadTexture("/gui/items.png"); + } + + GL11.glColor4f(par5, par6, par7, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, par2Icon.getSheetWidth(), par2Icon.getSheetHeight(), f12); + + if (itemstack != null && itemstack.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + this.renderManager.renderEngine.bindTexture("%blur%/misc/glint.png"); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float f13 = 0.76F; + GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float f14 = 0.125F; + GL11.glScalef(f14, f14, f14); + float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(f15, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(f14, f14, f14); + f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-f15, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + } + + GL11.glPopMatrix(); + + } + + /** + * Renders the item's icon or block into the UI at the specified position. + */ + public void renderItemIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + int k = par3ItemStack.itemID; + int l = par3ItemStack.getItemDamage(); + Icon icon = par3ItemStack.getIconIndex(); + float f; + float f1; + float f2; + + int j1; + + if (Item.itemsList[k].requiresMultipleRenderPasses()) + { + GL11.glDisable(GL11.GL_LIGHTING); + par2RenderEngine.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? "/terrain.png" : "/gui/items.png"); + + for (j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) + { + Icon icon1 = Item.itemsList[k].getIcon(par3ItemStack, j1); + int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); + f = (float) (k1 >> 16 & 255) / 255.0F; + f1 = (float) (k1 >> 8 & 255) / 255.0F; + float f3 = (float) (k1 & 255) / 255.0F; + + if (this.renderWithColor) + { + GL11.glColor4f(f, f1, f3, 1.0F); + } + + this.renderIcon(par4, par5, icon1, 16, 16); + } + + GL11.glEnable(GL11.GL_LIGHTING); + } + else + { + GL11.glDisable(GL11.GL_LIGHTING); + + if (par3ItemStack.getItemSpriteNumber() == 0) + { + par2RenderEngine.bindTexture("/terrain.png"); + } + else + { + par2RenderEngine.bindTexture("/gui/items.png"); + } + + if (icon == null) + { + icon = par2RenderEngine.getMissingIcon(par3ItemStack.getItemSpriteNumber()); + } + + j1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); + float f4 = (float) (j1 >> 16 & 255) / 255.0F; + f2 = (float) (j1 >> 8 & 255) / 255.0F; + f = (float) (j1 & 255) / 255.0F; + + if (this.renderWithColor) + { + GL11.glColor4f(f4, f2, f, 1.0F); + } + + this.renderIcon(par4, par5, icon, 16, 16); + GL11.glEnable(GL11.GL_LIGHTING); + } + + GL11.glEnable(GL11.GL_CULL_FACE); + } + + /** + * Render the item's icon or block into the GUI, including the glint effect. + */ + public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + if (par3ItemStack != null) + { + if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5)) + { + this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5); + } + + if (par3ItemStack.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_GREATER); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + par2RenderEngine.bindTexture("%blur%/misc/glint.png"); + this.zLevel -= 50.0F; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); + GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); + this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + this.zLevel += 50.0F; + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + } + } + + private void renderGlint (int par1, int par2, int par3, int par4, int par5) + { + for (int j1 = 0; j1 < 2; ++j1) + { + if (j1 == 0) + { + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + } + + if (j1 == 1) + { + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + } + + float f = 0.00390625F; + float f1 = 0.00390625F; + float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; + float f3 = 0.0F; + Tessellator tessellator = Tessellator.instance; + float f4 = 4.0F; + + if (j1 == 1) + { + f4 = -1.0F; + } + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), + (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.draw(); + } + } + + /** + * Renders the item's overlay information. Examples being stack count or + * damage on top of the item's image at the specified position. + */ + public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + this.renderItemStack(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5, (String) null); + } + + public void renderItemStack (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5, String par6Str) + { + if (par3ItemStack != null) + { + if (par3ItemStack.stackSize > 1 || par6Str != null) + { + String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + } + + if (par3ItemStack.isItemDamaged()) + { + int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); + int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_TEXTURE_2D); + Tessellator tessellator = Tessellator.instance; + int i1 = 255 - l << 16 | l << 8; + int j1 = (255 - l) / 4 << 16 | 16128; + this.renderQuad(tessellator, par4 + 2, par5 + 13, 13, 2, 0); + this.renderQuad(tessellator, par4 + 2, par5 + 13, 12, 1, j1); + this.renderQuad(tessellator, par4 + 2, par5 + 13, k, 1, i1); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + } + } + + /** + * Adds a quad to the tesselator at the specified position with the set + * width and height and color. Args: tessellator, x, y, width, height, color + */ + private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) + { + par1Tessellator.startDrawingQuads(); + par1Tessellator.setColorOpaque_I(par6); + par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); + par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + par5), 0.0D); + par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + par5), 0.0D); + par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + 0), 0.0D); + par1Tessellator.draw(); + } + + public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5) + { + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV()); + tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV()); + tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV()); + tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); + tessellator.draw(); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, + * always casting down its argument and then handing it off to a worker + * function which does the actual work. In all probabilty, the class Render + * is generic (Render= 10000) + if (maxDur > 0) { - fontRenderer.drawString("Durability:", xSize + 8, base + offset * 11, 0xffffff); - offset++; - fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); - offset++; - } - else - { - fontRenderer.drawString("Durability: " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); - offset++; + if (maxDur >= 10000) + { + fontRenderer.drawString("Durability:", xSize + 8, base + offset * 11, 0xffffff); + offset++; + fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + offset++; + } + else + { + fontRenderer.drawString("Durability: " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + offset++; + } } final float stonebound = tags.getFloat("Shoddy"); //Attack if (categories.contains("weapon")) { - int attack = (int) (tags.getInteger("Attack"));// * tool.getDamageModifier()); + int attack = (int) (tags.getInteger("Attack")); float stoneboundDamage = (float) Math.log(durability / 72f + 1) * -2 * stonebound; attack += stoneboundDamage; if (attack < 1) @@ -225,7 +232,7 @@ public class ToolStationGui extends NewContainerGui } offset++; } - + if (categories.contains("bow")) { DecimalFormat df = new DecimalFormat("##.##"); @@ -233,9 +240,35 @@ public class ToolStationGui extends NewContainerGui int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.fontRenderer.drawString("Draw Speed: " + df.format(trueDraw)+"s", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString("Draw Speed: " + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString("Arrow Speed: " + df.format(flightSpeed)+"x", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString("Arrow Speed: " + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } + + if (categories.contains("ammo")) + { + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + int attack = (int) (tags.getInteger("Attack")); + float mass = tags.getFloat("Mass"); + float shatter = tags.getFloat("BreakChance"); + float accuracy = tags.getFloat("Accuracy"); + + String heart = attack == 2 ? " Heart" : " Hearts"; + if (attack % 2 == 0) + this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + else + this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + offset++; + + this.fontRenderer.drawString("Weight: " + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + this.fontRenderer.drawString("Accuracy: " + df.format(accuracy)+"%", xSize + 8, base + offset * 10, 0xffffff); + offset++; + this.fontRenderer.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java index 5815ee7c..12c5c73e 100644 --- a/mods/tinker/tconstruct/common/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -81,7 +81,6 @@ public class TContent implements IFuelHandler public static ToolCore battlesign; public static ToolCore chisel; public static ToolCore mattock; - public static ToolCore shortbow; public static ToolCore scythe; public static ToolCore lumberaxe; @@ -90,6 +89,9 @@ public class TContent implements IFuelHandler public static ToolCore hammer; public static ToolCore battleaxe; + public static ToolCore shortbow; + public static ToolCore arrow; + public static Item potionLauncher; //Tool parts @@ -119,6 +121,8 @@ public class TContent implements IFuelHandler public static Item fullGuard; public static Item bowstring; + public static Item arrowhead; + public static Item fletching; //Crafting blocks public static Block toolStationWood; @@ -224,13 +228,15 @@ public class TContent implements IFuelHandler EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); - //EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true); //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); //EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(SlimeClone.class, "SlimeClone", 10, TConstruct.instance, 32, 3, true); EntityRegistry.registerModEntity(Automaton.class, "Automaton", 11, TConstruct.instance, 64, 3, true); EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); + EntityRegistry.registerModEntity(MiniGardy.class, "MiniGardy", 13, TConstruct.instance, 64, 3, true); //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); BiomeGenBase[] plains = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS); @@ -362,8 +368,8 @@ public class TContent implements IFuelHandler String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one"); GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one"); - String[] berryOresTwo = new String[] { "berry_aluminum", "berry_silver", "", "", "berry_aluminum_ripe", "berry_silver_ripe", "", "" }; - oreBerrySecond = (OreberryBush) new OreberryBush(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two"); + String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; + oreBerrySecond = (OreberryBush) new OreberryBushEssence(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two"); GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; @@ -493,6 +499,7 @@ public class TContent implements IFuelHandler battleaxe = new Battleaxe(PHConstruct.battleaxe); shortbow = new Shortbow(PHConstruct.shortbow); + arrow = new Arrow(PHConstruct.arrow); Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe }; String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", @@ -530,12 +537,15 @@ public class TContent implements IFuelHandler largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade").setUnlocalizedName("tconstruct.LargeSwordBlade"); hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head").setUnlocalizedName("tconstruct.HammerHead"); - bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.bowstring"); + bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.Bowstring"); + arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead").setUnlocalizedName("tconstruct.Arrowhead"); + fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching"); Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, heavyPlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard, - frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring }; + frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring, fletching, arrowhead }; String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", - "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring" }; + "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", + "fletching", "arrowhead" }; for (int i = 0; i < toolParts.length; i++) { @@ -568,7 +578,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(materials, 1, i)); } - String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Silver" }; + String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; for (int i = 0; i < oreberries.length; i++) { @@ -598,8 +608,8 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", ""); TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound"); TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); - TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 1f, "\u00A78", "Stonebound"); - TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Spiny"); + TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, -1F, "\u00A78", "Jagged"); + TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Jagged"); TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound"); @@ -632,30 +642,32 @@ public class TContent implements IFuelHandler TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); //Alumite TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); //Steel TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); //Blue Slime + + //Material ID, mass, fragility + TConstructRegistry.addArrowMaterial(0, 0.69F, 1.0F, 100F); //Wood + TConstructRegistry.addArrowMaterial(1, 2.5F, 5.0F, 100F); //Stone + TConstructRegistry.addArrowMaterial(2, 7.2F, 0.5F, 100F); //Iron + TConstructRegistry.addArrowMaterial(3, 2.65F, 1.0F, 100F); //Flint + TConstructRegistry.addArrowMaterial(4, 0.76F, 1.0F, 100F); //Cactus + TConstructRegistry.addArrowMaterial(5, 0.69F, 1.0F, 90F); //Bone + TConstructRegistry.addArrowMaterial(6, 2.4F, 1.0F, 100F); //Obsidian + TConstructRegistry.addArrowMaterial(7, 3.5F, 1.0F, 100F); //Netherrack + TConstructRegistry.addArrowMaterial(8, 0.69F, 0.0F, 100F); //Slime + TConstructRegistry.addArrowMaterial(9, 0.75F, 3.0F, 80F); //Paper + TConstructRegistry.addArrowMaterial(10, 8.9F, 0.25F, 100F); //Cobalt + TConstructRegistry.addArrowMaterial(11, 7.2F, 0.25F, 100F); //Ardite + TConstructRegistry.addArrowMaterial(12, 10.6F, 0.1F, 100F); //Manyullyn + TConstructRegistry.addArrowMaterial(13, 8.96F, 0.5F, 100F); //Copper + TConstructRegistry.addArrowMaterial(14, 7.9F, 0.25F, 100F); //Bronze + TConstructRegistry.addArrowMaterial(15, 4.7F, 0.25F, 100F); //Alumite + TConstructRegistry.addArrowMaterial(16, 7.6F, 0.25F, 100F); //Steel + TConstructRegistry.addArrowMaterial(17, 0.69F, 0.0F, 100F); //Blue Slime - TConstructRegistry.addBowstringMaterial(0, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String - - /*//Metallurgy - TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f); - TConstructRegistry.addToolMaterial(23, "Damascus Steel", 2, 3, 500, 600, 2, 1.35F, 1, 0f); - TConstructRegistry.addToolMaterial(24, "Angmallen", 2, 2, 300, 800, 2, 0.8F, 0, 0f); - - TConstructRegistry.addToolMaterial(25, "Promethium", 1, 1, 200, 400, 1, 1.0F, 0, 0.5f); - TConstructRegistry.addToolMaterial(26, "Deep Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f); - TConstructRegistry.addToolMaterial(27, "Oureclase", 2, 3, 750, 800, 2, 1.2F, 0, 0f); - TConstructRegistry.addToolMaterial(28, "Aredrite", 2, 3, 1000, 400, 2, 1.5F, 0, 1.0f); - TConstructRegistry.addToolMaterial(29, "Astral Silver", 1, 4, 35, 1200, 1, 0.5F, 0, 0f); - TConstructRegistry.addToolMaterial(30, "Carmot", 1, 4, 50, 1200, 1, 0.5F, 0, 0f); - TConstructRegistry.addToolMaterial(31, "Mithril", 2, 4, 1000, 900, 3, 1.25F, 3, 0f); - TConstructRegistry.addToolMaterial(32, "Orichalcum", 2, 5, 1350, 900, 3, 1.25F, 0, 0f); - TConstructRegistry.addToolMaterial(33, "Adamantine", 3, 6, 1550, 1000, 4, 1.5F, 1, 0f); - TConstructRegistry.addToolMaterial(34, "Atlarus", 3, 6, 1750, 1000, 4, 1.6F, 2, 0f); - - TConstructRegistry.addToolMaterial(35, "Black Steel", 2, 2, 500, 800, 2, 1.3F, 2, 0f); - TConstructRegistry.addToolMaterial(36, "Quicksilver", 2, 4, 1100, 1400, 3, 1.0F, 1, 0f); - TConstructRegistry.addToolMaterial(37, "Haderoth", 2, 4, 1250, 1200, 3, 1.0F, 2, 0f); - TConstructRegistry.addToolMaterial(38, "Celenegil", 3, 5, 1600, 1400, 3, 1.0F, 2, 0f); - TConstructRegistry.addToolMaterial(39, "Tartarite", 3, 7, 3000, 1400, 5, 1.6667F, 4, 0f);*/ + TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String + TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F); //Feather + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves), new ItemStack(fletching, 1, 1), 75F, 0F); //Leaves + TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F); //Slime + TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F); //BlueSlime PatternBuilder pb = PatternBuilder.instance; if (PHConstruct.enableTWood) @@ -703,7 +715,7 @@ public class TContent implements IFuelHandler { /* Tools */ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null }; + toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead }; int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; @@ -752,6 +764,7 @@ public class TContent implements IFuelHandler tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod); + tb.addNormalToolRecipe(arrow, arrowhead, toolRod, fletching); ItemStack diamond = new ItemStack(Item.diamond); tb.registerToolMod(new ModRepair()); @@ -861,7 +874,7 @@ public class TContent implements IFuelHandler tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 14), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 14), bucket, true, 10); //seared stone tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 15), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 15), bucket, true, 10); //emerald - tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new LiquidStack(liquidMetalStill.blockID, 320, 15), jewelCast, 80); + tableCasting.addCastingRecipe(new ItemStack(glassPane), new LiquidStack(liquidMetalStill.blockID, 250, 13), null, 80); liquids = new LiquidStack[] { new LiquidStack(liquidMetalStill.blockID, 1, 0), new LiquidStack(liquidMetalStill.blockID, 1, 2), new LiquidStack(liquidMetalStill.blockID, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 6), new LiquidStack(liquidMetalStill.blockID, 1, 9), new LiquidStack(liquidMetalStill.blockID, 1, 7), @@ -1143,7 +1156,7 @@ public class TContent implements IFuelHandler FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f); FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f); FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); + //FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); @@ -1372,7 +1385,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder)); } - + public static boolean thaumcraftAvailable; public void intermodCommunication () @@ -1429,8 +1442,8 @@ public class TContent implements IFuelHandler if (patternOutputs[meta] != null) TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); } - - TConstructRegistry.addBowstringMaterial(1, new ItemStack((Item) obj, 1, 7), new ItemStack(bowstring, 1, 1), 1F, 1F, 0.85f); + + TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(bowstring, 1, 1), 1F, 1F, 0.85f); TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); } else diff --git a/mods/tinker/tconstruct/common/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java index 2747caf9..59600420 100644 --- a/mods/tinker/tconstruct/common/TProxyCommon.java +++ b/mods/tinker/tconstruct/common/TProxyCommon.java @@ -174,6 +174,7 @@ public class TProxyCommon implements IGuiHandler LanguageRegistry.addName(TContent.lightCrystalBase, "Lightstone Crystal"); LanguageRegistry.addName(TContent.knapsack, "Knapsack"); LanguageRegistry.addName(TContent.shortbow, "Shortbow"); + LanguageRegistry.addName(TContent.arrow, "Arrow"); } @@ -185,11 +186,6 @@ public class TProxyCommon implements IGuiHandler { } - public File getLocation () - { - return new File("."); - } - public void spawnParticle (String slimeParticle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) { } @@ -206,19 +202,20 @@ public class TProxyCommon implements IGuiHandler "Copper Nugget", "Tin Nugget", "Aluminum Nugget", "Silver Nugget" };*/ public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", - "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; + "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead", - "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead", "FullGuard" }; + "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead", "FullGuard", + "Bowstring", "Fletching", "Arrowhead" }; public static final String[] materialNames = new String[] { " Rod", " Pickaxe Head", " Shovel Head", " Axe Head", " Sword Blade", " Wide Guard", " Hand Guard", " Crossbar", " Binding", " Pan", " Board", " Broad Axe Head", " Knife Blade", " Chisel Head", " Scythe Blade", " Broad Axe Head", " Tough Tool Rod", " Tough Binding", " Large Sword Blade", " Large Plate", - " Excavator Head", " Hammer Head", " Full Guard" }; + " Excavator Head", " Hammer Head", " Full Guard", " Bowstring", " Fletching", " Arrowhead" }; public static final String[] patterns = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring" }; + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; public static final String[] patternNames = new String[] { "Ingot", "Tool Rod", "Pickaxe Head", "Shovel Head", "Axe Head", "Sword Blade", "Wide Guard", "Hand Guard", "Crossbar", "Tool Binding", "Pan", "Board", "Knife Blade", "Chisel Head", "Tough Tool Rod", "Tough Binding", "Large Plate", "Broad Axe Head", "Scythe Head", "Broad Shovel Head", "Large Blade", "Hammer Head", - "Full Guard", "Bowstring" }; + "Full Guard", "Bowstring", "Fletching", "Arrowhead" }; } diff --git a/mods/tinker/tconstruct/entity/GolemBase.java b/mods/tinker/tconstruct/entity/GolemBase.java index f71a3594..eccd4998 100644 --- a/mods/tinker/tconstruct/entity/GolemBase.java +++ b/mods/tinker/tconstruct/entity/GolemBase.java @@ -5,6 +5,7 @@ import java.util.Random; import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.util.CoordTuple; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentThorns; import net.minecraft.entity.Entity; @@ -35,6 +36,11 @@ public class GolemBase extends EntityCreature implements IInventory public boolean paused; int useTime; protected static Random rand = new Random(); + //public static CoordTuple target; + public int targetX; + public int targetY; + public int targetZ; + public boolean targetLock; public ItemStack[] inventory; @@ -277,12 +283,12 @@ public class GolemBase extends EntityCreature implements IInventory } } - public void destroyCurrentEquippedItem () + public void teleport(double x, double y, double z) { - worldObj.playSoundAtEntity(this, "random.break", 0.5F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F); - this.setCurrentItemOrArmor(0, null); + this.setPosition(x, y, z); + worldObj.playSoundAtEntity(this, "mob.endermen.portal", 0.5F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F); } - + /* Other */ protected boolean canDespawn () { @@ -302,6 +308,7 @@ public class GolemBase extends EntityCreature implements IInventory return icon; } + /* Inventory */ @Override public ItemStack getStackInSlot (int slot) { @@ -366,7 +373,7 @@ public class GolemBase extends EntityCreature implements IInventory @Override public String getInvName () { - return "tconstruct.knapsack"; + return "golem.none"; } @Override @@ -405,7 +412,14 @@ public class GolemBase extends EntityCreature implements IInventory { return true; } + + public void destroyCurrentEquippedItem () + { + worldObj.playSoundAtEntity(this, "random.break", 0.5F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F); + this.setCurrentItemOrArmor(0, null); + } + /* Saving */ public void writeEntityToNBT (NBTTagCompound tags) { super.writeEntityToNBT(tags); diff --git a/mods/tinker/tconstruct/entity/MiniGardy.java b/mods/tinker/tconstruct/entity/MiniGardy.java new file mode 100644 index 00000000..1e0f194f --- /dev/null +++ b/mods/tinker/tconstruct/entity/MiniGardy.java @@ -0,0 +1,46 @@ +package mods.tinker.tconstruct.entity; + +import mods.tinker.tconstruct.entity.ai.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class MiniGardy extends GolemBase +{ + public MiniGardy(World world) + { + super(world); + this.texture = "/mods/tinker/textures/mob/googirl.png"; + this.setSize(0.375F, 0.875F); + this.tasks.addTask(3, new GAIFollowOwner(this)); + this.tasks.addTask(1, new GAIFellTree(this)); + } + + @SideOnly(Side.CLIENT) + public float getShadowSize () //Opacity, not size + { + return 1.0F; + } + + public boolean interact (EntityPlayer player) + { + ItemStack stack = this.getHeldItem(); + if (stack == null) + { + this.setCurrentItemOrArmor(0, player.getCurrentEquippedItem().copy()); + player.destroyCurrentEquippedItem(); + } + else + { + if (player.inventory.addItemStackToInventory(stack.copy())) + { + //this.worldObj.playSoundAtEntity(this, par1Str, par2, par3); + this.worldObj.playSoundAtEntity(player, "random.pop", 0.3F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + this.setCurrentItemOrArmor(0, null); + } + } + return true; + } +} diff --git a/mods/tinker/tconstruct/entity/ai/GAIFellTree.java b/mods/tinker/tconstruct/entity/ai/GAIFellTree.java new file mode 100644 index 00000000..8233129f --- /dev/null +++ b/mods/tinker/tconstruct/entity/ai/GAIFellTree.java @@ -0,0 +1,237 @@ +package mods.tinker.tconstruct.entity.ai; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import mods.tinker.tconstruct.entity.GolemBase; +import mods.touhou_alice_dolls.DollRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.StepSound; +import net.minecraft.util.MathHelper; + +public class GAIFellTree extends GolemAIBase +{ + private int counter; + private int logID; + private int blockStrength; + private int cutX, cutY, cutZ; + + public static int cutRange = 4; + public static double cutSpeed = 2.5; + + public GAIFellTree(GolemBase doll) + { + super(doll); + this.setMutexBits(3); + } + + @Override + public boolean shouldExecute () + { + if (golem.paused) + { + return false; + } + + int golemX = MathHelper.floor_double(golem.posX); + int golemY = MathHelper.floor_double(golem.posY + (double) golem.getEyeHeight()); + int golemZ = MathHelper.floor_double(golem.posZ); + int logCount = 0; + int leavesCount = 0; + int targetX = cutRange; + int targetY = 0; + int targetZ = cutRange; + boolean isTarget = false; + + for (int iterX = -cutRange; iterX <= cutRange; ++iterX) + { + for (int iterZ = -cutRange; iterZ <= cutRange; ++iterZ) + { + int dy = 0; + int distanceToBlock = Math.abs(iterX) + Math.abs(iterZ); + if (distanceToBlock > cutRange) + { + continue; + } + int bid = world.getBlockId(golemX + iterX, golemY + dy, golemZ + iterZ); + Block log = Block.blocksList[bid]; + if (log == null) + { + continue; + } + + if (log.isWood(world, golemX + iterX, golemY + dy, golemZ + iterZ)) + { + if (Math.abs(targetX) + Math.abs(targetZ) > distanceToBlock) + { + + while (golemY + dy > 0) + { + int cbid = world.getBlockId(golemX + iterX, golemY + dy - 1, golemZ + iterZ); + if (cbid != bid) + { + break; + } + --dy; + } + int lCount = 0; + int blockCount = 0; + while (golemY + dy < world.getHeight()) + { + int cbid = world.getBlockId(golemX + iterX, golemY + dy, golemZ + iterZ); + if (cbid != bid) + { + break; + } + + int[][] coords = new int[][] { { golemX + iterX + 1, golemY + dy, golemZ + iterZ }, { golemX + iterX - 1, golemY + dy, golemZ + iterZ }, + { golemX + iterX, golemY + dy, golemZ + iterZ + 1 }, { golemX + iterX, golemY + dy, golemZ + iterZ - 1 } }; + for (int i = 0; i < 4; ++i) + { + Block leaves = Block.blocksList[world.getBlockId(coords[i][0], coords[i][1], coords[i][2])]; + if (leaves != null && leaves.isLeaves(world, coords[i][0], coords[i][1], coords[i][2])) + { + blockCount++; + } + } + ++lCount; + ++dy; + } + + if (blockCount >= 4) + { + targetX = iterX; + targetY = dy - 1; + targetZ = iterZ; + isTarget = true; + logCount = blockCount; + leavesCount = lCount; + logID = bid; + } + } + } + } + } + golem.targetX = golemX + targetX; + golem.targetY = golemY + targetY; + golem.targetZ = golemZ + targetZ; + golem.targetLock = isTarget; + + if (!isTarget) + { + return false; + } + + golem.teleport((double) (golem.targetX) + 0.5D, (double) (golem.targetY + 1), (double) (golem.targetZ) + 0.5D); + golem.getNavigator().clearPathEntity(); + + return true; + } + + public void startExecuting () + { + counter = 0; + } + + public boolean continueExecuting () + { + if (golem.paused) + { + return false; + } + if (Math.abs(MathHelper.floor_double(golem.posX - golem.targetX)) + Math.abs(MathHelper.floor_double(golem.posY - golem.targetY)) + + Math.abs(MathHelper.floor_double(golem.posZ - golem.targetZ)) > cutRange) + { + System.out.println("Too far away"); + return false; + } + if (!golem.targetLock) + { + System.out.println("Target lost"); + return false; + } + return true; + } + + @Override + public void resetTask () + { + golem.targetLock = false; + } + + @Override + public void updateTask () + { + if (counter == 0) + { + boolean isCutting = false; + for (int dx = -cutRange; dx <= cutRange; ++dx) + { + for (int dz = -cutRange; dz <= cutRange; ++dz) + { + if (Math.abs(dx) + Math.abs(dz) > cutRange) + { + continue; + } + if (world.getBlockId(golem.targetX + dx, golem.targetY, golem.targetZ + dz) == logID) + { + cutX = golem.targetX + dx; + cutY = golem.targetY; + cutZ = golem.targetZ + dz; + isCutting = true; + } + if (isCutting) + { + break; + } + } + if (isCutting) + { + break; + } + } + if (!isCutting) + { + cutX = golem.targetX; + cutY = golem.targetY; + cutZ = golem.targetZ; + golem.targetY--; + if (world.getBlockId(golem.targetX, golem.targetY, golem.targetZ) == logID) + { + isCutting = true; + } + else + { + golem.targetLock = isCutting = false; + return; + } + } + + Block b = Block.blocksList[world.getBlockId(cutX, cutY, cutZ)]; + blockStrength = b == null ? 0 : MathHelper.floor_double(1.0 + 30.0 * b.getBlockHardness(world, cutX, cutY, cutZ) / cutSpeed); + blockStrength = blockStrength < 0 ? 0 : blockStrength; + } + + if (counter >= blockStrength) + { + Block b = Block.blocksList[world.getBlockId(cutX, cutY, cutZ)]; + if (b != null) + { + world.destroyBlock(cutX, cutY, cutZ, true); + } + counter = 0; + return; + } + if (counter % 4 == 0) + { + Block b = Block.blocksList[world.getBlockId(golem.targetX, golem.targetY, golem.targetZ)]; + if (b != null) + { + StepSound stepsound = b.stepSound; + world.playSoundEffect(golem.targetX + 0.5f, golem.targetY + 0.5f, golem.targetZ + 0.5f, stepsound.getBreakSound(), (stepsound.getVolume() + 1.0f) / 8f, stepsound.getPitch() * 0.5f); + } + } + this.golem.getLookHelper().setLookPosition((double) (cutX) + 0.5D, (double) (cutY) + 0.5D, (double) (cutZ) + 0.5D, 20.0F, (float) this.golem.getVerticalFaceSpeed()); + counter++; + } +} diff --git a/mods/tinker/tconstruct/entity/ai/GAIFindTarget.java b/mods/tinker/tconstruct/entity/ai/GAIFindTarget.java index 92be43a2..b1a745f0 100644 --- a/mods/tinker/tconstruct/entity/ai/GAIFindTarget.java +++ b/mods/tinker/tconstruct/entity/ai/GAIFindTarget.java @@ -17,8 +17,6 @@ public class GAIFindTarget extends GolemAIBase private int counter; public static double searchRange = 16; public static double searchHeight = 4; - public static String searchEntityRegex; - public static String targetEntityRegex; public GAIFindTarget(GolemBase golem) { @@ -50,41 +48,14 @@ public class GAIFindTarget extends GolemAIBase if (counter == 0) { List targetList = (List) (world.getEntitiesWithinAABB(EntityLiving.class, golem.boundingBox.expand(searchRange, searchHeight, searchRange))); - /*Pattern searchPattern = Pattern.compile(searchEntityRegex); - Pattern targetPattern = Pattern.compile(targetEntityRegex); - Matcher searchMatcher, targetMatcher; - TreeMap entityCount = new TreeMap();*/ EntityLiving theTarget = null; EntityLiving stealTarget = null; theTarget = null; for (EntityLiving e : targetList) { - /*String name = EntityList.getEntityString(e); - if (name == null) - { - continue; - } - - searchMatcher = searchPattern.matcher(name); - if (searchMatcher.find()) - { - if (entityCount.containsKey(name)) - { - int c = entityCount.get(name).intValue() + 1; - entityCount.put(name, new Integer(c)); - } - else - { - entityCount.put(name, new Integer(1)); - } - }*/ - - //System.out.println("Entity: "+e); if (golem.patrolling()) { - //targetMatcher = targetPattern.matcher(name); - //if (targetMatcher.find()) if (e instanceof IMob) { if (theTarget == null) diff --git a/mods/tinker/tconstruct/entity/ai/GAIFollowOwner.java b/mods/tinker/tconstruct/entity/ai/GAIFollowOwner.java index a99eb9e3..3fe6c103 100644 --- a/mods/tinker/tconstruct/entity/ai/GAIFollowOwner.java +++ b/mods/tinker/tconstruct/entity/ai/GAIFollowOwner.java @@ -33,10 +33,6 @@ public class GAIFollowOwner extends GolemAIBase { return false; } - /*if (!this.golem.isFollowMode()) - { - return false; - }*/ if (this.golem.getDistanceSqToEntity(owner) < (double) (this.minDist * this.minDist)) { return false; @@ -56,10 +52,6 @@ public class GAIFollowOwner extends GolemAIBase { return false; } - /*if (!this.golem.isFollowMode()) - { - return false; - }*/ return true; } diff --git a/mods/tinker/tconstruct/entity/projectile/ArrowEntity.java b/mods/tinker/tconstruct/entity/projectile/ArrowEntity.java new file mode 100644 index 00000000..97b61247 --- /dev/null +++ b/mods/tinker/tconstruct/entity/projectile/ArrowEntity.java @@ -0,0 +1,619 @@ +package mods.tinker.tconstruct.entity.projectile; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.crash.CrashReport; +import net.minecraft.crash.CrashReportCategory; +import net.minecraft.enchantment.EnchantmentThorns; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet70GameEvent; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ReportedException; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; + +public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData +{ + public ItemStack returnStack; + + public ArrowEntity(World par1World) + { + super(par1World); + } + + public ArrowEntity(World world, EntityLiving living, float baseSpeed, ItemStack stack) + { + super(world, living, baseSpeed); + this.returnStack = stack; + } + + @Override + public void onCollideWithPlayer (EntityPlayer par1EntityPlayer) + { + if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) + { + boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; + + if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(returnStack)) + { + flag = false; + } + + if (flag) + { + this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + par1EntityPlayer.onItemPickup(this, 1); + this.setDead(); + } + } + } + + @Override + public void onUpdate () + { + this.onEntityUpdate(); + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) + { + float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + } + + int i = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); + + if (i > 0) + { + Block.blocksList[i].setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); + AxisAlignedBB axisalignedbb = Block.blocksList[i].getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); + + if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) + { + this.inGround = true; + } + } + + if (this.arrowShake > 0) + { + --this.arrowShake; + } + + if (this.inGround) + { + int j = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); + int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); + + if (j == this.inTile && k == this.inData) + { + ++this.ticksInGround; + + if (this.ticksInGround == 120000) + { + this.setDead(); + } + } + else + { + this.inGround = false; + this.motionX *= (double) (this.rand.nextFloat() * 0.2F); + this.motionY *= (double) (this.rand.nextFloat() * 0.2F); + this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); + this.ticksInGround = 0; + this.ticksInAir = 0; + } + } + else + { + ++this.ticksInAir; + Vec3 vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); + Vec3 vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks_do_do(vec3, vec31, false, true); + vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); + vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + + if (movingobjectposition != null) + { + vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + } + + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + double d0 = 0.0D; + int l; + float f1; + + for (l = 0; l < list.size(); ++l) + { + Entity entity1 = (Entity) list.get(l); + + if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) + { + f1 = 0.3F; + AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double) f1, (double) f1, (double) f1); + MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); + + if (movingobjectposition1 != null) + { + double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + + if (d1 < d0 || d0 == 0.0D) + { + entity = entity1; + d0 = d1; + } + } + } + } + + if (entity != null) + { + movingobjectposition = new MovingObjectPosition(entity); + } + + if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) + { + EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; + + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).func_96122_a(entityplayer)) + { + movingobjectposition = null; + } + } + + float f2; + float f3; + + if (movingobjectposition != null) + { + if (movingobjectposition.entityHit != null) + { + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + int i1 = MathHelper.ceiling_double_int((double) f2 * this.damage); + + if (this.getIsCritical()) + { + i1 += this.rand.nextInt(i1 / 2 + 2); + } + + DamageSource damagesource = null; + + if (this.shootingEntity == null) + { + damagesource = DamageSource.causeArrowDamage(this, this); + } + else + { + damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); + } + + if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) + { + movingobjectposition.entityHit.setFire(5); + } + + if (movingobjectposition.entityHit.attackEntityFrom(damagesource, i1)) + { + if (movingobjectposition.entityHit instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving) movingobjectposition.entityHit; + + if (!this.worldObj.isRemote) + { + entityliving.setArrowCountInEntity(entityliving.getArrowCountInEntity() + 1); + } + + if (this.knockbackStrength > 0) + { + f3 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + + if (f3 > 0.0F) + { + movingobjectposition.entityHit.addVelocity(this.motionX * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3, 0.1D, this.motionZ + * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3); + } + } + + if (this.shootingEntity != null) + { + EnchantmentThorns.func_92096_a(this.shootingEntity, entityliving, this.rand); + } + + if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer + && this.shootingEntity instanceof EntityPlayerMP) + { + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacketToPlayer(new Packet70GameEvent(6, 0)); + } + } + + this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); + + if (!(movingobjectposition.entityHit instanceof EntityEnderman)) + { + this.motionX = 0; + this.motionZ = 0; + if (movingobjectposition.entityHit instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) movingobjectposition.entityHit; + if (player.inventory.addItemStackToInventory(returnStack)) + this.setDead(); + } + else if (movingobjectposition.entityHit instanceof EntityLiving) + { + EntityLiving living = (EntityLiving) movingobjectposition.entityHit; + if (addItemStackToInventory(returnStack, living)) + this.setDead(); + } + } + } + else + { + this.motionX *= -0.10000000149011612D; + this.motionY *= -0.10000000149011612D; + this.motionZ *= -0.10000000149011612D; + this.rotationYaw += 180.0F; + this.prevRotationYaw += 180.0F; + this.ticksInAir = 0; + } + } + else + { + this.xTile = movingobjectposition.blockX; + this.yTile = movingobjectposition.blockY; + this.zTile = movingobjectposition.blockZ; + this.inTile = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile); + this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); + this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); + this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); + this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + this.posX -= this.motionX / (double) f2 * 0.05000000074505806D; + this.posY -= this.motionY / (double) f2 * 0.05000000074505806D; + this.posZ -= this.motionZ / (double) f2 * 0.05000000074505806D; + this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); + this.inGround = true; + this.arrowShake = 7; + this.setIsCritical(false); + + if (this.inTile != 0) + { + Block.blocksList[this.inTile].onEntityCollidedWithBlock(this.worldObj, this.xTile, this.yTile, this.zTile, this); + } + } + } + + if (this.getIsCritical()) + { + for (l = 0; l < 4; ++l) + { + this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double) l / 4.0D, this.posY + this.motionY * (double) l / 4.0D, this.posZ + this.motionZ * (double) l / 4.0D, + -this.motionX, -this.motionY + 0.2D, -this.motionZ); + } + } + + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + + for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + { + ; + } + + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) + { + this.prevRotationPitch += 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw < -180.0F) + { + this.prevRotationYaw -= 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) + { + this.prevRotationYaw += 360.0F; + } + + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + float f4 = 0.99F; + f1 = 0.05F; + + if (this.isInWater()) + { + for (int j1 = 0; j1 < 4; ++j1) + { + f3 = 0.25F; + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, + this.motionY, this.motionZ); + } + + f4 = 0.8F; + } + + this.motionX *= (double) f4; + this.motionY *= (double) f4; + this.motionZ *= (double) f4; + this.motionY -= (double) f1; + this.setPosition(this.posX, this.posY, this.posZ); + this.doBlockCollisions(); + } + } + + public boolean addItemStackToInventory (ItemStack par1ItemStack, EntityLiving living) + { + if (par1ItemStack == null) + { + return false; + } + else + { + try + { + int stackSize; + + /*if (par1ItemStack.isItemDamaged()) + { + slotID = this.getFirstEmptyStack(living); + + if (slotID >= 0) + { + living.setCurrentItemOrArmor(slotID, par1ItemStack); + living.func_96120_a(slotID, 1.0f); + par1ItemStack.stackSize = 0; + return true; + } + else + { + return false; + } + } + else*/ + { + do + { + stackSize = par1ItemStack.stackSize; + par1ItemStack.stackSize = this.storePartialItemStack(par1ItemStack, living); + } while (par1ItemStack.stackSize > 0 && par1ItemStack.stackSize < stackSize); + + return par1ItemStack.stackSize < stackSize; + } + } + catch (Throwable throwable) + { + CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Adding item to inventory"); + CrashReportCategory crashreportcategory = crashreport.makeCategory("Item being added"); + crashreportcategory.addCrashSection("Item ID", Integer.valueOf(par1ItemStack.itemID)); + crashreportcategory.addCrashSection("Item data", Integer.valueOf(par1ItemStack.getItemDamage())); + //crashreportcategory.addCrashSectionCallable("Item name", new CallableItemName(this, par1ItemStack)); + throw new ReportedException(crashreport); + } + } + } + + public int getFirstEmptyStack (EntityLiving living) + { + for (int i = 0; i < 5; ++i) + { + if (living.getCurrentItemOrArmor(i) == null) + { + return i; + } + } + + return -1; + } + + private int storePartialItemStack (ItemStack par1ItemStack, EntityLiving living) + { + int i = par1ItemStack.itemID; + int j = par1ItemStack.stackSize; + int slotID; + + if (par1ItemStack.getMaxStackSize() == 1) + { + slotID = this.getFirstEmptyStack(living); + + if (slotID < 0) + { + return j; + } + else + { + /*if (this.mainInventory[k] == null) + { + this.mainInventory[k] = par1ItemStack; + }*/ + if (living.getCurrentItemOrArmor(slotID) == null) + { + living.setCurrentItemOrArmor(slotID, par1ItemStack); + living.func_96120_a(slotID, 1.0f); + } + + return 0; + } + } + else + { + slotID = this.storeItemStack(par1ItemStack, living); + + if (slotID < 0) + { + slotID = this.getFirstEmptyStack(living); + } + + if (slotID < 0) + { + return j; + } + else + { + ItemStack stack = living.getCurrentItemOrArmor(slotID); + if (stack == null) + { + living.setCurrentItemOrArmor(slotID, par1ItemStack); + living.func_96120_a(slotID, 1.0f); + return par1ItemStack.stackSize; + /*this.mainInventory[slotID] = new ItemStack(i, 0, par1ItemStack.getItemDamage()); + + if (par1ItemStack.hasTagCompound()) + { + this.mainInventory[slotID].setTagCompound((NBTTagCompound) par1ItemStack.getTagCompound().copy()); + }*/ + } + else + { + + int l = j; + + if (j > stack.getMaxStackSize() - stack.stackSize) + { + l = stack.getMaxStackSize() - stack.stackSize; + } + + if (l > 64 - stack.stackSize) + { + l = 64 - stack.stackSize; + } + + if (l == 0) + { + return j; + } + else + { + j -= l; + stack.stackSize++; + living.setCurrentItemOrArmor(slotID, stack); + living.func_96120_a(slotID, 1.0f); + //this.mainInventory[slotID].stackSize += l; + //this.mainInventory[slotID].animationsToGo = 5; + return j; + } + } + } + } + } + + private int storeItemStack (ItemStack par1ItemStack, EntityLiving living) + { + for (int slotID = 0; slotID < 5; ++slotID) + { + ItemStack stack = living.getCurrentItemOrArmor(slotID); + if (stack != null && stack.itemID == par1ItemStack.itemID && stack.isStackable() && stack.stackSize < stack.getMaxStackSize() && stack.stackSize < 64 + && (!stack.getHasSubtypes() || stack.getItemDamage() == par1ItemStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, par1ItemStack)) + { + return slotID; + } + } + + return -1; + } + + public void writeEntityToNBT (NBTTagCompound tags) + { + super.writeEntityToNBT(tags); + tags.setCompoundTag("Throwable", this.returnStack.writeToNBT(new NBTTagCompound())); + } + + public void readEntityFromNBT (NBTTagCompound tags) + { + super.readEntityFromNBT(tags); + this.returnStack = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Throwable")); + } + + @Override + public void writeSpawnData (ByteArrayDataOutput data) + { + if (!returnStack.hasTagCompound()) + this.kill(); + NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool"); + data.writeShort(returnStack.itemID); + data.writeFloat(rotationYaw); + data.writeInt(tags.getInteger("RenderHandle")); + data.writeInt(tags.getInteger("RenderHead")); + data.writeInt(tags.getInteger("RenderAccessory")); + + int effects = 0; + if (tags.hasKey("Effect1")) + effects++; + if (tags.hasKey("Effect2")) + effects++; + if (tags.hasKey("Effect3")) + effects++; + if (tags.hasKey("Effect4")) + effects++; + if (tags.hasKey("Effect5")) + effects++; + if (tags.hasKey("Effect6")) + effects++; + data.writeInt(effects); + + switch (effects) + { + case 6: + data.writeInt(tags.getInteger("Effect6")); + case 5: + data.writeInt(tags.getInteger("Effect5")); + case 4: + data.writeInt(tags.getInteger("Effect4")); + case 3: + data.writeInt(tags.getInteger("Effect3")); + case 2: + data.writeInt(tags.getInteger("Effect2")); + case 1: + data.writeInt(tags.getInteger("Effect1")); + } + } + + @Override + public void readSpawnData (ByteArrayDataInput data) + { + returnStack = new ItemStack(data.readShort(), 1, 0); + rotationYaw = data.readFloat(); + NBTTagCompound compound = new NBTTagCompound(); + NBTTagCompound toolTag = new NBTTagCompound(); + toolTag.setInteger("RenderHandle", data.readInt()); + toolTag.setInteger("RenderHead", data.readInt()); + toolTag.setInteger("RenderAccessory", data.readInt()); + switch (data.readInt()) + { + case 6: + toolTag.setInteger("Effect6", data.readInt()); + case 5: + toolTag.setInteger("Effect5", data.readInt()); + case 4: + toolTag.setInteger("Effect4", data.readInt()); + case 3: + toolTag.setInteger("Effect3", data.readInt()); + case 2: + toolTag.setInteger("Effect2", data.readInt()); + case 1: + toolTag.setInteger("Effect1", data.readInt()); + } + compound.setCompoundTag("InfiTool", toolTag); + returnStack.setTagCompound(compound); + } + + public ItemStack getEntityItem () + { + return returnStack; + } +} diff --git a/mods/tinker/tconstruct/items/Fletching.java b/mods/tinker/tconstruct/items/Fletching.java new file mode 100644 index 00000000..59891e61 --- /dev/null +++ b/mods/tinker/tconstruct/items/Fletching.java @@ -0,0 +1,46 @@ +package mods.tinker.tconstruct.items; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import mods.tinker.tconstruct.library.util.IToolPart; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; + +public class Fletching extends CraftingItem implements IToolPart +{ + public Fletching(int id) + { + super(id, toolMaterialNames, buildTextureNames("_fletching"), "parts/"); + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + private static String[] buildTextureNames (String textureType) + { + String[] names = new String[toolMaterialNames.length]; + for (int i = 0; i < toolMaterialNames.length; i++) + { + if (toolTextureNames[i].equals("")) + names[i] = ""; + else + names[i] = toolTextureNames[i] + textureType; + } + return names; + } + + public static final String[] toolMaterialNames = new String[] { "feather", "leaf", "slime", "blueslime" }; + + public static final String[] toolTextureNames = new String[] { "feather", "leaf", "slime", "blueslime" }; + + @Override + public int getMaterialID (ItemStack stack) + { + return stack.getItemDamage(); + } +} diff --git a/mods/tinker/tconstruct/items/MaterialItem.java b/mods/tinker/tconstruct/items/MaterialItem.java index 541cc54d..edfc9607 100644 --- a/mods/tinker/tconstruct/items/MaterialItem.java +++ b/mods/tinker/tconstruct/items/MaterialItem.java @@ -18,10 +18,10 @@ public class MaterialItem extends CraftingItem static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", - "TinNugget", "AluminumNugget", "SilverNugget", "AluBrassNugget", "SilkyCloth", "SilkyJewel" }; + "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel" }; static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", - "nugget_copper", "nugget_tin", "nugget_aluminum", "nugget_silver", "nugget_alubrass", "silkycloth", "silkyjewel" }; + "nugget_copper", "nugget_tin", "nugget_aluminum", "essencecrystal", "nugget_alubrass", "silkycloth", "silkyjewel" }; } diff --git a/mods/tinker/tconstruct/items/MetalPattern.java b/mods/tinker/tconstruct/items/MetalPattern.java index 91504fa9..c54d8e6b 100644 --- a/mods/tinker/tconstruct/items/MetalPattern.java +++ b/mods/tinker/tconstruct/items/MetalPattern.java @@ -8,14 +8,27 @@ import net.minecraft.item.ItemStack; public class MetalPattern extends Pattern { - public MetalPattern(int id, String partType, String patternType, String folder) - { - super(id, partType, patternType, folder); - } + public MetalPattern(int id, String partType, String patternType, String folder) + { + super(id, partType, patternType, folder); + } - public void getSubItems (int id, CreativeTabs tab, List list) - { - for (int i = 0; i < patternName.length; i++) - list.add(new ItemStack(id, 1, i)); - } + protected static String[] getPatternNames (String partType) + { + String[] names = new String[patternName.length]; + for (int i = 0; i < patternName.length; i++) + if (!(patternName[i].equals(""))) + names[i] = partType + patternName[i]; + return names; + } + + private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead" }; + + public void getSubItems (int id, CreativeTabs tab, List list) + { + for (int i = 0; i < patternName.length; i++) + if (!(patternName[i].equals(""))) + list.add(new ItemStack(id, 1, i)); + } } diff --git a/mods/tinker/tconstruct/items/OreBerries.java b/mods/tinker/tconstruct/items/OreBerries.java index b6db6d42..b7b1bdb4 100644 --- a/mods/tinker/tconstruct/items/OreBerries.java +++ b/mods/tinker/tconstruct/items/OreBerries.java @@ -9,8 +9,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class OreBerries extends CraftingItem { - static String[] names = new String[] { "iron", "gold", "copper", "tin", "aluminum", "silver" }; - static String[] tex = new String[] { "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_silver" }; + static String[] names = new String[] { "iron", "gold", "copper", "tin", "aluminum", "essence" }; + static String[] tex = new String[] { "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_essence" }; public OreBerries(int id) { @@ -39,7 +39,7 @@ public class OreBerries extends CraftingItem list.add("White Chocolate"); break; case 5: - list.add("Somewhat precious"); + list.add("Tastes like Creeper"); break; } } diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index a56b05cf..43857ae3 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -11,101 +11,128 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Pattern extends CraftingItem - implements IPattern +public class Pattern extends CraftingItem implements IPattern { - public Pattern(int id, String partType, String patternType, String folder) - { - super(id, patternName, getPatternNames(patternType), folder); - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setContainerItem(this); - this.setMaxStackSize(1); - - } - - private static String[] getPatternNames (String partType) - { - String[] names = new String[patternName.length]; - for (int i = 0; i < patternName.length; i++) - names[i] = partType+patternName[i]; - return names; - } + public Pattern(int id, String partType, String patternType, String folder) + { + super(id, patternName, getPatternNames(patternType), folder); + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setContainerItem(this); + this.setMaxStackSize(1); + } - public static final String[] patternName = new String[] { - "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", - "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring" }; + protected static String[] getPatternNames (String partType) + { + String[] names = new String[patternName.length]; + for (int i = 0; i < patternName.length; i++) + names[i] = partType + patternName[i]; + return names; + } - public void getSubItems (int id, CreativeTabs tab, List list) - { - for (int i = 1; i < patternName.length; i++) - { - //if (i != 23) - list.add(new ItemStack(id, 1, i)); - } - } + private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; - public ItemStack getContainerItemStack (ItemStack stack) - { - return stack; - } + public void getSubItems (int id, CreativeTabs tab, List list) + { + for (int i = 1; i < patternName.length; i++) + { + //if (i != 23) + list.add(new ItemStack(id, 1, i)); + } + } - public boolean doesContainerItemLeaveCraftingGrid (ItemStack stack) - { - return false; - } - - /* Tags and information about the pattern */ - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) - { - float cost = getPatternCost(stack) / 2f; - if (cost > 0) - { - if (cost - (int)cost < 0.1) - list.add("Material Cost: "+(int)cost); - else - list.add("Material Cost: "+cost); - } - } + public ItemStack getContainerItemStack (ItemStack stack) + { + return stack; + } - //2 for full material, 1 for half. - @Override - public int getPatternCost (ItemStack pattern) - { - switch (pattern.getItemDamage()) - { - case 0: return 2; - case 1: return 1; - case 2: return 2; - case 3: return 2; - case 4: return 2; - case 5: return 2; - case 6: return 1; - case 7: return 1; - case 8: return 1; - case 9: return 1; - case 10: return 2; - case 11: return 2; - case 12: return 1; - case 13: return 1; - case 14: return 6; - case 15: return 6; - case 16: return 16; - case 17: return 16; - case 18: return 16; - case 19: return 16; - case 20: return 16; - case 21: return 16; - case 22: return 6; - default: return 0; - } - } + public boolean doesContainerItemLeaveCraftingGrid (ItemStack stack) + { + return false; + } - @Override - public ItemStack getPatternOutput (ItemStack stack, ItemStack input, MaterialSet set) - { - return TConstructRegistry.getPartMapping(this.itemID, stack.getItemDamage(), set.materialID); - } + /* Tags and information about the pattern */ + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + float cost = getPatternCost(stack) / 2f; + if (cost > 0) + { + if (cost - (int) cost < 0.1) + list.add("Material Cost: " + (int) cost); + else + list.add("Material Cost: " + cost); + } + } + + //2 for full material, 1 for half. + @Override + public int getPatternCost (ItemStack pattern) + { + switch (pattern.getItemDamage()) + { + case 0: + return 2; + case 1: + return 1; + case 2: + return 2; + case 3: + return 2; + case 4: + return 2; + case 5: + return 2; + case 6: + return 1; + case 7: + return 1; + case 8: + return 1; + case 9: + return 1; + case 10: + return 2; + case 11: + return 2; + case 12: + return 1; + case 13: + return 1; + case 14: + return 6; + case 15: + return 6; + case 16: + return 16; + case 17: + return 16; + case 18: + return 16; + case 19: + return 16; + case 20: + return 16; + case 21: + return 16; + case 22: + return 6; + case 23: + return 6; + case 24: + return 2; + case 25: + return 2; + default: + return 0; + } + } + + @Override + public ItemStack getPatternOutput (ItemStack stack, ItemStack input, MaterialSet set) + { + return TConstructRegistry.getPartMapping(this.itemID, stack.getItemDamage(), set.materialID); + } } diff --git a/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java index b6c7d84f..0f4f92d0 100644 --- a/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -32,11 +32,15 @@ public class OreberryBushSecondItem extends ItemBlock /* Place bushes on dirt, grass, or other bushes only */ @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { if (side != 1) return false; + int meta = stack.getItemDamage(); + if (meta % 4 != 1 && world.getFullBlockLightValue(x, y+1, z) >= 13) + return false; + else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = Block.blocksList[world.getBlockId(x, y, z)]; @@ -66,8 +70,8 @@ public class OreberryBushSecondItem extends ItemBlock } public static final String blockType[] = { - "aluminum", "silver", "", "", "aluminum", "silver", "", "", - "aluminum", "silver", "", "", "aluminum", "silver", "", "" + "aluminum", "essence", "", "", "aluminum", "essence", "", "", + "aluminum", "essence", "", "", "aluminum", "essence", "", "" }; @Override @@ -80,7 +84,7 @@ public class OreberryBushSecondItem extends ItemBlock list.add("White Chocolate"); break; case 1: - list.add("Somewhat precious"); + list.add("Tastes like Creeper"); break; } } diff --git a/mods/tinker/tconstruct/items/tools/Arrow.java b/mods/tinker/tconstruct/items/tools/Arrow.java new file mode 100644 index 00000000..56146183 --- /dev/null +++ b/mods/tinker/tconstruct/items/tools/Arrow.java @@ -0,0 +1,102 @@ +package mods.tinker.tconstruct.items.tools; + +import java.util.List; + +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.tools.ToolCore; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class Arrow extends ToolCore +{ + + public Arrow(int id) + { + super(id, 1); + this.setUnlocalizedName("InfiTool.Arrow"); + this.setMaxStackSize(64); + this.setMaxDamage(0); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_arrow_head"; + case 1: + return ""; //Doesn't break + case 2: + return "_arrow_shaft"; + case 3: + return "_arrow_fletching"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_arrow_effect"; + } + @Override + public String getDefaultFolder () + { + return "arrow"; + } + + @Override + public void registerPartPaths (int index, String[] location) + { + headStrings.put(index, location[0]); + handleStrings.put(index, location[2]); + } + + @Override + public void registerAlternatePartPaths (int index, String[] location) + { + accessoryStrings.put(index, location[3]); + } + + @Override + public Item getHeadItem () + { + return TContent.arrowhead; + } + + @Override + public Item getAccessoryItem () + { + return TContent.fletching; + } + + @Override + public String[] toolCategories () + { + return new String[] {"ammo"}; + } + + @Override + public void buildTool (int id, String name, List list) + { + Item accessory = getAccessoryItem(); + ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, 0) : null; + Item extra = getExtraItem(); + ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null; + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName()); + if (tool == null) + { + System.out.println("Creative builder failed tool for " + name + this.getToolName()); + System.out.println("Make sure you do not have item ID conflicts"); + } + else + { + tool.stackSize = 1; + tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); + list.add(tool); + } + } +} diff --git a/mods/tinker/tconstruct/items/tools/Battleaxe.java b/mods/tinker/tconstruct/items/tools/Battleaxe.java index cd2280c8..003b4e7c 100644 --- a/mods/tinker/tconstruct/items/tools/Battleaxe.java +++ b/mods/tinker/tconstruct/items/tools/Battleaxe.java @@ -7,6 +7,7 @@ import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; @@ -188,6 +189,8 @@ public class Battleaxe extends HarvestTool boost = 2; player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, time*4, boost)); player.addPotionEffect(new PotionEffect(Potion.jump.id, time*4, boost)); + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, time*4, 0)); + player.addPotionEffect(new PotionEffect(Potion.hunger.id, time*2, 0)); if (time > 5 && player.onGround) { player.addExhaustion(0.2F); @@ -220,20 +223,22 @@ public class Battleaxe extends HarvestTool return true; } - /*@Override + @Override + @SideOnly(Side.CLIENT) public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayer) + if (entity instanceof EntityPlayerSP) { - EntityPlayer player = (EntityPlayer) entity; - ItemStack equipped = player.getCurrentEquippedItem(); - if (equipped == stack) + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.getItemInUse(); + if (usingItem != null && usingItem.getItem() == this) { - player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 1, 1)); + player.movementInput.moveForward *= 5.0F; + player.movementInput.moveStrafe *= 5.0F; } } - }*/ + } @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) diff --git a/mods/tinker/tconstruct/items/tools/Broadsword.java b/mods/tinker/tconstruct/items/tools/Broadsword.java index 4f119d01..3e961836 100644 --- a/mods/tinker/tconstruct/items/tools/Broadsword.java +++ b/mods/tinker/tconstruct/items/tools/Broadsword.java @@ -2,7 +2,13 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.tools.Weapon; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Broadsword extends Weapon { @@ -58,4 +64,20 @@ public class Broadsword extends Weapon { return "broadsword"; } + + /*@Override + @SideOnly(Side.CLIENT) + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) + { + EntityPlayerSP player = (EntityPlayerSP) entity; + if (player.itemInUse != null && player.itemInUse.getItem() == this) + { + player.movementInput.moveForward *= 5.0F; + player.movementInput.moveStrafe *= 5.0F; + } + } + }*/ } diff --git a/mods/tinker/tconstruct/items/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java index 8f01d587..fb6759ce 100644 --- a/mods/tinker/tconstruct/items/tools/Chisel.java +++ b/mods/tinker/tconstruct/items/tools/Chisel.java @@ -5,6 +5,8 @@ import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.crafting.Detailing.DetailInput; import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.ToolCore; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; @@ -119,6 +121,23 @@ public class Chisel extends ToolCore return itemstack; } + + @Override + @SideOnly(Side.CLIENT) + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) + { + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.getItemInUse(); + if (usingItem != null && usingItem.getItem() == this) + { + player.movementInput.moveForward *= 2.0; + player.movementInput.moveStrafe *= 2.0; + } + } + } @Override public int getMaxItemUseDuration (ItemStack itemstack) diff --git a/mods/tinker/tconstruct/items/tools/Excavator.java b/mods/tinker/tconstruct/items/tools/Excavator.java index 219e0de9..2466d30f 100644 --- a/mods/tinker/tconstruct/items/tools/Excavator.java +++ b/mods/tinker/tconstruct/items/tools/Excavator.java @@ -161,7 +161,7 @@ public class Excavator extends HarvestTool } } - MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 6); + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 5.0D); if (mop == null || !validStart) return super.onBlockStartBreak(stack, x, y, z, player); @@ -209,7 +209,7 @@ public class Excavator extends HarvestTool if (!cancelHarvest) { - if (block != null && !(block.blockHardness < 0)) + if (block != null && !(localHardness < 0)) { for (int iter = 0; iter < materials.length; iter++) { diff --git a/mods/tinker/tconstruct/items/tools/Hammer.java b/mods/tinker/tconstruct/items/tools/Hammer.java index ba3ef06f..0a483f5f 100644 --- a/mods/tinker/tconstruct/items/tools/Hammer.java +++ b/mods/tinker/tconstruct/items/tools/Hammer.java @@ -233,7 +233,7 @@ public class Hammer extends HarvestTool } } - MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 6); + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 5.0D); if (mop == null || !validStart) return super.onBlockStartBreak(stack, x, y, z, player); @@ -281,7 +281,7 @@ public class Hammer extends HarvestTool if (!cancelHarvest) { - if (block != null && !(block.blockHardness < 0)) + if (block != null && !(localHardness < 0)) { for (int iter = 0; iter < materials.length; iter++) { diff --git a/mods/tinker/tconstruct/items/tools/Longsword.java b/mods/tinker/tconstruct/items/tools/Longsword.java index f8c20188..c120798b 100644 --- a/mods/tinker/tconstruct/items/tools/Longsword.java +++ b/mods/tinker/tconstruct/items/tools/Longsword.java @@ -1,8 +1,12 @@ package mods.tinker.tconstruct.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.Weapon; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; @@ -80,6 +84,23 @@ public class Longsword extends Weapon } } + @Override + @SideOnly(Side.CLIENT) + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) + { + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.getItemInUse(); + if (usingItem != null && usingItem.getItem() == this) + { + player.movementInput.moveForward *= 5.0F; + player.movementInput.moveStrafe *= 5.0F; + } + } + } + @Override public Item getHeadItem () { diff --git a/mods/tinker/tconstruct/items/tools/PotionLauncher.java b/mods/tinker/tconstruct/items/tools/PotionLauncher.java index 37d46a30..c95cbb00 100644 --- a/mods/tinker/tconstruct/items/tools/PotionLauncher.java +++ b/mods/tinker/tconstruct/items/tools/PotionLauncher.java @@ -6,7 +6,9 @@ import mods.tinker.tconstruct.entity.projectile.LaunchedPotion; 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.entity.player.InventoryPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -18,162 +20,162 @@ import cpw.mods.fml.relauncher.SideOnly; public class PotionLauncher extends Item { - @SideOnly(Side.CLIENT) - private Icon[] icons; - public static final String[] textureNames = new String[] { "potionlauncher" }; + @SideOnly(Side.CLIENT) + private Icon[] icons; + public static final String[] textureNames = new String[] { "potionlauncher" }; - public PotionLauncher(int par1) - { - super(par1); - this.maxStackSize = 1; - this.setCreativeTab(CreativeTabs.tabCombat); - this.setMaxDamage(3); - } + public PotionLauncher(int par1) + { + super(par1); + this.maxStackSize = 1; + this.setCreativeTab(CreativeTabs.tabCombat); + this.setMaxDamage(3); + } - public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - boolean loaded = tags.getBoolean("Loaded"); - //boolean fired = tags.getBoolean("Fired"); - if (!loaded) - { - tags.setBoolean("Loaded", true); - } - /*else if (fired) - { - tags.setBoolean("Loaded", false); - tags.setBoolean("Ready", false); - tags.setBoolean("Fired", false); - }*/ - return stack; - } + public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + boolean loaded = tags.getBoolean("Loaded"); + if (!loaded) + { + int slotID = getInventorySlotContainItem(Item.potion.itemID, player.inventory); + ItemStack potion = player.inventory.getStackInSlot(slotID); - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int time) - { - /*NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - boolean loaded = tags.getBoolean("Loaded"); - boolean ready = tags.getBoolean("Ready"); - boolean fired = tags.getBoolean("Fired"); - if (loaded) - { - tags.setBoolean("Ready", true); - } - if (loaded && ready && fired) - { - tags.setBoolean("Loaded", false); - tags.setBoolean("Ready", false); - tags.setBoolean("Fired", false); - }*/ - } + NBTTagCompound potionTag = new NBTTagCompound(); + potion.writeToNBT(potionTag); + tags.setCompoundTag("LoadedPotion", potionTag); + tags.setBoolean("Loaded", true); - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - /*NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - boolean loaded = tags.getBoolean("Loaded"); - boolean ready = tags.getBoolean("Ready"); - boolean fired = tags.getBoolean("Fired"); - if (loaded && ready && !fired) - { - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + if (!player.capabilities.isCreativeMode) + { + potion.stackSize--; + if (potion.stackSize < 1) + player.inventory.setInventorySlotContents(slotID, null); + } - if (!world.isRemote) - { - world.spawnEntityInWorld(new LaunchedPotion(world, player, stack)); - } - tags.setBoolean("Fired", true); - } - player.setItemInUse(stack, this.getMaxItemUseDuration(stack));*/ - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.getBoolean("Loaded")) - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); - return stack; - } + world.playSoundEffect(player.posX, player.posY, player.posZ, "sounds.launcher_clank", 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.15F + 1.0F); + } + return stack; + } - public void onUpdate (ItemStack stack, World world, Entity entity, int slot, boolean equipped) - { - /*if (equipped && entity instanceof EntityPlayer) - { - EntityPlayer player = ((EntityPlayer) entity); - if (!player.worldObj.isRemote) - System.out.println(player.getItemInUse()); - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - //System.out.println("useTime "+((EntityPlayer) entity).getItemInUseCount()); - }*/ - } + public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int time) + { - /** - * How long it takes to use or consume an item - */ - public int getMaxItemUseDuration (ItemStack stack) - { - //if (!stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) - return 30; - //else - //return 72000; - } + } - /** - * returns the action that specifies what animation to play when the items is being used - */ - public EnumAction getItemUseAction (ItemStack stack) - { - if (!stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) - return EnumAction.bow; - else - return EnumAction.none; - } + public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int slotID = getInventorySlotContainItem(Item.potion.itemID, player.inventory); + if (!tags.getBoolean("Loaded") && slotID >= 0) + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + return stack; + } - @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) - { - this.icons = new Icon[textureNames.length]; + /** + * How long it takes to use or consume an item + */ + public int getMaxItemUseDuration (ItemStack stack) + { + return 30; + } - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = par1IconRegister.registerIcon("tinker:" + textureNames[i]); - } - } + /** + * returns the action that specifies what animation to play when the items is being used + */ + public EnumAction getItemUseAction (ItemStack stack) + { + if (!stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) + return EnumAction.bow; + else + return EnumAction.none; + } - @SideOnly(Side.CLIENT) - public Icon getIconFromDamage (int meta) - { - return icons[0]; - } + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister par1IconRegister) + { + this.icons = new Icon[textureNames.length]; - @Override - public void getSubItems (int id, CreativeTabs tabs, List list) - { - ItemStack stack = new ItemStack(id, 1, 0); - NBTTagCompound compound = new NBTTagCompound(); - NBTTagCompound tags = new NBTTagCompound(); - compound.setCompoundTag("InfiTool", tags); + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = par1IconRegister.registerIcon("tinker:" + textureNames[i]); + } + } - tags.setBoolean("Loaded", false); + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage (int meta) + { + return icons[0]; + } - stack.setTagCompound(compound); + @Override + public void getSubItems (int id, CreativeTabs tabs, List list) + { + ItemStack stack = new ItemStack(id, 1, 0); + NBTTagCompound compound = new NBTTagCompound(); + NBTTagCompound tags = new NBTTagCompound(); + compound.setCompoundTag("InfiTool", tags); - list.add(stack); - } + tags.setBoolean("Loaded", false); - public boolean swingItem (EntityPlayer player, ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Loaded")) - { - World world = player.worldObj; - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + stack.setTagCompound(compound); - if (!world.isRemote) - { - world.spawnEntityInWorld(new LaunchedPotion(world, player, stack)); - } - tags.setBoolean("Loaded", false); - return false; - } - return true; - } - - @Override + list.add(stack); + } + + @Override + public boolean onEntitySwing (EntityLiving player, ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (tags.getBoolean("Loaded")) + { + NBTTagCompound potionTag = tags.getCompoundTag("LoadedPotion"); + ItemStack potion = ItemStack.loadItemStackFromNBT(potionTag);//findPotion(player);InventoryLogic + if (potion != null) + { + World world = player.worldObj; + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + + if (!world.isRemote) + { + world.spawnEntityInWorld(new LaunchedPotion(world, player, potion)); + } + tags.removeTag("LoadedPotion"); + tags.setBoolean("Loaded", false); + } + return true; + } + return false; + } + + ItemStack findPotion (EntityLiving living) + { + if (living instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) living; + int potionSlot = getInventorySlotContainItem(Item.potion.itemID, player.inventory); + if (potionSlot >= 0) + { + return player.inventory.getStackInSlot(potionSlot); + } + } + return null; + } + + int getInventorySlotContainItem (int itemID, InventoryPlayer inventory) + { + for (int j = 0; j < inventory.mainInventory.length; ++j) + { + if (inventory.mainInventory[j] != null && inventory.mainInventory[j].itemID == itemID) + { + return j; + } + } + + return -1; + } + + @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { diff --git a/mods/tinker/tconstruct/items/tools/Shortbow.java b/mods/tinker/tconstruct/items/tools/Shortbow.java index 278e7fa1..ccc0d753 100644 --- a/mods/tinker/tconstruct/items/tools/Shortbow.java +++ b/mods/tinker/tconstruct/items/tools/Shortbow.java @@ -1,14 +1,21 @@ package mods.tinker.tconstruct.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.tools.BowBase; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class Shortbow extends BowBase { public Shortbow(int itemID) { super(itemID); + this.setUnlocalizedName("InfiTool.Shortbow"); } @Override @@ -65,4 +72,20 @@ public class Shortbow extends BowBase return new String[] { "weapon", "ranged", "bow" }; } + @Override + @SideOnly(Side.CLIENT) + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) + { + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.getItemInUse(); + if (usingItem != null && usingItem.getItem() == this) + { + player.movementInput.moveForward *= 1.3F; + player.movementInput.moveStrafe *= 1.3F; + } + } + } } diff --git a/mods/tinker/tconstruct/library/TConstructRegistry.java b/mods/tinker/tconstruct/library/TConstructRegistry.java index 66a05540..c21fc13f 100644 --- a/mods/tinker/tconstruct/library/TConstructRegistry.java +++ b/mods/tinker/tconstruct/library/TConstructRegistry.java @@ -8,14 +8,10 @@ import java.util.List; import mods.tinker.tconstruct.library.crafting.*; import mods.tinker.tconstruct.library.tools.*; -import mods.tinker.tconstruct.library.util.*; -import net.minecraft.block.*; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; +import mods.tinker.tconstruct.library.util.TabTools; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntitySign; -import net.minecraftforge.common.ForgeHooks; /** A registry to store any relevant API work * @@ -48,6 +44,7 @@ public class TConstructRegistry * pickaxeHead, shovelhead, hatchetHead, swordBlade, wideguard, handGuard, crossbar, knifeBlade, * fullGuard, frypanHead, signHead, chiselHead * scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead + * bowstring, fletching, arrowhead */ public static HashMap itemDirectory = new HashMap(); @@ -307,7 +304,6 @@ public class TConstructRegistry { mat = new BowMaterial(durability, drawSpeed, speedMax); bowMaterials.put(materialID, mat); - //toolMaterialStrings.put(materialName, mat); } else throw new IllegalArgumentException("[TCon API] Bow Material ID " + materialID + " is already occupied"); @@ -322,36 +318,107 @@ public class TConstructRegistry { return bowMaterials.get(materialID); } - - public static ArrayList bowstringMaterials = new ArrayList(); - public static void addBowstringMaterial(int materialID, ItemStack stack, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed) + public static HashMap arrowMaterials = new HashMap(40); + + public static void addArrowMaterial(int materialID, float mass, float breakChance, float accuracy) { - BowstringMaterial mat = new BowstringMaterial(materialID, stack, craftingMaterial, durability, drawSpeed, flightSpeed); - bowstringMaterials.add(mat); + ArrowMaterial mat = arrowMaterials.get(materialID); + if (mat == null) + { + mat = new ArrowMaterial(mass, breakChance, accuracy); + arrowMaterials.put(materialID, mat); + } + else + throw new IllegalArgumentException("[TCon API] Arrow Material ID " + materialID + " is already occupied"); } - public static BowstringMaterial getBowstringMaterial(int materialID) + public static boolean validArrowMaterial(int materialID) { - for (BowstringMaterial mat : bowstringMaterials) + return arrowMaterials.containsKey(materialID); + } + + public static ArrowMaterial getArrowMaterial(int materialID) + { + return arrowMaterials.get(materialID); + } + + //Custom materials - bowstrings, fletching, etc + public static ArrayList customMaterials = new ArrayList(); + + public static void addCustomMaterial(CustomMaterial mat) + { + if (mat != null) + customMaterials.add(mat); + } + + public static void addBowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed) + { + BowstringMaterial mat = new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed); + customMaterials.add(mat); + } + + public static void addFletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingMaterial, float accuracy, float breakChance) + { + FletchingMaterial mat = new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance); + customMaterials.add(mat); + } + + public static CustomMaterial getCustomMaterial(int materialID, Class clazz) + { + for (CustomMaterial mat : customMaterials) { - if (mat.materialID == materialID) + if (mat.getClass().equals(clazz) && mat.materialID == materialID) return mat; } return null; } - public static ItemStack craftBowString(ItemStack stack) + public static CustomMaterial getCustomMaterial(ItemStack input, Class clazz) { + for (CustomMaterial mat : customMaterials) + { + if (mat.getClass().equals(clazz) && input.isItemEqual(mat.input)) + return mat; + } + return null; + } + + /*public static CustomMaterial getCustomMaterial(ItemStack input, ItemStack pattern) + { + for (CustomMaterial mat : customMaterials) + { + if (mat.matches(input, pattern)) + return mat; + } + return null; + }*/ + + /*public static ItemStack craftBowString(ItemStack stack) + { + if (stack.stackSize < 3) + return null; + for (BowstringMaterial mat : bowstringMaterials) { - System.out.println("mat: "+mat.input); - //if (ItemStack.areItemStacksEqual(stack, mat.input)) if (stack.isItemEqual(mat.input)) return mat.craftingItem.copy(); } return null; } + + public static BowstringMaterial getBowstringMaterial(ItemStack stack) + { + if (stack.stackSize < 3) + return null; + + for (BowstringMaterial mat : bowstringMaterials) + { + if (stack.isItemEqual(mat.input)) + return mat; + } + return null; + }*/ public static LiquidCasting getTableCasting () { diff --git a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java index 3a628668..dc5f5df9 100644 --- a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java @@ -5,9 +5,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.event.PartBuilderEvent; -import mods.tinker.tconstruct.library.event.ToolCraftEvent; -import mods.tinker.tconstruct.library.tools.ToolMaterial; +import mods.tinker.tconstruct.library.tools.BowstringMaterial; +import mods.tinker.tconstruct.library.tools.CustomMaterial; import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -137,6 +138,12 @@ public class PatternBuilder ItemKey key = getItemKey(material); if (key != null) return key.value; + + for (CustomMaterial mat : TConstructRegistry.customMaterials) + { + if (material.isItemEqual(mat.input)) + return mat.value; + } } return 0; } diff --git a/mods/tinker/tconstruct/library/tools/AbilityHelper.java b/mods/tinker/tconstruct/library/tools/AbilityHelper.java index af510af8..004410ca 100644 --- a/mods/tinker/tconstruct/library/tools/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/tools/AbilityHelper.java @@ -387,16 +387,39 @@ public class AbilityHelper return false; int charge = tags.getInteger("charge"); - int mineSpeed = tags.getCompoundTag("InfiTool").getInteger("MiningSpeed"); - if (tags.getCompoundTag("InfiTool").hasKey("MiningSpeed2")) - mineSpeed = (mineSpeed + tags.getCompoundTag("InfiTool").getInteger("MiningSpeed2")) / 2; int durability = tags.getInteger("Damage"); float shoddy = tags.getFloat("Shoddy"); - mineSpeed += shoddy * durability / 100f; - mineSpeed /= 15; + + float mineSpeed = tags.getInteger("MiningSpeed"); + int heads = 1; + if (tags.hasKey("MiningSpeed2")) + { + mineSpeed += tags.getInteger("MiningSpeed2"); + heads++; + } + + if (tags.hasKey("MiningSpeedHandle")) + { + mineSpeed += tags.getInteger("MiningSpeedHandle"); + heads++; + } + + if (tags.hasKey("MiningSpeedExtra")) + { + mineSpeed += tags.getInteger("MiningSpeedExtra"); + heads++; + } + float trueSpeed = mineSpeed / (heads * 100f); + float stonebound = tags.getFloat("Shoddy"); + float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; + trueSpeed += bonusLog; + - if (charge < mineSpeed) + /*mineSpeed += shoddy * durability / 100f; + mineSpeed /= 15;*/ + + if (charge < trueSpeed) { if (charge > 0) tags.setInteger("charge", 0); diff --git a/mods/tinker/tconstruct/library/tools/ArrowMaterial.java b/mods/tinker/tconstruct/library/tools/ArrowMaterial.java new file mode 100644 index 00000000..c55f6505 --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/ArrowMaterial.java @@ -0,0 +1,15 @@ +package mods.tinker.tconstruct.library.tools; + +public class ArrowMaterial +{ + public final float mass; + public final float breakChance; + public final float accuracy; + + public ArrowMaterial(float weight, float breakChance, float accuracy) + { + this.mass = weight; + this.breakChance = breakChance; + this.accuracy = accuracy; + } +} diff --git a/mods/tinker/tconstruct/library/tools/BowBase.java b/mods/tinker/tconstruct/library/tools/BowBase.java index 02a3aece..d73559c8 100644 --- a/mods/tinker/tconstruct/library/tools/BowBase.java +++ b/mods/tinker/tconstruct/library/tools/BowBase.java @@ -5,11 +5,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.entity.projectile.ArrowEntity; import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; @@ -43,11 +46,11 @@ public abstract class BowBase extends ToolCore }*/ /* Bow usage */ - public void onPlayerStoppedUsing (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer, int useRemaining) + public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useRemaining) { int time = this.getMaxItemUseDuration(stack) - useRemaining; - ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, stack, time); + ArrowLooseEvent event = new ArrowLooseEvent(player, stack, time); MinecraftForge.EVENT_BUS.post(event); if (event.isCanceled()) { @@ -55,9 +58,13 @@ public abstract class BowBase extends ToolCore } time = event.charge; - boolean var5 = par3EntityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + int slotID = getInventorySlotContainItem(TContent.arrow.itemID, player.inventory); + ItemStack arrow = null; + if (slotID != -1) + arrow = player.inventory.getStackInSlot(slotID); - if (var5 || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) + if (creative || arrow != null || player.inventory.hasItem(Item.arrow.itemID)) { NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); float drawTime = toolTag.getInteger("DrawSpeed"); @@ -75,7 +82,17 @@ public abstract class BowBase extends ToolCore speedBase = flightSpeed; } - EntityArrow arrowEntity = new EntityArrow(par2World, par3EntityPlayer, speedBase * 2.0F); + EntityArrow arrowEntity = null; + if (arrow != null) + { + ItemStack arrowStack = arrow.copy(); + arrowStack.stackSize = 1; + arrowEntity = new ArrowEntity(world, player, speedBase * 2.0F, arrowStack); + } + else + { + arrowEntity = new EntityArrow(world, player, speedBase * 2.0F); + } if (speedBase >= 1.0F) { @@ -101,25 +118,53 @@ public abstract class BowBase extends ToolCore arrowEntity.setFire(100); } - stack.damageItem(1, par3EntityPlayer); - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); + int reinforced = 0; - if (var5) + if (toolTag.hasKey("Unbreaking")) + reinforced = toolTag.getInteger("Unbreaking"); + + if (random.nextInt(10) < 10 - reinforced) + { + AbilityHelper.damageTool(stack, 1, player, false); + } + world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); + + if (creative) { arrowEntity.canBePickedUp = 2; } else { - par3EntityPlayer.inventory.consumeInventoryItem(Item.arrow.itemID); + if (arrow != null) + { + player.inventory.consumeInventoryItem(TContent.arrow.itemID); + } + else + { + player.inventory.consumeInventoryItem(Item.arrow.itemID); + } } - if (!par2World.isRemote) + if (!world.isRemote) { - par2World.spawnEntityInWorld(arrowEntity); + world.spawnEntityInWorld(arrowEntity); } } } + int getInventorySlotContainItem (int itemID, InventoryPlayer inventory) + { + for (int j = 0; j < inventory.mainInventory.length; ++j) + { + if (inventory.mainInventory[j] != null && inventory.mainInventory[j].itemID == itemID) + { + return j; + } + } + + return -1; + } + public ItemStack onFoodEaten (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) { return stack; @@ -144,21 +189,28 @@ public abstract class BowBase extends ToolCore /** * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ - public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + public ItemStack onItemRightClick (ItemStack stack, World par2World, EntityPlayer player) { - ArrowNockEvent event = new ArrowNockEvent(par3EntityPlayer, par1ItemStack); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) + if (stack.hasTagCompound()) { - return event.result; + NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); + if (!toolTag.getBoolean("Broken")) + { + ArrowNockEvent event = new ArrowNockEvent(player, stack); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) + { + return event.result; + } + + if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TContent.arrow.itemID)) + { + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + } + } } - if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) - { - par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); - } - - return par1ItemStack; + return stack; } @SideOnly(Side.CLIENT) @@ -182,14 +234,14 @@ public abstract class BowBase extends ToolCore while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - headIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + headIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } iterOne = handleStrings.entrySet().iterator(); while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - handleIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + handleIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } if (getPartAmount() > 2) @@ -198,7 +250,7 @@ public abstract class BowBase extends ToolCore while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - accessoryIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + accessoryIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } } @@ -208,7 +260,7 @@ public abstract class BowBase extends ToolCore while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - extraIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + extraIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } } @@ -216,9 +268,9 @@ public abstract class BowBase extends ToolCore while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - effectIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + effectIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } - + headIcons2.clear(); handleIcons2.clear(); accessoryIcons2.clear(); @@ -228,14 +280,14 @@ public abstract class BowBase extends ToolCore while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - headIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + headIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } iterTwo = handleStrings.entrySet().iterator(); while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - handleIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + handleIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } if (getPartAmount() > 2) @@ -244,7 +296,7 @@ public abstract class BowBase extends ToolCore while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - accessoryIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + accessoryIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } } @@ -254,7 +306,7 @@ public abstract class BowBase extends ToolCore while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - extraIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + extraIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } } @@ -262,9 +314,9 @@ public abstract class BowBase extends ToolCore while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - effectIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + effectIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } - + headIcons3.clear(); handleIcons3.clear(); accessoryIcons3.clear(); @@ -274,14 +326,14 @@ public abstract class BowBase extends ToolCore while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - headIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + headIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } iterThree = handleStrings.entrySet().iterator(); while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - handleIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + handleIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } if (getPartAmount() > 2) @@ -290,7 +342,7 @@ public abstract class BowBase extends ToolCore while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - accessoryIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + accessoryIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } } @@ -300,7 +352,7 @@ public abstract class BowBase extends ToolCore while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - extraIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + extraIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } } @@ -308,19 +360,19 @@ public abstract class BowBase extends ToolCore while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - effectIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + effectIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } - + registerArrows(iconRegister); } - - void registerArrows(IconRegister iconRegister) + + void registerArrows (IconRegister iconRegister) { - arrow1 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_1"); - arrow2 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_2"); - arrow3 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_3"); + arrow1 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_1"); + arrow2 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_2"); + arrow3 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_3"); } - + @Override public Icon getIcon (ItemStack stack, int renderPass) { @@ -409,24 +461,24 @@ public abstract class BowBase extends ToolCore if (location.length > 4) extraStrings.put(index, location[4]); } - + @Override - public void registerAlternatePartPaths(int index, String[] location) + public void registerAlternatePartPaths (int index, String[] location) { brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } - + public Icon arrow1; public Icon arrow2; public Icon arrow3; - + public HashMap headIcons1 = new HashMap(); public HashMap handleIcons1 = new HashMap(); public HashMap accessoryIcons1 = new HashMap(); public HashMap extraIcons1 = new HashMap(); public HashMap effectIcons1 = new HashMap(); - + public HashMap headIcons2 = new HashMap(); public HashMap handleIcons2 = new HashMap(); public HashMap accessoryIcons2 = new HashMap(); @@ -445,7 +497,7 @@ public abstract class BowBase extends ToolCore int useTime = stack.getMaxItemUseDuration() - useRemaining; if (!stack.hasTagCompound()) return emptyIcon; - + NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); int drawTime = toolTag.getInteger("DrawSpeed"); float flightSpeed = toolTag.getFloat("FlightSpeed"); @@ -460,7 +512,7 @@ public abstract class BowBase extends ToolCore } return getIcon1(stack, renderPass); } - + public Icon getIcon1 (ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); @@ -614,7 +666,7 @@ public abstract class BowBase extends ToolCore } return emptyIcon; } - + public Icon getIcon3 (ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); @@ -691,7 +743,7 @@ public abstract class BowBase extends ToolCore } return emptyIcon; } - + @Override public void buildTool (int id, String name, List list) { diff --git a/mods/tinker/tconstruct/library/tools/BowstringMaterial.java b/mods/tinker/tconstruct/library/tools/BowstringMaterial.java index 97ead7ae..39054f13 100644 --- a/mods/tinker/tconstruct/library/tools/BowstringMaterial.java +++ b/mods/tinker/tconstruct/library/tools/BowstringMaterial.java @@ -2,20 +2,15 @@ package mods.tinker.tconstruct.library.tools; import net.minecraft.item.ItemStack; -public class BowstringMaterial +public class BowstringMaterial extends CustomMaterial { - public final int materialID; - public final ItemStack input; - public final ItemStack craftingItem; public final float durabilityModifier; public final float drawspeedModifier; public final float flightSpeedModifier; - public BowstringMaterial(int materialID, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed) + public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed) { - this.materialID = materialID; - this.input = input; - this.craftingItem = craftingItem; + super(materialID, value, input, craftingItem); this.durabilityModifier = durability; this.drawspeedModifier = drawspeed; this.flightSpeedModifier = flightspeed; diff --git a/mods/tinker/tconstruct/library/tools/CustomMaterial.java b/mods/tinker/tconstruct/library/tools/CustomMaterial.java new file mode 100644 index 00000000..c1f12d0d --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/CustomMaterial.java @@ -0,0 +1,26 @@ +package mods.tinker.tconstruct.library.tools; + +import net.minecraft.item.ItemStack; + +public abstract class CustomMaterial +{ + public final int materialID; + public final int value; + public final ItemStack input; + public final ItemStack craftingItem; + + public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem) + { + this.materialID = materialID; + this.value = value; + this.input = input; + this.craftingItem = craftingItem; + } + + /*public boolean matches(ItemStack input, ItemStack pattern) + { + if (ItemStack.areItemStacksEqual(this.input, input) && ItemStack.areItemStacksEqual(this.craftingPattern, pattern)) + return true; + return false; + }*/ +} diff --git a/mods/tinker/tconstruct/library/tools/FletchingMaterial.java b/mods/tinker/tconstruct/library/tools/FletchingMaterial.java new file mode 100644 index 00000000..2cb5d5a0 --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/FletchingMaterial.java @@ -0,0 +1,15 @@ +package mods.tinker.tconstruct.library.tools; + +import net.minecraft.item.ItemStack; + +public class FletchingMaterial extends CustomMaterial +{ + public final float accuracy; + public final float breakChance; + public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance) + { + super(materialID, value, input, craftingItem); + this.accuracy = accuracy; + this.breakChance = breakChance; + } +} diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java index 5f3008be..3efcec7d 100644 --- a/mods/tinker/tconstruct/library/tools/ToolCore.java +++ b/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -555,6 +555,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox /* Updating */ + @Override public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) { for (ActiveToolMod mod : TConstructRegistry.activeModifiers) diff --git a/mods/tinker/tconstruct/library/tools/Weapon.java b/mods/tinker/tconstruct/library/tools/Weapon.java index 043819cc..437122f4 100644 --- a/mods/tinker/tconstruct/library/tools/Weapon.java +++ b/mods/tinker/tconstruct/library/tools/Weapon.java @@ -1,7 +1,11 @@ package mods.tinker.tconstruct.library.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; @@ -89,6 +93,23 @@ public abstract class Weapon extends ToolCore return web; } + @Override + @SideOnly(Side.CLIENT) + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) + { + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.getItemInUse(); + if (usingItem != null && usingItem.getItem() == this) + { + player.movementInput.moveForward *= 2.5F; + player.movementInput.moveStrafe *= 2.5F; + } + } + } + /*@Override public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) { diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java index 65bbf8a0..dea200ab 100644 --- a/mods/tinker/tconstruct/util/PHConstruct.java +++ b/mods/tinker/tconstruct/util/PHConstruct.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.IOException; import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.items.Fletching; +import mods.tinker.tconstruct.items.ToolPart; import net.minecraft.block.Block; import net.minecraftforge.common.Configuration; @@ -142,6 +144,8 @@ public class PHConstruct hammerHead = config.getItem("Tool Parts", "Hammer Head", 14046).getInt(14046); fullGuard = config.getItem("Tool Parts", "Full Guard", 14047).getInt(14047); bowstring = config.getItem("Tool Parts", "Bowstring", 14048).getInt(14048); + arrowhead = config.getItem("Tool Parts", "Arrowhead", 14049).getInt(14049); + fletching = config.getItem("Tool Parts", "Fletching", 14050).getInt(14050); pickaxe = config.getItem("Tools", "Pickaxe", 14051).getInt(14051); shovel = config.getItem("Tools", "Shovel", 14052).getInt(14052); @@ -169,6 +173,7 @@ public class PHConstruct battleaxe = config.getItem("Tools", "Battleaxe", 14071).getInt(14071); cutlass = config.getItem("Tools", "Cutlass", 14072).getInt(14072); + arrow = config.getItem("Tools", "Arrow", 14073).getInt(14073); buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); @@ -220,7 +225,7 @@ public class PHConstruct generateCopperBush = config.get("Worldgen Disabler", "Generate Copper Bushes", true).getBoolean(true); generateTinBush = config.get("Worldgen Disabler", "Generate Tin Bushes", true).getBoolean(true); generateAluminumBush = config.get("Worldgen Disabler", "Generate Aluminum Bushes", true).getBoolean(true); - generateSilverBush = config.get("Worldgen Disabler", "Generate Silver Bushes", true).getBoolean(true); + generateEssenceBush = config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true); addToVillages = config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true); copperuDensity = config.get("Worldgen", "Copper Underground Density", 2).getInt(2); @@ -254,7 +259,7 @@ public class PHConstruct copperBushRarity = config.get("Worldgen", "Copper Bush Rarity", 3).getInt(3); tinBushRarity = config.get("Worldgen", "Tin Bush Rarity", 3).getInt(3); aluminumBushRarity = config.get("Worldgen", "Aluminum Bush Rarity", 2).getInt(2); - silverBushRarity = config.get("Worldgen", "Silver Bush Rarity", 8).getInt(8); + essenceBushRarity = config.get("Worldgen", "Essence Bush Rarity", 6).getInt(6); copperBushMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20); copperBushMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60); @@ -276,10 +281,10 @@ public class PHConstruct /* Save the configuration file */ config.save(); - File gt = new File(TConstruct.proxy.getLocation() + "/config/GregTech"); + File gt = new File(location+"/GregTech"); if (gt.exists()) { - File gtDyn = new File(TConstruct.proxy.getLocation() + "/config/GregTech/DynamicConfig.cfg"); + File gtDyn = new File(location + "/GregTech/DynamicConfig.cfg"); Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); @@ -381,6 +386,7 @@ public class PHConstruct public static int battleaxe; public static int chisel; + public static int arrow; //Tool parts public static int swordBlade; @@ -411,6 +417,8 @@ public class PHConstruct public static int largePlate; public static int bowstring; + public static int arrowhead; + public static int fletching; //Wearables public static int heavyHelmet; @@ -440,7 +448,7 @@ public class PHConstruct public static boolean generateCopperBush; public static boolean generateTinBush; public static boolean generateAluminumBush; - public static boolean generateSilverBush; + public static boolean generateEssenceBush; public static boolean addToVillages; @@ -468,7 +476,7 @@ public class PHConstruct public static int copperBushRarity; public static int tinBushRarity; public static int aluminumBushRarity; - public static int silverBushRarity; + public static int essenceBushRarity; public static int copperuMinY; public static int copperuMaxY; diff --git a/mods/tinker/tconstruct/util/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java index 5726f301..072f654c 100644 --- a/mods/tinker/tconstruct/util/TEventHandler.java +++ b/mods/tinker/tconstruct/util/TEventHandler.java @@ -13,8 +13,10 @@ import mods.tinker.tconstruct.library.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.ToolBuilder; import mods.tinker.tconstruct.library.event.PartBuilderEvent; import mods.tinker.tconstruct.library.event.ToolCraftEvent; +import mods.tinker.tconstruct.library.tools.ArrowMaterial; import mods.tinker.tconstruct.library.tools.BowMaterial; import mods.tinker.tconstruct.library.tools.BowstringMaterial; +import mods.tinker.tconstruct.library.tools.FletchingMaterial; import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.util.ValueCoordTuple; import mods.tinker.tconstruct.modifiers.ModAttack; @@ -85,25 +87,50 @@ public class TEventHandler { BowMaterial top = TConstructRegistry.getBowMaterial(toolTag.getInteger("Head")); BowMaterial bottom = TConstructRegistry.getBowMaterial(toolTag.getInteger("Accessory")); - BowstringMaterial string = TConstructRegistry.getBowstringMaterial(toolTag.getInteger("Handle")); - - if (toolTag.getInteger("Handle") == 1) + BowstringMaterial string = (BowstringMaterial) TConstructRegistry.getCustomMaterial(toolTag.getInteger("Handle"), BowstringMaterial.class); + + if (top != null && bottom != null && string != null) { - int modifiers = toolTag.getInteger("Modifiers"); - modifiers += 1; - toolTag.setInteger("Modifiers", modifiers); + if (toolTag.getInteger("Handle") == 1) + { + int modifiers = toolTag.getInteger("Modifiers"); + modifiers += 1; + toolTag.setInteger("Modifiers", modifiers); + } + + int durability = (int) ((top.durability + bottom.durability) / 2 * string.durabilityModifier); + toolTag.setInteger("TotalDurability", durability); + toolTag.setInteger("BaseDurability", durability); + + int drawSpeed = (int) ((top.drawspeed + bottom.drawspeed) / 2 * string.drawspeedModifier); + toolTag.setInteger("DrawSpeed", drawSpeed); + toolTag.setInteger("BaseDrawSpeed", drawSpeed); + + float flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax) / 2f * string.flightSpeedModifier; + toolTag.setFloat("FlightSpeed", flightSpeed); } + } + + if (event.tool == TContent.arrow) + { + ArrowMaterial head = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Head")); + ArrowMaterial shaft = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Handle")); + FletchingMaterial fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial(toolTag.getInteger("Accessory"), FletchingMaterial.class); - int durability = (int) ((top.durability + bottom.durability) / 2 * string.durabilityModifier); - toolTag.setInteger("TotalDurability", durability); - toolTag.setInteger("BaseDurability", durability); - - int drawSpeed = (int) ((top.drawspeed + bottom.drawspeed) / 2 * string.drawspeedModifier); - toolTag.setInteger("DrawSpeed", drawSpeed); - toolTag.setInteger("BaseDrawSpeed", drawSpeed); - - float flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax) / 2f * string.flightSpeedModifier; - toolTag.setFloat("FlightSpeed", flightSpeed); + if (head != null && shaft != null && fletching != null) + { + float mass = (head.mass / 5f + shaft.mass) / 1.2f; + float shatter = (head.breakChance + shaft.breakChance + fletching.breakChance) / 4f; + float accuracy = (head.accuracy + shaft.accuracy + fletching.accuracy) / 3; + + ItemStack arrow = new ItemStack(event.tool, 4); + toolTag.setInteger("TotalDurability", 0); + toolTag.setFloat("Mass", mass); + toolTag.setFloat("BreakChance", shatter); + toolTag.setFloat("Accuracy", accuracy); + arrow.setTagCompound(event.toolTag); + event.overrideResult(arrow); + } } } @@ -112,13 +139,40 @@ public class TEventHandler { if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 23) { - //System.out.println("Fire! "); - ItemStack result = TConstructRegistry.craftBowString(event.material); + ItemStack result = craftBowString(event.material); if (result != null) { event.overrideResult(new ItemStack[] { result, null }); } } + + if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 24) + { + ItemStack result = craftFletching(event.material); + if (result != null) + { + event.overrideResult(new ItemStack[] { result, null }); + } + } + } + + public static ItemStack craftBowString(ItemStack stack) + { + if (stack.stackSize < 3) + return null; + + BowstringMaterial mat = (BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class); + if (mat != null) + return mat.craftingItem.copy(); + return null; + } + + public static ItemStack craftFletching(ItemStack stack) + { + FletchingMaterial mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class); + if (mat != null) + return mat.craftingItem.copy(); + return null; } /* Interact */ diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index dca1442d..16e7f4a4 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -196,7 +196,7 @@ public class TBaseWorldGenerator implements IWorldGenerator } } } - if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverBushRarity) == 0) + if (PHConstruct.generateEssenceBush && random.nextInt(PHConstruct.essenceBushRarity) == 0) { for (int i = 0; i < PHConstruct.silverBushDensity; i++) { diff --git a/mods/tinker/textures/blocks/crops/berry_essence_fancy.png b/mods/tinker/textures/blocks/crops/berry_essence_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..81986b9c575bdf8d228a9a72a65491921b3fff61 GIT binary patch literal 641 zcmV-{0)G98P)k7mF$(I?!OJcY*hP3@ClxP-ARWSkHoXR(b|{D)Dmv_<;%RhHWFiR` zjNnZ-$rtnW-n9q|Gs||K*b-G`tL(R;TAetvx@)Jc%e`1u*LWFeWr)* z)6tq$Aq_S~uKzP|aq)>?KktoN1~=Dsk0<3?^o6>3>6J48fW}7hy>fbV27vqJ7nWYI zUHOFTIZ`OL$%$X*(5snCdKh3fT~z*F4S%mjIAWuMZ;EAcc6vbPmDg${-z&4}qRQk_ zqOX0J+BAy>=XxYJyrxve9~H}vnJ*GuD-9wJ&h-dDXFP_cl^b3&J(gBIyS&J|Z>9YYIVt2YuPbM<)pZtBab>a%(9@cl*&oDEI7NzlLAmEw#m-Xm}GJ($>dTp zFdjGkp^1flnR&n8u)EMPbIVn@m?gEfbd~JxZ>p21#r)tN4Oq5M&rFHYgay_R3 b)8GCD;Z-g>k4GqA00000NkvXXu0mjfo}49H literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/berry_essence_fast.png b/mods/tinker/textures/blocks/crops/berry_essence_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..fdcdf4f504bef8b455ea6b49c1d954f7e99ab6d6 GIT binary patch literal 821 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 L`njxgN@xNAqm?}f diff --git a/mods/tinker/textures/blocks/repeaterDust_cross_overlay.png b/mods/tinker/textures/blocks/repeaterDust_cross_overlay.png deleted file mode 100644 index 96729e159b885d68f678fc6053bd8a170ca1b10b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`LY^*;Ar-fh6C_v{Cy4YgaWF8j X2rw|NckR#t$})Jm`njxgN@xNA05A_g diff --git a/mods/tinker/textures/blocks/repeaterDust_line.png b/mods/tinker/textures/blocks/repeaterDust_line.png deleted file mode 100644 index ea4897a4919243a066ed50e18a8f38367d5afc5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 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 literal 7106 zcmd^k`9D-&{Qn(0L&#S4H_8%8giMTNO}4UyELjU<9~3i`t?a4n`@Uxh*+wQy$d<@D zgzSucFk?Qq&*!J_-|)TLxsP)n_nh-OukHDIz1|q=YcVl!GXMa#BU=O{g_G2FafU^C&AwXKjC9sp$S4U5Sc9xcgnqN44 zv}_sxcnoyZ?-~b8ZOx+H-uq?I;*T5e8YRMBKNB#0OeND`9$Hyz%v~=DOVaim`rNOk zngp9_TO7Rh7q1lFG!fgPCtv99Pg8ZU*SN*| zQlV`Lj)TtQ^VJ}Mtkl8ym5KVoebg1EtsDDWvbeyx?49F4rz{T*FE5!4i#jK!vhs4i z#-C$jOZQ=4ZCS2dxgwZ1R#XbWa@D56&XUZA26D;ph8( zOJxzs_zjze|NK{%!>I4LLPHqHwD$yZh?WVuoO%NLWRL9Tm?O3uXMgB{hg-dg+Ei&p zxd#i*1(WNpMNQ_jsbl(Mv$L_y%}Q�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 E03_HUXaE2J literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/alumite_arrow_shaft.png b/mods/tinker/textures/items/arrow/alumite_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..e9dcabed947bce139148fe1a2a813a7db8e8d4ab GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+MX_sAr-fh6C~mu1l?Nq-#okj y-|`a;`}hCrlWIykG2J-djd$Tx#b)*Y3=H>mQuT5}R%-*bF?hQAxvXEQ2hLvpkYEKiL@~mg>cDdcBMQYGCkm^>bP0l+XkKG7TC* literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/beheading_arrow_effect.png b/mods/tinker/textures/items/arrow/beheading_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..e8f62de965fdf9fbad2ce315a07281a0a83ab438 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`KAtX)Ar-fh4K988c|JLh;n-Bi z-T#_@@GN1NaBQA_|3B~W^k&{f13QX9X7SH z+=P>V|KFA3{KUhU8I^N_!K_6oyrIA^>c;<-b9eqf$;Uk*O@;6DpUXf literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/blueslime_arrow_fletching.png b/mods/tinker/textures/items/arrow/blueslime_arrow_fletching.png new file mode 100644 index 0000000000000000000000000000000000000000..2f0b1ac95a6f1453a8610ba42dddac34dd69e357 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`cAhSdAr-fh6C_v{C!A<(_}BSA zafZ%Wgd25M&TboFyt=akR{ E0QyNFivR!s literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/blueslime_arrow_shaft.png b/mods/tinker/textures/items/arrow/blueslime_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..5af6f3f42ca3d79a069cba57796a380c2e5c35c2 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`TAnVBAr-fh6C~msVq*U6-?;H( weHV{K-Jc&T6f@dNN=tjCoV1_`n`d!?NKXs{L-cmNH9gleGl04oJYD@<);T3K F0RS-}A@~3Q literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/bone_arrow_shaft.png b/mods/tinker/textures/items/arrow/bone_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..36c2c70d3651309ce191eefcaea0617fd4d8ce77 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`I-V|$Ar-fh6C~meTnl?@&k>w* z;CA|NcV0*1C!bbYE^fPUXaf89Z~x_OezG&1wQ}Cocx-|qP#=S*tDnm{r-UW|qAVgR literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/bronze_arrow_head.png b/mods/tinker/textures/items/arrow/bronze_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..18f80ff205ed9abe4d844af5ce7e550cc14d4f46 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhGkDB?@gL%O!ZhJo zu<_x4!6^b~CLFIeK4HwVgmZ~x3WsZ4q6F*WgeOc4I{gYM!uIQ?12r>vy85}Sb4q9e E0JLEq=>Px# literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/bronze_arrow_shaft.png b/mods/tinker/textures/items/arrow/bronze_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..d097cffbcce8b54ea48390fba738754dcfbec151 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`TAnVBAr-fh6C~megogjBZ&5p3 w-^Ek0$2|FpfQhr;SsrQAmasOSd4HH0jvloswBzq^1nOe&boFyt=akR{0Mt7iqyPW_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/cactus_arrow_head.png b/mods/tinker/textures/items/arrow/cactus_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..1f5aecb57fc2062700b34a8098cbbed8477a7955 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhANWrB!GDP73DbmU zH-iuT3r-O@Gr{}%^U3KP9>N~RCj`3o95Uc?J9vVXA$+FviDuQ(i9pQ^p00i_>zopr E08y$U$p8QV literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/cactus_arrow_shaft.png b/mods/tinker/textures/items/arrow/cactus_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..174d1c31e93c6edba5651e31af03f3c33d10f537 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`mYyz-Ar-fh6C~mqE_*((=Lk+| zIKnjdVVXxnzg}vajP)%e51z~wMN4gbT&hCZIu$oBZ}}^4^OK$7O@{IO%pMH|pdk#N Lu6{1-oD!M<+qEMt literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/cobalt_arrow_head.png b/mods/tinker/textures/items/arrow/cobalt_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..1d6d352ebbbf125fb6cd35a105e0fad688a04641 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fh6E@BKE8ik{f>q({ zsnqiS!6^b~CY%U;f6|y`3Fi{Y6b{$8LYgr+Ar-fh6C~msVh+Bx=Lk-5 tc(UsI; literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/copper_arrow_head.png b/mods/tinker/textures/items/arrow/copper_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..45d399c6200c098184e20ff38302dfa631130089 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhS8PuB!GDP73DbmU z#+pq3HH|pZPOLVw{lvqV$&|?^=`=B1!tJ1j#7+hV9SP}BuC1AQK+O!Eu6{1-oD!M< Dfr}jO literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/copper_arrow_shaft.png b/mods/tinker/textures/items/arrow/copper_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..e27be7dcdf182192c11f731ec2fe422bfed486fb GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6C~mkoF+fC=Lk+Y tu-a^Ipz{SD%gIUxSsZJ5ByE1OGYFnD&v#@gya&|6;OXk;vd$@?2>>vi8Jz$C literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/diamond_arrow_effect.png b/mods/tinker/textures/items/arrow/diamond_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..a83fd965d639a0b1f5b1bd08863b40d84a0cb773 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ik>cxAr-fh1MZu=w&yUO!0j-r nH-7%IK1H6z2_ijBjm!*k+l9EZ+BR1K6*G9c`njxgN@xNAuUHsK literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/electric_arrow_effect.png b/mods/tinker/textures/items/arrow/electric_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..c69d1d6843e6e8bca75790f045342e6777b0ca6d GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`cAhSdAr-fh6C~;m+`03|o@4Ub z%3ohzCgh}~e3`GqoOf@}&;R=cn18l4m^AX-T&Li*Q!z!F!MG*o?BawKj0~P7`pZ^_ SePjfh#Ng@b=d#Wzp$P!OBPtmH literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/emerald_arrow_effect.png b/mods/tinker/textures/items/arrow/emerald_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..828c6248fe9473cb8e3bf6a0eb969f877a478044 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+MX_sAr-fh6BbBur2XJOmXe(} y{qO$Q|3!^>8MBK1+;M8;PFN?wx;Wtp6T^X{f~tGo2wwtfWAJqKb6Mw<&;$TCj30CW literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/feather_arrow_fletching.png b/mods/tinker/textures/items/arrow/feather_arrow_fletching.png new file mode 100644 index 0000000000000000000000000000000000000000..22451c9352765cd0c3b7c35417e9d981e4b7f416 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ww^AIAr-fh6C_v{C!A>13|{u9 zJ#mvs^NaruAO8F-zQoI<$;O!CY?gP&V-}-=uYt42rJg*F$XSVO3$oc5&OCJs-~5zi Q6VM3rgZ~iE6Q&8z zHf-4NUqq7SQbc_G|Noz!o_-?9bcy8>k5P-#dV`*(K!YMihK;YJC6_pb`vVPN@O1Ta JS?83{1OPoMC9D7d literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/flint_arrow_shaft.png b/mods/tinker/textures/items/arrow/flint_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..a5246c615c10d47829e81ec328da044cf731ec09 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`I-V|$Ar-fh6C~msoSh%ra|EXx zczSxeJFlbhl70K?t_YYoA3Ahs#p6i_C)YFVOtBW6o&NA6P#=S*tDnm{r-UW|T0%|Rg!&{ZXos^Xas|& LtDnm{r-UW|sEsFC literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/iron_arrow_head.png b/mods/tinker/textures/items/arrow/iron_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..caf933598c4def78648d588084367d4d3b17405b GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``kpS1Ar-fhHS~4=@*m=P!ZhJo zGduskFVdQ&MBb@0J$a{#{d8T literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/lapis_arrow_effect.png b/mods/tinker/textures/items/arrow/lapis_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..018bebc9bd01811abb91c568ae97a1e0a78d277a GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6C_v{Cp=-yy#Mq6 u&Mm9|P0nTTC_ecme2O$v(a8s#;tVFGygMIvy}S<8!rJ97(8A5T-G@yGywp#za`HA literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/manyullyn_arrow_head.png b/mods/tinker/textures/items/arrow/manyullyn_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..18bc40ce9142265d8c126135fbf78ac4473ae387 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhKRo3A!GDP73DbmU zN!?5TYZ`H+omjHw@DoXp>FVdQ&MBb@ E02jd^p#T5? literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/manyullyn_arrow_shaft.png b/mods/tinker/textures/items/arrow/manyullyn_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..1be08ff34be86a49c08f1bfae6469a392bf8fca8 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6C~ms`W)Zba|EXx tShD8u;st_Va)8dZGaXGnQq#H2KP(L|sY22WQ%mvv4FO#p>G96ta6 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/moss_arrow_effect.png b/mods/tinker/textures/items/arrow/moss_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..4e18d6e3f0076c562c603597a45e34d9315bc620 GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`x}GkMAr-fh6C_xhWir&W|1bC0 yoZ9-dzOwu$qY29r!4!_0ag8^9CYrl30+lDs5&plKBXt8%BZH@_pUXO@geCwaJRRo% literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/necrotic_arrow_effect.png b/mods/tinker/textures/items/arrow/necrotic_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..49a1a02a86b8db3aca17dbd20b185e9a581cdfce GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`#-1*YAr-fh6C_v{CwMS=dY=5R zrl$7a^vRC@lXDx^uh+jJAfR@WVZzxHZ4=&d3CP7Xax<{-3VS=9JIM&t&fw|l=d#Wz Gp$PyB)gW^K literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/netherrack_arrow_head.png b/mods/tinker/textures/items/arrow/netherrack_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5399e5d85050ff8ee79f2c570bb829cb6448af GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)}AhoAr-fhKcuJs=Rd^rglWRF z$U}$z7whO8n4#nBAjK~#{=a_Ls$LsshglA@9NQ+m72Pz~p3Cjv2L=Wi1DPD(oTeh6 OF$|urelF{r5}E*`_$7t_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/netherrack_arrow_shaft.png b/mods/tinker/textures/items/arrow/netherrack_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..d0577d089029562abb7045e81175f27284f8dcc8 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`uAVNAAr-fh6C}zW*o#cgKj7l% zc#8Mrg9i)l2!w}*p5om&W$My96H+HmoFctxUk6v)8SgL4?o6;!U+ySmE&K1^e|G<8 aj0}uh)gL*vEZhh*kipZ{&t;ucLK6VDQ!Rl2 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/obsidian_arrow_head.png b/mods/tinker/textures/items/arrow/obsidian_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d132f912d7fa88eecba7815dfa0d787b75a0c5df GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fh3$}Xv<3GgnglWRF zQww7MYZ`H+o#^ZO|3s4M63ZnXqZXz020cxI21SevI-BGU@W=2U25M&TboFyt=akR{ E02G`c?*IS* literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/obsidian_arrow_shaft.png b/mods/tinker/textures/items/arrow/obsidian_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..a49e3fadad8cdd7557098f5450db8f5e939fb327 GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2A(dCAr-fh6C~ms{LenL=Lk-5 zs6R9{(D?$-NzNIjSsY@{C7OmTOLiJ%T>pP?ay^6VVJqjPS@8xyy$qhNelF{r5}E*Y C_8$5G literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/paper_arrow_head.png b/mods/tinker/textures/items/arrow/paper_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..6788f524781f117151d44f018a343e44689df202 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`CY~;iAr-fhXP9Omt`|sC5N|Mf zf2Z=7y(?Rz$-NyPf7o+ONagSl=4jwqctV?Jae_!s3SQ9DD)~OiskuQ|z=FZP1PupU4m*q~_(USEt<--$sh99?l&y_B{SPwLT!PC{x JWt~$(698SAB$ogH literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/piston_arrow_effect.png b/mods/tinker/textures/items/arrow/piston_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..30fdff1d78061991aca4c9696cfc1fa1a2793a35 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ww^AIAr-fh6C~;sjF0^Ie{*yC z|H*4B&-X0(@8;%~;IoNQVYZ`GbX3$ocQ?05=^P%yH)l=cO_X3=+`z)Xu#Z(<=%Rz# QE1*FPp00i_>zopr0P+eYe*gdg literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/quartz_arrow_effect.png b/mods/tinker/textures/items/arrow/quartz_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..a04b12fe2f94a14ffdb5f16d51e3b08068699c5d GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`CY~;iAr-fhU#!vl*WV-Q!K&c< zKF*%`vG?)vzwyS^kLow^D0my6Vc2APn89_H`#}u}IR=KUMux|0^4ns8`WZZ3{an^L HB{Ts5Ph=re literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/redstone_arrow_effect.png b/mods/tinker/textures/items/arrow/redstone_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..70550e7d3c64dca07b53a6a7f728f1919699ab92 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`DxNNmAr-fh6C_wA7IZW|tXB}2 qoXgxxgGkCiCxvXO`<*Q{612r>vy85}Sb4q9e E0LzRYRsaA1 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/slime_arrow_shaft.png b/mods/tinker/textures/items/arrow/slime_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..afad823e6012a853111632b108983ba7c285302f GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+MX_sAr-fh6C~mes6_m?=Lk-5 xxZL?D(D?$-$=egGvN&{kJYz+E*ME2-&#>IjcKfW8h0Z{244$rjF6*2Ung9)|9#DSwWk72g NJYD@<);T3K0RRfRIG_Lk literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/spider_arrow_effect.png b/mods/tinker/textures/items/arrow/spider_arrow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..f314c54f9a53407652467e93cce4ca1ff959d345 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8lEnWAr-fh6C_v{CwMUGvNir! u@Y(jP*6?D2&qT#urCn2`owlXTVq`GiEA;G6)$12PJq(_%elF{r5}E*i;T-k= literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/steel_arrow_head.png b/mods/tinker/textures/items/arrow/steel_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..31c37090054e640ecd775d53f8cdcd9c5c29b8fc GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhKdj0B!+(h93DbmU zTS}$>1*Zs{nJ`KC_(@}yC7eqnQ#f4X5+zs{Cp=+dV7sSu&AHq53{W$Jr>mdKI;Vst E02SaN8~^|S literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/steel_arrow_shaft.png b/mods/tinker/textures/items/arrow/steel_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..06742952b6152528ff1fe8fc572bde8213d6e361 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6C~ms>@9xSa|EY2 uoa}tOxNU*tq-}YJS14{VO8M|ao*{O=)Bmg8JF9_O7(8A5T-G@yGywprU>=wN literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/stone_arrow_head.png b/mods/tinker/textures/items/arrow/stone_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d1bbdd82730d12395c495a96cf18b0d05f9c7be9 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`hMq2tAr-fhPn+Z@ZYU?Ygr+Ar-fh6C~meT)g2_ml(&+wQ+Ws!E#Qf0Tc81#n;rwhsTlE#BE6aXK+O!Eu6{1-oD!M< Dm((5% literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/arrow/wood_arrow_shaft.png b/mods/tinker/textures/items/arrow/wood_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..6a36dc12587fb5a90a6d60352e8c5d48023e4fb2 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+MX_sAr-fh6C~me!~{RE=Lk-5 xh+cJTg4L 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 ThP`gTe~DWM4fg=bBW literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/ardite_arrowhead.png b/mods/tinker/textures/items/parts/ardite_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..5468df11018a15cc13b8040d1b83e022fe33bd57 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}cexVYNvO+G-OMo$;V5R22v2@YiP$-ZHQBb&|*7WJ!2H!9Bx zFc(T5X*&Jn^lZhFRg57Im=4$Hv~74$d~dS7K-F*2J9-ID;uZ%E9GG#v=fVD}4ts%* zyApnja^#*lec-?c$?Av%(+3R9%*tK!?T!DKKTA!p_&xK?jmdKI;Vst03Oy)8~^|S literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/blueslime_arrowhead.png b/mods/tinker/textures/items/parts/blueslime_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..733aa61ea5565a38785260303fe5a16a01d8f050 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}ce0@u}9bqj$)6`n4RAr_~T6C_xBUNHSSc<}$kpW@for5;IV;5Ku-en}|h zU42d4h6j^=e0ihF38njl?^7%a({XE z)7O>#E;}ce2z@qLo7}wCrGgNykH8P`0xM3pQoqgryNOV;5IwB)LY!h z00{p4IePHG0fB$=^Br||_|$#>CdLc|ho5*}HCXun22bL_=X=i2-w#$A66$~8C6ii7 zW9n&hBRBWshkt&T-;=0d$&;{PRTUFRn{!qc4@h@?5|e0lj*IKB|M&Ojf35!_p(F+5 fOkQ8f!oYCgo#E6+m-Zh7x{$%s)z4*}Q$iB}gcnzK literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/bronze_arrowhead.png b/mods/tinker/textures/items/parts/bronze_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0f60bc9f29a2f2f3d807192151c214aaf7db6d GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}cegb8!X{f|JQ9#0p?5R22v2@wtXITKL!}Uo_qS-k+UU~h`=P~=$FX!yS93Gqb$+REn Zn7PFU?^n)J-3nwfc)I$ztaD0e0sy5ARUiNW literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/cactus_arrowhead.png b/mods/tinker/textures/items/parts/cactus_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f66bacb93e7da5fe98aefd9e89c9fd31513e4a GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}ceu+HZ{^KyVf8$4YcLo7}wCrGgNykOeXDfEACeD|TB(%WLvj-)ein;op( zlrMR1>K3Cn_xH_hY;1gJZ`Zs*>cFx?M-#3DpDkFoL^Se;z2fx)dlfFN{uI9?{HcBX zvMc|s%b)*$?mOj&e~H8ap2Q~!NeRIZlYW#wmp=So{=bCX`Fh7a;tBVDR6gZCBF3l2 zHbeUYZ_=S{XE z)7O>#E;}cem`3Nbbp}A8iJmTwAr_~T6C_xBUNAl4iu*tDr@nkn@{x1~ZZpT_>y{RL z+qdb({~tU_2U9<-G=47u0u_hUoLRyQ{~S-_;I@0dx9ZcBMi6)%!R{w+u#kIC&4%8> z_(+pE|G!@JWt()Efo(@$sX>9Efx(_>oGAk72|xUO79{oZ7P7AY?_;+4|Kj5U7ad{_ ecGsL$2D)g^Onvntu_sPICWEJ|pUXO@geCyRj#S0~ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/copper_arrowhead.png b/mods/tinker/textures/items/parts/copper_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..708bb43aae9955325d2fe99383714c86e21444d8 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}cegrG+P_cox=WKS2z5R22v2@p@%*3oQ+r+VDn~Y*8!YNaUnyF2 z>;FBTF2JofS^jSIkpn;wkfh5X`tyVQY(zopr07ZvXL;wH) literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/feather_fletching.png b/mods/tinker/textures/items/parts/feather_fletching.png new file mode 100644 index 0000000000000000000000000000000000000000..a898c6ce24784e145da3113d49ecc4360f278d6b GIT binary patch literal 409 zcmV;K0cQS*P)MxnB;Wv4 zvlSK)&`N3cSDtVEnJ0VTzootjB}pOx)>?k%mr)c=>ht;R&LScJbzRf8E!Ns8K@>#< zL4fc30BEfN2*Xe|n+*V-=h3z;X_}H{nff5`eV^@i>*}&BrK&2bs&bySmMqKE2m1Yf zr|UYpu0v*ezu#hvk>l|w^P3q z>2zX|0ARo0Pw9KLHXEXG{cT6Vjgx?Zo& z8;1eZupCR+ec!9KAY*i6j2L59zv@qEt-lWs`ZoLvs&&oPj9C6|00000NkvXXu0mjf DQBbX3 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/flint_arrowhead.png b/mods/tinker/textures/items/parts/flint_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1fe9034612f705b1afd844998a91dab8a9fe7e GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}ceu;A(`mui7R4W2HJAr`0K25#g%Y{0X)nL(IzOjias zUn}S}$v)(%qR^z!$et+Dal(G*%+{#~?SwUs;)Vor^k8Cob_gP#adH_ zhK@fz8+w~&vZmQptQD;<|IpUKz>w7QV(;&nLCdoRCN7^+6Z68P8m2 T^^WNQ&@Bv}u6{1-oD!M{XE z)7O>#E;}ceka7C^MK^##)t)YnAr`0KPT0tK)Ih*_{$csEPebEgmVHps%jazl|G@Tc z&M8Ghd&Qq``yV(6%@Jr4&okTey>|WCGqJ2S`(|n`?d|s1FI)`2^OTcWoozGpI=d Pox$Mg>gTe~DWM4fDp62G literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/leaf_fletching.png b/mods/tinker/textures/items/parts/leaf_fletching.png new file mode 100644 index 0000000000000000000000000000000000000000..f703b57b69c950e15ffcf4440cb0e407570d3e9e GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)JExe1>6hCRF9L;@d%8G=Se#BykjOaT(WiD#W7&Tm zAgI4TA;aO0<#sTKKW|^kj~{=G55JY=?=W`Q(DQTuoE95q5ZJGxAM<&8?0*T#&Qd+2 zAHUlgAKqS9-&1jz;aQA?Lz$V6u^%(b=^6ix4Gat(6q((NIPff`B>k~TLqvMAX@f|5 zvV_B`&4D}$$8Tz|J@8g>dCq#!=-K~WZB{DTZj8Tbz5egKv!R{Uj)CD*X!ZRheZ4zC PCo_1u`njxgN@xNAc{XE z)7O>#E;}cexUtlXu(?2?UQZXt5R22v2@+FQ0Ye^Q> z@3!3d|AQy#VCtvC#r+Z>5Tg^N$fUmNf3k54>-^7gvHK4m0D^*-kCW!;B{+%iIPsyO z@ZFXOi~oQBpXO0%XXJ_b#lguPX~)dg=FjuLlQU$^#)an>e7N7P|G>VAN09f6q{xZu bHcUVV@@h}&>NNKNI*h^7)z4*}Q$iB}8)Q-a literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/netherrack_arrowhead.png b/mods/tinker/textures/items/parts/netherrack_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..47338a697ce5e65f3ee2966a6b6d1a119ca68fa5 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}cesOYc78y^9Mc6z!vhFF|VPLN>jdBM~*XU_kLKfmv=P?!)mHgpaXYAq=`~Cm(^YeRL zBo6?Af|}mB1)mEf^ z{QuVbPy#5pFLt*C&(o)p5^{Eb{CyTA_42y{XE z)7O>#E;}ceh*C7G>KdTXR8JSj5R22v2@EM>fKlH@A3I?Ne@0|i5r!*Ld-zWJgvtVNFA8bg=d#Wzp$P!S3Q~*! literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/paper_arrowhead.png b/mods/tinker/textures/items/parts/paper_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..d2810c5b1418c78bb87efb00245643060aba9868 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}ce7+>^j?Xy6krJgR1Ar`0KPB7$aau9Jz@7=!O#<`Sg?<~Csk~ikXY1tnA zryY>NZhLo{ns<_Whx-OOZDAJ!kJZ6{?N9FUVf*3D+iPOG;eYp&SHcOlX=yk4N^4uM z2{IJ$y;#~{XE z)7O>#E;}cesK%nxe?J3-Dm+~rLo7}wCrGgNykJs0`0M|~pXt})QjVlEaGN>q4-!v# zS6|b%;lZSe&yR$efuK2bjbxm2#0SgwzuV$BVdwFIi1m|EHELm6#V(*S4^)^Tv<5qMwonHDp&ZFq~!4R&ZUu*#+nZ22WQ% Jmvv4FO#tOWP5}S_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/slime_fletching.png b/mods/tinker/textures/items/parts/slime_fletching.png new file mode 100644 index 0000000000000000000000000000000000000000..24b0e317141da3460beb8ecde68743938fd9ad6a GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)JExc>>uJdeHb9|?o-U3d7N?J1GURG@5O8~#enQYk z{KzdYo7OV9liZcU(jS?`lo+>jWKQy1Et(SkvArQ!uO@$4#EvQ^(J7&Z%sh8Jg0~-x zZSA*6d3E+Dw@%L`_50uZSDL^6cDSK6a$Z85y#762pu+S@rh<;WjI7p-qRe+{`qMu? vW7-{i@EogF850PxMeP4{p_f7E-)Wt*KWFW&-`S@ObR2`HtDnm{r-UW|(E3>t literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/steel_arrowhead.png b/mods/tinker/textures/items/parts/steel_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..ed89ea7c96d28bc44f4ccc3d3f5aed5fcbe5c7e6 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}cef(oZkaUM{p#?!?y#NzbZz=NDe40wY3ny!7)mrm_?GtrhOQi(f-WB;A& zt#O={XE z)7O>#E;}cekm_V>@lK#nrKgKyh{fr*6F2g*DDtp8SJ_o4dM=|eYvLW|R0X4;`l3IJ zh1>tx?>oC^)3Md2HdgD}R{gShKBr$+Va=H-mu!CViM%_p)|4TsC;tMMP}#?-_Y5;` ze&;;rDnC7Y?VmdbC(LA2P}&}=!>D|8%Nr#p&8Pe0SFeh{|NF&a@ly*8It<(IZ3jAn N!PC{xWt~$(699RWPm2Hm literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/wood_arrowhead.png b/mods/tinker/textures/items/parts/wood_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6adb567ca1be3daf8a8285752e9be1bbc0ec33 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E;}a|zlwB#H#1OZil>WXh{fsT1PRuj7fez`cm7ZOX)afrdL*5J+w7o4d8S46 z#dFL5f0R7Zbo$Bn`Sr#IK=31~)6q5V@9{JaZoB8Tzkl{O0zu;Yo8}g=2U_$B9$ySU z=4w6v(9idFf0Gm}c@h$UQam8gwyFk1MI2^Y%_!iiQTH!@#i`>3|GuezdKBf{_uIbe eOCJ*p1H(*Va}BK-bF6^wWAJqKb6Mw<&;$UuHdciI literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/mob/googirl.png b/mods/tinker/textures/mob/googirl.png new file mode 100644 index 0000000000000000000000000000000000000000..04de12dadc15339cdc0dcf8498cfc11ef60b90d0 GIT binary patch literal 1888 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 UI;Z4Z-!2b}P%t!@9Vi6<0nQ)+kN^Mx literal 0 HcmV?d00001 diff --git a/spritesheets/arrows.png b/spritesheets/arrows.png index 214068ef4c2e46cc01da25e1ecde0f76914a2b82..8abe9ace322b1819f638ede5a7f6bba02d3d2678 100644 GIT binary patch literal 3458 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 R3*5Gj>Ed)8Q;R-#{of3ZAEE#N literal 5302 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 literal 27627 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 z zUL=xs%TdZC4O5+^5U1p!@hzEF_>Xzk0-*6$I+Q+ao#6v)v7l6BAb@Z&^Or1)CK%z@ z?40}yG4ZLaX$AQSfM{hfdB{mxSbUw+HQwxzA7w|URWYdsT8}RNGtJ*_v3(FN?GPwoJ4hJBpag1 z&oEfyEg>>&q@5&F!H(1myRh1i3LdDXUnfi#yZI7z00f81F9U>P}Q1@?V|aA z4?m4X**m#at0Gnq8F>mM`^O14Ltj}!J4_;}sYoRAjUO+9ggk_F`@Hwe&UR5Mf1*7k z&rl-73ZeRJZmXlmende**QGxYHIXQ%0Nu}UPTu$UZoA!QZOx%bE3pUW@!ft!NFdIC z2KX%!Lcb+moMLz|tsz^2_=NUWn^awO`dNyk@r9X&I&;y&c|P!A)@|)>*OpPy>6S+n zZVv1@*P6K{<+)Pq*`f#4Y}ZPBG)(xr@~;Zc@&rFQe71C6{T+~Vr|$SEat8eJIw^ro zHQ>BIwLlyzbhxUEoip0126Gb4X?Nj;>es&Z?RIMgcxn>v~Nnp?jpq;!}bwcf~zRhitCk zZ^R;S@j2&KX4rNWa-%aZh6Mht$-r=@4*h6wC-(`b-*#Qnt>FIUp57X^YdQX7e2r4M z@D{R<8zC-yu&h~xdanr^v(uO7HWg-z`#Ee8s+jw>h!t*6litI{ZVUf>B#cAE^qc1r zK3s?nc$3#jc`+C_0h_OCEj+>6K)mq$Zuq1=w?88hJcRO7lAEk>*r1W`e36sjgB$J> zxd=&>VV0l%QY8HPb^fPMGS+A=ba!wv_G-w_Opi(6zizI80!YN4)@fBC7Lo&hC^g;b zgOtu0{&gAfMgDVYub|9s&=lgWxo#BgUcO1%n8`5e8gQ9oRu^n`b@Iwa-_C30L*Ko=4S|t zC!N=EO5MYJ4r70t6JpXX?>t4870sAf+r1wa*wf!i2wNEcJ(HC-*$j}%f>k^j81MVY zvU}g@)}~O`K&dUM4<@U3@M6dS6U(m9)tu)A%C~23E_oTngPCfyY7i;!ujKh}O%JXM za2Xjt3B|Ba?&O&FNT>S%(3Bh37=ETT^HBG&^z_v48D_iYYAdKr`U-q5qNliYj1(Br z6P$i7ZQ+Bt$l#*Ifct{-&)yo8@Io2~1jo~;b4vpsum+C5W=j!+r=LBedqgOnQ~mW0 z&#sRVbaHD>+vy_EYoRgeHQ==hr5eQV+neu6%3u3uZu@?ziWrAJ5o}gH{aRhFwit@YlFAy!j3s1Egp|gb5E9uLnrx|T z*>{pXBZg_#_Z~gZ^Lw7(|2W?N?>*k*Jr3^W+V1PR?(;gY&-uOQ;blX8o*kk)007`Q ze@^!b06@S?2*AM(p03?{brU>s-Z^LK2>@Jz%zp@w_FNcDgn6C6qz4;=adM~}QF_@f z4FD3rd0lN&zu}ei01MN(>PqyPUr`_MQp(1JMrU1-194HNGO{0XvZS!ESFA3)?iULl z`uGeNneB~TLnKC>edbektVv-+IsYM#pM6bJj@8a@||QF#kvuWt95*Yt@TQZ73Qmy2kzZ{$C4{cK&9 z3q`}%VZ@!$-TLCP8QjBvyqLaDTYWXckQPjrlYd7)UD;r3hMLY|tzGf3D%UeZUG10d zS*nEshvgLPhRb!$h(QO;!TMju^9vSx57?V)ZAI3sGO7$8`Vg^S-LIH23fhAx2AhQ= z^y%})K18m8lvf2M7MJbJ;Rz>n=1QbDvcp+tE)p*Rh}AB{^Iv3kvBH{S6H)){?#PZ5 z1t<^_5@M$;+J3!sJ}EqC;jLp^XD1B!(A=C^Ri0GgKJwB;l)Sv`_U+rZjJmpgz@6`( zL<)QbL%@Nu0!n$`db2q>yTrz#QcQoApS zBG?xj-kOK2Qe_NnhG4*auNu3`yS%o0fhl0J$=R63%47A$@4hP?#GT$-eQ3RH?4aFV z@++)Xm}jd33*f)G6teD!H0~zj)pIl9O46dcch41}`Gf;wYYlKUoM) z#yabP0z=iW5vPU2XBZV-HTMQaDtTz0O5vGg2Rwz3hp%OPMrGsv5LG%)XUuc z=-?I!3zv$=Uu+0^^8pd;*FPt(`^4Yf9V8GaK+edJaBy%KJl$eO(gU++rlMGy_+9C*5x#-p2|biO%w};M4IC(EKgAam+ReZ2GmdfS ze;!#8zwt>lyH|}1$3ZVXGjVuF-3@R;28wM8WeIW2xiBy=+2z+t$b0!R3pB6l>gp(# zRbe`&jkmuGdS@?~6Fu4ajPWw7Q6n75s>SHw+r>71jC$z6S-Xk$L{j!=ih0d9gKJ3$ zNm6e09=+g7DTP&u1>*kxE;-KaM;UoA@_tvwO+I?N-3oey{)_pPAOWiCj$+y0U7B;+ z^~aTw)006q+cp2GW=?wt4p*bMFrl8_-gal@3jLwj8xO-zk~eV1Jw!Cm4oRSgXfhEHo+ZQcxVW=J<6IWkqs-3dCOLb_ zHD0vgrVJ6$amJBeE73699-MkO)I`%+0CZQ@KQ+e_IzJxzoW?0xd=dea}Xv zNI=dKQYH9k!_n0yi&KZ9zPO`}YZ|U=Lr`c+Kr=B2e7n*TA|jDRoafH6OI}12UM&iV z;nq#X^z`&d9DpvIlnT4b8;f5_R0Z!!RUqwc2)9d!oW3KB{bD}7 zLm(5cd%}KN@5!VlOR1?@*7*3hv~ol)W1cquEYX(5ISPFA$bVW}zU$c3 zR9b~X(!}w3;+V1V-SNY~lXTj<%N3R*YYJdpz28MG!KVCyc`?yf3v8@xY_|&HqoaFG zv5AQXY-&HAf>aufca@`1CHvDBDPD2irZ^2b0~1tdkd1PmzV1esDd;#XOlXa3!|VXc zH1#F<4eVWCM7V1JBlv7Pb&P8TZE5+`i=q%mrR*L48f`3Ul!|EpE z$(b2~UXPrx(D;DU2xBsMxJK0o%$VH7&5ob}LhI>}s<9MqrReocjT)i&DH%-)T`RpI zs}C8POw{UCCymK1p)EhyVCMV9mhXQ{>nvs%jn?$JEHOTQSq!}%oivO#@vEdaSELm$lgXN5*z$aUefw8p~kP3O;_ z_sRa$61&%|Pv*!qH*=ihnvNKnmAluURLDttuIBm1sZ$(4xVatKTp7_fF*4^xrVUCGUCqg({||#mHVo43dY?|jCga3h=>$aYWZ%uEn$086wJ+B6@`~8 z(946z^hQ>d>-Y8*kuSgivAnRZkC}Ic6+c9#3Y5GGqJh|Djl^fipUy1M9N(xLTVez< zG!{2OA2)Zwpa|VrRANpe3kpeDAn`BttW5{zX2lKyuU^+-ZuRao8=%Bqb04Fp*PECP zj6|Dm2c_X5bJ{eYf+6*^U$lpslT~C>rZfYTzuJ@~MU>!t;pxDro zzM&ZRNr>GxcF8~Z-%yty5J~=Z=Ao6bE4UDb;zN2)ngB zh+Rx#7YD8&FSG<_S#d}6w$waJiHw?CV5a&j2hD&GaX21xe5?*V(gSM!t!fZYo_-M)pxVgF#SQ@|fbfGMtv zRkx~R5I6Xbs92w$J4%uy09_i&{H_(x8TRbn0{<_5r5v>mr&0p}#IA@tyjnJsaWaTX&pBkJN>%#*N*prKM}UJd^dKaa&IFz1^w3)`ful8)*X z1$~SZ81(&lkUmeKKdJb|B)3g$O05X8{Fgtf%_ewYsTTjc655}l^;ZkXJ8krdr_1#a*Iv#o zD0GS^On_mg4e13^(p_#?)WJlb?%X4Fx8thqb}7madSBV zbZo3Oq?$U|jkO$E^-7xF0y&C}ZG*P5x_f}47LH8CI5tC z2RUpf(cA<)X$<8l{mFChN!*PE5R)vrOH^c}cuxxwxcX-~ijNWtf8pv$c=?NkK5z%q3RJ#40-#{$<2h>^dq+(~5OW2q^Hi&jS zZ)liYoc?0%7>lHa-OW;}EB_{v31}|gkIL&^^s9Qg!bK_J_DA`enm(`GfpBy}%O|<_ z`%n$Qx&q9iH1j?7j3?qi`OaOt!uk)&$mrMjJh{(u8(Y_1P=Yg>6TU>OEqmLj*aKxM z0{JomFotM7Lw!g{P)JC|%t=vLRzt(ukC9uU1u7X@yf{8pu9CLSkoxd*eGfy?vE%5z zk_ort-PrG+nnDWARaO`;Xf#auNg+^K|&8_*eiy~$Y}P!>j(^Kp~S48asNJSVX)K_fQjQ$f=cpD6W==keUL949L z3HM3c#4_;@10Gbe@@>KV562PzeiDu#JiTBtzZk7e!7do~_h` z#l*zy8Ea^=dow~Wz0tbM9S3@B)5^udt6F8p{sO%M+r%M{`#!WU z-#Ot;OmBY>sOYJyWU7kBRt5e#4oJw#a-7XhII<_YV=h%AprUt$sqUEw{eU7800B$fXc<> zNb2}2t96mb6E9*%lkR`Jz4P3)q{$5;DE~FDEOmYy)&&HU{6~IcS0;sVK zqhtLbjNYP+9{3^C2yTPv{pc%|?e4Tf>A4Z)+X>pHkWth?1dar7u}b8c?A`^bs(!bwo5kyKL?QBzZkjElQkN85%b@k{4GYIc=PU3VJY zx`6-}sco?WWHZGM*@SHyl8^||axp!1xHDO2!u1?ph~aidm?>nnw+k+W@_BA|U?R_x zyMI~9nsFKquL`7rfwAtqYRZ#Lk6NF|vg$s{>Xq-+uZ5c8|3#)O025Jx3{c)WiQL@1 zyGZM`=bk_yRoz?i@Zm29B(q=`XV62!fEW=$o_e}OtQf_F+5d*57^vPmP$uLC{#`Jv z-VwwU3`K-bHca7C+;5W@!85@h4`f`Fp&(e%pL)wKTV7#9nOflI%&+tje(61!y7qm) zdQ6$Rd6TM_*Xd#JQ~YWU#cwq z*#1pQ?EOPj>m67oq65!;0MIlOIp_;346hm#Q`}TI`HhOIVRpBIww~T!%e>mlX8!#56*Yz> zkH|z=w0hx(TlL3WW7b#k(Sq;W`1@_iZ9)G2>LRgc7s#JJT@*d-U+#svaA5}u6;V+GSAFFt3`vkV2cSL{F~lih>W?)X=TERUMvIJV8Ib@t+6G zsR5B;_I#JgTmnA_N}qjBdh$fdh8dtrN-p?=wCw2U*h6Fnq##e`F8Tgwldkd9s{y0X zQ?%Kk13xJf4q06AcBDSGN;Wuo8JpV<&6r(Z-&>s~jrOt}KO?~T_Q)d~FZx=ZE_o#8 zbPus44IzX~*|IzGVwc`r1y0rmS(<@qz|rcb{r?uAgEE+abcR{sRqbuT?bfYZj}n5x zolpmi7N<7b_kwqSXDrY?3Qf_s-u^cL<{p1k zdz<&LvfURi8;D zrwqmGto=>tWF(IFoGA7I`=_U1wt&FtU0hnvz`f)7Lc{2OWxJ=3SCN0+{P7T{8U&!@pG$^jx!suKr+}W8DX8mYp@fchW6muEf0isz>zU?cVV|#mhLa~kG z3(Sa&hx2d)nAMZ#8S|1nW@(wW_<(Gk%ucL4r9+dCzKk|N2gNRWScZ{7*^i#A_X^iH z$;T(bOIPt{SW|B+fnfT!tn9%S(uD#lWz0^RU&VSXq%K0ZiZHB2yRUVtUz8e0OZTGfY8E3q(U~vvk z0pxM4e`s+>{-(wKVrp^kRyrAb|SXQ z+h9GY>mGN;+n+3OD52>Fu<3e>$Cu?esD&ttf-~5Wj$vV8VQTBWn>3yk<+1a6U{Vb2 zY(nXTto*ZqKp|myUltb8FDzfLl*}3;Fr)2S70%UyObPGL10fwF9B!;S|MRF_(zIWp zpHyYUmP7rFXWLgLUYn9y7$|kAxyzlnJvzS$J!erhc#D?Y%=HVpk=Yf!qzi0SMtH>e zkIX$P8c+w`J%xat|6kw+0RlFcA;5>0mg^G@C{q)YY|q_P2@?9ri|Af!lM-Ahy=uw=*+mywB6Q$Vr$NtrU(^ z!xxsnfMMW-8Jotz=})k!;uT->l8yW2WZ9&zawrAv-tRZjPoGZM)Ti|$eZF6vDVrR^ zY5*^8Z0)l`?Qs`CkF&*)hTOoTqzCdl1RKj`0$R^3X3-xP#RTXN~zmwXCf%wUPKQf z+w^asPEuvQ?4B9z%XTley+uf)Bz;dtaDyKc{`!s)=_t|gu%AHkudjp+^p?yN3kHY% zc3wKrmKueLgC$gtuD3y(MDlmu^vX|k-+J~x;ye(6JxiwYi505*H0}iQYPAj_x!#jH z6t}LBR%cD3R@i~x3tA)`zxr#=C9Ww_f&F^wP1|+ou);-`;v4+*I##>XWKL^WUWqTZ ze7*qp%!5q#L+}vX%rU^+m*t8Vx1AFDq3}fRJ8R-qu~X%voS>vi#VcN1QapX%+4%0= z(g9w?)?W0KN$3qPFJ(P_{Q#;8A6)Z!I3Ij`nj#sX?faI7U0y%6PC9VZHJcoNU?e)B zPK*&CMNK@*C#vqfXsWBHXMFzr!!IN68S&m~e&m$)jabLff`O~t7PyON-XZH3NX>3P zf9ae#b4XcvS6^SBI3GhFj$#GQoj(tTHYA-z+Ni3XIHWN)yJTtffi3m^`_<&>?*jqG zzNJ&A9ibb#!))opgic$of0s!QTm-Wd0UFAQ13FP2XJBq^kjshLr>k zyjOpO<*f=@3NY;(bxT-%^TU>d@uq1koIViFC9HPu;8B~Ju&AgVejO4L?~%6NP$Z-F z^!R=Eok`p*lB7^N@8kdmM|E@?DNk|mYY}cMWSrrv~W?JK0v-F}feE6$88c(I!(@*oJm}lEjw4Uu_)g{cBv}XRe zuA=VE$p(D2d3|=QZ=}EViO>`6&k~O`(R+vsyTgMLXx#@+?Zi=t4t3x#YhKZ3+N4Qs za*St-y^knM8eO58Tl*C!^*I(vXu?o%bX7^Z*5QKU1uI8jexps11yeHy`-;PyKcV!Q z{9Vi;Dmwbs;@5n?%^@dabMuJdVXLoweVI8q9}3xn=jKYxchj{eAQpv(sI0)TW5*(+ zmhJcYH47q~on`O)^IMcV3;Y|Ot1J`+bV*uc=x!^eUruB5_!Z>4FI$zp2k_4GxuMD# ziV+U)8S{Nw0^{(DKG0y;e$36`Pj1G>#z_eY+R=ODvznuYOiWFa28x=J#G$h6^R=sp z37SoBLpCH6vP)3#Oe_?l(oL6>R8~%EiH94#P?w&3cmvqtN!7nDGAT@#)3?nadyMB5 zhzVMK)8Owz??Y|sXQiM^pS*};aGe%o2rViGDtZfRTC8p2YuI}_BTi3>O;`%hBjd}? zc|lz8xF>P^^wBa)cA%9o!po85^P-wXtAW40vwtwTt#%9!+)uW>op_s}a8Y2Xx z+E1P6`Y+)7nx93wN!=xs;0a9|E$Q^Nh0EQXft&QP>4te{%!#j_ zFVY0KWj`fw;e>$?46BpW2E${@5pZDNNRXax*m-xJ?w;I7}XN|mHe+zN=Vm>MYW-)e?rxU{mWKc;x{CS0Hf?x&UkuiaX(NA%{G zj`nGvpfW5{vR547?pj2Z@~ni@Ij)6;h2DC4dK^4F?iGocw08mS)cg{8!3TE7GowkP zLEqM)2!k*NEAw;2`xZYfbqY zK>WVvX=1;(2KoJ3&?oS#_nw)jidE7Mk1!yee2=VHMm?x(pJ_72axZ=uFw*Jpo)xr7 zE34_}Q^v+cn@iC${fy32bdKCktlkg9b>hv(>KiZ1r?j%0xA=0zjI{LNm;95(b(|_! zTRW}s6FZe~Hz@FZ0!N7ZCM-_OC%yRAdo5ClT7JdGrl_#ExIdqh5dja1oGz0}3wm&O zbEIMCzD|P4UiuK%_iUpQMeGYjxni5MlSJ3ZOZza7%gpbVzx}8h4=HybxsNam`Mh-c zHV-dNII;&8enBb%^+KwL9_7T|i09$Iw-bSa+*?cxxVlEJ?WMJ9? z1JYPS9o?x>6EMPS0&}4cI+`A#fFi-5O~^TK&SmIj5%9{-o-_o@II^(}wS!}(A&o+T zfD**Nph|cddPh8P6Y_=+p)&ph>P+>qHrjO^-Z)kpfdZDHUAuxjh>(-v6J+f-e2p~$ zgRn+TOfnzNnf9z3Ht7QJha#-`v?#zJEaMhHxC+PA5-94+P{L<|DjNj|RHQPWhp_$- z?+c*-z$RprYt&N{XdS{;7Yo{fPYJ~+e5Nl$oxj=sgbcFdst0Jx&?-tQrr;^~_@XbT zXQ6kV6Q8Z`&<3lHv4LIKdPIbf0$d5f$<@kL$4jo{!3$+JAgvPZnq!Q=`Ag zS#xU$_oS+lf6zTPAYFYvD{GPacYQ~HqrBupd?F({{2_xd2|fx?2gPndKDp&iFeis+ z6QWoYR|$4IHsCW%f}L{{LTWq)JS7B_@d3`HT*UX2+NJnUKkQ`?&(Rs6&*@YOaET!|1__jQ{GSQPLR3Q&M=c5tAa0`3qhYT&$P6a_fK z8|zn~{AFm*YZ5ulFuT1$MTVIE79kW60#3zzxBf(hKEMeFxU}6!#hV)WM<@4ou#ffP zE?)JX;nT0v=8%*?Ddo32-^c4b4Up|rb28);vqnqm!s{9e@QyZ$Bjt)hCBC|`Xb z1;by?!V$QL1B#~jTZ0#jR^4|Pk$^b(A&-;ot@`;@J|YK-k!MV&fuw!4QH7Pozc!Bn z_AD;9_eXNnf;KM9I_$EwzzJ`R#OCUB><&J@y}QreD#=7Tpt0kOSWO_6G2s-s*e5Wg zC)Kb7%rq@)NZ;Fz9u*0f%j#Ku%{m_$W7CND=qUW)bBM;HK{CeN>utGg0) z9)ZBk(lrSs{iOPsF%97$IEr;bEdlbX!J^GX6ElU6=mq1J`CcQfCq67pC?uwq$JN9m zJqNV$-!~zVp${rxJVQ)#1P>b$U00^IZo(0soZ6s?4o?Xcp}9yvnkeu=VzRLHIA~fl z44eX-QUpL--34Ljj;Qf=(&`G6i+6+d=eL`2stGn_8{O3%x;9PI?xvk`W{3PxV&v-0H8K8(1G6&K-Nn)_QME~`%O#vFtG?; z1I%QkUH+W&1|;K2AOP5%Zr67el2~Gu)wIr9ND-D7V!i*Kvn$U$wbPKkd*J8+0$JsQ zG%uoksPLqfWvWPj|D>8di-vq z@wXcGqC6*5$-q21&UBEbirok7O9w)}`#|3aBE)@I{8}X@*UQ>IwO~nBWZxhk7U$4( eprM_?68!F$?=ep^F7PL|zOX*!wH`)kTH2kCo+lH~Un(ln=fTOLbezCFtiba)PXP8qrrf1vRtR#Y?{4p!%#Cu4W;fl;&rrq}Jw_Q8i~? z+fp076Ew0h{mwYr?hOrV`uKPKO7gwANX_hgi^m@3h-9g><#pMWv|V>^R*>01s)s%} zhe0Pjx@g&z22^I+$HK0IO}@@3&&C&E$1zZM4CrT`eAR-8=BT$6n!wPEw-$jaM8he)aw zirE)251y7?*|pbO>O%q)1o3-$!*80Frfs+YJVGy}nzp_DS#cYd=P+KGRp#Ub^3BmegNL`? z@4}D=kLN>;C}7<)v@f^S9(#yCL&e%)N`WM^g4SUw@NYU+dD-TkJ&S!PQb~#b#fukr zn##Fw95ozh8yku7iHV*SpRcUyCA2`f*8DwQ04JQ)q`YKA= z)Hj%K_QN7ZBio`QxatR@p8Zv4>SNB@gqgKJEvQB+Z}V``yjm8OLyUwnhmVLnm?9k9 zti2vlZ(67RE^&oBVXK9K0%YJM{pfkwpuAIYRQF6G)F<@i5W)ejDkqX2vG<*2+CJi= zF_AhWBO~)|zKz5;85ystsw9pbJNAHSQIvKk#rr~}w3fAln%~dZJk^pR?LLwO%}6iUhX=+J& z9WxH1ZV*mqkalWj%;j$n(#hy7J>7el2e0(sekKBBqsrrzlX>HD(ZlY0A{%6EQ9f(# zGBPv%A$3}pFJJChO?t!9sd=zIea>gW;*{6adoOg=%novsN%)U-+!x&`)KgqE^457K z`F^!C&)BtE7F#{K4!op{?e>E=I2g|`{oWup`WU3+TKeQ|>F+tc#?1WSpCI8;ucRKE zAwOXKy+ZxDDBQboEX@8n*4bIQbdU6o9T7^fT$>Mq%F6tXOs9>E!lQW7m!CTLqkScA zq?GeP_j5V*PqJNdV|o%3{QT@5e^sQEhoK+qVJnV*=iIut^?<(u zTsXkIE{Gfn9~^iN#e9%o<4=Ia``{m+fDvFh|F9Mj(s-^-TSZ^ac5Q_3JKo(g3% zd`oK*cm-S5r(Yf$Bq?pGBoL3gt1@0(XQ> zHqESi@x6s<_qtTuSu?b+ucFy1B)O*D@E55!K-;OX>}+_oku6&PdBsn-(&@>3m0~($ z-2KEIU0(EX&F^2sxz{n>pnssQQ$D)6U8Q$7)AHfbco73d$3P2AODX+?PM5dGh%3Fj z_9te!j1ESlFW&VXisv~T`78DKdv^H5-j~BPqs)BQrS;TFQp(jG6sx8soZR?+Ew5$1 zJ1AeXqDFe7$B2931pVvRb)_XK9{R`G*30ET_}@5B5OPOHTP3m6A6W3&9p{aRX7 zVeGZpZVgtB$Cbp!?J7nvCh*T8h>IVulnk#*mP>s4)LHGT`%rm%8aeb{hMIlHV0 zdlQkXBXQ9!=FLtzjcSaum@?T5FrnuNi@85r)i;F9Lal*)={5h>4 zAFBy?(qI$`yrQ8NG;ghi_?xsuPdYIJkn`7gccO~mT?b8FK0nH)#bTr5J#<&p|~U;~@&rO_dwU|QFXdcp%}zY&Dp?N;<#!+WCV z>{Y1+4BE11(3TsuezifW*Ie#%Sx@+z#%YQsrv`|6#8E#pD?TkQi0!nuf0Jg`>vftL z4o;>C#4FfpJ2*&3o!s>-E^hWIn-qvsunw!L()ifW@G2`kwDkI5riqv@&_8oV$ItH= z7+sm^^lCcGaq)7dAZSi}a*8og-t7t?j^|!-us^gmNxwhD%TyZ7j%`nyIPaIqLPiSs zy8n{(r-w)+b<{Fz`4aVk7A~(n>#e3iMkCUvntpbVy7dJnFfAz%oT9g`*F9?#^Q*`G zd-}IsKC#&AqcG`TQ|lA+h1}Dcsp8+Bq4n;~!9Tn!vrvt(BM8Z?_@kA8!+hVq=~Z^u zq4Jc?CUhhl)zRv$q8RWXE^`0D{wjgv;fCM6}|7`WX#SH`OWG&G%9vW>cAWaT&l9(A|5T%Ph~bfF`+ zVflG~PS_`{r#w=l)>F-cnCDUQPTuM+5QWhxqh)tco@x`35DDd57JXW9S-27?00Gy^ zidSXIhlC|PQiEYiY^>9Iku}%A$TyR_Z-+Sxg8jZY#_C0kLh^ddRdL1^bAbAQxhP>t|+Eqi|{ z4pN)9%Ain(|G8ljcd0UEhrH7>NmUKCLr-~LNoKUpyZm1?cRXRj)~MV?Pt^OxNQkb8 zH2#Ij@tMLevFURy_qQwai9)c`TdTz+ZHrnR-n;*RUzQgdTBrqWu{_ktMA>1YdB$8X z4|9ugA+^ZR&2=AHzgL8od60TLl|o*}Jv+UmUY-(m`pxwp9+M2M`!7G4!ZAwY zc3*u}ZD`0lMK9#GM|x3*`it&Iq(ef;{Os8?gI=FxLBsWT9I<(X4^EQpNlhKAOPMay zibj%g1ja6tZcIaxKk9K7I}_y0q<{(zg*%_)`YSyCyXLl#6B*p!7x9q3#n4op%Dkve zd)n@q|IieTjNLUezc!UVcX0dn&h;{!xy|B~XpkcV(6+Fvo~8KqkJFz&YlU*|)6|rN zmWZ8{D)hMe-^jN`WU4Qw`$@i4hkgiaX@@y(0$$e!{cfSR+s^;Uxq0tDknSzd_q@H# zoV?EkSIwOu9%G!o|M=ku;oO5R`-eM^IF!jol>vqx+7K+~I@YJSAWnNtyT-G1in{ww zP7Zg6_puU^x!_vu(=43WE{&@A;w2HR8FQvCwOdr1Id1m{Dg=L9U;g7{LH*J9ZxZ|e z16@p8P*dsu!neQB@Gqtd$c8O@CQ`el=W*{jHuB~6@8921(s>xAU0Ii;RHRSSWF+oY zTzr@x$;ChwP{$15_+F!2pcVKGvG9LAF6 zUszkKWwv_j)-CxSShL($d^BEt^km)T-zQp-xU z!`8AlAr5qDux7!`Rw2red4Ur;`X{q1|PjL*q3806{ z2vCF%&g1NEZ^rZ#a?cTJHNg#oY5*rn@#e$>Uvu_<%RQqs~=l3qxksg zQ(ab8){gb1y>d2&m_GAbDG=5Uf}lQ_)i1);P#l z0}fZtOW7f$T&VO^j$N;v>~32#DDTatwKm+-n2>zSieaq{FJfZve~Wtxfd467Ey@mX z`^NBX>y+|+bu(l&`GN7$5opo%M;igH%Rl`3Xnq65x@D_DX%~;#(vvhzhI?Fi!aB(x z!iO<5XrJq~NquFjiV2DNm@mlnIr~J3nc|=^@};s>VeVf^Thuqqit*CrKW9#0zzC>? z;16JHcEXNQSH0D(yw6S@ApHY>V6-FS48TIOPxRr*1M>3SAGl~8mzy5P$A_1f9|c-= zc2YoEL4i+i_wM5BgQ`h6qyHdF4?R9UzSpCPL4^h!>I~1wci&D}=GlB{%(s;Gu}18| zXQ?XR9ML}WsOsMs8J7?&2SmzCSsErx=#&UDoc4kYW;b+4p@nUl3cu}@cb6V9wtm#l zPm%2XkPReORf&K$$Wpp?&FI2RVXODIyKn$mbA2`!!x$vPFBIaDw(KlDOH`Uu0 zrecZ=v{+F83mL&E#Ez>WU$8fhny(29=b_R)w+Djf>fV9}4t(3GQ6+-iXKI?r45B2( zS*vN_q4>H9qlKC&cd7SEL6Wi4_v8hvT|fyf*Pf^z9pVe@V}O-ARI>YTJ>{SGK>!d|iS-q~EQ*1LPnld|*S z5E(VnY)`v2iQD5iXq|^orjm8#wd-fgaAaNTT6id{V{4%p`Q3cgH!~uB`}3P=D}qc> ztG_GHTczM2JL|Mt>634k5LBU1q}s(~gJrv|4&8*fzN_;QZn)|$^Uk&nzY7q*&k;D?R z%w#u_DJhS@sL?W9o#1N@krScRqo&iJafOkmzu&q_NqMojRdFNB2T48R@=i%U{H11#rN8l_cGr7kc@11d`ZWAMHm|u6p#tj{J{67qS}#m!aW1q- zpPTxYd{$T1))kuUiW zUWL=CyEm@9{ROgqQ-43S(u+k^$u7PUZu8gpR~*Wuy#xz=7>sbB04zU8W7jL`#PAhS87r6gpiMcDccNoN`|0!W9mk<%L zPi-A*TJ8GpFk2ScpTu=j=E^=6Zt%l%tLZh#D%)-f>Gg^$X{8^uOl6dRHA*AiGpYgN&wPbkXg10 zIbc-zGk5Nkdi^}TtUH9fW!p`@N4DPniWYY{zTtJYT^8>0TXRg)uC3fqoD)>}NMlTs z%%231>fPl9Ad8APQNUMz{-$N@;K*?qru&LjZI|YJOfiQCQq3fpvSt9Zf`uzSv8yL3 z{eB}+wz5;Jjo(``QH>AQRT~akFdU;3*7saXGf|l zS1cRstCtmc&z_qsdLqVyfs|!s=wsVS4<66;vkw`iUZsz8yJh9Ni1J~C!f^ZXImOBB zSOjsxwzhA)nSCtpr;mC5igy=z-_x#x!`s8IdKTfDn-}v&VtefGOs;)&sVhSHfT-Ah zlNR^4YggXK2^e7%)u+#ZjEq7f2Gr}508gO5Y^L&7t^)z4X zyK&Gj7a|K1#i3KGYx_u-s|YNrOBs|BlWDFzSp5__mTKD-Q9($v^knmW$OEz*ft6DIas z@P^Y#{W6Kwx6@m?5AxcX*mn#`M8H0_9-`DUv=Nf7LLS|OEZ*pzIkaZ^ND#uumP2++ zx%kDDdeB#6hkoHsv@8|%%q6IM)hKTeR;B)U>JWz-y5X%G2WxIF)Gnz|BsM3uBEC42 zST=d)!A~{-OS8(BDMG0gSrS0woA|VAScKRg<`^u`e zw)Q?*S(fhZZaX+V91+9;^v|BnP^=+oUkgy@d3g%lq<+p(_jx6PNhVchlrODHb=hVS zGQEN3%OJa{t0Wi2=N@GU!bYz`5(g4gsb4*OM{#`$dVVaEU0|>FVjR243dpA5+Y)c$7~c7VyA5;n~d~$~GJ`No7=# zUim)Af_{7gbw21l8&E2+_o3Wbz^IUSaByu}khyGZZ5_!e zw8x?SwI0!ne_F{^sznKh)%nr=nLukj$qo~skcyYGDvcj13~K}6{Y<@W1^_NB<9`7} zvd{bcDE0pEt6texnZvm`MUP4jy;M6IJT0s$irZLqu3FExt@s=~@nsL`vphYaF@7h! z%jflmwz_oca5R74ZxnHc#y#COf)F+{_m)=%UVb-OU|Pd@)MQ++bHa-&=uSRm=v^N1 zo;B52?J~*A$Qdmy1=zvX6S<_`j5Ha1z42Nl4 zBivaNDMO@G-)6B-9$aV#()IK&HQYTfzo6z$Al&KMmytMIDTxz!MXA&ito^b=wD3I2 zed37HdvT5`4%m^-D_0_;qSBk24Xuh@1?26jp3CgogS-!Pac>tqc>)ejXRw z*74|dTH0Gj>C}@07`@QY(6&%cq0iP+ELFGoQt_#N(5_elkNHh3@|sIn&$`z5@yc%= zT|Nn;6k5!5gS~sk-f_CN(MS3{^@kEClTPxPRMFZNU@OZ4>*P-^7ei5$UEKE-YCDM@ z8Te4t`i&>B+C!AmklOEGV$sT!WQoOqU6hjkx|MG$j~?hODh!o|VDlG_4-)N>6!)U) zR_KMzKo8k{>sNl~XUCO+?gO*O=w%PsgGYu3Oa}0p`h#O4x%2@1OHC-KmNlH7`uGkb z){0%|drNzRa`AIqW-ZSa%A*i0$@5JNK5L3XxX{Q659neI4ZrjH4Pxf3JQDC6 z_#DTL69peJEfPVwCM?}!?4YsK{(NNqy&WUwc!FrM6cfPC(6nm8GI!(i5pUkG(@0>Z zaVDcDZ89K8fVS9mJ?%QlOmfcc7RVYn6vH<~N!0niGsudAE(h|}#?0enR=h>#q{V5N zcP$rv3ZpCX$+On&b=B!^IXOAr_wL<;rp49wk=U2T0oO^{`SL>drIlYLkgBQr%TWD8 z5#WI5L2tmnO)6AMKy%bU#9>2|4vo4qa3-2v-=|<|MNW2^Bunv;4I|3%1u*hE+o+S$ z2UkQcNiUo-uRz%1CQ1qTHB8&#kaRv6Bv5xJX|Y+Xit8ElZzQ9cHC&-5lT?dFOpN^6 z&q%dL^pwEwC%!&MMGo0c&Naz;&z_mtg*h3yxI_DRvTq{NFz5jkwQO)=Drd~&(F;N$ z70v~J;{VX&wA%DjyYHQ*5eF$<7i?{FbMo?f`~+!mBnjxbJTOCZPs~@McOSJI+Y+GY zAhfoMrsGAM>QJnkxj@2Ejs};!QT@x$R9j(3Tu9dk=?d$2PIRvwm?K#azjOsC9Ocu6WCG9Tk4CU~ZIEcWoxh`(6V{Fn%~_ z4|?HB>Ld?tSWd=|smMb^YFD~ z02@H#Q!g6urremjr#;VH9tTdngJp?AvR27E2qzbr}Td^tvD=OQ^ zo*L{4l*iUDBY-jeY;d#RU77F~!%gR~suRp0s9aOj0fB9TV|(fsn~*?&#Wwl{$>>Z;@?qCANGx{reAa&3MkL6P#9j#midOT1fJUQD_Z2!(Ip&!|uoL&R zq2+77RLGSJfz_F|JqO0!YU}H@A3S)V4XxsDC0S}nH4B_PKeXL;BemKc8(*4x57%1g%-w;&?iJxuDTLQf^g1K3 zZhh=+`lN&b_R*st;zVsc8no;P`unwF)?oT|NU+Gm7$(O6)E%|mAoViT7cE3JwheGZ zG^hk>$n}~WVi8;`2tZvRG0%+kM_@T{2lhhU+U1=Oz0YAJIJBYGz^i>N5R{IY&#|~( zEuLoPXJLuf&JQA&YBK4QfCa}TyiWdmlq(@S=l+F$$ zma*pUw++t=Av_rfuV;T;J)8e>4JNC{(@Zbc^#*;_lJBng+&#kGv5A}Q{LEOPhEEjfjiVPkBR1uE4ydJud9Zs z1%gJt_+I<(Y3C2**=aYISOi|@O(QoV@C8M?ODl8P~W|RdbT#;$TK*AK#>Exl7tG-bhOg$BeJ>)`8n!YFfU+#2lY=*lV=H}_cXW}1XHzY7v8 zZoha{aA!m=+@ZIywdx0R>Ld|%6n#sc1VCz5R)jkml$4Y(u;SLOLxC;qsVnNinJX|3 zbos%Z5!d&Q%J0|r#M9$SjpsfhHx9!wE=20%7)WmkW@S=fYnNeGUg7Gm*|mb|K0f+$wC(i-W>&R(O}&9)lUPRHP{hBX!spL zavU)yp&{Ke)#hJ=6?>8N<_J7U>?byGh{JW&1{!)@DMTj(R)h`Gn&MFa=~l}<+#zT% ze>~E__y(owK^n6LgGR0^F9$*kZ;M5Z!?boX#Eid93>u}~>_k^nS*s*?Z7J0wyOOz| z-8lLU5*pq~0L&}=iaBuQT+N-b}@io{UQF-O?-BU2HKKV*@mDQ=r;4Pl6f=Ok?=W`=|+f*ukm2*wnYf zV4mf1coL|Ax*=%$i+-Z8y(gx%^&Idn5YkGZAg1O%)#L9i!J&Uu1qOQObn~