From 84c2239244e492b8043a2dc5c7bad899489e7fb6 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 18:04:28 -0800 Subject: [PATCH] [ci skip] spotlessApply with the new settings --- .../undergroundBiomes/api/UBAPIHook.java | 2 + .../api/UBOreTexturizer.java | 23 +- src/main/java/tconstruct/TConstruct.java | 72 +- .../achievements/AchievementEvents.java | 22 +- .../achievements/TAchievements.java | 27 +- .../items/CraftAchievementItem.java | 10 +- .../api/IPlayerExtendedInventoryWrapper.java | 1 + .../java/tconstruct/api/TConstructAPI.java | 1 + .../java/tconstruct/armor/ArmorAbilities.java | 43 +- .../tconstruct/armor/ArmorProxyClient.java | 63 +- .../tconstruct/armor/ArmorProxyCommon.java | 4 +- .../tconstruct/armor/ArmorTickHandler.java | 14 +- .../tconstruct/armor/PlayerAbilityHelper.java | 1 + .../java/tconstruct/armor/TinkerArmor.java | 413 ++--- .../tconstruct/armor/TinkerArmorEvents.java | 16 +- .../tconstruct/armor/blocks/DryingRack.java | 75 +- .../armor/gui/ArmorExtendedGui.java | 9 +- .../tconstruct/armor/gui/KnapsackGui.java | 13 +- .../inventory/ArmorExtendedContainer.java | 17 +- .../armor/inventory/KnapsackContainer.java | 2 + .../armor/inventory/SlotAccessory.java | 2 + .../armor/inventory/SlotArmorCopy.java | 17 +- .../armor/inventory/SlotBehavedOnly.java | 1 + .../armor/inventory/SlotCanister.java | 9 +- .../armor/inventory/SlotKnapsack.java | 9 +- .../armor/inventory/SlotOnlyTake.java | 3 +- .../armor/inventory/SlotOpaqueBlocksOnly.java | 1 + .../armor/inventory/SlotUnused.java | 8 +- .../tconstruct/armor/items/ArmorBasic.java | 12 +- .../tconstruct/armor/items/ArmorPattern.java | 7 +- .../tconstruct/armor/items/DiamondApple.java | 14 +- .../java/tconstruct/armor/items/Glove.java | 2 + .../tconstruct/armor/items/HeartCanister.java | 20 +- .../java/tconstruct/armor/items/Jerky.java | 27 +- .../java/tconstruct/armor/items/Knapsack.java | 26 +- .../tconstruct/armor/items/TArmorBase.java | 51 +- .../tconstruct/armor/items/TravelBelt.java | 10 +- .../tconstruct/armor/items/TravelGear.java | 68 +- .../tconstruct/armor/items/TravelGlove.java | 6 +- .../tconstruct/armor/items/TravelWings.java | 13 +- .../tconstruct/armor/model/BeltModel.java | 9 +- .../java/tconstruct/armor/model/BootBump.java | 1 + .../armor/model/HiddenPlayerModel.java | 1 + .../armor/model/RenderArmorCast.java | 21 +- .../tconstruct/armor/model/WingModel.java | 1 + .../armor/modelblock/DryingRackRender.java | 9 +- .../modelblock/DryingRackSpecialRender.java | 4 +- .../armor/player/ArmorExtended.java | 32 +- .../armor/player/ArmorExtendedClient.java | 13 +- .../armor/player/KnapsackInventory.java | 7 +- .../armor/player/TPlayerHandler.java | 23 +- .../tconstruct/armor/player/TPlayerStats.java | 9 +- .../java/tconstruct/blocks/BlockFalling.java | 21 +- src/main/java/tconstruct/blocks/SlabBase.java | 22 +- .../tconstruct/blocks/TConstructBlock.java | 6 +- .../blocks/logic/DryingRackLogic.java | 5 +- .../tconstruct/blocks/slime/SlimeFluid.java | 8 +- .../tconstruct/blocks/slime/SlimeGel.java | 7 +- .../tconstruct/blocks/slime/SlimeGrass.java | 19 +- .../tconstruct/blocks/slime/SlimeLeaves.java | 18 +- .../tconstruct/blocks/slime/SlimeSapling.java | 7 +- .../blocks/slime/SlimeTallGrass.java | 10 +- .../blocks/traps/BarricadeBlock.java | 9 +- .../tconstruct/blocks/traps/Landmine.java | 80 +- .../java/tconstruct/blocks/traps/Punji.java | 17 +- .../tconstruct/client/AmmoItemRenderer.java | 4 +- .../java/tconstruct/client/ArmorControls.java | 35 +- .../client/BlockSkinRenderHelper.java | 1517 ++++++++--------- .../java/tconstruct/client/BreakingFX.java | 44 +- .../tconstruct/client/CustomBowRenderer.java | 7 +- .../java/tconstruct/client/CustomFont.java | 98 +- .../client/FlexibleToolRenderer.java | 11 +- .../java/tconstruct/client/IconFlipped.java | 1 + .../java/tconstruct/client/TProxyClient.java | 20 +- .../tconstruct/client/ToolCoreRenderer.java | 16 +- .../client/entity/item/ExplosiveRender.java | 22 +- .../client/entity/projectile/ArrowRender.java | 56 +- .../entity/projectile/ArrowRenderCustom.java | 53 +- .../entity/projectile/DaggerRender.java | 204 +-- .../entity/projectile/DaggerRenderCustom.java | 53 +- .../entity/projectile/LaunchedItemRender.java | 15 +- .../entity/projectile/RangedRenderBase.java | 1 + .../client/pages/BlockCastPage.java | 39 +- .../tconstruct/client/pages/MaterialPage.java | 72 +- .../tconstruct/client/pages/ModifierPage.java | 62 +- .../tconstruct/client/pages/ToolPage.java | 18 +- .../tconstruct/client/tabs/AbstractTab.java | 17 +- .../tabs/InventoryTabArmorExtended.java | 2 + .../client/tabs/InventoryTabKnapsack.java | 5 +- .../client/tabs/InventoryTabVanilla.java | 1 + .../tconstruct/client/tabs/TabRegistry.java | 16 +- .../java/tconstruct/common/TProxyCommon.java | 5 +- .../common/itemblocks/MetadataItemBlock.java | 1 + .../tconstruct/gadgets/TinkerGadgets.java | 26 +- .../gadgets/item/ItemSlimeBoots.java | 21 +- .../gadgets/item/ItemSlimeSling.java | 9 +- .../java/tconstruct/items/tools/Arrow.java | 31 +- .../tconstruct/items/tools/BattleSign.java | 19 +- .../tconstruct/items/tools/Battleaxe.java | 44 +- .../java/tconstruct/items/tools/BowBase.java | 62 +- .../tconstruct/items/tools/Broadsword.java | 14 +- .../java/tconstruct/items/tools/Chisel.java | 19 +- .../java/tconstruct/items/tools/Cleaver.java | 12 +- .../java/tconstruct/items/tools/Cutlass.java | 2 + .../java/tconstruct/items/tools/Dagger.java | 4 +- .../tconstruct/items/tools/Excavator.java | 7 +- .../tconstruct/items/tools/FryingPan.java | 25 +- .../java/tconstruct/items/tools/Hammer.java | 10 +- .../java/tconstruct/items/tools/Hatchet.java | 11 +- .../tconstruct/items/tools/Longsword.java | 26 +- .../tconstruct/items/tools/LumberAxe.java | 63 +- .../java/tconstruct/items/tools/Mattock.java | 22 +- .../java/tconstruct/items/tools/Pickaxe.java | 7 +- .../items/tools/PotionLauncher.java | 16 +- .../java/tconstruct/items/tools/Rapier.java | 2 + .../java/tconstruct/items/tools/Scythe.java | 147 +- .../java/tconstruct/items/tools/Shortbow.java | 13 +- .../java/tconstruct/items/tools/Shovel.java | 35 +- .../tconstruct/library/ActiveToolMod.java | 52 +- .../tconstruct/library/ItemBlocklike.java | 3 +- .../library/SlimeBounceHandler.java | 10 +- .../library/TConstructCreativeTab.java | 1 + .../library/TConstructRegistry.java | 357 ++-- .../library/accessory/AccessoryCore.java | 24 +- .../library/accessory/IAccessory.java | 4 +- .../library/accessory/IAccessoryModel.java | 7 +- .../library/accessory/IHealthAccessory.java | 1 + .../tconstruct/library/armor/ArmorCore.java | 40 +- .../tconstruct/library/armor/ArmorMod.java | 3 + .../library/armor/ArmorModTypeFilter.java | 26 +- .../tconstruct/library/armor/ArmorPart.java | 1 + .../armor/BehaviorDispenseArmorCopy.java | 13 +- .../library/client/FluidRenderProperties.java | 2 + .../tconstruct/library/client/GuiElement.java | 1 + .../library/client/StencilGuiElement.java | 1 + .../client/TConstructClientRegistry.java | 72 +- .../library/client/ToolGuiElement.java | 1 + .../library/component/IComponentHolder.java | 1 + .../library/component/LogicComponent.java | 1 + .../library/component/MultiFluidTank.java | 3 + .../library/component/TankLayerScan.java | 44 +- .../tconstruct/library/crafting/AlloyMix.java | 5 +- .../library/crafting/CastingRecipe.java | 22 +- .../library/crafting/Detailing.java | 6 +- .../library/crafting/DryingRackRecipes.java | 3 + .../library/crafting/FluidType.java | 6 +- .../library/crafting/LiquidCasting.java | 107 +- .../library/crafting/ModifyBuilder.java | 9 +- .../library/crafting/PatternBuilder.java | 64 +- .../library/crafting/ShapelessToolRecipe.java | 11 +- .../tconstruct/library/crafting/Smeltery.java | 97 +- .../library/crafting/StencilBuilder.java | 18 +- .../library/crafting/ToolBuilder.java | 87 +- .../library/crafting/ToolRecipe.java | 6 +- .../library/entity/ProjectileBase.java | 134 +- .../tconstruct/library/event/ModifyEvent.java | 6 +- .../library/event/PartBuilderEvent.java | 14 +- .../library/event/SmelteryCastEvent.java | 6 +- .../library/event/SmelteryCastedEvent.java | 9 +- .../library/event/SmelteryEvent.java | 18 +- .../library/event/ToolBuildEvent.java | 8 +- .../library/event/ToolCraftEvent.java | 16 +- .../library/event/ToolCraftedEvent.java | 3 +- .../library/modifier/ActiveArmorMod.java | 2 + .../library/modifier/IModifyable.java | 1 + .../library/modifier/ItemModifier.java | 26 +- .../library/tools/AOEHarvestTool.java | 16 +- .../library/tools/AbilityHelper.java | 116 +- .../library/tools/ArrowMaterial.java | 1 + .../tconstruct/library/tools/BowMaterial.java | 1 + .../library/tools/BowstringMaterial.java | 22 +- .../library/tools/CustomMaterial.java | 2 + .../library/tools/DualHarvestTool.java | 3 +- .../library/tools/DualMaterialToolPart.java | 26 +- .../library/tools/DynamicToolPart.java | 42 +- .../library/tools/FletchingMaterial.java | 43 +- .../library/tools/FletchlingLeafMaterial.java | 12 +- .../tconstruct/library/tools/HarvestTool.java | 55 +- .../tconstruct/library/tools/ToolCore.java | 95 +- .../library/tools/ToolMaterial.java | 71 +- .../java/tconstruct/library/tools/Weapon.java | 45 +- .../util/BehaviorProjectileBaseDispense.java | 2 + .../library/util/HarvestLevels.java | 2 + .../tconstruct/library/util/IPattern.java | 2 + .../tconstruct/library/util/IToolPart.java | 4 +- .../library/util/PiercingArrowDamage.java | 1 + .../library/util/PiercingEntityDamage.java | 1 + .../library/util/TextureHelper.java | 6 +- .../tconstruct/library/weaponry/AmmoItem.java | 19 +- .../library/weaponry/AmmoWeapon.java | 49 +- .../library/weaponry/ArrowShaftMaterial.java | 21 +- .../library/weaponry/BowBaseAmmo.java | 20 +- .../library/weaponry/IAccuracy.java | 1 + .../tconstruct/library/weaponry/IAmmo.java | 5 + .../tconstruct/library/weaponry/IWindup.java | 6 +- .../library/weaponry/ProjectileWeapon.java | 83 +- .../mechworks/MechworksProxyClient.java | 8 +- .../mechworks/MechworksProxyCommon.java | 4 +- .../tconstruct/mechworks/TinkerMechworks.java | 127 +- .../mechworks/blocks/BlockLandmine.java | 58 +- .../entity/item/EntityLandmineFirework.java | 19 +- .../entity/item/ExplosivePrimed.java | 15 +- .../tconstruct/mechworks/gui/GuiLandmine.java | 3 + .../inventory/ContainerLandmine.java | 166 +- .../itemblocks/ItemBlockLandmine.java | 16 +- .../mechworks/landmine/behavior/Behavior.java | 21 +- .../landmine/behavior/BehaviorBlockThrow.java | 9 +- .../landmine/behavior/BehaviorDefault.java | 9 +- .../landmine/behavior/BehaviorDummy.java | 8 +- .../landmine/behavior/BehaviorExplosive.java | 16 +- .../landmine/behavior/BehaviorFirecharge.java | 15 +- .../landmine/behavior/BehaviorFirework.java | 17 +- .../landmine/behavior/BehaviorPotion.java | 10 +- .../behavior/BehaviorPreventExplode.java | 8 +- .../landmine/behavior/BehaviorProjectile.java | 8 +- .../landmine/behavior/BehaviorShears.java | 16 +- .../landmine/behavior/BehaviorSpawnEgg.java | 8 +- .../stackCombo/SpecialStackHandler.java | 6 +- .../SpecialStackHandlerRocketFireball.java | 5 +- .../mechworks/logic/LandmineExplodeLogic.java | 17 +- .../logic/LandmineSpecialStackLogic.java | 12 +- .../mechworks/logic/TileEntityLandmine.java | 17 +- .../mechworks/model/CartRender.java | 15 +- .../mechworks/model/ModelPullcart.java | 1 + .../mechworks/model/ModelWagon.java | 71 +- .../modifiers/accessory/GloveClimb.java | 1 + .../modifiers/accessory/GloveSpeed.java | 10 +- .../modifiers/armor/AModBoolean.java | 7 +- .../modifiers/armor/AModInteger.java | 24 +- .../modifiers/armor/AModLeadBoots.java | 2 + .../modifiers/armor/AModThaumicVision.java | 20 +- .../modifiers/armor/ActiveTinkerArmor.java | 25 +- .../modifiers/armor/TravelModDoubleJump.java | 3 + .../modifiers/armor/TravelModRepair.java | 1 + .../modifiers/tools/ItemModTypeFilter.java | 19 +- .../modifiers/tools/ModAmmoRestock.java | 3 + .../modifiers/tools/ModAntiSpider.java | 3 +- .../tconstruct/modifiers/tools/ModAttack.java | 9 +- .../modifiers/tools/ModAutoSmelt.java | 4 +- .../tconstruct/modifiers/tools/ModBlaze.java | 5 +- .../modifiers/tools/ModBoolean.java | 6 +- .../modifiers/tools/ModButtertouch.java | 4 +- .../tools/ModCreativeToolModifier.java | 2 + .../modifiers/tools/ModDurability.java | 2 + .../modifiers/tools/ModExtraModifier.java | 2 + .../tconstruct/modifiers/tools/ModFlux.java | 48 +- .../modifiers/tools/ModInteger.java | 6 +- .../tconstruct/modifiers/tools/ModLapis.java | 5 +- .../tconstruct/modifiers/tools/ModPiston.java | 5 +- .../tconstruct/modifiers/tools/ModPotion.java | 3 +- .../modifiers/tools/ModRedstone.java | 7 +- .../tconstruct/modifiers/tools/ModRepair.java | 1 + .../tconstruct/modifiers/tools/ModSmite.java | 3 +- .../modifiers/tools/ModToolRepair.java | 1 + .../tconstruct/modifiers/tools/ModWindup.java | 5 +- .../tconstruct/plugins/TinkerThaumcraft.java | 14 +- .../tconstruct/plugins/fmp/TinkerFMP.java | 5 +- .../tconstruct/plugins/gears/GearCast.java | 2 + .../tconstruct/plugins/gears/TinkerGears.java | 10 +- .../tconstruct/plugins/ic2/TinkerIC2.java | 13 +- .../tconstruct/plugins/imc/TinkerAE2.java | 6 +- .../plugins/imc/TinkerBuildCraft.java | 5 +- .../plugins/imc/TinkerMystcraft.java | 37 +- .../tconstruct/plugins/imc/TinkerRfTools.java | 64 +- .../tconstruct/plugins/mfr/Drinkables.java | 1 + .../plugins/mfr/GrindableHorse.java | 3 + .../plugins/mfr/HarvestableOreBerry.java | 9 +- .../tconstruct/plugins/mfr/MFRRegister.java | 10 +- .../tconstruct/plugins/mfr/TinkerMFR.java | 9 +- .../nei/BeltToggleFromGuiInputHandler.java | 5 +- .../nei/CraftingStationOverlayHandler.java | 6 +- .../nei/CraftingStationStackPositioner.java | 10 +- .../plugins/nei/NEITConstructConfig.java | 2 +- .../plugins/nei/RecipeHandlerAlloying.java | 16 +- .../plugins/nei/RecipeHandlerBase.java | 23 +- .../plugins/nei/RecipeHandlerCastingBase.java | 8 +- .../nei/RecipeHandlerCastingBasin.java | 5 +- .../nei/RecipeHandlerCastingTable.java | 5 +- .../plugins/nei/RecipeHandlerDryingRack.java | 15 +- .../plugins/nei/RecipeHandlerMelting.java | 14 +- .../nei/RecipeHandlerToolMaterials.java | 13 +- .../tconstruct/plugins/te4/TE4Helper.java | 52 +- .../tconstruct/plugins/te4/TinkerTE4.java | 34 +- .../plugins/te4/TinkersThermalFoundation.java | 61 +- .../tconstruct/plugins/ubc/TinkerUBC.java | 12 +- .../plugins/waila/BasinDataProvider.java | 35 +- .../waila/CastingChannelDataProvider.java | 30 +- .../plugins/waila/SearedTankDataProvider.java | 30 +- .../plugins/waila/SmelteryDataProvider.java | 23 +- .../plugins/waila/TableDataProvider.java | 35 +- .../tconstruct/plugins/waila/TinkerWaila.java | 5 +- .../plugins/waila/WailaRegistrar.java | 3 + .../smeltery/SmelteryDamageSource.java | 2 + .../smeltery/SmelteryProxyClient.java | 9 +- .../smeltery/SmelteryProxyCommon.java | 5 +- .../tconstruct/smeltery/TinkerSmeltery.java | 1027 +++++------ .../smeltery/TinkerSmelteryEvents.java | 9 +- .../smeltery/blocks/CastingChannelBlock.java | 12 +- .../smeltery/blocks/GlassBlock.java | 10 +- .../smeltery/blocks/GlassBlockConnected.java | 17 +- .../blocks/GlassBlockConnectedMeta.java | 9 +- .../smeltery/blocks/GlassBlockStained.java | 24 +- .../tconstruct/smeltery/blocks/GlassPane.java | 4 +- .../smeltery/blocks/GlassPaneConnected.java | 24 +- .../smeltery/blocks/GlassPaneStained.java | 22 +- .../tconstruct/smeltery/blocks/GlueBlock.java | 3 +- .../tconstruct/smeltery/blocks/GlueFluid.java | 3 +- .../smeltery/blocks/LavaTankBlock.java | 36 +- .../smeltery/blocks/LiquidMetalFinite.java | 4 +- .../tconstruct/smeltery/blocks/MetalOre.java | 3 + .../tconstruct/smeltery/blocks/PaneBase.java | 5 +- .../smeltery/blocks/PigIronMoltenBlock.java | 8 +- .../smeltery/blocks/SearedBlock.java | 20 +- .../smeltery/blocks/SearedSlab.java | 5 +- .../smeltery/blocks/SmelteryBlock.java | 35 +- .../smeltery/blocks/SpeedBlock.java | 17 +- .../tconstruct/smeltery/blocks/SpeedSlab.java | 5 +- .../smeltery/blocks/TConstructFluid.java | 4 +- .../smeltery/gui/ActiveContainerGui.java | 1 + .../tconstruct/smeltery/gui/SmelteryGui.java | 37 +- .../smeltery/inventory/ActiveContainer.java | 2 + .../smeltery/inventory/ActiveSlot.java | 1 + .../smeltery/inventory/SmelteryContainer.java | 54 +- .../itemblocks/CastingChannelItem.java | 4 +- .../smeltery/itemblocks/GlassBlockItem.java | 5 +- .../smeltery/itemblocks/GlassPaneItem.java | 4 +- .../itemblocks/LavaTankItemBlock.java | 47 +- .../smeltery/itemblocks/MetalItemBlock.java | 8 +- .../smeltery/itemblocks/SearedSlabItem.java | 6 +- .../itemblocks/SearedTableItemBlock.java | 5 +- .../itemblocks/SmelteryItemBlock.java | 21 +- .../smeltery/itemblocks/SpeedBlockItem.java | 15 +- .../smeltery/itemblocks/SpeedSlabItem.java | 15 +- .../itemblocks/StainedGlassClearItem.java | 22 +- .../itemblocks/StainedGlassClearPaneItem.java | 22 +- .../smeltery/items/ClayPattern.java | 35 +- .../smeltery/items/FilledBucket.java | 108 +- .../smeltery/items/MetalPattern.java | 36 +- .../smeltery/logic/CastingBasinLogic.java | 2 + .../smeltery/logic/CastingBlockLogic.java | 46 +- .../smeltery/logic/CastingChannelLogic.java | 228 +-- .../smeltery/logic/CastingTableLogic.java | 2 + .../smeltery/logic/FaucetLogic.java | 30 +- .../smeltery/logic/LavaTankLogic.java | 11 +- .../smeltery/logic/LiquidTextureLogic.java | 1 + .../smeltery/logic/SmelteryDrainLogic.java | 28 +- .../smeltery/logic/SmelteryLogic.java | 87 +- .../model/BlockRenderCastingChannel.java | 71 +- .../model/CastingBasinSpecialRender.java | 5 +- .../smeltery/model/CastingBlockRender.java | 83 +- .../model/CastingTableSpecialRenderer.java | 5 +- .../smeltery/model/PaneConnectedRender.java | 13 +- .../tconstruct/smeltery/model/PaneRender.java | 8 +- .../smeltery/model/SmelteryRender.java | 104 +- .../smeltery/model/TankItemRenderer.java | 11 +- .../tconstruct/smeltery/model/TankRender.java | 9 +- src/main/java/tconstruct/tools/BowRecipe.java | 1 + .../java/tconstruct/tools/TActiveOmniMod.java | 72 +- .../tconstruct/tools/TinkerToolEvents.java | 79 +- .../java/tconstruct/tools/TinkerTools.java | 1107 ++++++------ .../tconstruct/tools/ToolProxyClient.java | 413 +++-- .../tconstruct/tools/ToolProxyCommon.java | 5 +- .../tools/blocks/BattlesignBlock.java | 40 +- .../tconstruct/tools/blocks/CraftingSlab.java | 54 +- .../tools/blocks/CraftingStationBlock.java | 8 +- .../tconstruct/tools/blocks/EquipBlock.java | 21 +- .../tconstruct/tools/blocks/FurnaceSlab.java | 7 +- .../tconstruct/tools/blocks/MultiBrick.java | 67 +- .../tools/blocks/MultiBrickFancy.java | 70 +- .../tools/blocks/MultiBrickMetal.java | 18 +- .../tools/blocks/ToolForgeBlock.java | 24 +- .../tools/blocks/ToolStationBlock.java | 101 +- .../tools/client/DaggerEntityRenderer.java | 2 + .../tconstruct/tools/entity/ArrowEntity.java | 70 +- .../tconstruct/tools/entity/DaggerEntity.java | 14 +- .../tools/entity/FancyEntityItem.java | 4 +- .../tools/entity/LaunchedPotion.java | 21 +- .../tconstruct/tools/entity/RotatingBase.java | 61 +- .../tconstruct/tools/gui/BattlesignGui.java | 34 +- .../java/tconstruct/tools/gui/ChestSlot.java | 8 +- .../tools/gui/CraftingStationGui.java | 86 +- .../java/tconstruct/tools/gui/FrypanGui.java | 7 +- .../java/tconstruct/tools/gui/FurnaceGui.java | 15 +- .../tconstruct/tools/gui/GuiBorderWidget.java | 27 +- .../tools/gui/GuiButtonStencil.java | 16 +- .../tconstruct/tools/gui/GuiButtonTool.java | 14 +- .../tconstruct/tools/gui/GuiElementDuex.java | 29 +- .../tools/gui/GuiElementScalable.java | 29 +- .../tconstruct/tools/gui/GuiSliderWidget.java | 39 +- .../tconstruct/tools/gui/PartCrafterGui.java | 81 +- .../tconstruct/tools/gui/PatternChestGui.java | 11 +- .../tconstruct/tools/gui/StencilTableGui.java | 38 +- .../tconstruct/tools/gui/ToolForgeGui.java | 52 +- .../tconstruct/tools/gui/ToolStationGui.java | 85 +- .../tools/gui/ToolStationGuiHelper.java | 56 +- .../inventory/CraftingStationContainer.java | 50 +- .../tools/inventory/FrypanContainer.java | 7 +- .../tools/inventory/FurnaceContainer.java | 7 +- .../inventory/InventoryCraftingStation.java | 22 +- .../InventoryCraftingStationResult.java | 29 +- .../inventory/PartCrafterChestContainer.java | 20 +- .../tools/inventory/PartCrafterContainer.java | 16 +- .../inventory/PatternChestContainer.java | 4 +- .../inventory/PatternShaperContainer.java | 79 +- .../tools/inventory/SlotCraftingStation.java | 11 +- .../tools/inventory/SlotFrypan.java | 4 +- .../tools/inventory/SlotPattern.java | 2 + .../tconstruct/tools/inventory/SlotTool.java | 25 +- .../tools/inventory/SlotToolForge.java | 13 +- .../tools/inventory/ToolForgeContainer.java | 19 +- .../tools/inventory/ToolStationContainer.java | 48 +- .../itemblocks/CraftingSlabItemBlock.java | 7 +- .../tools/itemblocks/MultiBrickFancyItem.java | 26 +- .../tools/itemblocks/MultiBrickItem.java | 27 +- .../tools/itemblocks/MultiBrickMetalItem.java | 14 +- .../itemblocks/ToolStationItemBlock.java | 22 +- .../tconstruct/tools/items/Bowstring.java | 10 +- .../tools/items/CreativeModifier.java | 4 +- .../tconstruct/tools/items/Fletching.java | 10 +- .../java/tconstruct/tools/items/Manual.java | 15 +- .../tconstruct/tools/items/ManualInfo.java | 25 +- .../tconstruct/tools/items/MaterialItem.java | 106 +- .../java/tconstruct/tools/items/Pattern.java | 38 +- .../tconstruct/tools/items/TitleIcon.java | 38 +- .../java/tconstruct/tools/items/ToolPart.java | 78 +- .../tools/items/ToolPartHidden.java | 1 + .../tconstruct/tools/items/ToolShard.java | 2 + .../tools/logic/BattlesignLogic.java | 5 +- .../tools/logic/CraftingStationLogic.java | 25 +- .../tconstruct/tools/logic/EquipLogic.java | 7 +- .../tconstruct/tools/logic/FrypanLogic.java | 31 +- .../tconstruct/tools/logic/FurnaceLogic.java | 33 +- .../tools/logic/PartBuilderLogic.java | 3 + .../tools/logic/PatternChestLogic.java | 3 + .../tools/logic/StencilTableLogic.java | 14 +- .../tools/logic/ToolForgeLogic.java | 36 +- .../tools/logic/ToolStationLogic.java | 15 +- .../tools/model/BattlesignRender.java | 8 +- .../tools/model/BattlesignTesr.java | 14 +- .../tools/model/FancyItemRender.java | 333 ++-- .../tconstruct/tools/model/FrypanRender.java | 8 +- .../tconstruct/tools/model/TableRender.java | 9 +- .../tconstruct/util/CraftingRecipeHelper.java | 2 + .../tconstruct/util/EnvironmentChecks.java | 7 +- src/main/java/tconstruct/util/IMCHandler.java | 121 +- src/main/java/tconstruct/util/ItemHelper.java | 8 +- src/main/java/tconstruct/util/Reference.java | 1 + .../util/config/DimensionBlacklist.java | 11 +- .../tconstruct/util/config/PHConstruct.java | 308 ++-- .../network/AccessoryInventoryPacket.java | 6 +- .../util/network/ArmourGuiSyncPacket.java | 15 +- .../tconstruct/util/network/BeltPacket.java | 7 +- .../util/network/DoubleJumpPacket.java | 6 +- .../tconstruct/util/network/GogglePacket.java | 14 +- .../util/network/HealthUpdatePacket.java | 7 +- .../util/network/MovementUpdatePacket.java | 7 +- .../util/network/PacketPipeline.java | 112 +- .../util/network/PatternTablePacket.java | 14 +- .../util/network/SignDataPacket.java | 13 +- .../util/network/SmelteryPacket.java | 13 +- .../util/network/ToolStationPacket.java | 10 +- .../weaponry/AlternateBoltRecipe.java | 6 +- .../tconstruct/weaponry/TinkerWeaponry.java | 173 +- .../weaponry/WeaponryActiveToolMod.java | 2 + .../weaponry/WeaponryClientProxy.java | 69 +- .../weaponry/WeaponryCommonProxy.java | 7 +- .../tconstruct/weaponry/WeaponryHandler.java | 95 +- .../tconstruct/weaponry/ammo/ArrowAmmo.java | 11 +- .../tconstruct/weaponry/ammo/BoltAmmo.java | 11 +- .../weaponry/client/AmmoSlotHandler.java | 13 +- .../weaponry/client/CrosshairHandler.java | 27 +- .../weaponry/client/RenderEventHandler.java | 9 +- .../client/entity/ArrowEntityRenderer.java | 2 + .../client/entity/JavelinEntityRenderer.java | 6 +- .../client/entity/ProjectileBaseRenderer.java | 14 +- .../client/entity/ShurikenEntityRenderer.java | 5 +- .../weaponry/client/item/BowRenderer.java | 13 +- .../client/item/CrossbowRenderer.java | 3 + .../weaponry/client/item/JavelinRenderer.java | 8 +- .../client/item/ThrowingKnifeRenderer.java | 3 + .../weaponry/entity/ArrowEntity.java | 4 +- .../weaponry/entity/BoltEntity.java | 1 + .../weaponry/entity/JavelinEntity.java | 4 +- .../weaponry/entity/ShurikenEntity.java | 8 +- .../weaponry/entity/ThrowingKnifeEntity.java | 2 + .../tconstruct/weaponry/items/Boneana.java | 7 +- .../weaponry/items/GlassArrows.java | 7 +- .../weaponry/items/WeaponryPattern.java | 5 +- .../weaponry/items/WeaponryPatternClay.java | 5 +- .../tconstruct/weaponry/weapons/Crossbow.java | 29 +- .../tconstruct/weaponry/weapons/Javelin.java | 8 +- .../tconstruct/weaponry/weapons/LongBow.java | 6 +- .../tconstruct/weaponry/weapons/ShortBow.java | 10 +- .../tconstruct/weaponry/weapons/Shuriken.java | 6 +- .../weaponry/weapons/ThrowingKnife.java | 6 +- .../tconstruct/world/MiningExplosion.java | 45 +- .../world/TDispenserBehaviorSpawnEgg.java | 5 +- .../java/tconstruct/world/TinkerWorld.java | 510 +++--- .../tconstruct/world/TinkerWorldEvents.java | 14 +- .../world/TinkerWorldProxyClient.java | 65 +- .../world/TinkerWorldProxyCommon.java | 4 +- .../tconstruct/world/blocks/ConveyorBase.java | 10 +- .../tconstruct/world/blocks/GravelOre.java | 17 +- .../tconstruct/world/blocks/MeatBlock.java | 25 +- .../tconstruct/world/blocks/OreberryBush.java | 26 +- .../world/blocks/OreberryBushEssence.java | 8 +- .../world/blocks/SlimeExplosive.java | 29 +- .../tconstruct/world/blocks/SlimePad.java | 7 +- .../tconstruct/world/blocks/SoilBlock.java | 14 +- .../tconstruct/world/blocks/SoilSlab.java | 5 +- .../tconstruct/world/blocks/StoneLadder.java | 3 +- .../tconstruct/world/blocks/StoneTorch.java | 46 +- .../tconstruct/world/blocks/TMetalBlock.java | 17 +- .../tconstruct/world/blocks/WoodRail.java | 7 +- .../tconstruct/world/entity/BlueSlime.java | 2 + .../tconstruct/world/entity/CartEntity.java | 208 +-- .../world/entity/KingBlueSlime.java | 21 +- .../tconstruct/world/entity/MetalSlime.java | 11 +- .../tconstruct/world/entity/SlimeBase.java | 21 +- .../tconstruct/world/gen/OreberryBushGen.java | 14 +- .../world/gen/OverworldProvider.java | 16 +- .../java/tconstruct/world/gen/PlantGen.java | 5 +- .../tconstruct/world/gen/SlimeIslandGen.java | 47 +- .../tconstruct/world/gen/SlimeTreeGen.java | 67 +- .../tconstruct/world/gen/SurfaceOreGen.java | 14 +- .../world/gen/TBaseWorldGenerator.java | 33 +- .../world/gen/TerrainGenEventHandler.java | 12 +- .../world/itemblocks/BarricadeItem.java | 59 +- .../itemblocks/CraftedSoilItemBlock.java | 11 +- .../world/itemblocks/GravelOreItem.java | 4 +- .../world/itemblocks/HamboneItemBlock.java | 32 +- .../world/itemblocks/MetalOreItemBlock.java | 5 +- .../world/itemblocks/OreberryBushItem.java | 28 +- .../itemblocks/OreberryBushSecondItem.java | 42 +- .../world/itemblocks/SlimeGelItemBlock.java | 4 +- .../world/itemblocks/SlimeGrassItemBlock.java | 4 +- .../itemblocks/SlimeLeavesItemBlock.java | 4 +- .../itemblocks/SlimeSaplingItemBlock.java | 4 +- .../world/itemblocks/SlimeTallGrassItem.java | 7 +- .../world/itemblocks/SoilSlabItem.java | 11 +- .../world/itemblocks/WoolSlab1Item.java | 15 +- .../world/itemblocks/WoolSlab2Item.java | 15 +- .../tconstruct/world/items/GoldenHead.java | 5 +- .../tconstruct/world/items/OreBerries.java | 21 +- .../tconstruct/world/items/SpecialFood.java | 5 +- .../tconstruct/world/items/StrangeFood.java | 13 +- .../world/model/BarricadeRender.java | 8 +- .../world/model/CrystalModelSmall.java | 37 +- .../tconstruct/world/model/CrystalRender.java | 15 +- .../world/model/OreberryRender.java | 8 +- .../tconstruct/world/model/PunjiRender.java | 29 +- .../world/model/RenderLandmine.java | 12 +- .../world/model/SlimeChannelRender.java | 19 +- .../tconstruct/world/model/SlimeModel.java | 4 +- .../world/model/SlimePadRender.java | 26 +- .../tconstruct/world/model/SlimeRender.java | 9 +- .../world/village/ComponentSmeltery.java | 74 +- .../world/village/ComponentToolWorkshop.java | 56 +- .../world/village/TVillageTrades.java | 4 +- .../world/village/VillageSmelteryHandler.java | 17 +- .../village/VillageToolStationHandler.java | 17 +- 561 files changed, 8872 insertions(+), 9300 deletions(-) diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java index cc827b2d..a2c516f9 100644 --- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java @@ -2,9 +2,11 @@ package exterminatorJeff.undergroundBiomes.api; /** * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API + * * @author Zeno410 */ public class UBAPIHook { + public static final UBAPIHook ubAPIHook = new UBAPIHook(); // public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes public UBOreTexturizer ubOreTexturizer; diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java index a55fb59d..19634765 100644 --- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java @@ -1,21 +1,23 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * To change this template, choose Tools | Templates and open the template in the editor. */ package exterminatorJeff.undergroundBiomes.api; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.block.Block; import net.minecraft.world.World; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + /** - * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API - * This is an interface for the class that can create Underground Biomes versions of arbitary ores - * It creates three new blocks for each texturized ore. + * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API This is an + * interface for the class that can create Underground Biomes versions of arbitary ores It creates three new blocks for + * each texturized ore. + * * @author Zeno410 */ public interface UBOreTexturizer { + // usage: Block is the ore block. // Overlay name is the fully qualified name, e.g. modname:overlayName // that static vars are fully qualified names for all the textures in the UB pack, just pass as is @@ -24,8 +26,8 @@ public interface UBOreTexturizer { void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); - void setupUBOre( - Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); + void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, + FMLPreInitializationEvent event); void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; @@ -54,6 +56,7 @@ public interface UBOreTexturizer { String uranium_overlay = "undergroundbiomes:uranium_overlay"; class BlocksAreAlreadySet extends RuntimeException { + // this is thrown if UB has already run its pre-initialization step and can no longer register blocks public final Block oreBlock; public final String overlayName; @@ -69,7 +72,9 @@ public interface UBOreTexturizer { String overlayDescription = "undefined overlay"; if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName(); if (overlayName != null) overlayDescription = overlayName; - return "Attempt to create Underground Biomes ore for " + blockDescription + " with " + overlayDescription + return "Attempt to create Underground Biomes ore for " + blockDescription + + " with " + + overlayDescription + " after blocks have already been defined"; } } diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index c14c11cb..90c30b7d 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -1,25 +1,17 @@ package tconstruct; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; -import cpw.mods.fml.relauncher.Side; import java.util.Map; import java.util.Random; + import mantle.pulsar.config.ForgeCFG; import mantle.pulsar.control.PulseManager; + import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.MinecraftForge; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import tconstruct.achievements.AchievementEvents; import tconstruct.achievements.TAchievements; import tconstruct.api.TConstructAPI; @@ -59,10 +51,21 @@ import tconstruct.weaponry.TinkerWeaponry; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeIslandGen; import tconstruct.world.village.*; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.NetworkCheckHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.relauncher.Side; /** - * TConstruct, the tool mod. Craft your tools with style, then modify until the - * original is gone! + * TConstruct, the tool mod. Craft your tools with style, then modify until the original is gone! * * @author mDiyo */ @@ -70,23 +73,24 @@ import tconstruct.world.village.*; modid = TConstruct.modID, name = "TConstruct", version = TConstruct.modVersion, - dependencies = - "required-after:Forge@[10.13.3.1384,11.14);" + "required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);" - + // make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix - "after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);" - + "after:ThermalExpansion@[1.7.10R4.0.0RC2,);" - + "after:ThermalFoundation@[1.7.10R1.0.0RC3,);" - + "after:armourersWorkshop@[1.7.10-0.28.0,);" - + "after:CoFHAPI|energy;" - + "after:CoFHCore;" - + "after:battlegear2;" - + "after:ZeldaItemAPI;" - + "after:DynamicSkillsAPI;" - + "after:NotEnoughItems;" - + "after:Waila;" - + "before:GalacticraftCore;" - + "before:UndergroundBiomes") + dependencies = "required-after:Forge@[10.13.3.1384,11.14);" + + "required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);" + + // make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix + "after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);" + + "after:ThermalExpansion@[1.7.10R4.0.0RC2,);" + + "after:ThermalFoundation@[1.7.10R1.0.0RC3,);" + + "after:armourersWorkshop@[1.7.10-0.28.0,);" + + "after:CoFHAPI|energy;" + + "after:CoFHCore;" + + "after:battlegear2;" + + "after:ZeldaItemAPI;" + + "after:DynamicSkillsAPI;" + + "after:NotEnoughItems;" + + "after:Waila;" + + "before:GalacticraftCore;" + + "before:UndergroundBiomes") public class TConstruct { + public static final String modVersion = "GRADLETOKEN_VERSION"; /** The value of one ingot in millibuckets */ public static final int ingotLiquidValue = 144; @@ -112,7 +116,8 @@ public class TConstruct { /* Loads modules in a way that doesn't clutter the @Mod list */ public static PulseManager pulsar = new PulseManager( - modID, new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod")); + modID, + new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod")); public TConstruct() { if (Loader.isModLoaded("Natura")) { @@ -153,8 +158,9 @@ public class TConstruct { pulsar.registerPulse(new TinkerUBC()); pulsar.registerPulse(new TinkerGears()); pulsar.registerPulse(new TinkerRfTools()); - /*pulsar.registerPulse(new TinkerPrayers()); - pulsar.registerPulse(new TinkerCropify());*/ + /* + * pulsar.registerPulse(new TinkerPrayers()); pulsar.registerPulse(new TinkerCropify()); + */ TConstructRegistry.materialTab = new TConstructCreativeTab("TConstructMaterials"); TConstructRegistry.toolTab = new TConstructCreativeTab("TConstructTools"); diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java index bc17fcb9..d844363c 100644 --- a/src/main/java/tconstruct/achievements/AchievementEvents.java +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -1,7 +1,5 @@ package tconstruct.achievements; -import com.mojang.realmsclient.gui.ChatFormatting; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; @@ -9,12 +7,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.ItemTooltipEvent; + import tconstruct.items.tools.FryingPan; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.tools.*; import tconstruct.tools.logic.ToolForgeLogic; +import com.mojang.realmsclient.gui.ChatFormatting; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class AchievementEvents { + @SubscribeEvent public void toolCreate(ToolCraftedEvent event) { if (event.player != null) { @@ -24,8 +27,7 @@ public class AchievementEvents { TAchievements.triggerAchievement(event.player, "tconstruct.preparedFight"); } - if (event.inventory instanceof ToolForgeLogic - && event.tool.getItem() instanceof ToolCore + if (event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) { TAchievements.triggerAchievement(event.player, "tconstruct.proTinkerer"); } @@ -68,12 +70,14 @@ public class AchievementEvents { @SubscribeEvent public void tooltip(ItemTooltipEvent event) { - if (event.itemStack == null - || event.itemStack.getItem() == null + if (event.itemStack == null || event.itemStack.getItem() == null || !event.itemStack.hasTagCompound() - || !event.itemStack.getTagCompound().hasKey("frypanKill")) return; + || !event.itemStack.getTagCompound().hasKey("frypanKill")) + return; - event.toolTip.add("" + ChatFormatting.DARK_PURPLE + ChatFormatting.ITALIC - + StatCollector.translateToLocal("frypankill.tooltip")); + event.toolTip.add( + "" + ChatFormatting.DARK_PURPLE + + ChatFormatting.ITALIC + + StatCollector.translateToLocal("frypankill.tooltip")); } } diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java index 82c5cd1d..34e469b0 100644 --- a/src/main/java/tconstruct/achievements/TAchievements.java +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -1,11 +1,13 @@ package tconstruct.achievements; import java.util.HashMap; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import net.minecraftforge.common.AchievementPage; + import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; @@ -17,7 +19,8 @@ public class TAchievements { /** * Adds an achievement and registers it, so there is no need to call .registerStat - * @param name The name of the achievement + * + * @param name The name of the achievement * @param achievement The achievement */ public static void addAchievement(String name, Achievement achievement) { @@ -30,6 +33,7 @@ public class TAchievements { /** * Returns a registered achievement + * * @param name The name of the achievement * @return The achievement */ @@ -39,8 +43,9 @@ public class TAchievements { /** * Grants the achievement + * * @param player The player that earned the achievement - * @param name The name of the achievement + * @param name The name of the achievement */ public static void triggerAchievement(EntityPlayer player, String name) { if (!PHConstruct.achievementsEnabled) { @@ -123,13 +128,12 @@ public class TAchievements { addAchievement( "tconstruct.dualConvenience", new Achievement( - "tconstruct.dualConvenience", - "tconstruct.dualConvenience", - 0, - 7, - new ItemStack(TinkerTools.titleIcon, 1, 4100), - getAchievement("tconstruct.enemySlayer")) - .setSpecial()); + "tconstruct.dualConvenience", + "tconstruct.dualConvenience", + 0, + 7, + new ItemStack(TinkerTools.titleIcon, 1, 4100), + getAchievement("tconstruct.enemySlayer")).setSpecial()); } /** @@ -143,8 +147,9 @@ public class TAchievements { Achievement[] achievements = new Achievement[achievementsList.size()]; achievements = achievementsList.values().toArray(achievements); - achievementsPage = - new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements); + achievementsPage = new AchievementPage( + StatCollector.translateToLocal("tconstruct.achievementPage.name"), + achievements); AchievementPage.registerAchievementPage(achievementsPage); } } diff --git a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java index b6649763..7e9d852a 100644 --- a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java +++ b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java @@ -1,21 +1,19 @@ package tconstruct.achievements.items; import mantle.items.abstracts.CraftingItem; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.achievements.TAchievements; public class CraftAchievementItem extends CraftingItem { + public String grantedAchievement; - public CraftAchievementItem( - String[] names, - String[] tex, - String folder, - String modTexturePrefix, - CreativeTabs tab, + public CraftAchievementItem(String[] names, String[] tex, String folder, String modTexturePrefix, CreativeTabs tab, String tachievement) { super(names, tex, folder, modTexturePrefix, tab); diff --git a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java index 274cbf4a..f8c184ea 100644 --- a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java +++ b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public interface IPlayerExtendedInventoryWrapper { + IInventory getKnapsackInventory(EntityPlayer player); IInventory getAccessoryInventory(EntityPlayer player); diff --git a/src/main/java/tconstruct/api/TConstructAPI.java b/src/main/java/tconstruct/api/TConstructAPI.java index a7c0793a..9d917768 100644 --- a/src/main/java/tconstruct/api/TConstructAPI.java +++ b/src/main/java/tconstruct/api/TConstructAPI.java @@ -3,6 +3,7 @@ package tconstruct.api; import net.minecraft.entity.player.EntityPlayer; public class TConstructAPI { + public static String PROP_NAME; public static IPlayerExtendedInventoryWrapper getInventoryWrapper(EntityPlayer player) { diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index 90af74a0..aef0dec3 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilities.java +++ b/src/main/java/tconstruct/armor/ArmorAbilities.java @@ -1,21 +1,24 @@ package tconstruct.armor; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; import java.util.ArrayList; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.TConstruct; import tconstruct.armor.items.TravelGear; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.network.HealthUpdatePacket; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; public class ArmorAbilities { + public static List stepBoostedPlayers = new ArrayList<>(); // ItemStack prevFeet; double prevMotionY; @@ -39,8 +42,8 @@ public class ArmorAbilities { ItemStack feet = player.getCurrentArmor(0); if (feet != null && feet.hasTagCompound()) { if (feet.getItem() instanceof IModifyable && !player.isSneaking()) { - NBTTagCompound tag = - feet.getTagCompound().getCompoundTag(((IModifyable) feet.getItem()).getBaseTagName()); + NBTTagCompound tag = feet.getTagCompound() + .getCompoundTag(((IModifyable) feet.getItem()).getBaseTagName()); int sole = tag.getInteger("Slimy Soles"); if (sole > 0) { if (!player.isSneaking() && player.onGround && prevMotionY < -0.4) @@ -49,17 +52,12 @@ public class ArmorAbilities { } prevMotionY = player.motionY; } - /* Former step height boost handling - if (feet != prevFeet) - { - if (prevFeet != null && prevFeet.getItem() instanceof TravelGear) - player.stepHeight -= 0.6f; - if (feet != null && feet.getItem() instanceof TravelGear) - player.stepHeight += 0.6f; - prevFeet = feet; - }*/ - boolean stepBoosted = - stepBoostedPlayers.contains(player.getGameProfile().getName()); + /* + * Former step height boost handling if (feet != prevFeet) { if (prevFeet != null && prevFeet.getItem() + * instanceof TravelGear) player.stepHeight -= 0.6f; if (feet != null && feet.getItem() instanceof TravelGear) + * player.stepHeight += 0.6f; prevFeet = feet; } + */ + boolean stepBoosted = stepBoostedPlayers.contains(player.getGameProfile().getName()); if (stepBoosted) player.stepHeight = 1.1f; if (!stepBoosted && feet != null && feet.getItem() instanceof TravelGear) { stepBoostedPlayers.add(player.getGameProfile().getName()); @@ -68,11 +66,10 @@ public class ArmorAbilities { player.stepHeight -= 0.6f; } // TODO: Proper minimap support - /*ItemStack stack = player.inventory.getStackInSlot(8); - if (stack != null && stack.getItem() instanceof ItemMap) - { - stack.getItem().onUpdate(stack, player.worldObj, player, 8, true); - }*/ + /* + * ItemStack stack = player.inventory.getStackInSlot(8); if (stack != null && stack.getItem() instanceof + * ItemMap) { stack.getItem().onUpdate(stack, player.worldObj, player, 8, true); } + */ } @SubscribeEvent @@ -82,7 +79,7 @@ public class ArmorAbilities { // this callback is only called serverside float oldHealth = event.player.getHealth(); // tell the client to update its hp - TConstruct.packetPipeline.sendTo( - new HealthUpdatePacket(oldHealth), (net.minecraft.entity.player.EntityPlayerMP) event.player); + TConstruct.packetPipeline + .sendTo(new HealthUpdatePacket(oldHealth), (net.minecraft.entity.player.EntityPlayerMP) event.player); } } diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 90150df9..9f72e7de 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -1,10 +1,9 @@ package tconstruct.armor; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Random; + import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.model.ModelBiped; @@ -29,6 +28,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; + import tconstruct.armor.gui.ArmorExtendedGui; import tconstruct.armor.gui.KnapsackGui; import tconstruct.armor.items.TravelGear; @@ -50,8 +50,12 @@ import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ArmorProxyClient extends ArmorProxyCommon { + public static WingModel wings = new WingModel(); public static BootBump bootbump = new BootBump(); public static HiddenPlayerModel glove = new HiddenPlayerModel(0.25F, 4); @@ -127,16 +131,8 @@ public class ArmorProxyClient extends ArmorProxyCommon { new ItemStack(Blocks.piston), null); - ItemStack[] recipe = new ItemStack[] { - new ItemStack(TinkerWorld.slimeGel, 1, 0), - new ItemStack(Items.ender_pearl), - feather, - feather, - feather, - feather, - feather, - feather - }; + ItemStack[] recipe = new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, feather }; ItemStack modWings = ModifyBuilder.instance.modifyItem(wings, recipe); MantleClientRegistry.registerManualLargeRecipe( "featherfall", @@ -160,7 +156,10 @@ public class ArmorProxyClient extends ArmorProxyCommon { new ItemStack(Blocks.piston), null); TConstructClientRegistry.registerManualModifier( - "waterwalk", boots.copy(), new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily)); + "waterwalk", + boots.copy(), + new ItemStack(Blocks.waterlily), + new ItemStack(Blocks.waterlily)); TConstructClientRegistry.registerManualModifier("leadboots", boots.copy(), new ItemStack(Blocks.iron_block)); TConstructClientRegistry.registerManualModifier( "slimysoles", @@ -169,8 +168,8 @@ public class ArmorProxyClient extends ArmorProxyCommon { new ItemStack(TinkerWorld.slimePad, 1, 0)); ItemStack gloves = TinkerArmor.travelGlove.getDefaultItem(); - TConstructClientRegistry.registerManualModifier( - "glovehaste", gloves.copy(), redstone, new ItemStack(Blocks.redstone_block)); + TConstructClientRegistry + .registerManualModifier("glovehaste", gloves.copy(), redstone, new ItemStack(Blocks.redstone_block)); // MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), // new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null); TConstructClientRegistry.registerManualModifier( @@ -379,11 +378,23 @@ public class ArmorProxyClient extends ArmorProxyCommon { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - par1 + 0, par2 + par6, this.zLevel, (float) (par3 + 0) * f, (float) (par4 + par6) * f1); + par1 + 0, + par2 + par6, + this.zLevel, + (float) (par3 + 0) * f, + (float) (par4 + par6) * f1); tessellator.addVertexWithUV( - par1 + par5, par2 + par6, this.zLevel, (float) (par3 + par5) * f, (float) (par4 + par6) * f1); + par1 + par5, + par2 + par6, + this.zLevel, + (float) (par3 + par5) * f, + (float) (par4 + par6) * f1); tessellator.addVertexWithUV( - par1 + par5, par2 + 0, this.zLevel, (float) (par3 + par5) * f, (float) (par4 + 0) * f1); + par1 + par5, + par2 + 0, + this.zLevel, + (float) (par3 + par5) * f, + (float) (par4 + 0) * f1); tessellator.addVertexWithUV(par1 + 0, par2 + 0, this.zLevel, (float) (par3 + 0) * f, (float) (par4 + 0) * f1); tessellator.draw(); } @@ -449,7 +460,9 @@ public class ArmorProxyClient extends ArmorProxyCommon { if (player.isRiding() && player.ridingEntity instanceof EntityLivingBase) { EntityLivingBase entitylivingbase1 = (EntityLivingBase) player.ridingEntity; yawOffset = this.interpolateRotation( - entitylivingbase1.prevRenderYawOffset, entitylivingbase1.renderYawOffset, partialTick); + entitylivingbase1.prevRenderYawOffset, + entitylivingbase1.renderYawOffset, + partialTick); pitch = MathHelper.wrapAngleTo180_float(yawRotation - yawOffset); if (pitch < -85.0F) { @@ -469,8 +482,8 @@ public class ArmorProxyClient extends ArmorProxyCommon { pitch = this.handleRotationFloat(player, partialTick); float bodyRotation = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTick; - float limbSwing = - player.prevLimbSwingAmount + (player.limbSwingAmount - player.prevLimbSwingAmount) * partialTick; + float limbSwing = player.prevLimbSwingAmount + + (player.limbSwingAmount - player.prevLimbSwingAmount) * partialTick; float limbSwingMod = player.limbSwing - player.limbSwingAmount * (1.0F - partialTick); // TPlayerStats stats = TPlayerStats.get(player); ArmorExtended armor = ArmorProxyClient.armorExtended; // TODO: Do this for every player, not just the client @@ -479,8 +492,7 @@ public class ArmorProxyClient extends ArmorProxyCommon { ModelBiped model = item.getArmorModel(player, armor.inventory[1], 4); if (item instanceof IAccessoryModel) { - this.mc - .getTextureManager() + this.mc.getTextureManager() .bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); model.render( @@ -499,8 +511,7 @@ public class ArmorProxyClient extends ArmorProxyCommon { ModelBiped model = item.getArmorModel(player, armor.inventory[3], 5); if (item instanceof IAccessoryModel) { - this.mc - .getTextureManager() + this.mc.getTextureManager() .bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); model.render( diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 7937471f..f307f34b 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -1,15 +1,17 @@ package tconstruct.armor; -import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.armor.inventory.*; import tconstruct.armor.player.TPlayerStats; import tconstruct.common.TProxyCommon; +import cpw.mods.fml.common.network.IGuiHandler; public class ArmorProxyCommon implements IGuiHandler { + public static final int inventoryGui = 100; public static final int armorGuiID = 101; public static final int knapsackGuiID = 102; diff --git a/src/main/java/tconstruct/armor/ArmorTickHandler.java b/src/main/java/tconstruct/armor/ArmorTickHandler.java index 49bffc1f..8c8165b5 100644 --- a/src/main/java/tconstruct/armor/ArmorTickHandler.java +++ b/src/main/java/tconstruct/armor/ArmorTickHandler.java @@ -1,10 +1,11 @@ package tconstruct.armor; +import net.minecraft.client.Minecraft; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; public class ArmorTickHandler { @@ -13,14 +14,15 @@ public class ArmorTickHandler { @SideOnly(Side.CLIENT) @SubscribeEvent public void tickEnd(ClientTickEvent event) { - /*TinkerWorld.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); - TinkerWorld.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); - TinkerWorld.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);*/ + /* + * TinkerWorld.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); + * TinkerWorld.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); + * TinkerWorld.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P); + */ if (mc.thePlayer != null && mc.thePlayer.onGround) ArmorProxyClient.controlInstance.landOnGround(); } /* - * @Override public EnumSet ticks () { return - * EnumSet.of(TickType.RENDER); } + * @Override public EnumSet ticks () { return EnumSet.of(TickType.RENDER); } */ } diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java index 82fb797a..70086056 100644 --- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java +++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.*; import net.minecraft.potion.*; + import tconstruct.armor.player.*; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 8ef19317..36d47ed9 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -1,11 +1,9 @@ package tconstruct.armor; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import java.util.EnumSet; + import mantle.pulsar.pulse.*; + import net.minecraft.block.Block; import net.minecraft.init.*; import net.minecraft.item.*; @@ -14,6 +12,7 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.ShapedOreRecipe; + import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; import tconstruct.armor.items.*; @@ -27,10 +26,15 @@ import tconstruct.modifiers.armor.*; import tconstruct.modifiers.tools.ModAttack; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Armory", description = "Modifyable armors, such as the traveller's gear.") public class TinkerArmor { + @SidedProxy(clientSide = "tconstruct.armor.ArmorProxyClient", serverSide = "tconstruct.armor.ArmorProxyCommon") public static ArmorProxyCommon proxy; @@ -41,12 +45,9 @@ public class TinkerArmor { public static Block dryingRack; // Wearables /* - public static Item heavyHelmet; - public static Item heavyChestplate; - public static Item heavyPants; - public static Item heavyBoots; - public static Item glove; - */ + * public static Item heavyHelmet; public static Item heavyChestplate; public static Item heavyPants; public static + * Item heavyBoots; public static Item glove; + */ public static Item knapsack; public static Item heartCanister; // Armor - basic @@ -99,15 +100,15 @@ public class TinkerArmor { GameRegistry.registerItem(TinkerArmor.knapsack, "knapsack"); LiquidCasting basinCasting = TConstruct.getBasinCasting(); - TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] {1, 2, 2, 1}, 3); - TinkerArmor.helmetWood = - new ArmorBasic(TinkerArmor.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); - TinkerArmor.chestplateWood = - new ArmorBasic(TinkerArmor.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); - TinkerArmor.leggingsWood = - new ArmorBasic(TinkerArmor.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); - TinkerArmor.bootsWood = - new ArmorBasic(TinkerArmor.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); + TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); + TinkerArmor.helmetWood = new ArmorBasic(TinkerArmor.materialWood, 0, "wood") + .setUnlocalizedName("tconstruct.helmetWood"); + TinkerArmor.chestplateWood = new ArmorBasic(TinkerArmor.materialWood, 1, "wood") + .setUnlocalizedName("tconstruct.chestplateWood"); + TinkerArmor.leggingsWood = new ArmorBasic(TinkerArmor.materialWood, 2, "wood") + .setUnlocalizedName("tconstruct.leggingsWood"); + TinkerArmor.bootsWood = new ArmorBasic(TinkerArmor.materialWood, 3, "wood") + .setUnlocalizedName("tconstruct.bootsWood"); GameRegistry.registerItem(TinkerArmor.helmetWood, "helmetWood"); GameRegistry.registerItem(TinkerArmor.chestplateWood, "chestplateWood"); GameRegistry.registerItem(TinkerArmor.leggingsWood, "leggingsWood"); @@ -149,10 +150,10 @@ public class TinkerArmor { private void craftingTableRecipes() { // Armor Recipes - Object[] helm = new String[] {"www", "w w"}; - Object[] chest = new String[] {"w w", "www", "www"}; - Object[] pants = new String[] {"www", "w w", "w w"}; - Object[] shoes = new String[] {"w w", "w w"}; + Object[] helm = new String[] { "www", "w w" }; + Object[] chest = new String[] { "w w", "www", "www" }; + Object[] pants = new String[] { "www", "w w", "w w" }; + Object[] shoes = new String[] { "w w", "w w" }; GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.helmetWood, helm, 'w', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.chestplateWood, chest, 'w', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.leggingsWood, pants, 'w', "logWood")); @@ -166,18 +167,27 @@ public class TinkerArmor { // GameRegistry.addRecipe(new ShapedOreRecipe(new // ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', // "ingotNaturalAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerArmor.heartCanister, 1, 0), + " # ", + "#B#", + " # ", + '#', + "ingotTin", + 'B', + Items.bone)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerArmor.diamondApple), - " d ", - "d#d", - " d ", - 'd', - "gemDiamond", - '#', - new ItemStack(Items.apple))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerArmor.diamondApple), + " d ", + "d#d", + " d ", + 'd', + "gemDiamond", + '#', + new ItemStack(Items.apple))); GameRegistry.addShapelessRecipe( new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), @@ -185,7 +195,8 @@ public class TinkerArmor { new ItemStack(TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1)); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerArmor.heartCanister, 1, 1), new ItemStack(TinkerArmor.heartCanister, 1, 3)); + new ItemStack(TinkerArmor.heartCanister, 1, 1), + new ItemStack(TinkerArmor.heartCanister, 1, 3)); GameRegistry.addShapelessRecipe( new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), @@ -194,17 +205,18 @@ public class TinkerArmor { // GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new // ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerArmor.knapsack, 1, 0), - "###", - "rmr", - "###", - '#', - new ItemStack(Items.leather), - 'r', - new ItemStack(TinkerTools.toughRod, 1, 2), - 'm', - "ingotGold")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerArmor.knapsack, 1, 0), + "###", + "rmr", + "###", + '#', + new ItemStack(Items.leather), + 'r', + new ItemStack(TinkerTools.toughRod, 1, 2), + 'm', + "ingotGold")); ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); GameRegistry.addRecipe( new ItemStack(TinkerArmor.knapsack, 1, 0), @@ -218,60 +230,74 @@ public class TinkerArmor { 'm', aluBrass); // Drying Rack Recipes - GameRegistry.addRecipe( - new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood")); + GameRegistry + .addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood")); // Temporary recipes ItemStack leather = new ItemStack(Items.leather); ItemStack glass = new ItemStack(Blocks.glass); ItemStack string = new ItemStack(Items.string); - GameRegistry.addRecipe(new ShapedOreRecipe( - travelGoggles.getDefaultItem(), - "# #", - "q#q", - "g g", - '#', - leather, - 'q', - "blockGlass", - 'g', - "ingotGold")); - GameRegistry.addRecipe(new ShapedOreRecipe( - travelWings.getDefaultItem(), - "g g", - "i#i", - "i i", - '#', - Items.ender_pearl, - 'g', - "ingotGold", - 'i', - "ingotBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe( - travelVest.getDefaultItem(), - "#w#", - "#i#", - "#w#", - '#', - leather, - 'i', - "ingotAluminum", - 'w', - new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe( - travelBoots.getDefaultItem(), "#s#", "#i#", "#s#", '#', leather, 's', string, 'i', "ingotAluminum")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + travelGoggles.getDefaultItem(), + "# #", + "q#q", + "g g", + '#', + leather, + 'q', + "blockGlass", + 'g', + "ingotGold")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + travelWings.getDefaultItem(), + "g g", + "i#i", + "i i", + '#', + Items.ender_pearl, + 'g', + "ingotGold", + 'i', + "ingotBronze")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + travelVest.getDefaultItem(), + "#w#", + "#i#", + "#w#", + '#', + leather, + 'i', + "ingotAluminum", + 'w', + new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + travelBoots.getDefaultItem(), + "#s#", + "#i#", + "#s#", + '#', + leather, + 's', + string, + 'i', + "ingotAluminum")); GameRegistry.addShapedRecipe(travelGlove.getDefaultItem(), " #", "###", " ##", '#', leather); - GameRegistry.addRecipe(new ShapedOreRecipe( - travelBelt.getDefaultItem(), - "###", - "ici", - "###", - '#', - leather, - 'c', - "chestWood", - 'i', - "ingotAluminum")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + travelBelt.getDefaultItem(), + "###", + "ici", + "###", + '#', + leather, + 'c', + "chestWood", + 'i', + "ingotAluminum")); } protected static void addRecipesForDryingRack() { @@ -284,9 +310,13 @@ public class TinkerArmor { DryingRackRecipes.addDryingRecipe(Items.fish, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 4)); DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 5)); DryingRackRecipes.addDryingRecipe( - new ItemStack(TinkerWorld.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 6)); + new ItemStack(TinkerWorld.strangeFood, 1, 0), + 20 * 60 * 5, + new ItemStack(TinkerArmor.jerky, 1, 6)); DryingRackRecipes.addDryingRecipe( - new ItemStack(TinkerWorld.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 7)); + new ItemStack(TinkerWorld.strangeFood, 1, 1), + 20 * 60 * 5, + new ItemStack(TinkerArmor.jerky, 1, 7)); // DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5), // 20 * 60 * 10, Item.leather); @@ -298,130 +328,113 @@ public class TinkerArmor { // Travel gear modifiers // MultiType ModifyBuilder.registerModifier( - new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { - new ItemStack(Items.ghast_tear), - new ItemStack(TinkerWorld.slimeGel, 1, 0), - new ItemStack(Blocks.piston) - })); + new TravelModDoubleJump( + EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), + new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Blocks.piston) })); ModifyBuilder.registerModifier( - new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { - new ItemStack(Items.ghast_tear), - new ItemStack(TinkerWorld.slimeGel, 1, 1), - new ItemStack(Blocks.piston) - })); - ModifyBuilder.registerModifier(new AModInteger( - 4, - "Moss", - EnumSet.of(ArmorPart.Legs, ArmorPart.Feet, ArmorPart.Chest, ArmorPart.Head), - new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 6)}, - 3, - "\u00a72", - StatCollector.translateToLocal("modifier.tool.moss"))); + new TravelModDoubleJump( + EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), + new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), + new ItemStack(Blocks.piston) })); + ModifyBuilder.registerModifier( + new AModInteger( + 4, + "Moss", + EnumSet.of(ArmorPart.Legs, ArmorPart.Feet, ArmorPart.Chest, ArmorPart.Head), + new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, + 3, + "\u00a72", + StatCollector.translateToLocal("modifier.tool.moss"))); ModifyBuilder.registerModifier(new TravelModRepair()); TConstructRegistry.registerActiveArmorMod(new ActiveTinkerArmor()); // Head - ModifyBuilder.registerModifier(new AModBoolean( - 0, - "Night Vision", - EnumSet.of(ArmorPart.Head), - new ItemStack[] { - new ItemStack(Items.flint_and_steel), - new ItemStack(Items.potionitem, 1, 8198), - new ItemStack(Items.golden_carrot) - }, - "\u00a78", - "Night Vision")); + ModifyBuilder.registerModifier( + new AModBoolean( + 0, + "Night Vision", + EnumSet.of(ArmorPart.Head), + new ItemStack[] { new ItemStack(Items.flint_and_steel), + new ItemStack(Items.potionitem, 1, 8198), new ItemStack(Items.golden_carrot) }, + "\u00a78", + "Night Vision")); // Chest - ModifyBuilder.registerModifier(new AModInteger( - 0, - "Perfect Dodge", - EnumSet.of(ArmorPart.Chest), - new ItemStack[] { - new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar) - }, - 1, - "\u00a7d", - "Perfect Dodge")); - ModifyBuilder.registerModifier(new AModBoolean( - 1, - "Stealth", - EnumSet.of(ArmorPart.Chest), - new ItemStack[] { - new ItemStack(Items.fermented_spider_eye), - new ItemStack(Items.ender_eye), - new ItemStack(Items.potionitem, 1, 8206), - new ItemStack(Items.golden_carrot) - }, - "\u00a78", - "Stealth")); + ModifyBuilder.registerModifier( + new AModInteger( + 0, + "Perfect Dodge", + EnumSet.of(ArmorPart.Chest), + new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), + new ItemStack(Items.sugar) }, + 1, + "\u00a7d", + "Perfect Dodge")); + ModifyBuilder.registerModifier( + new AModBoolean( + 1, + "Stealth", + EnumSet.of(ArmorPart.Chest), + new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), + new ItemStack(Items.potionitem, 1, 8206), new ItemStack(Items.golden_carrot) }, + "\u00a78", + "Stealth")); // Wings ItemStack feather = new ItemStack(Items.feather); - ModifyBuilder.registerModifier(new AModInteger( - 1, - "Feather Fall", - EnumSet.of(ArmorPart.Legs), - new ItemStack[] { - new ItemStack(TinkerWorld.slimeGel, 1, 0), - new ItemStack(Items.ender_pearl), - feather, - feather, - feather, - feather, - feather, - feather - }, - 1, - "\u00a7f", - "Feather Fall")); - ModifyBuilder.registerModifier(new AModInteger( - 1, - "Feather Fall", - EnumSet.of(ArmorPart.Legs), - new ItemStack[] { - new ItemStack(TinkerWorld.slimeGel, 1, 1), - new ItemStack(Items.ender_pearl), - feather, - feather, - feather, - feather, - feather, - feather - }, - 1, - "\u00a7f", - "Feather Fall")); + ModifyBuilder.registerModifier( + new AModInteger( + 1, + "Feather Fall", + EnumSet.of(ArmorPart.Legs), + new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.ender_pearl), + feather, feather, feather, feather, feather, feather }, + 1, + "\u00a7f", + "Feather Fall")); + ModifyBuilder.registerModifier( + new AModInteger( + 1, + "Feather Fall", + EnumSet.of(ArmorPart.Legs), + new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Items.ender_pearl), + feather, feather, feather, feather, feather, feather }, + 1, + "\u00a7f", + "Feather Fall")); // Feet - ModifyBuilder.registerModifier(new AModBoolean( - 1, - "WaterWalk", - EnumSet.of(ArmorPart.Feet), - new ItemStack[] {new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily)}, - "\u00a79", - "Water-Walking")); - ModifyBuilder.registerModifier(new AModLeadBoots(new ItemStack[] {new ItemStack(Blocks.iron_block)})); - ModifyBuilder.registerModifier(new AModInteger( - 3, - "Slimy Soles", - EnumSet.of(ArmorPart.Feet), - new ItemStack[] {new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0)}, - 1, - "\u00a7a", - "Slimy Soles")); + ModifyBuilder.registerModifier( + new AModBoolean( + 1, + "WaterWalk", + EnumSet.of(ArmorPart.Feet), + new ItemStack[] { new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily) }, + "\u00a79", + "Water-Walking")); + ModifyBuilder.registerModifier(new AModLeadBoots(new ItemStack[] { new ItemStack(Blocks.iron_block) })); + ModifyBuilder.registerModifier( + new AModInteger( + 3, + "Slimy Soles", + EnumSet.of(ArmorPart.Feet), + new ItemStack[] { new ItemStack(TinkerWorld.slimePad, 1, 0), + new ItemStack(TinkerWorld.slimePad, 1, 0) }, + 1, + "\u00a7a", + "Slimy Soles")); // Glove ModifyBuilder.registerModifier( - new GloveSpeed(1, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); + new GloveSpeed(1, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); // ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new // ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) })); modAttackGlove = new ModAttack( "Quartz", 2, - new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, - new int[] {1, 4}, + new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, + new int[] { 1, 4 }, 50, 50, "Accessory"); diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index 203b9d29..a84c1ffa 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -1,7 +1,7 @@ package tconstruct.armor; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Locale; + import net.minecraft.entity.boss.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.IMob; @@ -12,12 +12,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; + import tconstruct.TConstruct; import tconstruct.armor.items.TravelWings; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.ArmourGuiSyncPacket; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TinkerArmorEvents { @@ -27,8 +29,7 @@ public class TinkerArmorEvents { if (!event.entityLiving.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) return; - if (TConstruct.random.nextInt(200) == 0 - && event.entityLiving instanceof IMob + if (TConstruct.random.nextInt(200) == 0 && event.entityLiving instanceof IMob && event.source.damageType.equals("player")) { ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); EntityItem entityitem = new EntityItem( @@ -67,9 +68,8 @@ public class TinkerArmorEvents { if (event.entityPlayer == null) return; ItemStack glove = TPlayerStats.get(event.entityPlayer).armor.getStackInSlot(1); - if (event.entityPlayer - .worldObj - .isRemote) { // todo: sync extended inventory with clients so this stuff and rendering is done + if (event.entityPlayer.worldObj.isRemote) { // todo: sync extended inventory with clients so this stuff and + // rendering is done // properly... if (ArmorProxyClient.armorExtended != null) glove = ArmorProxyClient.armorExtended.getStackInSlot(1); else glove = null; @@ -97,8 +97,8 @@ public class TinkerArmorEvents { public void slimefall(LivingFallEvent event) { ItemStack boots = event.entityLiving.getEquipmentInSlot(1); if (boots != null && boots.getItem() instanceof IModifyable) { - NBTTagCompound tag = - boots.getTagCompound().getCompoundTag(((IModifyable) boots.getItem()).getBaseTagName()); + NBTTagCompound tag = boots.getTagCompound() + .getCompoundTag(((IModifyable) boots.getItem()).getBaseTagName()); int sole = tag.getInteger("Slimy Soles"); if (sole > 0) { event.distance /= (1 + sole); diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index 54279417..da30d01c 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -1,8 +1,9 @@ package tconstruct.armor.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.material.Material; import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; @@ -11,11 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.armor.modelblock.DryingRackRender; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; +import cpw.mods.fml.relauncher.*; public class DryingRack extends InventoryBlock { @@ -63,8 +66,8 @@ public class DryingRack extends InventoryBlock { /* Activation */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float clickX, + float clickY, float clickZ) { return activateDryingRack(world, x, y, z, player); } @@ -175,8 +178,8 @@ public class DryingRack extends InventoryBlock { } @Override - public void addCollisionBoxesToList( - World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + Entity entity) { this.setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } @@ -189,15 +192,8 @@ public class DryingRack extends InventoryBlock { @Override public String[] getTextureNames() { - return new String[] { - "castingtable_top", - "castingtable_side", - "castingtable_bottom", - "faucet", - "blockcast_top", - "blockcast_side", - "blockcast_bottom" - }; + return new String[] { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", + "blockcast_side", "blockcast_bottom" }; } @Override @@ -234,48 +230,33 @@ public class DryingRack extends InventoryBlock { } /* - * @Override public boolean shouldSideBeRendered (IBlockAccess - * par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; - * } + * @Override public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int + * par5) { return true; } */ /* - * @Override public void getSubBlocks (int id, CreativeTabs tab, List list) - * { for (int iter = 0; iter < 3; iter++) { list.add(new ItemStack(id, 1, - * iter)); } } + * @Override public void getSubBlocks (int id, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { + * list.add(new ItemStack(id, 1, iter)); } } */ /* - * @Override public void setBlockBoundsBasedOnState (IBlockAccess world, int - * x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta - * != 1) { this.setBlockBounds(0, 0, 0, 1, 1, 1); } else { FaucetLogic logic - * = (FaucetLogic) world.getBlockTileEntity(x, y, z); float xMin = 0.25F; - * float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - * - * switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; zMax = 1.0F; - * break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; - * xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; } - * - * this.setBlockBounds(xMin, 0.25F, zMin, xMax, 0.625F, zMax); } } + * @Override public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) { int meta = + * world.getBlockMetadata(x, y, z); if (meta != 1) { this.setBlockBounds(0, 0, 0, 1, 1, 1); } else { FaucetLogic + * logic = (FaucetLogic) world.getBlockTileEntity(x, y, z); float xMin = 0.25F; float xMax = 0.75F; float zMin = + * 0.25F; float zMax = 0.75F; switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; zMax = 1.0F; break; case + * 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; + * break; } this.setBlockBounds(xMin, 0.25F, zMin, xMax, 0.625F, zMax); } } */ /* - * @Override public AxisAlignedBB getCollisionBoundingBoxFromPool (World - * world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - * if (meta != 1) { return AxisAlignedBB.getBoundingBox(x, y, z, x + - * 1, y + 1, z + 1); } else { FaucetLogic logic = (FaucetLogic) - * world.getBlockTileEntity(x, y, z); if (logic != null) { float xMin = - * 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - * - * switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; zMax = 1.0F; - * break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; - * xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; } - * - * return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), - * (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + - * xMax), (double) y + 0.625, (double) ((float) z + zMax)); } } - * - * return super.getCollisionBoundingBoxFromPool(world, x, y, z); } + * @Override public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { int meta = + * world.getBlockMetadata(x, y, z); if (meta != 1) { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + + * 1); } else { FaucetLogic logic = (FaucetLogic) world.getBlockTileEntity(x, y, z); if (logic != null) { float xMin + * = 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; switch (logic.getRenderDirection()) { case + * 2: zMin = 0.625F; zMax = 1.0F; break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; xMax = + * 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; } return AxisAlignedBB.getBoundingBox((double) ((float) x + + * xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, (double) + * ((float) z + zMax)); } } return super.getCollisionBoundingBoxFromPool(world, x, y, z); } */ /* Redstone */ diff --git a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java index 78aacaf3..9679976a 100644 --- a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java @@ -5,12 +5,15 @@ import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.*; + import tconstruct.armor.inventory.ArmorExtendedContainer; import tconstruct.armor.player.ArmorExtended; import tconstruct.client.tabs.*; public class ArmorExtendedGui extends InventoryEffectRenderer { + public InventoryPlayer inv; public ArmorExtended stats; @@ -140,9 +143,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer { } /* - * protected void keyTyped(char par1, int par2) { if (par2 == - * TControls.armorKey.keyCode) { this.mc.thePlayer.closeScreen(); } - * - * super.keyTyped(par1, par2); } + * protected void keyTyped(char par1, int par2) { if (par2 == TControls.armorKey.keyCode) { + * this.mc.thePlayer.closeScreen(); } super.keyTyped(par1, par2); } */ } diff --git a/src/main/java/tconstruct/armor/gui/KnapsackGui.java b/src/main/java/tconstruct/armor/gui/KnapsackGui.java index 6713110b..000b93dc 100644 --- a/src/main/java/tconstruct/armor/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/armor/gui/KnapsackGui.java @@ -3,12 +3,15 @@ package tconstruct.armor.gui; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.*; + import org.lwjgl.opengl.GL11; + import tconstruct.armor.inventory.KnapsackContainer; import tconstruct.armor.player.KnapsackInventory; import tconstruct.client.tabs.*; public class KnapsackGui extends InventoryEffectRenderer { + public InventoryPlayer inv; public KnapsackInventory stats; @@ -44,8 +47,8 @@ public class KnapsackGui extends InventoryEffectRenderer { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); - fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); @@ -60,9 +63,7 @@ public class KnapsackGui extends InventoryEffectRenderer { } /* - * protected void keyTyped(char par1, int par2) { if (par2 == - * TControls.armorKey.keyCode) { this.mc.thePlayer.closeScreen(); } - * - * super.keyTyped(par1, par2); } + * protected void keyTyped(char par1, int par2) { if (par2 == TControls.armorKey.keyCode) { + * this.mc.thePlayer.closeScreen(); } super.keyTyped(par1, par2); } */ } diff --git a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 1c365845..8746cc36 100644 --- a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -3,10 +3,12 @@ package tconstruct.armor.inventory; import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import tconstruct.armor.player.ArmorExtended; import tconstruct.smeltery.inventory.ActiveContainer; public class ArmorExtendedContainer extends ActiveContainer { + public InventoryPlayer invPlayer; public ArmorExtended armor; @@ -24,13 +26,14 @@ public class ArmorExtendedContainer extends ActiveContainer { this.addSlotToContainer(new SlotAccessory(armor, 5, 152, 35, 10)); this.addSlotToContainer(new SlotAccessory(armor, 6, 152, 17, 10)); for (int playerArmor = 0; playerArmor < 4; ++playerArmor) { - this.addSlotToContainer(new SlotArmorCopy( - this, - inventoryplayer, - inventoryplayer.getSizeInventory() - 1 - playerArmor, - 98, - 8 + playerArmor * 18, - playerArmor)); + this.addSlotToContainer( + new SlotArmorCopy( + this, + inventoryplayer, + inventoryplayer.getSizeInventory() - 1 - playerArmor, + 98, + 8 + playerArmor * 18, + playerArmor)); } for (int column = 0; column < 3; column++) { diff --git a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index d391b573..71e66893 100644 --- a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -3,9 +3,11 @@ package tconstruct.armor.inventory; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.armor.player.KnapsackInventory; public class KnapsackContainer extends Container { + public KnapsackInventory backpack; public int progress = 0; public int fuel = 0; diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index 6e95c1e3..5476f521 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -2,9 +2,11 @@ package tconstruct.armor.inventory; import net.minecraft.inventory.*; import net.minecraft.item.*; + import tconstruct.library.accessory.IAccessory; public class SlotAccessory extends Slot { + private final int slotID; private final int slotStackLimit; diff --git a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java index 9dc58493..92508e82 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java @@ -1,20 +1,20 @@ package tconstruct.armor.inventory; -import cpw.mods.fml.relauncher.*; import net.minecraft.inventory.*; import net.minecraft.item.*; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.*; + public class SlotArmorCopy extends Slot { + /** - * The armor type that can be placed on that slot, it uses the same values - * of armorType field on ItemArmor. + * The armor type that can be placed on that slot, it uses the same values of armorType field on ItemArmor. */ final int armorType; /** - * The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner - * class. + * The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class. */ final Container parent; @@ -25,8 +25,8 @@ public class SlotArmorCopy extends Slot { } /** - * Returns the maximum stack size for a given slot (usually the same as - * getInventoryStackLimit(), but 1 in the case of armor slots) + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) */ @Override public int getSlotStackLimit() { @@ -34,8 +34,7 @@ public class SlotArmorCopy extends Slot { } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack par1ItemStack) { diff --git a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java index 272caeef..b9bf9bc8 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java @@ -2,6 +2,7 @@ package tconstruct.armor.inventory; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.mechworks.landmine.behavior.Behavior; public class SlotBehavedOnly extends Slot { diff --git a/src/main/java/tconstruct/armor/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java index b6be015b..e2281f5d 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -2,9 +2,11 @@ package tconstruct.armor.inventory; import net.minecraft.inventory.*; import net.minecraft.item.*; + import tconstruct.library.accessory.IHealthAccessory; public class SlotCanister extends Slot { + private final int slotID; public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) { @@ -13,8 +15,8 @@ public class SlotCanister extends Slot { } /** - * Returns the maximum stack size for a given slot (usually the same as - * getInventoryStackLimit(), but 1 in the case of armor slots) + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) */ @Override public int getSlotStackLimit() { @@ -22,8 +24,7 @@ public class SlotCanister extends Slot { } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack par1ItemStack) { diff --git a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 46464c48..0af9278f 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -2,16 +2,18 @@ package tconstruct.armor.inventory; import net.minecraft.inventory.*; import net.minecraft.item.*; + import tconstruct.armor.items.Knapsack; public class SlotKnapsack extends Slot { + public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); } /** - * Returns the maximum stack size for a given slot (usually the same as - * getInventoryStackLimit(), but 1 in the case of armor slots) + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) */ @Override public int getSlotStackLimit() { @@ -19,8 +21,7 @@ public class SlotKnapsack extends Slot { } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack par1ItemStack) { diff --git a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java index 2648451d..1840a994 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java @@ -10,8 +10,7 @@ public class SlotOnlyTake extends Slot { } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack stack) { diff --git a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java index b6e4ee7a..50978a3d 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java @@ -1,6 +1,7 @@ package tconstruct.armor.inventory; import mantle.blocks.BlockUtils; + import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/armor/inventory/SlotUnused.java b/src/main/java/tconstruct/armor/inventory/SlotUnused.java index 14886b50..7f532cea 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotUnused.java +++ b/src/main/java/tconstruct/armor/inventory/SlotUnused.java @@ -4,13 +4,14 @@ import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class SlotUnused extends Slot { + public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); } /** - * Returns the maximum stack size for a given slot (usually the same as - * getInventoryStackLimit(), but 1 in the case of armor slots) + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) */ @Override public int getSlotStackLimit() { @@ -18,8 +19,7 @@ public class SlotUnused extends Slot { } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack par1ItemStack) { diff --git a/src/main/java/tconstruct/armor/items/ArmorBasic.java b/src/main/java/tconstruct/armor/items/ArmorBasic.java index 08cace29..415774e6 100644 --- a/src/main/java/tconstruct/armor/items/ArmorBasic.java +++ b/src/main/java/tconstruct/armor/items/ArmorBasic.java @@ -15,12 +15,12 @@ public class ArmorBasic extends ItemArmor { @Override public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" - + (this.armorType == 0 - ? "helmet" - : this.armorType == 1 - ? "chestplate" - : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = par1IconRegister.registerIcon( + "tinker:armor/" + textureName + + "_" + + (this.armorType == 0 ? "helmet" + : this.armorType == 1 ? "chestplate" + : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); } @Override diff --git a/src/main/java/tconstruct/armor/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java index ceeac537..f3ec8e71 100644 --- a/src/main/java/tconstruct/armor/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -1,13 +1,16 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; + import tconstruct.library.*; +import cpw.mods.fml.relauncher.*; public class ArmorPattern extends CraftingItem implements ItemBlocklike { @@ -38,7 +41,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike { baseIcon = iconRegister.registerIcon("tinker:" + folder + "armor_cast"); } - private static final String[] patternName = new String[] {"helmet", "chestplate", "leggings", "boots"}; + private static final String[] patternName = new String[] { "helmet", "chestplate", "leggings", "boots" }; @Override public void getSubItems(Item block, CreativeTabs tab, List list) { diff --git a/src/main/java/tconstruct/armor/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java index c842f4ee..b1418636 100644 --- a/src/main/java/tconstruct/armor/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -1,6 +1,5 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; @@ -8,10 +7,13 @@ import net.minecraft.potion.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class DiamondApple extends ItemFood { + public IIcon[] icons; - public String[] textureNames = new String[] {"food/apple_diamond"}; - public String[] itemNames = new String[] {"apple.diamond"}; + public String[] textureNames = new String[] { "food/apple_diamond" }; + public String[] itemNames = new String[] { "apple.diamond" }; public DiamondApple() { super(4, 2.0F, false); @@ -64,9 +66,7 @@ public class DiamondApple extends ItemFood { @Override public String getUnlocalizedName(ItemStack itemstack) { return "item.food." - + itemNames[ - (itemstack.getItemDamage() >= itemNames.length || itemstack.getItemDamage() < 0) - ? (0) - : (itemstack.getItemDamage())]; + + itemNames[(itemstack.getItemDamage() >= itemNames.length || itemstack.getItemDamage() < 0) ? (0) + : (itemstack.getItemDamage())]; } } diff --git a/src/main/java/tconstruct/armor/items/Glove.java b/src/main/java/tconstruct/armor/items/Glove.java index d15ab375..1207cc39 100644 --- a/src/main/java/tconstruct/armor/items/Glove.java +++ b/src/main/java/tconstruct/armor/items/Glove.java @@ -2,9 +2,11 @@ package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; + import tconstruct.library.TConstructRegistry; public class Glove extends Item { + public Glove() { super(); this.setCreativeTab(TConstructRegistry.materialTab); diff --git a/src/main/java/tconstruct/armor/items/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java index a74e379c..f43ab4da 100644 --- a/src/main/java/tconstruct/armor/items/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -1,31 +1,27 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.armor.player.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IHealthAccessory; +import cpw.mods.fml.relauncher.*; public class HeartCanister extends CraftingItem implements IHealthAccessory { public HeartCanister() { super( - new String[] {"empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", "green" - }, - new String[] { - "canister_empty", - "miniheart_red", - "canister_red", - "miniheart_yellow", - "canister_yellow", - "miniheart_green", - "canister_green" - }, + new String[] { "empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", + "green" }, + new String[] { "canister_empty", "miniheart_red", "canister_red", "miniheart_yellow", "canister_yellow", + "miniheart_green", "canister_green" }, "", "tinker", TConstructRegistry.materialTab); diff --git a/src/main/java/tconstruct/armor/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java index 06f0d49a..6f9603d6 100644 --- a/src/main/java/tconstruct/armor/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -1,31 +1,26 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.*; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.world.items.SpecialFood; +import cpw.mods.fml.relauncher.*; public class Jerky extends SpecialFood { - public static String[] textureNames = - new String[] {"beef", "chicken", "pork", "mutton", "fish", "monster", "blueslime", "blood"}; - public static String[] itemNames = new String[] { - "jerky.beef", - "jerky.chicken", - "jerky.pig", - "jerky.sheep", - "jerky.fish", - "jerky.zombie", - "jerky.blueslime", - "jerky.blood" - }; - public static int[] hunger = new int[] {8, 6, 8, 6, 5, 4, 6, 4}; - public static float[] saturation = new float[] {1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.4f}; - public static int[] overhaulHunger = new int[] {1, 1, 1, 1, 1, 1, 1, 1}; + + public static String[] textureNames = new String[] { "beef", "chicken", "pork", "mutton", "fish", "monster", + "blueslime", "blood" }; + public static String[] itemNames = new String[] { "jerky.beef", "jerky.chicken", "jerky.pig", "jerky.sheep", + "jerky.fish", "jerky.zombie", "jerky.blueslime", "jerky.blood" }; + public static int[] hunger = new int[] { 8, 6, 8, 6, 5, 4, 6, 4 }; + public static float[] saturation = new float[] { 1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.4f }; + public static int[] overhaulHunger = new int[] { 1, 1, 1, 1, 1, 1, 1, 1 }; public Jerky(boolean hungerOverhaul) { super(hungerOverhaul ? overhaulHunger : hunger, saturation, itemNames, textureNames); diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java index 209e962f..c1b9ec7f 100644 --- a/src/main/java/tconstruct/armor/items/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -1,18 +1,26 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; +import cpw.mods.fml.relauncher.*; public class Knapsack extends CraftingItem implements IAccessory { public Knapsack() { - super(new String[] {"knapsack"}, new String[] {"knapsack"}, "armor/", "tinker", TConstructRegistry.materialTab); + super( + new String[] { "knapsack" }, + new String[] { "knapsack" }, + "armor/", + "tinker", + TConstructRegistry.materialTab); this.setMaxStackSize(10); } @@ -31,15 +39,11 @@ public class Knapsack extends CraftingItem implements IAccessory { // TODO feel fix this so that stuff ticks in backpacks /* - * @Override public void onArmorTickUpdate (World world, EntityPlayer - * player, ItemStack itemStack) { TPlayerStats stats = - * TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); - * KnapsackInventory inv = stats.knapsack; - * - * if (stats != null && inv != null) { for (int i = 0; i < - * inv.getSizeInventory(); i++) { if (inv.getStackInSlot(i) != null) { - * inv.getStackInSlot(i).getItem().onUpdate(inv.getStackInSlot(i), - * player.worldObj, player, i, false); } } } } + * @Override public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack) { TPlayerStats + * stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); KnapsackInventory inv = stats.knapsack; + * if (stats != null && inv != null) { for (int i = 0; i < inv.getSizeInventory(); i++) { if (inv.getStackInSlot(i) + * != null) { inv.getStackInSlot(i).getItem().onUpdate(inv.getStackInSlot(i), player.worldObj, player, i, false); } + * } } } */ } diff --git a/src/main/java/tconstruct/armor/items/TArmorBase.java b/src/main/java/tconstruct/armor/items/TArmorBase.java index b6bd8d69..8bc3b193 100644 --- a/src/main/java/tconstruct/armor/items/TArmorBase.java +++ b/src/main/java/tconstruct/armor/items/TArmorBase.java @@ -1,6 +1,5 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -10,11 +9,14 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class TArmorBase extends ItemArmor // implements ISpecialArmor { + IIcon[] icons; - String[] iconNames = {"wood_boots"}; + String[] iconNames = { "wood_boots" }; // static Minecraft mc = Minecraft.getMinecraft(); // private ModelBiped modelArmor; @@ -33,21 +35,15 @@ public class TArmorBase extends ItemArmor public void onArmorTickUpdate(World world, EntityPlayer player, ItemStack itemStack) {} /** - * Called by RenderBiped and RenderPlayer to determine the armor texture - * that should be use for the currently equiped item. This will only be - * called on instances of ItemArmor. + * Called by RenderBiped and RenderPlayer to determine the armor texture that should be use for the currently + * equiped item. This will only be called on instances of ItemArmor. * * Returning null from this function will use the default value. * - * @param stack - * ItemStack for the equpt armor - * @param entity - * The entity wearing the armor - * @param slot - * The slot the armor is in - * @param layer - * The render layer, either 1 or 2, 2 is only used for CLOTH - * armor by default + * @param stack ItemStack for the equpt armor + * @param entity The entity wearing the armor + * @param slot The slot the armor is in + * @param layer The render layer, either 1 or 2, 2 is only used for CLOTH armor by default * @return Path of texture to bind, or null to use default */ @Override @@ -59,12 +55,9 @@ public class TArmorBase extends ItemArmor /** * Override this method to have an item handle its own armor rendering. * - * @param entityLiving - * The entity wearing the armor - * @param itemStack - * The itemStack to render the model of - * @param armorSlot - * 0=head, 1=torso, 2=legs, 3=feet + * @param entityLiving The entity wearing the armor + * @param itemStack The itemStack to render the model of + * @param armorSlot 0=head, 1=torso, 2=legs, 3=feet * * @return A ModelBiped to render instead of the default */ @@ -97,17 +90,11 @@ public class TArmorBase extends ItemArmor } /* - * @Override public ArmorProperties getProperties (EntityLiving player, - * ItemStack armor, DamageSource source, double damage, int slot) { // TODO - * Auto-generated method stub return null; } - * - * @Override public int getArmorDisplay (EntityPlayer player, ItemStack - * armor, int slot) { // TODO Auto-generated method stub return 0; } - * - * @Override public void damageArmor (EntityLiving entity, ItemStack stack, - * DamageSource source, int damage, int slot) { // TODO Auto-generated - * method stub - * - * } + * @Override public ArmorProperties getProperties (EntityLiving player, ItemStack armor, DamageSource source, double + * damage, int slot) { // TODO Auto-generated method stub return null; } + * @Override public int getArmorDisplay (EntityPlayer player, ItemStack armor, int slot) { // TODO Auto-generated + * method stub return 0; } + * @Override public void damageArmor (EntityLiving entity, ItemStack stack, DamageSource source, int damage, int + * slot) { // TODO Auto-generated method stub } */ } diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index e5d23679..3ea1d2df 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -1,7 +1,7 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; @@ -10,11 +10,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import tconstruct.armor.ArmorProxyClient; import tconstruct.client.ArmorControls; import tconstruct.library.accessory.*; +import cpw.mods.fml.relauncher.*; public class TravelBelt extends AccessoryCore implements IAccessoryModel { + public TravelBelt() { super("travelgear/travel_belt"); } @@ -48,7 +51,8 @@ public class TravelBelt extends AccessoryCore implements IAccessoryModel { if (!stack.hasTagCompound()) return; list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.ability")); - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.control") - + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); + list.add( + "\u00a76" + StatCollector.translateToLocal("armor.travelbelt.control") + + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); } } diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index ceac2f0c..42625d7a 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -1,8 +1,7 @@ package tconstruct.armor.items; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; @@ -13,16 +12,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.TinkerArmor; import tconstruct.library.armor.*; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; -@Optional.InterfaceList({ - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer"), - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles") -}) +@Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer"), + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles") }) public class TravelGear extends ArmorCore implements IRevealer, IGoggles { public TravelGear(ArmorPart part) { @@ -100,12 +100,14 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" - + (this.armorType == 0 - ? "goggles" - : this.armorType == 1 - ? "vest" - : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = iconRegister.registerIcon( + "tinker:" + textureFolder + + "/" + + textureName + + "_" + + (this.armorType == 0 ? "goggles" + : this.armorType == 1 ? "vest" + : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } @@ -121,16 +123,16 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles { @Override @SideOnly(Side.CLIENT) protected void registerModifiers(IIconRegister iconRegister) // temporary - { + { switch (armorType) { case 0: modifiers = new IIcon[5]; - modifiers[0] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision"); - modifiers[1] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1"); - modifiers[2] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2"); + modifiers[0] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision"); + modifiers[1] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1"); + modifiers[2] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2"); modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss"); break; case 1: @@ -141,19 +143,19 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles { break; case 2: modifiers = new IIcon[5]; - modifiers[0] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); - modifiers[1] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); + modifiers[0] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); + modifiers[1] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); break; case 3: modifiers = new IIcon[5]; - modifiers[0] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump"); + modifiers[0] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump"); modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk"); - modifiers[2] = - iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight"); + modifiers[2] = iconRegister + .registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight"); modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole"); modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss"); break; @@ -166,10 +168,14 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles { switch (armorPart) { case Head: - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") - + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") - + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); + list.add( + "\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") + + GameSettings + .getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); + list.add( + "\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") + + GameSettings.getKeyDisplayString( + tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); break; case Chest: list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability")); diff --git a/src/main/java/tconstruct/armor/items/TravelGlove.java b/src/main/java/tconstruct/armor/items/TravelGlove.java index 465233c8..ab83e5a6 100644 --- a/src/main/java/tconstruct/armor/items/TravelGlove.java +++ b/src/main/java/tconstruct/armor/items/TravelGlove.java @@ -1,15 +1,17 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.util.*; + import tconstruct.armor.ArmorProxyClient; import tconstruct.library.accessory.*; +import cpw.mods.fml.relauncher.*; public class TravelGlove extends AccessoryCore implements IAccessoryModel { + public TravelGlove() { super("travelgear/travel_glove"); } @@ -44,6 +46,6 @@ public class TravelGlove extends AccessoryCore implements IAccessoryModel { @Override public String[] getTraits() { - return new String[] {"accessory", "glove"}; + return new String[] { "accessory", "glove" }; } } diff --git a/src/main/java/tconstruct/armor/items/TravelWings.java b/src/main/java/tconstruct/armor/items/TravelWings.java index cf242661..1525e4b6 100644 --- a/src/main/java/tconstruct/armor/items/TravelWings.java +++ b/src/main/java/tconstruct/armor/items/TravelWings.java @@ -1,7 +1,5 @@ package tconstruct.armor.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import tconstruct.library.armor.ArmorPart; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TravelWings extends TravelGear { @@ -26,10 +27,10 @@ public class TravelWings extends TravelGear { modifiers[0] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); modifiers[1] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); modifiers[4] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); - /*modifiers = new IIcon[3]; - modifiers[0] = IIconRegister.registerIcon(base + "slimewings"); - modifiers[1] = IIconRegister.registerIcon(base + "piston"); - modifiers[2] = IIconRegister.registerIcon(base + "pearl");*/ + /* + * modifiers = new IIcon[3]; modifiers[0] = IIconRegister.registerIcon(base + "slimewings"); modifiers[1] = + * IIconRegister.registerIcon(base + "piston"); modifiers[2] = IIconRegister.registerIcon(base + "pearl"); + */ } @Override diff --git a/src/main/java/tconstruct/armor/model/BeltModel.java b/src/main/java/tconstruct/armor/model/BeltModel.java index c9011e54..483528d7 100644 --- a/src/main/java/tconstruct/armor/model/BeltModel.java +++ b/src/main/java/tconstruct/armor/model/BeltModel.java @@ -4,6 +4,7 @@ import net.minecraft.client.model.*; import net.minecraft.entity.Entity; public class BeltModel extends ModelBiped { + ModelRenderer Buckle; ModelRenderer FrontRight; ModelRenderer FrontLeft; @@ -57,11 +58,9 @@ public class BeltModel extends ModelBiped { setRotationAngles(f, f1, f2, f3, f4, f5, entity); bipedBody.render(f5); // Buckle.render(f5); - /*FrontRight.render(f5); - FrontLeft.render(f5); - SideRight.render(f5); - SideLeft.render(f5); - Back.render(f5);*/ + /* + * FrontRight.render(f5); FrontLeft.render(f5); SideRight.render(f5); SideLeft.render(f5); Back.render(f5); + */ } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/tconstruct/armor/model/BootBump.java b/src/main/java/tconstruct/armor/model/BootBump.java index 8d808d37..79104166 100644 --- a/src/main/java/tconstruct/armor/model/BootBump.java +++ b/src/main/java/tconstruct/armor/model/BootBump.java @@ -3,6 +3,7 @@ package tconstruct.armor.model; import net.minecraft.client.model.*; public class BootBump extends ModelBiped { + ModelRenderer rightBump; ModelRenderer leftBump; diff --git a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java index 033031b2..60bfd528 100644 --- a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java +++ b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java @@ -3,6 +3,7 @@ package tconstruct.armor.model; import net.minecraft.client.model.ModelBiped; public class HiddenPlayerModel extends ModelBiped { + public HiddenPlayerModel(float size, int slot) { super(size, 0, 64, 32); diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index f7b244bb..96efe8fc 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -1,6 +1,7 @@ package tconstruct.armor.model; import java.util.*; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureManager; @@ -8,7 +9,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; + import tconstruct.armor.items.ArmorPattern; public class RenderArmorCast implements IItemRenderer { @@ -36,8 +39,7 @@ public class RenderArmorCast implements IItemRenderer { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.renderBlocksRg; Tessellator tessellator = Tessellator.instance; - IIcon baseIcon = item.getItem() instanceof ArmorPattern - ? ((ArmorPattern) item.getItem()).getBaseIcon() + IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex(); GL11.glPushMatrix(); switch (type) { @@ -87,8 +89,8 @@ public class RenderArmorCast implements IItemRenderer { tessellator.draw(); } - public void renderSelectedCube( - Tessellator tessellator, RenderBlocks renderer, IIcon icon, List sidesToRender) { + public void renderSelectedCube(Tessellator tessellator, RenderBlocks renderer, IIcon icon, + List sidesToRender) { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); if (sidesToRender.contains(ForgeDirection.WEST)) renderer.renderFaceXNeg(null, 0F, 0F, 0F, icon); @@ -138,15 +140,8 @@ public class RenderArmorCast implements IItemRenderer { GL11.glPopMatrix(); } - public static void renderItemIn2D( - Tessellator par0Tessellator, - float par1, - float par2, - float par3, - float par4, - float par5, - float par6, - float par7) { + public static void renderItemIn2D(Tessellator par0Tessellator, float par1, float par2, float par3, float par4, + float par5, float par6, float par7) { par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 0.0F, 1.0F); par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, par1, par4); diff --git a/src/main/java/tconstruct/armor/model/WingModel.java b/src/main/java/tconstruct/armor/model/WingModel.java index b6e2db4b..19a6b259 100644 --- a/src/main/java/tconstruct/armor/model/WingModel.java +++ b/src/main/java/tconstruct/armor/model/WingModel.java @@ -5,6 +5,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; public class WingModel extends ModelBiped { + ModelRenderer WingBaseRight; ModelRenderer WingEdgeRight; ModelRenderer WingInsetRight; diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index 6863db13..1fc6a030 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -1,13 +1,16 @@ package tconstruct.armor.modelblock; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class DryingRackRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -19,8 +22,8 @@ public class DryingRackRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 0) { diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 629f5f93..8116a010 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -1,13 +1,15 @@ package tconstruct.armor.modelblock; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; + import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.tools.entity.FancyEntityItem; +import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index eb838413..b059261c 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -1,11 +1,8 @@ package tconstruct.armor.player; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.relauncher.Side; -import io.netty.buffer.ByteBuf; import java.lang.ref.WeakReference; import java.util.UUID; + import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -15,9 +12,15 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import tconstruct.library.accessory.IHealthAccessory; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; public class ArmorExtended implements IInventory { + public ItemStack[] inventory = new ItemStack[7]; public WeakReference parent; public UUID globalID = UUID.fromString("B243BE32-DC1B-4C53-8D13-8752D5C69D5B"); @@ -104,8 +107,7 @@ public class ArmorExtended implements IInventory { recalculateHealth(player, stats); /* - * if (inventory[2] == null && stats.knapsack != null) { - * stats.knapsack.unequipItems(); } + * if (inventory[2] == null && stats.knapsack != null) { stats.knapsack.unequipItems(); } */ } @@ -125,14 +127,13 @@ public class ArmorExtended implements IInventory { int healthChange = bonusHP - prevHealth; if (healthChange != 0) { - IAttributeInstance attributeinstance = - player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); + IAttributeInstance attributeinstance = player.getAttributeMap() + .getAttributeInstance(SharedMonsterAttributes.maxHealth); try { attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); - } catch (Exception ignored) { - } - attributeinstance.applyModifier( - new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); + } catch (Exception ignored) {} + attributeinstance + .applyModifier(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); } } else if (parent != null && parent.get() != null) { int prevHealth = stats.bonusHealth; @@ -140,12 +141,11 @@ public class ArmorExtended implements IInventory { stats.bonusHealth = bonusHP; int healthChange = bonusHP - prevHealth; if (healthChange != 0) { - IAttributeInstance attributeinstance = - player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); + IAttributeInstance attributeinstance = player.getAttributeMap() + .getAttributeInstance(SharedMonsterAttributes.maxHealth); try { attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } } } diff --git a/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java b/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java index 38f343b7..7dc1485c 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java @@ -2,13 +2,10 @@ package tconstruct.armor.player; public class ArmorExtendedClient extends ArmorExtended { /* - * public void recalculateSkills(EntityPlayer player, TPlayerStats stats) { - * TConstruct.logger.info("Client skills"); if (inventory[1] != null && - * inventory[1].getItem() == TContent.glove) { if - * (TProxyClient.skillList.size() < 1) { try { - * TProxyClient.skillList.add(SkillRegistry - * .skills.get("Wall Building").copy()); } catch (Exception e) { - * e.printStackTrace(); } } } else { if (TProxyClient.skillList.size() > 0) - * { TProxyClient.skillList.remove(0); } } } + * public void recalculateSkills(EntityPlayer player, TPlayerStats stats) { TConstruct.logger.info("Client skills"); + * if (inventory[1] != null && inventory[1].getItem() == TContent.glove) { if (TProxyClient.skillList.size() < 1) { + * try { TProxyClient.skillList.add(SkillRegistry .skills.get("Wall Building").copy()); } catch (Exception e) { + * e.printStackTrace(); } } } else { if (TProxyClient.skillList.size() > 0) { TProxyClient.skillList.remove(0); } } + * } */ } diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index d8321520..52a1b59d 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -1,8 +1,7 @@ package tconstruct.armor.player; -import cpw.mods.fml.common.network.ByteBufUtils; -import io.netty.buffer.ByteBuf; import java.lang.ref.WeakReference; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -11,7 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import cpw.mods.fml.common.network.ByteBufUtils; +import io.netty.buffer.ByteBuf; + public class KnapsackInventory implements IInventory { + public ItemStack[] inventory = new ItemStack[27]; public WeakReference parent; diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index b01f2339..04415a4c 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -1,15 +1,12 @@ package tconstruct.armor.player; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import cpw.mods.fml.relauncher.Side; import java.io.*; import java.net.*; import java.util.*; import java.util.concurrent.ConcurrentHashMap; + import mantle.player.PlayerUtils; + import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; @@ -20,10 +17,16 @@ import net.minecraft.nbt.*; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerDropsEvent; + import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import cpw.mods.fml.relauncher.Side; // TODO: Redesign this class public class TPlayerHandler { @@ -151,8 +154,8 @@ public class TPlayerHandler { if (PHConstruct.lavaFortuneInteraction) { PlayerUtils.sendChatMessage(player, "Warning: Cross-mod Exploit Present!"); PlayerUtils.sendChatMessage(player, "Solution 1: Disable Reverse Smelting recipes from GregTech."); - PlayerUtils.sendChatMessage( - player, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); + PlayerUtils + .sendChatMessage(player, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); } } } @@ -202,7 +205,7 @@ public class TPlayerHandler { @SubscribeEvent public void livingFall(LivingFallEvent evt) // Only for negating fall damage - { + { if (evt.entityLiving instanceof EntityPlayer) { evt.distance -= 1; } @@ -249,8 +252,8 @@ public class TPlayerHandler { /* Modify Player */ public void updateSize(String user, float offset) { /* - * EntityPlayer player = getEntityPlayer(user); setEntitySize(0.6F, - * offset, player); player.yOffset = offset - 0.18f; + * EntityPlayer player = getEntityPlayer(user); setEntitySize(0.6F, offset, player); player.yOffset = offset - + * 0.18f; */ } diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index ae78b7b3..2818d145 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -1,18 +1,21 @@ package tconstruct.armor.player; import java.lang.ref.WeakReference; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; + import tconstruct.api.IPlayerExtendedInventoryWrapper; -public class TPlayerStats - implements IExtendedEntityProperties, - IPlayerExtendedInventoryWrapper // TODO: IExtendedEntityProperties is not appropriate! +public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedInventoryWrapper // TODO: + // IExtendedEntityProperties + // is not appropriate! { + public static final String PROP_NAME = "TConstruct"; public WeakReference player; diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java index 310ba519..9627570b 100644 --- a/src/main/java/tconstruct/blocks/BlockFalling.java +++ b/src/main/java/tconstruct/blocks/BlockFalling.java @@ -1,6 +1,7 @@ package tconstruct.blocks; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; public class BlockFalling extends Block { + public static boolean fallInstantly; public BlockFalling() { @@ -26,8 +28,8 @@ public class BlockFalling extends Block { } @Override - public void onNeighborBlockChange( - World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) { + public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, + Block p_149695_5_) { p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_)); } @@ -42,14 +44,13 @@ public class BlockFalling extends Block { if (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ >= 0) { byte b0 = 32; - if (!fallInstantly - && p_149830_1_.checkChunksExist( - p_149830_2_ - b0, - p_149830_3_ - b0, - p_149830_4_ - b0, - p_149830_2_ + b0, - p_149830_3_ + b0, - p_149830_4_ + b0)) { + if (!fallInstantly && p_149830_1_.checkChunksExist( + p_149830_2_ - b0, + p_149830_3_ - b0, + p_149830_4_ - b0, + p_149830_2_ + b0, + p_149830_3_ + b0, + p_149830_4_ + b0)) { // if (!p_149830_1_.isRemote) { // EntityFallingBlock entityfallingblock = new // EntityFallingBlock(p_149830_1_, diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index b0b739cd..13e3fc64 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -1,8 +1,9 @@ package tconstruct.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,9 +12,12 @@ import net.minecraft.entity.Entity; import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class SlabBase extends MantleBlock { + Block modelBlock; int startingMeta; int totalSize; @@ -32,8 +36,8 @@ public class SlabBase extends MantleBlock { } @Override - public void addCollisionBoxesToList( - World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, + Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } @@ -49,16 +53,8 @@ public class SlabBase extends MantleBlock { setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } - public int onBlockPlaced( - World par1World, - int blockX, - int blockY, - int blockZ, - int side, - float clickX, - float clickY, - float clickZ, - int metadata) { + public int onBlockPlaced(World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, + float clickZ, int metadata) { if (side == 1) return metadata; if (side == 0 || clickY >= 0.5F) return metadata | 8; diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 7b5c021c..24eae56b 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -1,16 +1,20 @@ package tconstruct.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.MantleBlock; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class TConstructBlock extends MantleBlock { + public String[] textureNames; public IIcon[] icons; diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 55f36ae6..985d48d7 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -1,7 +1,7 @@ package tconstruct.blocks.logic; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; @@ -10,9 +10,12 @@ import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + import tconstruct.library.crafting.DryingRackRecipes; +import cpw.mods.fml.relauncher.*; public class DryingRackLogic extends InventoryLogic { + int currentTime; int maxTime; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index c37b2bc6..b3dc8195 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -1,19 +1,22 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.*; + import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; +import cpw.mods.fml.relauncher.*; public class SlimeFluid extends BlockFluidClassic { + IIcon stillIcon; IIcon flowIcon; @@ -40,8 +43,7 @@ public class SlimeFluid extends BlockFluidClassic { @Override public void updateTick(World world, int x, int y, int z, Random rand) { super.updateTick(world, x, y, z, rand); - if (rand.nextInt(100) == 0 - && world.getBlockMetadata(x, y, z) == 0 + if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision( AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) { SlimeBase slime; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 7335f464..7bedbdcf 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -1,7 +1,7 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -10,12 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.*; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + import tconstruct.blocks.TConstructBlock; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class SlimeGel extends TConstructBlock { + public SlimeGel() { - super(Material.sponge, 0.5f, new String[] {"slimeblock_blue", "slimeblock_green", "slimeblock_purple"}); + super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 13873070..fe037e78 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -1,8 +1,9 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.*; + import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,14 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.*; import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.*; public class SlimeGrass extends MantleBlock { - public String[] textureNames = { - "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" - }; // green, - // purple + + public String[] textureNames = { "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", + "slimegrass_green_dirt_side" }; // green, + // purple public IIcon[] icons; public SlimeGrass() { @@ -33,7 +36,7 @@ public class SlimeGrass extends MantleBlock { @Override public int damageDropped(int meta) { if (meta == 1) // dirt - return 0; + return 0; else // slime dirt return 5; @@ -71,8 +74,8 @@ public class SlimeGrass extends MantleBlock { } @Override - public boolean canSustainPlant( - IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, + IPlantable plant) { EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); return plantType == EnumPlantType.Plains && plant.getPlant(world, x, y + 1, z) != Blocks.tallgrass; } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index edc78e58..2246b648 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -1,7 +1,7 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.BlockLeaves; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,12 +9,15 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class SlimeLeaves extends BlockLeaves { - private static final String[] fastLeaves = new String[] {"slimeleaves_blue_fast"}; - private static final String[] fancyLeaves = new String[] {"slimeleaves_blue_fancy"}; + + private static final String[] fastLeaves = new String[] { "slimeleaves_blue_fast" }; + private static final String[] fancyLeaves = new String[] { "slimeleaves_blue_fancy" }; @SideOnly(Side.CLIENT) private IIcon[] fastIcons; @@ -98,10 +101,9 @@ public class SlimeLeaves extends BlockLeaves { if (!world.isRemote) { int dropChance = 35; - /*if ((meta & 3) == 3) - { - j1 = 40; - }*/ + /* + * if ((meta & 3) == 3) { j1 = 40; } + */ if (fortune > 0) { dropChance -= 2 << fortune; @@ -134,6 +136,6 @@ public class SlimeLeaves extends BlockLeaves { @Override public String[] func_150125_e() { - return new String[] {"slime"}; + return new String[] { "slime" }; } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 1d51ac5d..1045e8d2 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -1,7 +1,7 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -11,14 +11,17 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; + import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeTreeGen; +import cpw.mods.fml.relauncher.*; public class SlimeSapling extends BlockSapling { + public IIcon[] icons; - public String[] textureNames = new String[] {"blue"}; + public String[] textureNames = new String[] { "blue" }; public SlimeSapling() { super(); diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index b2e78ee8..c0fa2703 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -1,7 +1,7 @@ package tconstruct.blocks.slime; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,10 +11,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.*; import net.minecraftforge.common.*; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class SlimeTallGrass extends BlockBush implements IShearable { - private static final String[] grassTypes = new String[] {"slimegrass_blue_tall"}; + + private static final String[] grassTypes = new String[] { "slimegrass_blue_tall" }; @SideOnly(Side.CLIENT) private IIcon[] iconArray; @@ -44,8 +47,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable { } /** - * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' - * (inclusive). + * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ @Override public int quantityDroppedWithBonus(int par1, Random par2Random) { diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index e7bcdc61..b7d46ac1 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -1,7 +1,7 @@ package tconstruct.blocks.traps; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,10 +10,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.world.model.BarricadeRender; +import cpw.mods.fml.relauncher.*; public class BarricadeBlock extends MantleBlock { + Block modelBlock; int modelMeta; @@ -68,8 +71,8 @@ public class BarricadeBlock extends MantleBlock { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { ItemStack stack = player.getCurrentEquippedItem(); if ((stack != null) && (stack.getItem() == Item.getItemFromBlock(this)) && (!player.isSneaking())) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index fc0689e1..cb4bf490 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -1,11 +1,11 @@ package tconstruct.blocks.traps; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mantle.blocks.MantleBlock; import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; @@ -18,9 +18,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Landmine extends MantleBlock { + /** The mob type that can trigger this pressure plate. */ private final EnumCreatureType triggerMobType; @@ -60,8 +64,8 @@ public class Landmine extends MantleBlock { } /** - * Returns a bounding box from the pool of bounding boxes (this means this - * box can change after the pool has been cleared to be reused) + * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been + * cleared to be reused) */ @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { @@ -69,9 +73,8 @@ public class Landmine extends MantleBlock { } /** - * Is this block (a) opaque and (b) a full 1m cube? This determines whether - * or not to render the shared face of two adjacent blocks and also whether - * the player can attach torches, redstone wire, etc to this block. + * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ @Override public boolean isOpaqueCube() { @@ -79,8 +82,7 @@ public class Landmine extends MantleBlock { } /** - * If this block doesn't render as an ordinary block it will return False - * (examples: signs, buttons, stairs, etc) + * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) */ @Override public boolean renderAsNormalBlock() { @@ -93,8 +95,7 @@ public class Landmine extends MantleBlock { } /** - * Checks to see if its valid to put this block at the specified - * coordinates. Args: world, x, y, z + * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -103,9 +104,8 @@ public class Landmine extends MantleBlock { } /** - * Lets the block know when one of its neighbor changes. Doesn't know which - * neighbor changed (coordinates passed are their own) Args: x, y, z, - * neighbor blockID + * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are + * their own) Args: x, y, z, neighbor blockID */ public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { boolean var6 = !World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) @@ -130,8 +130,7 @@ public class Landmine extends MantleBlock { } /** - * Triggered whenever an entity collides with this block (enters into the - * block). Args: world, x, y, z, entity + * Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity */ @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { @@ -143,8 +142,7 @@ public class Landmine extends MantleBlock { } /** - * Checks if there are mobs on the plate. If a mob is on the plate and it is - * off, it turns it on, and vice versa. + * Checks if there are mobs on the plate. If a mob is on the plate and it is off, it turns it on, and vice versa. */ private void setStateIfMobInteractsWithPlate(World world, int posX, int posY, int posZ) { boolean var5 = world.getBlockMetadata(posX, posY, posZ) == 1; @@ -177,11 +175,9 @@ public class Landmine extends MantleBlock { } /* - * if (this.triggerMobType == EnumCreatureType.players) { var8 = - * world.getEntitiesWithinAABB( EntityPlayer.class, - * AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), - * (double) posY, (double) ((float) posZ + var7), (double) ((float) - * (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + + * if (this.triggerMobType == EnumCreatureType.players) { var8 = world.getEntitiesWithinAABB( + * EntityPlayer.class, AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) + * ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + * 1) - var7))); } */ @@ -198,34 +194,25 @@ public class Landmine extends MantleBlock { WorldHelper.setBlockToAir(world, posX, posY, posZ); world.createExplosion(null, posX, posY, posZ, 2.0F, true); /* - * par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1); - * par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, - * this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY - * - 1, posZ, this.blockID); - * par1World.func_147479_m(posX, posY, posZ, posX, - * posY, posZ); par1World.playSoundEffect((double)posX + 0.5D, - * (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F, - * 0.6F); + * par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1); par1World.notifyBlocksOfNeighborChange(posX, + * posY, posZ, this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY - 1, posZ, this.blockID); + * par1World.func_147479_m(posX, posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX + + * 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F, 0.6F); */ } /* - * if (!var6 && var5) { par1World.setBlockMetadataWithNotify(posX, posY, - * posZ, 0); par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, - * this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY - 1, - * posZ, this.blockID); par1World.func_147479_m(posX, - * posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX - * + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", - * 0.3F, 0.5F); } - * - * if (var6) { par1World.scheduleBlockUpdate(posX, posY, posZ, - * this.blockID, this.tickRate()); } + * if (!var6 && var5) { par1World.setBlockMetadataWithNotify(posX, posY, posZ, 0); + * par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, this.blockID); + * par1World.notifyBlocksOfNeighborChange(posX, posY - 1, posZ, this.blockID); par1World.func_147479_m(posX, + * posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX + 0.5D, (double)posY + 0.1D, + * (double)posZ + 0.5D, "random.click", 0.3F, 0.5F); } if (var6) { par1World.scheduleBlockUpdate(posX, posY, + * posZ, this.blockID, this.tickRate()); } */ } /** - * ejects contained items into the world, and notifies neighbours of an - * update, as appropriate + * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @Override public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { @@ -238,8 +225,7 @@ public class Landmine extends MantleBlock { } /** - * Updates the blocks bounds based on its current state. Args: world, x, y, - * z + * Updates the blocks bounds based on its current state. Args: world, x, y, z */ @Override public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { @@ -265,8 +251,8 @@ public class Landmine extends MantleBlock { } /** - * Returns the mobility information of the block, 0 = free, 1 = can't push - * but can move over, 2 = total immobility and stop pistons + * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility + * and stop pistons */ @Override public int getMobilityFlag() { diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 05719022..8905a487 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -1,8 +1,9 @@ package tconstruct.blocks.traps; -import cpw.mods.fml.relauncher.*; import java.util.Random; + import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,9 +13,11 @@ import net.minecraft.item.*; import net.minecraft.potion.*; import net.minecraft.util.DamageSource; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.PunjiRender; +import cpw.mods.fml.relauncher.*; public class Punji extends MantleBlock { @@ -38,8 +41,8 @@ public class Punji extends MantleBlock { /* Right-click adds sticks */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, + float hitY, float hitZ) { /* * if (world.isRemote) return false; */ @@ -72,9 +75,8 @@ public class Punji extends MantleBlock { } /** - * Is this block (a) opaque and (b) a full 1m cube? This determines whether - * or not to render the shared face of two adjacent blocks and also whether - * the player can attach torches, redstone wire, etc to this block. + * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ @Override public boolean isOpaqueCube() { @@ -82,8 +84,7 @@ public class Punji extends MantleBlock { } /** - * If this block doesn't render as an ordinary block it will return False - * (examples: signs, buttons, stairs, etc) + * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) */ @Override public boolean renderAsNormalBlock() { diff --git a/src/main/java/tconstruct/client/AmmoItemRenderer.java b/src/main/java/tconstruct/client/AmmoItemRenderer.java index d9666e79..847821f2 100644 --- a/src/main/java/tconstruct/client/AmmoItemRenderer.java +++ b/src/main/java/tconstruct/client/AmmoItemRenderer.java @@ -3,14 +3,16 @@ package tconstruct.client; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; + import tconstruct.library.weaponry.IAmmo; public class AmmoItemRenderer extends FlexibleToolRenderer { // public static FontRenderer fontRenderer; public AmmoItemRenderer() { - // super(true); + // super(true); // fontRenderer = new FontRenderer(Minecraft.getMinecraft().gameSettings, new // ResourceLocation(Reference.RESOURCE, "textures/font/border_numbers.png"), // Minecraft.getMinecraft().renderEngine, false); diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index d7d0991a..ee1dd8f2 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -1,19 +1,17 @@ package tconstruct.client; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import mantle.common.network.AbstractPacket; import modwarriors.notenoughkeys.api.Api; import modwarriors.notenoughkeys.api.KeyBindingPressedEvent; + import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; + import org.lwjgl.input.Keyboard; + import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.ArmorProxyCommon; @@ -23,11 +21,16 @@ import tconstruct.util.network.AccessoryInventoryPacket; import tconstruct.util.network.BeltPacket; import tconstruct.util.network.DoubleJumpPacket; import tconstruct.util.network.GogglePacket; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; public class ArmorControls { public static final String keybindCategory = "tconstruct.keybindings"; - public static final String[] keyDescs = new String[] {"key.tarmor", "key.tgoggles", "key.tbelt", "key.tzoom"}; + public static final String[] keyDescs = new String[] { "key.tarmor", "key.tgoggles", "key.tbelt", "key.tzoom" }; public static KeyBinding armorKey = new KeyBinding(keyDescs[0], Keyboard.KEY_NONE, keybindCategory); public static KeyBinding toggleGoggles = new KeyBinding(keyDescs[1], Keyboard.KEY_NONE, keybindCategory); public static KeyBinding beltSwap = new KeyBinding(keyDescs[2], Keyboard.KEY_NONE, keybindCategory); @@ -51,7 +54,7 @@ public class ArmorControls { public ArmorControls() { getVanillaKeyBindings(); - keys = new KeyBinding[] {armorKey, toggleGoggles, beltSwap, zoomKey, null, null}; + keys = new KeyBinding[] { armorKey, toggleGoggles, beltSwap, zoomKey, null, null }; } public void registerKeys() { @@ -122,8 +125,8 @@ public class ArmorControls { mc.thePlayer.motionY = 0.42D; mc.thePlayer.fallDistance = 0; if (mc.thePlayer.isPotionActive(Potion.jump)) { - mc.thePlayer.motionY += - (float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F; + mc.thePlayer.motionY += (float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) + * 0.1F; } midairJumps--; resetFallDamage(); @@ -131,16 +134,12 @@ public class ArmorControls { if (!jumping) { jumping = mc.thePlayer.isAirBorne; ItemStack shoes = mc.thePlayer.getCurrentArmor(0); - if (shoes != null - && shoes.hasTagCompound() - && shoes.getTagCompound().hasKey("TinkerArmor")) { + if (shoes != null && shoes.hasTagCompound() && shoes.getTagCompound().hasKey("TinkerArmor")) { NBTTagCompound shoeTag = shoes.getTagCompound().getCompoundTag("TinkerArmor"); midairJumps += shoeTag.getInteger("Double-Jump"); } ItemStack wings = mc.thePlayer.getCurrentArmor(1); - if (wings != null - && wings.hasTagCompound() - && wings.getTagCompound().hasKey("TinkerArmor")) { + if (wings != null && wings.hasTagCompound() && wings.getTagCompound().hasKey("TinkerArmor")) { NBTTagCompound shoeTag = wings.getTagCompound().getCompoundTag("TinkerArmor"); midairJumps += shoeTag.getInteger("Double-Jump"); } @@ -150,10 +149,8 @@ public class ArmorControls { private void checkAndToggleNightVision() { ItemStack goggles = mc.thePlayer.getCurrentArmor(3); if (goggles != null && goggles.getItem() instanceof TravelGear) { // TODO: Genericize this - if (goggles.hasTagCompound() - && goggles.getTagCompound() - .getCompoundTag(((TravelGear) goggles.getItem()).getBaseTagName()) - .getBoolean("Night Vision")) { + if (goggles.hasTagCompound() && goggles.getTagCompound() + .getCompoundTag(((TravelGear) goggles.getItem()).getBaseTagName()).getBoolean("Night Vision")) { activeGoggles = !activeGoggles; PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); toggleGoggles(); diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java index c955d955..491d9012 100644 --- a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -7,11 +7,13 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.FluidRegistry; + import org.lwjgl.opengl.GL11; public class BlockSkinRenderHelper { - public static boolean renderMetadataBlock( - Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { + + public static boolean renderMetadataBlock(Block block, int metadata, int x, int y, int z, RenderBlocks renderer, + IBlockAccess world) { int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; @@ -31,17 +33,8 @@ public class BlockSkinRenderHelper { : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } - static boolean renderMetadataBlockWithAmbientOcclusion( - Block block, - int metadata, - int xPos, - int yPos, - int zPos, - float colorRed, - float colorGreen, - float colorBlue, - RenderBlocks render, - IBlockAccess world) { + static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xPos, int yPos, int zPos, + float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { render.enableAO = true; boolean flag = false; float f3; @@ -88,40 +81,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos - 1); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos + 1); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos - 1); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos + 1); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) { @@ -130,55 +135,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinY <= 0.0D - || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { + if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP - + render.aoLightValueScratchXYNN - + render.aoLightValueScratchYZNP - + f7) - / 4.0F; - f6 = (render.aoLightValueScratchYZNP - + f7 - + render.aoLightValueScratchXYZPNP - + render.aoLightValueScratchXYPN) - / 4.0F; - f5 = (f7 - + render.aoLightValueScratchYZNN - + render.aoLightValueScratchXYPN - + render.aoLightValueScratchXYZPNN) - / 4.0F; - f4 = (render.aoLightValueScratchXYNN - + render.aoLightValueScratchXYZNNN - + f7 - + render.aoLightValueScratchYZNN) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + + render.aoLightValueScratchYZNP + + f7) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (f7 + render.aoLightValueScratchYZNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + + f7 + + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.5F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } render.colorRedTopLeft *= f3; @@ -219,40 +212,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos - 1); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos - 1); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos + 1); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos + 1); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } if (render.renderMaxY >= 1.0D) { @@ -261,46 +266,34 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxY >= 1.0D - || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { + if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP - + render.aoLightValueScratchXYNP - + render.aoLightValueScratchYZPP - + f7) - / 4.0F; - f3 = (render.aoLightValueScratchYZPP - + f7 - + render.aoLightValueScratchXYZPPP - + render.aoLightValueScratchXYPP) - / 4.0F; - f4 = (f7 - + render.aoLightValueScratchYZPN - + render.aoLightValueScratchXYPP - + render.aoLightValueScratchXYZPPN) - / 4.0F; - f5 = (render.aoLightValueScratchXYNP - + render.aoLightValueScratchXYZNPN - + f7 - + render.aoLightValueScratchYZPN) - / 4.0F; - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + + render.aoLightValueScratchYZPP + + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + + render.aoLightValueScratchXYZPPP + + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; render.colorRedTopLeft *= f3; render.colorGreenTopLeft *= f3; render.colorBlueTopLeft *= f3; @@ -341,40 +334,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos - 1, + zPos); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos + 1, + zPos); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos - 1, + zPos); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos + 1, + zPos); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } if (render.renderMinZ <= 0.0D) { @@ -383,55 +388,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinZ <= 0.0D - || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { + if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN - + render.aoLightValueScratchXYZNPN - + f7 - + render.aoLightValueScratchYZPN) - / 4.0F; - f4 = (f7 - + render.aoLightValueScratchYZPN - + render.aoLightValueScratchXZPN - + render.aoLightValueScratchXYZPPN) - / 4.0F; - f5 = (render.aoLightValueScratchYZNN - + f7 - + render.aoLightValueScratchXYZPNN - + render.aoLightValueScratchXZPN) - / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN - + render.aoLightValueScratchXZNN - + render.aoLightValueScratchYZNN - + f7) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXZPN + + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + + render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + + render.aoLightValueScratchYZNN + + f7) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.8F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -474,40 +467,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos - 1, + zPos); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos + 1, + zPos); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos - 1, + zPos); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos + 1, + zPos); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } if (render.renderMaxZ >= 1.0D) { @@ -516,55 +521,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxZ >= 1.0D - || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { + if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP - + render.aoLightValueScratchXYZNPP - + f7 - + render.aoLightValueScratchYZPP) - / 4.0F; - f6 = (f7 - + render.aoLightValueScratchYZPP - + render.aoLightValueScratchXZPP - + render.aoLightValueScratchXYZPPP) - / 4.0F; - f5 = (render.aoLightValueScratchYZNP - + f7 - + render.aoLightValueScratchXYZPNP - + render.aoLightValueScratchXZPP) - / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP - + render.aoLightValueScratchXZNP - + render.aoLightValueScratchYZNP - + f7) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + + f7 + + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + + render.aoLightValueScratchYZNP + + f7) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.8F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -607,40 +600,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos - 1); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos + 1); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos - 1); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos + 1); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } if (render.renderMinX <= 0.0D) { @@ -649,55 +654,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinX <= 0.0D - || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { + if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN - + render.aoLightValueScratchXYZNNP - + f7 - + render.aoLightValueScratchXZNP) - / 4.0F; - f3 = (f7 - + render.aoLightValueScratchXZNP - + render.aoLightValueScratchXYNP - + render.aoLightValueScratchXYZNPP) - / 4.0F; - f4 = (render.aoLightValueScratchXZNN - + f7 - + render.aoLightValueScratchXYZNPN - + render.aoLightValueScratchXYNP) - / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN - + render.aoLightValueScratchXYNN - + render.aoLightValueScratchXZNN - + f7) - / 4.0F; - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + + f7 + + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + + render.aoLightValueScratchXYZNPN + + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + + render.aoLightValueScratchXZNN + + f7) / 4.0F; + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.6F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -740,40 +733,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos - 1); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos + 1); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos - 1); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos + 1); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } if (render.renderMaxX >= 1.0D) { @@ -782,55 +787,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxX >= 1.0D - || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { + if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN - + render.aoLightValueScratchXYZPNP - + f7 - + render.aoLightValueScratchXZPP) - / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN - + render.aoLightValueScratchXYPN - + render.aoLightValueScratchXZPN - + f7) - / 4.0F; - f5 = (render.aoLightValueScratchXZPN - + f7 - + render.aoLightValueScratchXYZPPN - + render.aoLightValueScratchXYPP) - / 4.0F; - f6 = (f7 - + render.aoLightValueScratchXZPP - + render.aoLightValueScratchXYPP - + render.aoLightValueScratchXYZPPP) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + + f7 + + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXZPN + + f7) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + f7 + + render.aoLightValueScratchXYZPPN + + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.6F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -855,17 +848,8 @@ public class BlockSkinRenderHelper { return flag; } - static boolean renderMetadataBlockWithColorMultiplier( - Block block, - int metadata, - int xPos, - int yPos, - int zPos, - float colorRed, - float colorGreen, - float colorBlue, - RenderBlocks render, - IBlockAccess world) { + static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int xPos, int yPos, int zPos, + float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; @@ -902,8 +886,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { tessellator.setBrightness( - render.renderMinY > 0.0D - ? l + render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); @@ -912,8 +895,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { tessellator.setBrightness( - render.renderMaxY < 1.0D - ? l + render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); @@ -924,8 +906,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { tessellator.setBrightness( - render.renderMinZ > 0.0D - ? l + render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); @@ -935,8 +916,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { tessellator.setBrightness( - render.renderMaxZ < 1.0D - ? l + render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); @@ -946,8 +926,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { tessellator.setBrightness( - render.renderMinX > 0.0D - ? l + render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); @@ -957,8 +936,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { tessellator.setBrightness( - render.renderMaxX < 1.0D - ? l + render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); @@ -969,33 +947,18 @@ public class BlockSkinRenderHelper { return flag; } - public static boolean renderLiquidBlock( - IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { + public static boolean renderLiquidBlock(IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, + RenderBlocks renderer, IBlockAccess world) { return renderLiquidBlock(stillIcon, flowingIcon, x, y, z, renderer, world, false); } - public static boolean renderLiquidBlock( - IIcon stillIcon, - IIcon flowingIcon, - int x, - int y, - int z, - RenderBlocks renderer, - IBlockAccess world, - boolean extraBright) { + public static boolean renderLiquidBlock(IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, + RenderBlocks renderer, IBlockAccess world, boolean extraBright) { return renderLiquidBlock(stillIcon, flowingIcon, x, y, z, renderer, world, extraBright, 0xffffffff); } - public static boolean renderLiquidBlock( - IIcon stillIcon, - IIcon flowingIcon, - int x, - int y, - int z, - RenderBlocks renderer, - IBlockAccess world, - boolean extraBright, - int color) { + public static boolean renderLiquidBlock(IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, + RenderBlocks renderer, IBlockAccess world, boolean extraBright, int color) { Block block = Blocks.stone; float alpha = (float) (color >> 24 & 255) / 255.0F; float red = (float) (color >> 16 & 255) / 255.0F; @@ -1028,12 +991,28 @@ public class BlockSkinRenderHelper { GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT); boolean ret; - if (Minecraft.isAmbientOcclusionEnabled()) - ret = renderFakeBlockWithAmbientOcclusion( - stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); - else - ret = renderFakeBlockWithColorMultiplier( - stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); + if (Minecraft.isAmbientOcclusionEnabled()) ret = renderFakeBlockWithAmbientOcclusion( + stillIcon, + flowingIcon, + x, + y, + z, + red, + green, + blue, + renderer, + world); + else ret = renderFakeBlockWithColorMultiplier( + stillIcon, + flowingIcon, + x, + y, + z, + red, + green, + blue, + renderer, + world); GL11.glPopAttrib(); @@ -1041,17 +1020,8 @@ public class BlockSkinRenderHelper { return ret; } - static boolean renderFakeBlockWithAmbientOcclusion( - IIcon stillIcon, - IIcon flowingIcon, - int xPos, - int yPos, - int zPos, - float colorRed, - float colorGreen, - float colorBlue, - RenderBlocks render, - IBlockAccess world) { + static boolean renderFakeBlockWithAmbientOcclusion(IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, + float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; render.enableAO = true; boolean flag = false; @@ -1099,40 +1069,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos - 1); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos + 1); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos - 1); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos + 1); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) { @@ -1141,55 +1123,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinY <= 0.0D - || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { + if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP - + render.aoLightValueScratchXYNN - + render.aoLightValueScratchYZNP - + f7) - / 4.0F; - f6 = (render.aoLightValueScratchYZNP - + f7 - + render.aoLightValueScratchXYZPNP - + render.aoLightValueScratchXYPN) - / 4.0F; - f5 = (f7 - + render.aoLightValueScratchYZNN - + render.aoLightValueScratchXYPN - + render.aoLightValueScratchXYZPNN) - / 4.0F; - f4 = (render.aoLightValueScratchXYNN - + render.aoLightValueScratchXYZNNN - + f7 - + render.aoLightValueScratchYZNN) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + + render.aoLightValueScratchYZNP + + f7) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (f7 + render.aoLightValueScratchYZNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + + f7 + + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.5F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } render.colorRedTopLeft *= f3; @@ -1230,40 +1200,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos - 1); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos - 1); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos, + zPos + 1); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos, + zPos + 1); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } if (render.renderMaxY >= 1.0D) { @@ -1272,46 +1254,34 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxY >= 1.0D - || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { + if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP - + render.aoLightValueScratchXYNP - + render.aoLightValueScratchYZPP - + f7) - / 4.0F; - f3 = (render.aoLightValueScratchYZPP - + f7 - + render.aoLightValueScratchXYZPPP - + render.aoLightValueScratchXYPP) - / 4.0F; - f4 = (f7 - + render.aoLightValueScratchYZPN - + render.aoLightValueScratchXYPP - + render.aoLightValueScratchXYZPPN) - / 4.0F; - f5 = (render.aoLightValueScratchXYNP - + render.aoLightValueScratchXYZNPN - + f7 - + render.aoLightValueScratchYZPN) - / 4.0F; - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + + render.aoLightValueScratchYZPP + + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + + render.aoLightValueScratchXYZPPP + + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; render.colorRedTopLeft *= f3; render.colorGreenTopLeft *= f3; render.colorBlueTopLeft *= f3; @@ -1350,40 +1320,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos - 1, + zPos); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos + 1, + zPos); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos - 1, + zPos); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos + 1, + zPos); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } if (render.renderMinZ <= 0.0D) { @@ -1392,55 +1374,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinZ <= 0.0D - || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { + if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN - + render.aoLightValueScratchXYZNPN - + f7 - + render.aoLightValueScratchYZPN) - / 4.0F; - f4 = (f7 - + render.aoLightValueScratchYZPN - + render.aoLightValueScratchXZPN - + render.aoLightValueScratchXYZPPN) - / 4.0F; - f5 = (render.aoLightValueScratchYZNN - + f7 - + render.aoLightValueScratchXYZPNN - + render.aoLightValueScratchXZPN) - / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN - + render.aoLightValueScratchXZNN - + render.aoLightValueScratchYZNN - + f7) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXZPN + + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + + render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + + render.aoLightValueScratchYZNN + + f7) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.8F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -1482,40 +1452,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos - 1, + zPos); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos - 1, + yPos + 1, + zPos); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos - 1, + zPos); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos + 1, + yPos + 1, + zPos); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } if (render.renderMaxZ >= 1.0D) { @@ -1524,55 +1506,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxZ >= 1.0D - || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { + if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP - + render.aoLightValueScratchXYZNPP - + f7 - + render.aoLightValueScratchYZPP) - / 4.0F; - f6 = (f7 - + render.aoLightValueScratchYZPP - + render.aoLightValueScratchXZPP - + render.aoLightValueScratchXYZPPP) - / 4.0F; - f5 = (render.aoLightValueScratchYZNP - + f7 - + render.aoLightValueScratchXYZPNP - + render.aoLightValueScratchXZPP) - / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP - + render.aoLightValueScratchXZNP - + render.aoLightValueScratchYZNP - + f7) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + + f7 + + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + + render.aoLightValueScratchYZNP + + f7) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.8F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -1614,40 +1584,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos - 1); + render.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos + 1); + render.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos - 1); + render.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos + 1); + render.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } if (render.renderMinX <= 0.0D) { @@ -1656,55 +1638,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMinX <= 0.0D - || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { + if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN - + render.aoLightValueScratchXYZNNP - + f7 - + render.aoLightValueScratchXZNP) - / 4.0F; - f3 = (f7 - + render.aoLightValueScratchXZNP - + render.aoLightValueScratchXYNP - + render.aoLightValueScratchXYZNPP) - / 4.0F; - f4 = (render.aoLightValueScratchXZNN - + f7 - + render.aoLightValueScratchXYZNPN - + render.aoLightValueScratchXYNP) - / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN - + render.aoLightValueScratchXYNN - + render.aoLightValueScratchXZNN - + f7) - / 4.0F; - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + + f7 + + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + + render.aoLightValueScratchXYZNPN + + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + + render.aoLightValueScratchXZNN + + f7) / 4.0F; + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.6F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -1746,40 +1716,52 @@ public class BlockSkinRenderHelper { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos - 1); + render.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos - 1, + zPos + 1); + render.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPPN = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos - 1); + render.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPPP = - getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue( + render.blockAccess, + xPos, + yPos + 1, + zPos + 1); + render.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } if (render.renderMaxX >= 1.0D) { @@ -1788,55 +1770,43 @@ public class BlockSkinRenderHelper { i1 = l; - if (render.renderMaxX >= 1.0D - || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { + if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN - + render.aoLightValueScratchXYZPNP - + f7 - + render.aoLightValueScratchXZPP) - / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN - + render.aoLightValueScratchXYPN - + render.aoLightValueScratchXZPN - + f7) - / 4.0F; - f5 = (render.aoLightValueScratchXZPN - + f7 - + render.aoLightValueScratchXYZPPN - + render.aoLightValueScratchXYPP) - / 4.0F; - f6 = (f7 - + render.aoLightValueScratchXZPP - + render.aoLightValueScratchXYPP - + render.aoLightValueScratchXYZPPP) - / 4.0F; - render.brightnessTopLeft = render.getAoBrightness( - render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness( - render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness( - render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness( - render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + + f7 + + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXZPN + + f7) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + f7 + + render.aoLightValueScratchXYZPPN + + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render + .getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render + .getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render + .getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render + .getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); if (flag1) { - render.colorRedTopLeft = render.colorRedBottomLeft = - render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = - render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = - render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed + * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen + * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue + * 0.6F; } else { - render.colorRedTopLeft = - render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = - render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = - render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -1860,17 +1830,8 @@ public class BlockSkinRenderHelper { return flag; } - static boolean renderFakeBlockWithColorMultiplier( - IIcon stillIcon, - IIcon flowingIcon, - int xPos, - int yPos, - int zPos, - float colorRed, - float colorGreen, - float colorBlue, - RenderBlocks render, - IBlockAccess world) { + static boolean renderFakeBlockWithColorMultiplier(IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, + float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; render.enableAO = false; Tessellator tessellator = Tessellator.instance; @@ -1908,8 +1869,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { tessellator.setBrightness( - render.renderMinY > 0.0D - ? l + render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); render.renderFaceYNeg(block, xPos, yPos, zPos, stillIcon); @@ -1918,8 +1878,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { tessellator.setBrightness( - render.renderMaxY < 1.0D - ? l + render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); render.renderFaceYPos(block, xPos, yPos, zPos, stillIcon); @@ -1930,8 +1889,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { tessellator.setBrightness( - render.renderMinZ > 0.0D - ? l + render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZNeg(block, xPos, yPos, zPos, flowingIcon); @@ -1941,8 +1899,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { tessellator.setBrightness( - render.renderMaxZ < 1.0D - ? l + render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZPos(block, xPos, yPos, zPos, flowingIcon); @@ -1952,8 +1909,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { tessellator.setBrightness( - render.renderMinX > 0.0D - ? l + render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXNeg(block, xPos, yPos, zPos, flowingIcon); @@ -1963,8 +1919,7 @@ public class BlockSkinRenderHelper { if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { tessellator.setBrightness( - render.renderMaxX < 1.0D - ? l + render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXPos(block, xPos, yPos, zPos, flowingIcon); diff --git a/src/main/java/tconstruct/client/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java index c042dc9c..36a8ba2e 100644 --- a/src/main/java/tconstruct/client/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -1,14 +1,16 @@ package tconstruct.client; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + @SideOnly(Side.CLIENT) public class BreakingFX extends EntityFX { + public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item) { this(par1World, par2, par4, par6, par8Item, 0); } @@ -21,16 +23,8 @@ public class BreakingFX extends EntityFX { this.particleScale /= 2.0F; } - public BreakingFX( - World par1World, - double par2, - double par4, - double par6, - double par8, - double par10, - double par12, - Item par14Item, - int par15) { + public BreakingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, + Item par14Item, int par15) { this(par1World, par2, par4, par6, par14Item, par15); this.motionX *= 0.10000000149011612D; this.motionY *= 0.10000000149011612D; @@ -46,8 +40,8 @@ public class BreakingFX extends EntityFX { } @Override - public void renderParticle( - Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { + public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, + float par7) { float f6 = ((float) this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F; float f7 = f6 + 0.015609375F; float f8 = ((float) this.particleTextureIndexY + this.particleTextureJitterY / 4.0F) / 16.0F; @@ -67,12 +61,28 @@ public class BreakingFX extends EntityFX { float f14 = 1.0F; par1Tessellator.setColorOpaque_F(f14 * this.particleRed, f14 * this.particleGreen, f14 * this.particleBlue); par1Tessellator.addVertexWithUV( - f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10, f6, f9); + f11 - par3 * f10 - par6 * f10, + f12 - par4 * f10, + f13 - par5 * f10 - par7 * f10, + f6, + f9); par1Tessellator.addVertexWithUV( - f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f6, f8); + f11 - par3 * f10 + par6 * f10, + f12 + par4 * f10, + f13 - par5 * f10 + par7 * f10, + f6, + f8); par1Tessellator.addVertexWithUV( - f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10, f7, f8); + f11 + par3 * f10 + par6 * f10, + f12 + par4 * f10, + f13 + par5 * f10 + par7 * f10, + f7, + f8); par1Tessellator.addVertexWithUV( - f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10, f7, f9); + f11 + par3 * f10 - par6 * f10, + f12 - par4 * f10, + f13 + par5 * f10 - par7 * f10, + f7, + f9); } } diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index f9184a27..16271cf3 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -9,9 +9,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.*; public class CustomBowRenderer implements IItemRenderer { + Minecraft mc = Minecraft.getMinecraft(); private final RenderBlocks renderBlocksInstance = new RenderBlocks(); @@ -39,9 +41,8 @@ public class CustomBowRenderer implements IItemRenderer { IIcon icon; if (living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; - if (player.getItemInUse() != null) - icon = stack.getItem() - .getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount()); + if (player.getItemInUse() != null) icon = stack.getItem() + .getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount()); else icon = living.getItemIcon(stack, renderPass); } else { icon = living.getItemIcon(stack, renderPass); diff --git a/src/main/java/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java index a5bdddfa..6502e42a 100644 --- a/src/main/java/tconstruct/client/CustomFont.java +++ b/src/main/java/tconstruct/client/CustomFont.java @@ -4,19 +4,21 @@ import java.awt.*; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.io.*; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; + import org.lwjgl.opengl.GL11; /** * * @author TheObliterator * - * A class to create and draw true type fonts onto the Minecraft game - * engine. + * A class to create and draw true type fonts onto the Minecraft game engine. */ public class CustomFont { + private int texID; private final int[] xPos; private final int[] yPos; @@ -25,39 +27,29 @@ public class CustomFont { private final FontMetrics metrics; /** - * Instantiates the font, filling in default start and end character - * parameters. + * Instantiates the font, filling in default start and end character parameters. * * 'new CustomFont(ModLoader.getMinecraftInstance(), "Arial", 12); * - * @param mc - * The Minecraft instance for the font to be bound to. - * @param fontName - * The name of the font to be drawn. - * @param size - * The size of the font to be drawn. + * @param mc The Minecraft instance for the font to be bound to. + * @param fontName The name of the font to be drawn. + * @param size The size of the font to be drawn. */ public CustomFont(Minecraft mc, Object font, int size) { this(mc, font, size, 0, 4000); } /** - * Instantiates the font, pre-rendering a sprite font image by using a true - * type font on a bitmap. Then allocating that bitmap to the Minecraft - * rendering engine for later use. + * Instantiates the font, pre-rendering a sprite font image by using a true type font on a bitmap. Then allocating + * that bitmap to the Minecraft rendering engine for later use. * * 'new CustomFont(ModLoader.getMinecraftInstance(), "Arial", 12, 32, 126);' * - * @param mc - * The Minecraft instance for the font to be bound to. - * @param fontName - * The name of the font to be drawn. - * @param size - * The size of the font to be drawn. - * @param startChar - * The starting ASCII character id to be drawable. (Default 32) - * @param endChar - * The ending ASCII character id to be drawable. (Default 126) + * @param mc The Minecraft instance for the font to be bound to. + * @param fontName The name of the font to be drawn. + * @param size The size of the font to be drawn. + * @param startChar The starting ASCII character id to be drawable. (Default 32) + * @param endChar The ending ASCII character id to be drawable. (Default 126) */ public CustomFont(Minecraft mc, Object font, int size, int startChar, int endChar) { this.startChar = startChar; @@ -75,12 +67,10 @@ public class CustomFont { if (font instanceof String) { String fontName = (String) font; if (fontName.contains("/")) - g.setFont(Font.createFont(Font.TRUETYPE_FONT, new File(fontName)) - .deriveFont((float) size)); + g.setFont(Font.createFont(Font.TRUETYPE_FONT, new File(fontName)).deriveFont((float) size)); else g.setFont(new Font(fontName, 0, size)); } else if (font instanceof InputStream) { - g.setFont( - Font.createFont(Font.TRUETYPE_FONT, (InputStream) font).deriveFont((float) size)); + g.setFont(Font.createFont(Font.TRUETYPE_FONT, (InputStream) font).deriveFont((float) size)); } else if (font instanceof File) { g.setFont(Font.createFont(Font.TRUETYPE_FONT, (File) font).deriveFont((float) size)); } @@ -120,16 +110,11 @@ public class CustomFont { /** * Draws a given string with an automatically calculated shadow below it. * - * @param gui - * The gui/subclass to be drawn on - * @param text - * The string to be drawn - * @param x - * The x position to start drawing - * @param y - * The y position to start drawing - * @param color - * The color of the non-shadowed text (Hex) + * @param gui The gui/subclass to be drawn on + * @param text The string to be drawn + * @param x The x position to start drawing + * @param y The y position to start drawing + * @param color The color of the non-shadowed text (Hex) */ public void drawStringS(Gui gui, String text, int x, int y, int color) { int l = color & 0xff000000; @@ -142,16 +127,11 @@ public class CustomFont { /** * Draws a given string onto a gui/subclass. * - * @param gui - * The gui/subclass to be drawn on - * @param text - * The string to be drawn - * @param x - * The x position to start drawing - * @param y - * The y position to start drawing - * @param color - * The color of the non-shadowed text (Hex) + * @param gui The gui/subclass to be drawn on + * @param text The string to be drawn + * @param x The x position to start drawing + * @param y The y position to start drawing + * @param color The color of the non-shadowed text (Hex) */ public void drawString(Gui gui, String text, int x, int y, int color) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -180,8 +160,7 @@ public class CustomFont { } /** - * Returns the created FontMetrics which is used to retrive various - * information about the True Type Font + * Returns the created FontMetrics which is used to retrive various information about the True Type Font * * @return FontMetrics of the created font. */ @@ -192,8 +171,7 @@ public class CustomFont { /** * Gets the drawing width of a given string of string. * - * @param text - * The string to be measured + * @param text The string to be measured * @return The width of the given string. */ public int getStringWidth(String text) { @@ -203,8 +181,7 @@ public class CustomFont { /** * Gets the drawing height of a given string of string. * - * @param text - * The string to be measured + * @param text The string to be measured * @return The height of the given string. */ public int getStringHeight(String text) { @@ -212,13 +189,10 @@ public class CustomFont { } /** - * A method that returns a Rectangle that contains the width and height - * demensions of the given string. + * A method that returns a Rectangle that contains the width and height demensions of the given string. * - * @param text - * The string to be measured - * @return Rectangle containing width and height that the text will consume - * when drawn. + * @param text The string to be measured + * @return Rectangle containing width and height that the text will consume when drawn. */ private Rectangle getBounds(String text) { int w = 0; @@ -265,7 +239,11 @@ public class CustomFont { tessellator.startDrawingQuads(); tessellator.addVertexWithUV((x + 0), (y + height), 0, ((u + 0) * offsetWidth), ((v + height) * offsetHeight)); tessellator.addVertexWithUV( - (x + width), (y + height), 0, ((u + width) * offsetWidth), ((v + height) * offsetHeight)); + (x + width), + (y + height), + 0, + ((u + width) * offsetWidth), + ((v + height) * offsetHeight)); tessellator.addVertexWithUV((x + width), (y + 0), 0, ((u + width) * offsetWidth), ((v + 0) * offsetHeight)); tessellator.addVertexWithUV((x + 0), (y + 0), 0, ((u + 0) * offsetWidth), ((v + 0) * offsetHeight)); tessellator.draw(); diff --git a/src/main/java/tconstruct/client/FlexibleToolRenderer.java b/src/main/java/tconstruct/client/FlexibleToolRenderer.java index f22a9872..986a5709 100644 --- a/src/main/java/tconstruct/client/FlexibleToolRenderer.java +++ b/src/main/java/tconstruct/client/FlexibleToolRenderer.java @@ -6,12 +6,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; public class FlexibleToolRenderer implements IItemRenderer { + public float depth = 1 / 32f; public void setDepth(float d) { @@ -248,19 +251,17 @@ public class FlexibleToolRenderer implements IItemRenderer { ToolCore tool = (ToolCore) item.getItem(); IIcon[] tempParts = new IIcon[iconParts]; - label: - { + label: { if (!isInventory && ent instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) ent; ItemStack itemInUse = player.getItemInUse(); if (itemInUse != null) { int useCount = player.getItemInUseCount(); - for (int i = iconParts; i-- > 0; ) - tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); + for (int i = iconParts; i-- > 0;) tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); break label; } } - for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i); + for (int i = iconParts; i-- > 0;) tempParts[i] = tool.getIcon(item, i); } int count = 0; diff --git a/src/main/java/tconstruct/client/IconFlipped.java b/src/main/java/tconstruct/client/IconFlipped.java index 69e597d4..e349f145 100644 --- a/src/main/java/tconstruct/client/IconFlipped.java +++ b/src/main/java/tconstruct/client/IconFlipped.java @@ -4,6 +4,7 @@ import net.minecraft.util.IIcon; // required to fix Mojansg bugs... public class IconFlipped extends net.minecraft.client.renderer.IconFlipped { + private final IIcon baseIcon; private final boolean flipV; diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index c1b2da5b..8a7f2606 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -2,15 +2,20 @@ package tconstruct.client; import java.io.InputStream; import java.text.DecimalFormat; + import javax.xml.parsers.*; + import mantle.client.SmallFontRenderer; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraft.util.*; + import org.w3c.dom.Document; + import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.player.TPlayerStats; @@ -18,6 +23,7 @@ import tconstruct.common.TProxyCommon; import tconstruct.tools.items.ManualInfo; public class TProxyClient extends TProxyCommon { + public static DecimalFormat df = new DecimalFormat("##.#"); /* TODO: Split this class up into its respective parts */ @@ -35,7 +41,10 @@ public class TProxyClient extends TProxyCommon { public void registerRenderer() { Minecraft mc = Minecraft.getMinecraft(); smallFontRenderer = new SmallFontRenderer( - mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); + mc.gameSettings, + new ResourceLocation("textures/font/ascii.png"), + mc.renderEngine, + false); } public static Document diary; @@ -47,10 +56,7 @@ public class TProxyClient extends TProxyCommon { public void readManuals() { DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - String CurrentLanguage = Minecraft.getMinecraft() - .getLanguageManager() - .getCurrentLanguage() - .getLanguageCode(); + String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory); Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory); @@ -62,8 +68,8 @@ public class TProxyClient extends TProxyCommon { volume1 = volume1_cl != null ? volume1_cl : readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory); volume2 = volume2_cl != null ? volume2_cl : readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory); smelter = smelter_cl != null ? smelter_cl : readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory); - weaponry = - weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory); + weaponry = weaponry_cl != null ? weaponry_cl + : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory); initManualIcons(); initManualRecipes(); diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index 5b4b1686..326a92bc 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -6,11 +6,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.*; + import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; public class ToolCoreRenderer implements IItemRenderer { + private final boolean isEntity; private final boolean noEntityTranslation; @@ -66,19 +69,17 @@ public class ToolCoreRenderer implements IItemRenderer { // (requires more logic rewrite than it sounds like) IIcon[] tempParts = new IIcon[iconParts]; - label: - { + label: { if (!isInventory && ent instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) ent; ItemStack itemInUse = player.getItemInUse(); if (itemInUse != null) { int useCount = player.getItemInUseCount(); - for (int i = iconParts; i-- > 0; ) - tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); + for (int i = iconParts; i-- > 0;) tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); break label; } } - for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i); + for (int i = iconParts; i-- > 0;) tempParts[i] = tool.getIcon(item, i); } int count = 0; @@ -164,9 +165,8 @@ public class ToolCoreRenderer implements IItemRenderer { GL11.glTranslatef(0, -4 / 16f, 0); break; case ENTITY: - if (!noEntityTranslation) - GL11.glTranslatef( - -0.5f, 0f, depth); // correction of the rotation point when items lie on the ground + if (!noEntityTranslation) GL11.glTranslatef(-0.5f, 0f, depth); // correction of the rotation point + // when items lie on the ground break; default: } diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index 9a42655b..aef3c985 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -1,26 +1,29 @@ package tconstruct.client.entity.item; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class ExplosiveRender extends Render { + private final RenderBlocks blockRenderer = new RenderBlocks(); public ExplosiveRender() { this.shadowSize = 0.5F; } - public void renderPrimedTNT( - ExplosivePrimed par1EntityTNTPrimed, double par2, double par4, double par6, float par8, float par9) { + public void renderPrimedTNT(ExplosivePrimed par1EntityTNTPrimed, double par2, double par4, double par6, float par8, + float par9) { GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); float f2; @@ -67,8 +70,7 @@ public class ExplosiveRender extends Render { } /** - * Returns the location of an entity's texture. Doesn't seem to be called - * unless you call Render.bindEntityTexture. + * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. */ @Override protected ResourceLocation getEntityTexture(Entity par1Entity) { @@ -76,12 +78,10 @@ public class ExplosiveRender extends Render { } /** - * 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 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); + 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 + 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 + 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); @@ -508,8 +489,8 @@ public class DaggerRender extends Render { } /** - * 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 + * 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(); @@ -537,12 +518,10 @@ public class DaggerRender extends Render { } /** - * 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 0.0F) GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); // GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); @@ -72,47 +75,33 @@ public class DaggerRenderCustom extends Render { /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** - * Renders the item's overlay information. Examples being stack count or - * damage on top of the item's image at the specified position. + * 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, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** - * 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 1) - manual.renderitem.renderItemOverlayIntoGUI( - manual.fonts, - manual.getMC().renderEngine, - icons[0], - (localWidth + 106) / 2, - (localHeight + 74) / 2, - String.valueOf(icons[0].stackSize)); + if (icons[0].stackSize > 1) manual.renderitem.renderItemOverlayIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[0], + (localWidth + 106) / 2, + (localHeight + 74) / 2, + String.valueOf(icons[0].stackSize)); manual.renderitem.zLevel = 0; GL11.glScalef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 91ce0365..8f251caa 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -2,17 +2,21 @@ package tconstruct.client.pages; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.*; import org.w3c.dom.*; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; public class MaterialPage extends BookPage { + String title; ItemStack[] icons; String iconText; @@ -29,8 +33,7 @@ public class MaterialPage extends BookPage { if (nodes != null) iconText = nodes.item(0).getTextContent(); nodes = element.getElementsByTagName("icon"); - if (nodes != null) - icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); + if (nodes != null) icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); nodes = element.getElementsByTagName("toolmaterial"); if (nodes != null && nodes.getLength() > 0) @@ -98,17 +101,28 @@ public class MaterialPage extends BookPage { // renderitem.renderItemAndEffectIntoGUI(fonts, getMC().renderEngine, // icons[0], localWidth + 50, localHeight + 0); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[1], localWidth + 108, localHeight + 50); + manual.fonts, + manual.getMC().renderEngine, + icons[1], + localWidth + 108, + localHeight + 50); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[2], localWidth + 108, localHeight + 82); + manual.fonts, + manual.getMC().renderEngine, + icons[2], + localWidth + 108, + localHeight + 82); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[3], localWidth + 108, localHeight + 114); + manual.fonts, + manual.getMC().renderEngine, + icons[3], + localWidth + 108, + localHeight + 114); manual.renderitem.zLevel = 0; RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); - String icon = - icons[1].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); + String icon = icons[1].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); if (isTranslatable) icon = StatCollector.translateToLocal(icon); int iconOffset = icon.length() > 12 ? 0 : 3; manual.fonts.drawSplitString(icon, localWidth + 128, localHeight + 50 + iconOffset, 52, 0); @@ -118,9 +132,7 @@ public class MaterialPage extends BookPage { if (isTranslatable) icon = StatCollector.translateToLocal(icon); iconOffset = icon.length() > 12 ? 0 : 3; manual.fonts.drawSplitString( - icons[2].getTooltip(manual.getMC().thePlayer, false) - .get((0)) - .toString(), + icons[2].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 82 + iconOffset, 52, @@ -131,9 +143,7 @@ public class MaterialPage extends BookPage { if (isTranslatable) icon = StatCollector.translateToLocal(icon); iconOffset = icon.length() > 12 ? 0 : 3; manual.fonts.drawSplitString( - icons[3].getTooltip(manual.getMC().thePlayer, false) - .get((0)) - .toString(), + icons[3].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 114 + iconOffset, 52, @@ -141,8 +151,8 @@ public class MaterialPage extends BookPage { } manual.fonts.drawString(durability + ": " + material.durability(), localWidth, localHeight + 40, 0); - manual.fonts.drawString( - handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0); + manual.fonts + .drawString(handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0); manual.fonts.drawString( fullToolDurability + ": " + (int) (material.durability() * material.handleDurability()), localWidth, @@ -151,19 +161,20 @@ public class MaterialPage extends BookPage { manual.fonts.drawString(miningSpeed + ": " + material.toolSpeed() / 100f, localWidth, localHeight + 80, 0); manual.fonts.drawString( - miningLevel + ": " + material.harvestLevel() + " (" - + HarvestLevels.getHarvestLevelName(material.harvestLevel()) + ")", + miningLevel + ": " + + material.harvestLevel() + + " (" + + HarvestLevels.getHarvestLevelName(material.harvestLevel()) + + ")", localWidth, localHeight + 90, 0); int attack = material.attack(); String heart = attack == 2 ? " " + heart_ : " " + hearts; - if (attack % 2 == 0) - manual.fonts.drawString( - baseAttack + ": " + material.attack() / 2 + heart, localWidth, localHeight + 100, 0); - else - manual.fonts.drawString( - baseAttack + ": " + material.attack() / 2f + heart, localWidth, localHeight + 100, 0); + if (attack % 2 == 0) manual.fonts + .drawString(baseAttack + ": " + material.attack() / 2 + heart, localWidth, localHeight + 100, 0); + else manual.fonts + .drawString(baseAttack + ": " + material.attack() / 2f + heart, localWidth, localHeight + 100, 0); int offset = 0; String ability = material.ability(); @@ -178,17 +189,26 @@ public class MaterialPage extends BookPage { manual.fonts.drawString(traitReinforced, localWidth, localHeight + 120 + 10 * offset, 0); offset++; manual.fonts.drawString( - reinforcedLevel + ": " + material.reinforced(), localWidth, localHeight + 120 + 10 * offset, 0); + reinforcedLevel + ": " + material.reinforced(), + localWidth, + localHeight + 120 + 10 * offset, + 0); offset++; } if (material.shoddy() > 0) { manual.fonts.drawString( - stoneboundLevel + ": " + material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); + stoneboundLevel + ": " + material.shoddy(), + localWidth, + localHeight + 120 + 10 * offset, + 0); offset++; } else if (material.shoddy() < 0) { manual.fonts.drawString( - splinteringLevel + ": " + -material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); + splinteringLevel + ": " + -material.shoddy(), + localWidth, + localHeight + 120 + 10 * offset, + 0); offset++; } } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 1ab11006..74f40292 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -1,15 +1,19 @@ package tconstruct.client.pages; import java.util.*; + import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.*; + import org.lwjgl.opengl.*; import org.w3c.dom.*; public class ModifierPage extends BookPage { + String type; ItemStack[] icons; ItemStack[][] iconsMulti; @@ -31,10 +35,9 @@ public class ModifierPage extends BookPage { if (type.equals("travelmulti")) { List stacks = new LinkedList<>(); List tools = new LinkedList<>(); - String[] suffixes = new String[] {"goggles", "vest", "wings", "boots", "glove", "belt"}; + String[] suffixes = new String[] { "goggles", "vest", "wings", "boots", "glove", "belt" }; for (String suffix : suffixes) { - ItemStack[] icons2 = - MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent() + suffix); + ItemStack[] icons2 = MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent() + suffix); if (icons2 != null) { stacks.add(icons2); tools.add(suffix); @@ -78,8 +81,7 @@ public class ModifierPage extends BookPage { if (type.equals("travelmulti")) toolstack = toolMulti[counter]; // update displayed item - if (iconsMulti != null - && iconsMulti.length > 0 + if (iconsMulti != null && iconsMulti.length > 0 && type.equals("travelmulti") && System.currentTimeMillis() - lastUpdate > 1000) { lastUpdate = System.currentTimeMillis(); @@ -104,14 +106,17 @@ public class ModifierPage extends BookPage { (localWidth + 130) / 2, (localHeight + 54) / 2); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 18) / 2, (localHeight + 36) / 2); - if (icons[2] != null) - manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, - manual.getMC().renderEngine, - icons[2], - (localWidth + 18) / 2, - (localHeight + 74) / 2); + manual.fonts, + manual.getMC().renderEngine, + icons[1], + (localWidth + 18) / 2, + (localHeight + 36) / 2); + if (icons[2] != null) manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[2], + (localWidth + 18) / 2, + (localHeight + 74) / 2); } else { manual.renderitem.renderItemAndEffectIntoGUI( manual.fonts, @@ -126,18 +131,29 @@ public class ModifierPage extends BookPage { (localWidth + 140) / 2, (localHeight + 54) / 2); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth - 2) / 2, (localHeight + 36) / 2); + manual.fonts, + manual.getMC().renderEngine, + icons[1], + (localWidth - 2) / 2, + (localHeight + 36) / 2); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth - 2) / 2, (localHeight + 74) / 2); + manual.fonts, + manual.getMC().renderEngine, + icons[2], + (localWidth - 2) / 2, + (localHeight + 74) / 2); manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[3], (localWidth + 36) / 2, (localHeight + 36) / 2); - if (icons[4] != null) - manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, - manual.getMC().renderEngine, - icons[4], - (localWidth + 36) / 2, - (localHeight + 74) / 2); + manual.fonts, + manual.getMC().renderEngine, + icons[3], + (localWidth + 36) / 2, + (localHeight + 36) / 2); + if (icons[4] != null) manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[4], + (localWidth + 36) / 2, + (localHeight + 74) / 2); } manual.renderitem.zLevel = 0; diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index 9087e64d..a3764580 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -2,13 +2,16 @@ package tconstruct.client.pages; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.*; import org.w3c.dom.*; public class ToolPage extends BookPage { + String title; ItemStack[] icons; String[] iconText; @@ -35,8 +38,7 @@ public class ToolPage extends BookPage { } nodes = element.getElementsByTagName("icon"); - if (nodes != null) - icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); + if (nodes != null) icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); } @Override @@ -60,7 +62,11 @@ public class ToolPage extends BookPage { RenderHelper.enableGUIStandardItemLighting(); manual.renderitem.zLevel = 100; manual.renderitem.renderItemAndEffectIntoGUI( - manual.fonts, manual.getMC().renderEngine, icons[0], localWidth + 50, localHeight + 0); + manual.fonts, + manual.getMC().renderEngine, + icons[0], + localWidth + 50, + localHeight + 0); for (int i = 1; i < icons.length; i++) { manual.renderitem.renderItemAndEffectIntoGUI( manual.fonts, @@ -70,7 +76,11 @@ public class ToolPage extends BookPage { localHeight + 20 + 10 * size + 18 * i); int partOffset = iconText[i + 1].length() > 11 ? -3 : 0; manual.fonts.drawSplitString( - iconText[i + 1], localWidth + 140, localHeight + 24 + 10 * size + 18 * i + partOffset, 44, 0); + iconText[i + 1], + localWidth + 140, + localHeight + 24 + 10 * size + 18 * i + partOffset, + 44, + 0); } manual.renderitem.zLevel = 0; RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index 7f8be6fc..82f9265f 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -6,9 +6,11 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.*; public abstract class AbstractTab extends GuiButton { + ResourceLocation texture = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); ItemStack renderStack; RenderItem itemRenderer = new RenderItem(); @@ -37,9 +39,17 @@ public abstract class AbstractTab extends GuiButton { GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); this.itemRenderer.renderItemAndEffectIntoGUI( - mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); + mc.fontRenderer, + mc.renderEngine, + renderStack, + xPosition + 6, + yPosition + 8); this.itemRenderer.renderItemOverlayIntoGUI( - mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); + mc.fontRenderer, + mc.renderEngine, + renderStack, + xPosition + 6, + yPosition + 8); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); this.itemRenderer.zLevel = 0.0F; @@ -50,8 +60,7 @@ public abstract class AbstractTab extends GuiButton { @Override public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) { - boolean inWindow = this.enabled - && this.visible + boolean inWindow = this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java index 7d6fb9db..7fbb3836 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java @@ -2,9 +2,11 @@ package tconstruct.client.tabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import tconstruct.client.ArmorControls; public class InventoryTabArmorExtended extends AbstractTab { + public InventoryTabArmorExtended() { super(0, 0, 0, new ItemStack(Items.diamond_chestplate)); } diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index e3fb70dc..4c1be6e0 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -1,10 +1,12 @@ package tconstruct.client.tabs; import net.minecraft.item.ItemStack; + import tconstruct.armor.*; import tconstruct.client.ArmorControls; public class InventoryTabKnapsack extends AbstractTab { + public InventoryTabKnapsack() { super(0, 0, 0, new ItemStack(TinkerArmor.knapsack)); } @@ -16,8 +18,7 @@ public class InventoryTabKnapsack extends AbstractTab { @Override public boolean shouldAddToList() { - return ArmorProxyClient.armorExtended != null - && ArmorProxyClient.armorExtended.inventory[2] != null + return ArmorProxyClient.armorExtended != null && ArmorProxyClient.armorExtended.inventory[2] != null && ArmorProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack; } } diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java b/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java index ea3ffe5e..699e2b0c 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java @@ -4,6 +4,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; public class InventoryTabVanilla extends AbstractTab { + public InventoryTabVanilla() { super(0, 0, 0, new ItemStack(Blocks.crafting_table)); } diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 858daf06..9e1e6fab 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -1,17 +1,20 @@ package tconstruct.client.tabs; +import java.util.*; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.network.play.client.C0DPacketCloseWindow; +import net.minecraftforge.client.event.GuiScreenEvent; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.*; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiInventory; -import net.minecraft.network.play.client.C0DPacketCloseWindow; -import net.minecraftforge.client.event.GuiScreenEvent; public class TabRegistry { + private static final ArrayList tabList = new ArrayList<>(); public static void registerTab(AbstractTab tab) { @@ -81,8 +84,7 @@ public class TabRegistry { return 60; } } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } else { // If NEI is not installed, offset the tabs return 60; diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index 53e91c5e..d083c610 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -1,11 +1,14 @@ package tconstruct.common; -import cpw.mods.fml.common.network.IGuiHandler; import java.util.HashMap; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + public class TProxyCommon implements IGuiHandler { + public void initialize() {} @Override diff --git a/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java index 2d6f7944..46d4192a 100644 --- a/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java +++ b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; public class MetadataItemBlock extends ItemBlock { + public MetadataItemBlock(Block b) { super(b); setMaxDamage(0); diff --git a/src/main/java/tconstruct/gadgets/TinkerGadgets.java b/src/main/java/tconstruct/gadgets/TinkerGadgets.java index 63db7a60..67277ca8 100644 --- a/src/main/java/tconstruct/gadgets/TinkerGadgets.java +++ b/src/main/java/tconstruct/gadgets/TinkerGadgets.java @@ -1,24 +1,28 @@ package tconstruct.gadgets; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Locale; + import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.ShapedOreRecipe; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import tconstruct.TConstruct; import tconstruct.gadgets.item.ItemSlimeBoots; import tconstruct.gadgets.item.ItemSlimeSling; import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; @Pulse(id = "Tinkers' Gadgets", description = "All the fun toys.", forced = true) public class TinkerGadgets { @@ -45,8 +49,18 @@ public class TinkerGadgets { GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(slimeBoots), " ", "s s", "b b", 's', "slimeball", 'b', ore)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(slimeSling), "fbf", "s s", " s ", 'f', Items.string, 's', "slimeball", 'b', ore)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(slimeSling), + "fbf", + "s s", + " s ", + 'f', + Items.string, + 's', + "slimeball", + 'b', + ore)); TConstructRegistry.gadgetsTab.init(new ItemStack(slimeBoots)); } diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java index b6fd3adf..0a214a2e 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -1,9 +1,7 @@ package tconstruct.gadgets.item; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.I18n; @@ -23,14 +21,18 @@ import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingFallEvent; + import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; import tconstruct.library.armor.ArmorPart; import tconstruct.tools.entity.FancyEntityItem; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { - public static ArmorMaterial SLIME_MATERIAL = EnumHelper.addArmorMaterial("SLIME", 100, new int[] {0, 0, 0, 0}, 0); + public static ArmorMaterial SLIME_MATERIAL = EnumHelper.addArmorMaterial("SLIME", 100, new int[] { 0, 0, 0, 0 }, 0); public final ArmorPart armorPart; protected final String textureFolder; @@ -178,8 +180,8 @@ public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { // ISpecialArmor overrides @Override - public ArmorProperties getProperties( - EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, + int slot) { return new ArmorProperties(0, armor.getItemDamage() / 100, 100); } @@ -217,10 +219,9 @@ public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add("Boooounce!"); - list.add("Hold " - + (I18n.format( - Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription())) - + " to stop bouncing."); + list.add( + "Hold " + (I18n.format(Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription())) + + " to stop bouncing."); } /* Prevent armor from dying */ diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java index 336de0f6..1ed77751 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java @@ -1,8 +1,7 @@ package tconstruct.gadgets.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -14,11 +13,14 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.gadgets.TinkerGadgets; import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; import tconstruct.util.network.MovementUpdatePacket; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemSlimeSling extends Item { @@ -28,8 +30,7 @@ public class ItemSlimeSling extends Item { } /** - * Called whenever this item is equipped and the right mouse button is pressed. - * Args: itemStack, world, entityPlayer + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ @Override public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 3a63d7dd..05f11a4d 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -1,19 +1,21 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.weaponry.TinkerWeaponry; +import cpw.mods.fml.relauncher.*; @Deprecated public class Arrow extends ToolCore { @@ -85,7 +87,7 @@ public class Arrow extends ToolCore { @Override public String[] getTraits() { - return new String[] {"ammo"}; + return new String[] { "ammo" }; } @Override @@ -152,17 +154,8 @@ public class Arrow extends ToolCore { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { return false; } @@ -212,9 +205,13 @@ public class Arrow extends ToolCore { } } int attack = (int) (tags.getCompoundTag("InfiTool").getInteger("Attack") * this.getDamageModifier()); - list.add("\u00A79+" + attack + " " - + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); - list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " - + StatCollector.translateToLocalFormatted("attribute.name.ammo.attackDamage")); + list.add( + "\u00A79+" + attack + + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); + list.add( + "\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + + " " + + StatCollector.translateToLocalFormatted("attribute.name.ammo.attackDamage")); } } diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 873a894b..ead427e4 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,16 +1,18 @@ package tconstruct.items.tools; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.library.tools.Weapon; import tconstruct.tools.*; import tconstruct.tools.logic.EquipLogic; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; public class BattleSign extends Weapon { + public BattleSign() { super(1); this.setUnlocalizedName("InfiTool.Battlesign"); @@ -68,17 +70,8 @@ public class BattleSign extends Weapon { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { if (side == 0 || !player.isSneaking()) { return false; } else if (!world.getBlock(x, y, z).getMaterial().isSolid()) { diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index cac16566..205ea299 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,10 +1,8 @@ package tconstruct.items.tools; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; @@ -19,15 +17,19 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import tconstruct.library.tools.AOEHarvestTool; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), - @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword") -}) + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), + @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword") }) public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { + public Battleaxe() { super(4, 1, 1); this.setUnlocalizedName("InfiTool.Battleaxe"); @@ -44,14 +46,14 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block b, int x, int y, int z, EntityLivingBase player) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block b, int x, int y, int z, + EntityLivingBase player) { if (b != null && b.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, b, x, y, z, player, random); } - static Material[] materials = {Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd}; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; @Override public Item getHeadItem() { @@ -128,23 +130,14 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "harvest", "melee", "slicing"}; + return new String[] { "weapon", "harvest", "melee", "slicing" }; } /* Battleaxe Specific */ @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { return false; } @@ -239,8 +232,8 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity( - PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, + ItemStack offhandItem) { return true; } @@ -267,9 +260,8 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { if (offhand == null) return true; - return (mainhand != null - && mainhand.getItem() != TinkerTools.cleaver - && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 1df16d7d..986b479a 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -1,6 +1,7 @@ package tconstruct.items.tools; import java.util.*; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.*; import net.minecraft.entity.player.*; @@ -12,6 +13,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.*; + import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; @@ -20,6 +22,7 @@ import tconstruct.util.config.PHConstruct; @Deprecated public abstract class BowBase extends ToolCore { + public BowBase() { super(0); } @@ -106,7 +109,10 @@ public abstract class BowBase extends ToolCore { AbilityHelper.damageTool(stack, 1, player, false); } world.playSoundAtEntity( - player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); + player, + "random.bow", + 1.0F, + 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); if (creative) { arrowEntity.canBePickedUp = 2; @@ -148,8 +154,7 @@ public abstract class BowBase extends ToolCore { } /** - * returns the action that specifies what animation to play when the items - * is being used + * returns the action that specifies what animation to play when the items is being used */ @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { @@ -157,8 +162,7 @@ public abstract class BowBase extends ToolCore { } /** - * Called whenever this item is equipped and the right mouse button is - * pressed. Args: itemStack, world, entityPlayer + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ @Override public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer player) { @@ -171,8 +175,7 @@ public abstract class BowBase extends ToolCore { return event.result; } - if (player.capabilities.isCreativeMode - || player.inventory.hasItemStack(new ItemStack(Items.arrow)) + if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow))) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } @@ -188,34 +191,34 @@ public abstract class BowBase extends ToolCore { super.registerIcons(iconRegister); if (PHConstruct.minimalTextures) { headIcons1.clear(); - headIcons1.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1")); + headIcons1 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1")); handleIcons1.clear(); - handleIcons1.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1")); + handleIcons1 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1")); accessoryIcons1.clear(); - accessoryIcons1.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1")); + accessoryIcons1 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1")); headIcons2.clear(); - headIcons2.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2")); + headIcons2 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2")); handleIcons2.clear(); - handleIcons2.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2")); + handleIcons2 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2")); accessoryIcons2.clear(); - accessoryIcons2.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2")); + accessoryIcons2 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2")); headIcons3.clear(); - headIcons3.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3")); + headIcons3 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3")); handleIcons3.clear(); - handleIcons3.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3")); + handleIcons3 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3")); accessoryIcons3.clear(); - accessoryIcons3.put( - -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3")); + accessoryIcons3 + .put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3")); // effect icons effectIcons1.clear(); @@ -233,8 +236,7 @@ public abstract class BowBase extends ToolCore { accessoryIcons1.clear(); extraIcons1.clear(); effectIcons1.clear(); - Iterator> iterOne = - headStrings.entrySet().iterator(); + Iterator> iterOne = headStrings.entrySet().iterator(); while (iterOne.hasNext()) { Map.Entry pairs = iterOne.next(); headIcons1.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); @@ -273,8 +275,7 @@ public abstract class BowBase extends ToolCore { accessoryIcons2.clear(); extraIcons2.clear(); effectIcons2.clear(); - Iterator> iterTwo = - headStrings.entrySet().iterator(); + Iterator> iterTwo = headStrings.entrySet().iterator(); while (iterTwo.hasNext()) { Map.Entry pairs = iterTwo.next(); headIcons2.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); @@ -313,8 +314,7 @@ public abstract class BowBase extends ToolCore { accessoryIcons3.clear(); extraIcons3.clear(); effectIcons3.clear(); - Iterator> iterThree = - headStrings.entrySet().iterator(); + Iterator> iterThree = headStrings.entrySet().iterator(); while (iterThree.hasNext()) { Map.Entry pairs = iterThree.next(); headIcons3.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); diff --git a/src/main/java/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java index 94e39f9d..f5794164 100644 --- a/src/main/java/tconstruct/items/tools/Broadsword.java +++ b/src/main/java/tconstruct/items/tools/Broadsword.java @@ -1,10 +1,12 @@ package tconstruct.items.tools; import net.minecraft.item.Item; + import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; public class Broadsword extends Weapon { + public Broadsword() { super(4); this.setUnlocalizedName("InfiTool.Broadsword"); @@ -53,13 +55,9 @@ public class Broadsword 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; if (player.itemInUse != - * null && player.itemInUse.getItem() == this) { - * player.movementInput.moveForward *= 5.0F; player.movementInput.moveStrafe - * *= 5.0F; } } } + * @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/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index c1d20916..61ff321f 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -1,6 +1,5 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; @@ -10,12 +9,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.library.crafting.Detailing.DetailInput; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.*; public class Chisel extends ToolCore { + public Chisel() { super(0); this.setUnlocalizedName("InfiTool.Chisel"); @@ -49,17 +51,8 @@ public class Chisel extends ToolCore { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { return false; } @@ -188,6 +181,6 @@ public class Chisel extends ToolCore { @Override public String[] getTraits() { - return new String[] {"utility"}; + return new String[] { "utility" }; } } diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index d6e81f9e..123f5751 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -5,10 +5,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.potion.*; import net.minecraft.world.World; + import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; public class Cleaver extends Weapon { + public Cleaver() { super(5); this.setUnlocalizedName("InfiTool.Cleaver"); @@ -99,10 +101,8 @@ public class Cleaver extends Weapon { entity.hurtResistantTime += 7; /* - * if (entity instanceof EntityLiving) { EntityLiving living = - * (EntityLiving) entity; if (living.getHealth() <= 0) { - * - * } } + * if (entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; if (living.getHealth() + * <= 0) { } } */ // if (entity.getHealth() <= 0) } @@ -122,7 +122,7 @@ public class Cleaver extends Weapon { } /* - * @Override public boolean onEntitySwing (EntityLiving entity, ItemStack - * stack) { entity.swingProgressInt /= 2; return false; } + * @Override public boolean onEntitySwing (EntityLiving entity, ItemStack stack) { entity.swingProgressInt /= 2; + * return false; } */ } diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index 5612d03d..c9ea4f0a 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -1,10 +1,12 @@ package tconstruct.items.tools; import net.minecraft.item.Item; + import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; public class Cutlass extends Weapon { + public Cutlass() { super(4); this.setUnlocalizedName("InfiTool.Cutlass"); diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index d047bfd7..77c0e29a 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -3,11 +3,13 @@ package tconstruct.items.tools; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.world.World; + import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.DaggerEntity; public class Dagger extends Weapon { + public Dagger() { super(1); this.setUnlocalizedName("InfiTool.Dagger"); @@ -40,7 +42,7 @@ public class Dagger extends Weapon { @Override public String[] getTraits() { - return new String[] {"weapon", "melee", "throwing"}; + return new String[] { "weapon", "melee", "throwing" }; } @Override diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 00d9750d..965ad952 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -2,10 +2,12 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.item.*; + import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; public class Excavator extends AOEHarvestTool { + public Excavator() { super(2, 1, 0); this.setUnlocalizedName("InfiTool.Excavator"); @@ -21,9 +23,8 @@ public class Excavator extends AOEHarvestTool { return "shovel"; } - static Material[] materials = { - Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay - }; + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, + Material.clay }; @Override public Item getHeadItem() { diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index 667b27e7..4fc7db0f 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -1,6 +1,7 @@ package tconstruct.items.tools; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; @@ -9,12 +10,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.EquipLogic; public class FryingPan extends Weapon { + public FryingPan() { super(2); this.setUnlocalizedName("InfiTool.FryPan"); @@ -67,7 +70,7 @@ public class FryingPan extends Weapon { tags.setInteger("BaseDurability", Integer.MAX_VALUE / 100); tags.setInteger("MiningSpeed", Integer.MAX_VALUE / 100); - int[] keyPair = new int[] {Integer.MAX_VALUE / 100, 0, 0}; + int[] keyPair = new int[] { Integer.MAX_VALUE / 100, 0, 0 }; tags.setIntArray("Blaze", keyPair); tags.setInteger("Necrotic", Integer.MAX_VALUE / 100); tags.setInteger("Effect1", 7); @@ -77,17 +80,8 @@ public class FryingPan extends Weapon { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { if (side == 0 || !player.isSneaking()) { return false; } else if (!world.getBlock(x, y, z).getMaterial().isSolid()) { @@ -121,7 +115,12 @@ public class FryingPan extends Weapon { world.setBlock(x, y, z, TinkerTools.heldItemBlock, 0, 3); TinkerTools.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); world.playSoundEffect( - x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); + x, + y, + z, + "tinker:frypan_hit", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); EquipLogic logic = (EquipLogic) world.getTileEntity(x, y, z); logic.setEquipmentItem(stack); diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 75af421e..f66ba99c 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -1,16 +1,19 @@ package tconstruct.items.tools; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; + import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; public class Hammer extends AOEHarvestTool { + public Hammer() { super(2, 1, 0); this.setUnlocalizedName("InfiTool.Hammer"); @@ -41,9 +44,8 @@ public class Hammer extends AOEHarvestTool { return materials; } - static Material[] materials = - new Material[] {Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil - }; + static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, + Material.piston, Material.anvil }; @Override public Item getHeadItem() { @@ -150,6 +152,6 @@ public class Hammer extends AOEHarvestTool { @Override public String[] getTraits() { - return new String[] {"weapon", "harvest", "melee", "bludgeoning"}; + return new String[] { "weapon", "harvest", "melee", "bludgeoning" }; } } diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 461a5194..626d4827 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -5,10 +5,12 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.*; import net.minecraft.world.World; + import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; public class Hatchet extends HarvestTool { + public Hatchet() { super(3); this.setUnlocalizedName("InfiTool.Axe"); @@ -25,16 +27,15 @@ public class Hatchet extends HarvestTool { } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, + EntityLivingBase player) { if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { - Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.gourd - }; + static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, + Material.gourd }; @Override public Item getHeadItem() { diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 4f163009..4be19a0e 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -1,16 +1,18 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; + import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.*; public class Longsword extends Weapon { + public Longsword() { super(4); this.setUnlocalizedName("InfiTool.Longsword"); @@ -37,21 +39,13 @@ public class Longsword extends Weapon { @Override public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useCount) { /* - * if (player.onGround) { int time = this.getMaxItemUseDuration(stack) - - * useCount; if (time > 5) { player.addExhaustion(0.2F); - * player.setSprinting(true); - * - * float speed = 0.05F * time; if (speed > 0.925f) speed = 0.925f; - * - * float increase = (float) (0.02 * time + 0.2); if (increase > 0.56f) - * increase = 0.56f; player.motionY += increase + speed/3; - * - * player.motionX = (double) (-MathHelper.sin(player.rotationYaw / - * 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / - * 180.0F * (float) Math.PI) * speed); player.motionZ = (double) - * (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * - * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * - * speed); } } + * if (player.onGround) { int time = this.getMaxItemUseDuration(stack) - useCount; if (time > 5) { + * player.addExhaustion(0.2F); player.setSprinting(true); float speed = 0.05F * time; if (speed > 0.925f) speed + * = 0.925f; float increase = (float) (0.02 * time + 0.2); if (increase > 0.56f) increase = 0.56f; + * player.motionY += increase + speed/3; player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F + * * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); player.motionZ + * = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); } } */ int time = this.getMaxItemUseDuration(stack) - useCount; if (time > 5) { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index ced650c9..afd42a2a 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -1,15 +1,11 @@ package tconstruct.items.tools; -import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import gnu.trove.set.hash.THashSet; import java.util.Queue; import java.util.Set; import java.util.Stack; + import mantle.player.PlayerUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -18,11 +14,21 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; + import tconstruct.library.*; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; +import com.google.common.collect.Lists; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import gnu.trove.set.hash.THashSet; + public class LumberAxe extends AOEHarvestTool { + public LumberAxe() { super(0, 1, 1); this.setUnlocalizedName("InfiTool.LumberAxe"); @@ -49,25 +55,22 @@ public class LumberAxe extends AOEHarvestTool { } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, + EntityLivingBase player) { if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = {Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd}; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; /* Lumber axe specific */ /* - * @Override public void onUpdate (ItemStack stack, World world, Entity - * entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, - * par4, par5); if (entity instanceof EntityPlayer) { EntityPlayer player = - * (EntityPlayer) entity; ItemStack equipped = - * player.getCurrentEquippedItem(); if (equipped == stack) { - * player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 1, 1)); } - * } } + * @Override public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) { + * super.onUpdate(stack, world, entity, par4, par5); if (entity instanceof EntityPlayer) { EntityPlayer player = + * (EntityPlayer) entity; ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == stack) { + * player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 1, 1)); } } } */ @Override @@ -89,18 +92,17 @@ public class LumberAxe extends AOEHarvestTool { if (wood == null) return super.onBlockStartBreak(stack, x, y, z, player); - if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) - if (detectTree(world, x, y, z)) { - TreeChopTask chopper = new TreeChopTask(this, stack, new ChunkPosition(x, y, z), player, 128); - try { - FMLCommonHandler.instance().bus().register(chopper); - } catch (LinkageError l) { - PlayerUtils.sendChatMessage(player, "Well, that's embarrassing, you missed!"); - FMLLog.warning("Unable to spawn TreeChopTask due to LinkageError"); - } - // custom block breaking code, don't call vanilla code - return true; + if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) if (detectTree(world, x, y, z)) { + TreeChopTask chopper = new TreeChopTask(this, stack, new ChunkPosition(x, y, z), player, 128); + try { + FMLCommonHandler.instance().bus().register(chopper); + } catch (LinkageError l) { + PlayerUtils.sendChatMessage(player, "Well, that's embarrassing, you missed!"); + FMLLog.warning("Unable to spawn TreeChopTask due to LinkageError"); } + // custom block breaking code, don't call vanilla code + return true; + } return super.onBlockStartBreak(stack, x, y, z, player); } @@ -142,8 +144,7 @@ public class LumberAxe extends AOEHarvestTool { for (int offX = 0; offX < d; offX++) { for (int offY = 0; offY < d; offY++) { for (int offZ = 0; offZ < d; offZ++) { - int xPos = pos.chunkPosX - 1 + offX, - yPos = pos.chunkPosY - 1 + offY, + int xPos = pos.chunkPosX - 1 + offX, yPos = pos.chunkPosY - 1 + offY, zPos = pos.chunkPosZ - 1 + offZ; Block leaf = world.getBlock(xPos, yPos, zPos); if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) { @@ -170,8 +171,8 @@ public class LumberAxe extends AOEHarvestTool { public Queue blocks = Lists.newLinkedList(); public Set visited = new THashSet<>(); - public TreeChopTask( - AOEHarvestTool tool, ItemStack stack, ChunkPosition start, EntityPlayer player, int blocksPerTick) { + public TreeChopTask(AOEHarvestTool tool, ItemStack stack, ChunkPosition start, EntityPlayer player, + int blocksPerTick) { this.world = player.getEntityWorld(); this.player = player; this.tool = tool; diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index db2fc0aa..13858d03 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -1,16 +1,19 @@ package tconstruct.items.tools; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; public class Mattock extends DualHarvestTool { + public Mattock() { super(3); this.setUnlocalizedName("InfiTool.Mattock"); @@ -36,8 +39,8 @@ public class Mattock extends DualHarvestTool { return "shovel"; } - static Material[] axeMaterials = {Material.wood, Material.cactus, Material.plants, Material.vine, Material.gourd}; - static Material[] shovelMaterials = {Material.grass, Material.ground, Material.clay}; + static Material[] axeMaterials = { Material.wood, Material.cactus, Material.plants, Material.vine, Material.gourd }; + static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay }; @Override public Item getHeadItem() { @@ -83,17 +86,8 @@ public class Mattock extends DualHarvestTool { /* Mattock specific */ @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); if (tags.getBoolean("Broken")) return false; @@ -108,7 +102,7 @@ public class Mattock extends DualHarvestTool { } private boolean allowCrafting(int head) { - int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; for (int nonMetal : nonMetals) { if (head == nonMetal) return false; } diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index 6e8f2e5b..7efdfb7d 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -2,10 +2,12 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.item.Item; + import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; public class Pickaxe extends HarvestTool { + public Pickaxe() { super(1); this.setUnlocalizedName("InfiTool.Pickaxe"); @@ -21,9 +23,8 @@ public class Pickaxe extends HarvestTool { return materials; } - static Material[] materials = new Material[] { - Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits - }; + static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, + Material.piston, Material.anvil, Material.circuits }; @Override public Item getHeadItem() { diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 4e6c2f12..0d7d9582 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -1,7 +1,7 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -11,13 +11,16 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.tools.entity.LaunchedPotion; +import cpw.mods.fml.relauncher.*; public class PotionLauncher extends Item { + @SideOnly(Side.CLIENT) private IIcon[] icons; - public static final String[] textureNames = new String[] {"potionlauncher"}; + public static final String[] textureNames = new String[] { "potionlauncher" }; public PotionLauncher() { super(); @@ -75,14 +78,13 @@ public class PotionLauncher extends Item { } /** - * returns the action that specifies what animation to play when the items - * is being used + * returns the action that specifies what animation to play when the items is being used */ @Override public EnumAction getItemUseAction(ItemStack stack) { - if (stack != null - && stack.hasTagCompound() - && !stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) return EnumAction.bow; + if (stack != null && stack.hasTagCompound() + && !stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) + return EnumAction.bow; else return EnumAction.none; } diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index 29b02c83..876f110f 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -6,10 +6,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; + import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; public class Rapier extends Weapon { + public Rapier() { super(2); this.setUnlocalizedName("InfiTool.Rapier"); diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 4a0518d8..bed8af70 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -1,7 +1,7 @@ package tconstruct.items.tools; -import cpw.mods.fml.client.FMLClientHandler; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -18,11 +18,14 @@ import net.minecraft.stats.StatList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; + import tconstruct.library.*; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.client.FMLClientHandler; public class Scythe extends Weapon { + public Scythe() { super(4); this.setUnlocalizedName("InfiTool.Scythe"); @@ -37,9 +40,8 @@ public class Scythe extends Weapon { return materials; } - static Material[] materials = new Material[] { - Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine, Material.gourd - }; + static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, + Material.vine, Material.gourd }; @Override public Item getHeadItem() { @@ -121,7 +123,7 @@ public class Scythe extends Weapon { @Override public String[] getTraits() { - return new String[] {"weapon", "melee", "harvest"}; + return new String[] { "weapon", "melee", "harvest" }; } /* Scythe Specific */ @@ -149,53 +151,55 @@ public class Scythe extends Weapon { if (!cancelHarvest) { Block localBlock = world.getBlock(xPos, yPos, zPos); int localMeta = world.getBlockMetadata(xPos, yPos, zPos); - float localHardness = localBlock == null - ? Float.MAX_VALUE + float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); - if (localBlock - != null) // && (block.blockMaterial == Material.leaves || block.isLeaves(world, + if (localBlock != null) // && (block.blockMaterial == Material.leaves || + // block.isLeaves(world, // xPos, yPos, zPos))) { for (Material material : materials) { if (material == localBlock.getMaterial()) { if (!player.capabilities.isCreativeMode) { - if (butter - && localBlock instanceof IShearable + if (butter && localBlock instanceof IShearable && ((IShearable) localBlock) .isShearable(stack, player.worldObj, xPos, yPos, zPos)) { - ArrayList drops = ((IShearable) localBlock) - .onSheared( - stack, - player.worldObj, - xPos, - yPos, - zPos, - EnchantmentHelper.getEnchantmentLevel( - Enchantment.fortune.effectId, stack)); + ArrayList drops = ((IShearable) localBlock).onSheared( + stack, + player.worldObj, + xPos, + yPos, + zPos, + EnchantmentHelper.getEnchantmentLevel( + Enchantment.fortune.effectId, + stack)); Random rand = new Random(); - if (!world.isRemote) - for (ItemStack dropStack : drops) { - float f = 0.7F; - double d = (double) (rand.nextFloat() * f) - + (double) (1.0F - f) * 0.5D; - double d1 = (double) (rand.nextFloat() * f) - + (double) (1.0F - f) * 0.5D; - double d2 = (double) (rand.nextFloat() * f) - + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem( - player.worldObj, - (double) xPos + d, - (double) yPos + d1, - (double) zPos + d2, - dropStack); - entityitem.delayBeforeCanPickup = 10; - player.worldObj.spawnEntityInWorld(entityitem); - } + if (!world.isRemote) for (ItemStack dropStack : drops) { + float f = 0.7F; + double d = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + double d1 = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + double d2 = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem( + player.worldObj, + (double) xPos + d, + (double) yPos + d1, + (double) zPos + d2, + dropStack); + entityitem.delayBeforeCanPickup = 10; + player.worldObj.spawnEntityInWorld(entityitem); + } - if (localHardness > 0f) - onBlockDestroyed( - stack, world, localBlock, xPos, yPos, zPos, player); + if (localHardness > 0f) onBlockDestroyed( + stack, + world, + localBlock, + xPos, + yPos, + zPos, + player); player.addStat( StatList.mineBlockStatArray[Block.getIdFromBlock(localBlock)], 1); @@ -208,7 +212,11 @@ public class Scythe extends Weapon { localBlock.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (localBlock.removedByPlayer(world, player, xPos, yPos, zPos, true)) { localBlock.onBlockDestroyedByPlayer( - world, xPos, yPos, zPos, localMeta); + world, + xPos, + yPos, + zPos, + localMeta); localBlock.harvestBlock(world, player, xPos, yPos, zPos, localMeta); // Workaround for dropping experience if (!butter) @@ -219,26 +227,34 @@ public class Scythe extends Weapon { INetHandler handler = FMLClientHandler.instance() .getClientPlayHandler(); if (handler instanceof NetHandlerPlayClient) { - NetHandlerPlayClient handlerClient = - (NetHandlerPlayClient) handler; - handlerClient.addToSendQueue(new C07PacketPlayerDigging( - 0, - x, - y, - z, - Minecraft.getMinecraft().objectMouseOver.sideHit)); - handlerClient.addToSendQueue(new C07PacketPlayerDigging( - 2, - x, - y, - z, - Minecraft.getMinecraft().objectMouseOver.sideHit)); + NetHandlerPlayClient handlerClient = (NetHandlerPlayClient) handler; + handlerClient.addToSendQueue( + new C07PacketPlayerDigging( + 0, + x, + y, + z, + Minecraft + .getMinecraft().objectMouseOver.sideHit)); + handlerClient.addToSendQueue( + new C07PacketPlayerDigging( + 2, + x, + y, + z, + Minecraft + .getMinecraft().objectMouseOver.sideHit)); } } - if (localHardness > 0f) - onBlockDestroyed( - stack, world, localBlock, xPos, yPos, zPos, player); + if (localHardness > 0f) onBlockDestroyed( + stack, + world, + localBlock, + xPos, + yPos, + zPos, + player); } } else { world.setBlockToAir(xPos, yPos, zPos); @@ -258,13 +274,12 @@ public class Scythe extends Weapon { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { AxisAlignedBB box = AxisAlignedBB.getBoundingBox( - entity.posX, - entity.posY, - entity.posZ, - entity.posX + 1.0D, - entity.posY + 1.0D, - entity.posZ + 1.0D) - .expand(1.0D, 1.0D, 1.0D); + entity.posX, + entity.posY, + entity.posZ, + entity.posX + 1.0D, + entity.posY + 1.0D, + entity.posZ + 1.0D).expand(1.0D, 1.0D, 1.0D); List list = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, box); for (Entity e : list) { AbilityHelper.onLeftClickEntity(stack, player, e, this); diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index 813191ad..b443a051 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -1,7 +1,7 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,14 +9,17 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; +import cpw.mods.fml.relauncher.*; @Deprecated public class Shortbow extends BowBase { + public Shortbow() { super(); this.setUnlocalizedName("InfiTool.Shortbow"); @@ -76,7 +79,7 @@ public class Shortbow extends BowBase { @Override public String[] getTraits() { - return new String[] {"weapon", "ranged", "bow"}; + return new String[] { "weapon", "ranged", "bow" }; } @Override @@ -157,8 +160,10 @@ public class Shortbow extends BowBase { } } list.add(""); - list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " - + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); + list.add( + "\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); } public String getBowstringName(int type) { diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 7ceee064..cda8c5e0 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -2,10 +2,12 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.item.Item; + import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; public class Shovel extends HarvestTool { + public Shovel() { super(2); this.setUnlocalizedName("InfiTool.Shovel"); @@ -21,9 +23,8 @@ public class Shovel extends HarvestTool { return "shovel"; } - static Material[] materials = { - Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay - }; + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, + Material.clay }; @Override public Item getHeadItem() { @@ -72,25 +73,13 @@ public class Shovel extends HarvestTool { } /* - * @Override public Icon getIcon (ItemStack stack, int renderPass) { - * NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - * - * if (renderPass == 0) // Handle { return - * (handleIcons.get(tags.getInteger("RenderHandle"))); } - * - * if (renderPass == 1) // Head { if (tags.getBoolean("Broken")) return - * (brokenHeadIcons.get(tags.getInteger("RenderHead"))); else return - * (headIcons.get(tags.getInteger("RenderHead"))); } - * - * if (renderPass == 2) { if (tags.hasKey("Effect1")) return - * (effectIcons.get(tags.getInteger("Effect1"))); } - * - * if (renderPass == 3) { if (tags.hasKey("Effect2")) return - * (effectIcons.get(tags.getInteger("Effect2"))); } - * - * if (renderPass == 4) { if (tags.hasKey("Effect3")) return - * (effectIcons.get(tags.getInteger("Effect3"))); } - * - * return TProxyClient.blankSprite; } + * @Override public Icon getIcon (ItemStack stack, int renderPass) { NBTTagCompound tags = + * stack.getTagCompound().getCompoundTag("InfiTool"); if (renderPass == 0) // Handle { return + * (handleIcons.get(tags.getInteger("RenderHandle"))); } if (renderPass == 1) // Head { if + * (tags.getBoolean("Broken")) return (brokenHeadIcons.get(tags.getInteger("RenderHead"))); else return + * (headIcons.get(tags.getInteger("RenderHead"))); } if (renderPass == 2) { if (tags.hasKey("Effect1")) return + * (effectIcons.get(tags.getInteger("Effect1"))); } if (renderPass == 3) { if (tags.hasKey("Effect2")) return + * (effectIcons.get(tags.getInteger("Effect2"))); } if (renderPass == 4) { if (tags.hasKey("Effect3")) return + * (effectIcons.get(tags.getInteger("Effect3"))); } return TProxyClient.blankSprite; } */ } diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index ed37b405..982da8ad 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -5,9 +5,11 @@ import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.tools.ToolCore; public class ActiveToolMod { + /* Updating */ public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) {} @@ -18,67 +20,41 @@ public class ActiveToolMod { @Deprecated public boolean afterBlockBreak() // Unfinished, not called - { + { return false; } - public void afterBlockBreak( - ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) {} + public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, + EntityLivingBase entity) {} /* Attacking */ - public int baseAttackDamage( - int earlyModDamage, - int damage, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public int baseAttackDamage(int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { return earlyModDamage; } // Calculated after sprinting and enchant bonuses - public float knockback( - float modKnockback, - float currentKnockback, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public float knockback(float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { return modKnockback; } - public int attackDamage( - int modDamage, - int currentDamage, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public int attackDamage(int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { return modDamage; } public void lateAttackEntity() // Unfinished, not called - {} + {} /* Damage tool */ public boolean damageTool(ItemStack stack, int damage, EntityLivingBase entity) { return false; } - public boolean doesCriticalHit( - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public boolean doesCriticalHit(ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, + EntityLivingBase player, Entity entity) { return false; } } diff --git a/src/main/java/tconstruct/library/ItemBlocklike.java b/src/main/java/tconstruct/library/ItemBlocklike.java index 4e479445..e5e96203 100644 --- a/src/main/java/tconstruct/library/ItemBlocklike.java +++ b/src/main/java/tconstruct/library/ItemBlocklike.java @@ -1,3 +1,4 @@ package tconstruct.library; -public interface ItemBlocklike {} +public interface ItemBlocklike { +} diff --git a/src/main/java/tconstruct/library/SlimeBounceHandler.java b/src/main/java/tconstruct/library/SlimeBounceHandler.java index 66642f92..78aaa7bd 100644 --- a/src/main/java/tconstruct/library/SlimeBounceHandler.java +++ b/src/main/java/tconstruct/library/SlimeBounceHandler.java @@ -1,16 +1,18 @@ package tconstruct.library; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.IdentityHashMap; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.Vec3; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; + import tconstruct.gadgets.TinkerGadgets; import tconstruct.gadgets.item.ItemSlimeBoots; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** Logic for entities bouncing */ public class SlimeBounceHandler { @@ -54,8 +56,7 @@ public class SlimeBounceHandler { } /** - * Causes the entity to bounce, needed because the fall event will reset motion - * afterwards + * Causes the entity to bounce, needed because the fall event will reset motion afterwards * * @param entity Entity to bounce * @param bounce Bounce amount @@ -252,6 +253,7 @@ public class SlimeBounceHandler { /** Data class to keep track of bouncing info for an entity */ private static class BounceInfo { + /** Velocity the entity should have, unused if 0 */ private double bounce; /** Time to update the entities velocity */ diff --git a/src/main/java/tconstruct/library/TConstructCreativeTab.java b/src/main/java/tconstruct/library/TConstructCreativeTab.java index 699393f5..8b8bb8b6 100644 --- a/src/main/java/tconstruct/library/TConstructCreativeTab.java +++ b/src/main/java/tconstruct/library/TConstructCreativeTab.java @@ -4,6 +4,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; public class TConstructCreativeTab extends CreativeTabs { + ItemStack display; public TConstructCreativeTab(String label) { diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index c398a8c5..adcd5650 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -2,8 +2,11 @@ package tconstruct.library; import java.lang.reflect.Method; import java.util.*; + import net.minecraft.item.*; + import org.apache.logging.log4j.*; + import tconstruct.library.crafting.*; import tconstruct.library.modifier.ActiveArmorMod; import tconstruct.library.tools.*; @@ -15,6 +18,7 @@ import tconstruct.tools.TinkerTools; * @author mDiyo */ public class TConstructRegistry { + public static TConstructRegistry instance = new TConstructRegistry(); public static Logger logger = LogManager.getLogger("TCon-API"); @@ -33,27 +37,22 @@ public class TConstructRegistry { /** * A directory of crafting items and tools used by the mod. * - * Tools: pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, - * cutlass frypan, battlesign, mattock, chisel lumberaxe, cleaver, scythe, - * excavator, hammer, battleaxe + * Tools: pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass frypan, battlesign, mattock, + * chisel lumberaxe, cleaver, scythe, excavator, hammer, battleaxe * * Patterns: blankPattern, woodPattern, metalPattern, clayPattern * - * Tool crafting parts: toolRod, toolShard, binding, toughBinding, toughRod, - * heavyPlate pickaxeHead, shovelhead, hatchetHead, swordBlade, wideguard, - * handGuard, crossbar, knifeBlade, fullGuard, frypanHead, signHead, - * chiselHead scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, - * hammerHead bowstring, fletching, arrowhead + * Tool crafting parts: toolRod, toolShard, binding, toughBinding, toughRod, heavyPlate 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<>(); /** * Adds an item to the directory * - * @param name - * Associates the name with the stack - * @param itemstack - * The stack to add to the directory + * @param name Associates the name with the stack + * @param itemstack The stack to add to the directory */ public static void addItemToDirectory(String name, Item itemstack) { Item add = itemDirectory.get(name); @@ -65,8 +64,7 @@ public class TConstructRegistry { /** * Retrieves an itemstack from the directory * - * @param name - * The name of the item to get + * @param name The name of the item to get * @return Item associated with the name, or null if not present. */ public static Item getItem(String name) { @@ -79,31 +77,25 @@ public class TConstructRegistry { /** * A directory of ItemStacks. Contains mostly crafting items * - * Materials: paperStack, greenSlimeCrystal, blueSlimeCrystal, searedBrick, - * mossBall, lavaCrystal, necroticBone, silkyCloth, silkyJewel ingotCobalt, - * ingotArdite, ingotManyullyn, ingotCopper, ingotTin, ingotAluminum, - * rawAluminum, ingotBronze, ingotAluminumBrass, ingotAlumite, ingotSteel, - * ingotObsidian nuggetIron, nuggetCopper, nuggetTin, nuggetAluminum, - * nuggetSilver, nuggetAluminumBrass oreberryIron, oreberryGold, - * oreberryCopper, oreberryTin, oreberryTin, oreberrySilver, diamondApple, - * blueSlimeFood, canisterEmpty, miniRedHeart, canisterRedHeart + * Materials: paperStack, greenSlimeCrystal, blueSlimeCrystal, searedBrick, mossBall, lavaCrystal, necroticBone, + * silkyCloth, silkyJewel ingotCobalt, ingotArdite, ingotManyullyn, ingotCopper, ingotTin, ingotAluminum, + * rawAluminum, ingotBronze, ingotAluminumBrass, ingotAlumite, ingotSteel, ingotObsidian nuggetIron, nuggetCopper, + * nuggetTin, nuggetAluminum, nuggetSilver, nuggetAluminumBrass oreberryIron, oreberryGold, oreberryCopper, + * oreberryTin, oreberryTin, oreberrySilver, diamondApple, blueSlimeFood, canisterEmpty, miniRedHeart, + * canisterRedHeart * - * Patterns - These have a suffix of Pattern or Cast. ex: hatchetHeadPattern - * ingot, toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, - * wideGuard, handGuard, crossbar, binding, frypanHead, signHead, - * knifeBlade, chiselHead, toughRod, toughBinding, largePlate, broadAxeHead, - * scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowString, - * fletching, arrowHead + * Patterns - These have a suffix of Pattern or Cast. ex: hatchetHeadPattern ingot, toolRod, pickaxeHead, + * shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, + * chiselHead, toughRod, toughBinding, largePlate, broadAxeHead, scytheHead, excavatorHead, largeBlade, hammerHead, + * fullGuard, bowString, fletching, arrowHead */ static HashMap itemstackDirectory = new HashMap<>(); /** * Adds an itemstack to the directory * - * @param name - * Associates the name with the stack - * @param itemstack - * The stack to add to the directory + * @param name Associates the name with the stack + * @param itemstack The stack to add to the directory */ public static void addItemStackToDirectory(String name, ItemStack itemstack) { ItemStack add = itemstackDirectory.get(name); @@ -115,8 +107,7 @@ public class TConstructRegistry { /** * Retrieves an itemstack from the directory * - * @param name - * The name of the item to get + * @param name The name of the item to get * @return Item associated with the name, or null if not present. */ public static ItemStack getItemStack(String name) { @@ -131,22 +122,17 @@ public class TConstructRegistry { // Parts /** - * List: Item ID, metadata, material ID ItemStack: Output. Ex: Cactus - * Binding + * List: Item ID, metadata, material ID ItemStack: Output. Ex: Cactus Binding */ public static HashMap patternPartMapping = new HashMap<>(); /** * Maps an item and a material ID to an output part * - * @param woodPattern - * ID to check against - * @param patternMeta - * Metadata to check against - * @param materialID - * Material that goes with the item - * @param output - * The resulting part + * @param woodPattern ID to check against + * @param patternMeta Metadata to check against + * @param materialID Material that goes with the item + * @param output The resulting part */ public static void addPartMapping(Item woodPattern, int patternMeta, int materialID, ItemStack output) { patternPartMapping.put(Arrays.asList(woodPattern, patternMeta, materialID), output); @@ -179,15 +165,12 @@ public class TConstructRegistry { } /** - * Registers a tool to its crafting parts. If an output is registered - * multiple times the parts are added to the recipe's input list Valid part - * amounts are 2, 3, and 4. + * Registers a tool to its crafting parts. If an output is registered multiple times the parts are added to the + * recipe's input list Valid part amounts are 2, 3, and 4. * * @see ToolBuilder - * @param output - * The ToolCore to craft - * @param parts - * Pieces to make the tool with + * @param output The ToolCore to craft + * @param parts Pieces to make the tool with */ public static void addToolRecipe(ToolCore output, Item... parts) { ToolBuilder tb = ToolBuilder.instance; @@ -217,39 +200,19 @@ public class TConstructRegistry { /** * Adds a tool material to the registry * - * @param materialID - * Unique ID, stored for each part - * @param materialName - * Unique name for data lookup purposes - * @param harvestLevel - * The materials which the tool can harvest. Pickaxe levels - 0: - * Wood, 1: Stone, 2: Redstone/Diamond, 3: Obsidian, 4: - * Cobalt/Ardite, 5: Manyullyn - * @param durability - * Base durability of the tool, affects tool heads. - * @param miningspeed - * Base mining speed, divided by 100 in use - * @param attack - * Base attack - * @param handleModifier - * Durability multiplier on the tool - * @param reinforced - * Reinforced level - * @param stonebound - * Amount of Stonebound to put on the tool. Negative numbers are - * Spiny. + * @param materialID Unique ID, stored for each part + * @param materialName Unique name for data lookup purposes + * @param harvestLevel The materials which the tool can harvest. Pickaxe levels - 0: Wood, 1: Stone, 2: + * Redstone/Diamond, 3: Obsidian, 4: Cobalt/Ardite, 5: Manyullyn + * @param durability Base durability of the tool, affects tool heads. + * @param miningspeed Base mining speed, divided by 100 in use + * @param attack Base attack + * @param handleModifier Durability multiplier on the tool + * @param reinforced Reinforced level + * @param stonebound Amount of Stonebound to put on the tool. Negative numbers are Spiny. */ - public static void addToolMaterial( - int materialID, - String materialName, - int harvestLevel, - int durability, - int miningspeed, - int attack, - float handleModifier, - int reinforced, - float stonebound, - String style, + public static void addToolMaterial(int materialID, String materialName, int harvestLevel, int durability, + int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, int primaryColor) { ToolMaterial mat = toolMaterials.get(materialID); if (mat == null) { @@ -266,51 +229,28 @@ public class TConstructRegistry { primaryColor); toolMaterials.put(materialID, mat); toolMaterialStrings.put(materialName, mat); - } else - throw new IllegalArgumentException( - "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } /** * Adds a tool material to the registry * - * @param materialID - * Unique ID, stored for each part - * @param materialName - * Unique name for data lookup purposes - * @param localizationName - * The string used to localize the material name - * @param harvestLevel - * The materials which the tool can harvest. Pickaxe levels - 0: - * Wood, 1: Stone, 2: Redstone/Diamond, 3: Obsidian, 4: - * Cobalt/Ardite, 5: Manyullyn - * @param durability - * Base durability of the tool, affects tool heads. - * @param miningspeed - * Base mining speed, divided by 100 in use - * @param attack - * Base attack - * @param handleModifier - * Durability multiplier on the tool - * @param reinforced - * Reinforced level - * @param stonebound - * Amount of Stonebound to put on the tool. Negative numbers are - * Spiny. + * @param materialID Unique ID, stored for each part + * @param materialName Unique name for data lookup purposes + * @param localizationName The string used to localize the material name + * @param harvestLevel The materials which the tool can harvest. Pickaxe levels - 0: Wood, 1: Stone, 2: + * Redstone/Diamond, 3: Obsidian, 4: Cobalt/Ardite, 5: Manyullyn + * @param durability Base durability of the tool, affects tool heads. + * @param miningspeed Base mining speed, divided by 100 in use + * @param attack Base attack + * @param handleModifier Durability multiplier on the tool + * @param reinforced Reinforced level + * @param stonebound Amount of Stonebound to put on the tool. Negative numbers are Spiny. */ - public static void addToolMaterial( - int materialID, - String materialName, - String localizationName, - int harvestLevel, - int durability, - int miningspeed, - int attack, - float handleModifier, - int reinforced, - float stonebound, - String style, - int primaryColor) { + public static void addToolMaterial(int materialID, String materialName, String localizationName, int harvestLevel, + int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, + String style, int primaryColor) { ToolMaterial mat = toolMaterials.get(materialID); if (mat == null) { mat = new ToolMaterial( @@ -327,23 +267,13 @@ public class TConstructRegistry { primaryColor); toolMaterials.put(materialID, mat); toolMaterialStrings.put(materialName, mat); - } else - throw new IllegalArgumentException( - "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } @Deprecated - public static void addToolMaterial( - int materialID, - String materialName, - int harvestLevel, - int durability, - int miningspeed, - int attack, - float handleModifier, - int reinforced, - float stonebound, - String style) { + public static void addToolMaterial(int materialID, String materialName, int harvestLevel, int durability, + int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style) { logger.warn( "[TCon API] Using deprecated addToolMaterial with no primary color. A fallback of white will be used."); addToolMaterial( @@ -361,17 +291,8 @@ public class TConstructRegistry { } @Deprecated - public static void addToolMaterial( - int materialID, - String materialName, - int harvestLevel, - int durability, - int miningspeed, - int attack, - float handleModifier, - int reinforced, - float stonebound, - String style, + public static void addToolMaterial(int materialID, String materialName, int harvestLevel, int durability, + int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, String ability) { logger.warn( "[TCon API] Using deprecated addToolMaterial with ability name. ability will be ignored, use languages files for that."); @@ -389,19 +310,9 @@ public class TConstructRegistry { } @Deprecated - public static void addToolMaterial( - int materialID, - String materialName, - String displayName, - int harvestLevel, - int durability, - int miningspeed, - int attack, - float handleModifier, - int reinforced, - float stonebound, - String style, - String ability) { + public static void addToolMaterial(int materialID, String materialName, String displayName, int harvestLevel, + int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, + String style, String ability) { logger.warn( "[TCon API] Using deprecated addToolMaterial with display and ability name. displayName and ability will be ignored, use languages files for that."); addToolMaterial( @@ -420,27 +331,22 @@ public class TConstructRegistry { /** * Adds a tool material to the registry * - * @param materialID - * Unique ID, stored for each part - * @param material - * Complete tool material to add. Uses the name in the material - * for lookup purposes. + * @param materialID Unique ID, stored for each part + * @param material Complete tool material to add. Uses the name in the material for lookup purposes. */ public static void addtoolMaterial(int materialID, ToolMaterial material) { ToolMaterial mat = toolMaterials.get(materialID); if (mat == null) { toolMaterials.put(materialID, material); toolMaterialStrings.put(material.name(), material); - } else - throw new IllegalArgumentException( - "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } /** * Looks up a tool material by ID * - * @param key - * The ID to look up + * @param key The ID to look up * @return Tool Material */ public static ToolMaterial getMaterial(int key) { @@ -456,8 +362,7 @@ public class TConstructRegistry { /** * Looks up a tool material by name * - * @param key - * the name to look up + * @param key the name to look up * @return Tool Material */ public static ToolMaterial getMaterial(String key) { @@ -519,59 +424,59 @@ public class TConstructRegistry { if (mat != null) customMaterials.add(mat); } - public static void addBowstringMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingMaterial, - float durability, - float drawSpeed, - float flightSpeed, - int color) { + public static void addBowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingMaterial, + float durability, float drawSpeed, float flightSpeed, int color) { BowstringMaterial mat = new BowstringMaterial( - materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed, color); + materialID, + value, + input, + craftingMaterial, + durability, + drawSpeed, + flightSpeed, + color); customMaterials.add(mat); } - public static void addFletchingMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingMaterial, - float accuracy, - float breakChance, - float durabilityModifier, - int color) { + public static void addFletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingMaterial, + float accuracy, float breakChance, float durabilityModifier, int color) { FletchingMaterial mat = new FletchingMaterial( - materialID, value, input, craftingMaterial, accuracy, breakChance, durabilityModifier, color); + materialID, + value, + input, + craftingMaterial, + accuracy, + breakChance, + durabilityModifier, + color); customMaterials.add(mat); } @Deprecated - 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); + 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); } @Deprecated - public static void addFletchingMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingMaterial, - float accuracy, - float breakChance, - float mass) { - FletchingMaterial mat = - new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, mass); + public static void addFletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingMaterial, + float accuracy, float breakChance, float mass) { + FletchingMaterial mat = new FletchingMaterial( + materialID, + value, + input, + craftingMaterial, + accuracy, + breakChance, + mass); customMaterials.add(mat); } @@ -590,24 +495,16 @@ public class TConstructRegistry { } /* - * public static CustomMaterial getCustomMaterial(ItemStack input, ItemStack - * pattern) { for (CustomMaterial mat : customMaterials) { if - * (mat.matches(input, pattern)) 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) { 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 ItemStack craftBowString(ItemStack stack) { if (stack.stackSize < 3) return null; for + * (BowstringMaterial mat : bowstringMaterials) { 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() { @@ -667,9 +564,7 @@ public class TConstructRegistry { } /** - * Default Material Index 0: Wood 1: Stone 2: Iron 3: Flint 4: Cactus 5: - * Bone 6: Obsidian 7: Netherrack 8: Green Slime 9: Paper 10: Cobalt 11: - * Ardite 12: Manyullyn 13: Copper 14: Bronze 15: Alumite 16: Steel 17: Blue - * Slime + * Default Material Index 0: Wood 1: Stone 2: Iron 3: Flint 4: Cactus 5: Bone 6: Obsidian 7: Netherrack 8: Green + * Slime 9: Paper 10: Cobalt 11: Ardite 12: Manyullyn 13: Copper 14: Bronze 15: Alumite 16: Steel 17: Blue Slime */ } diff --git a/src/main/java/tconstruct/library/accessory/AccessoryCore.java b/src/main/java/tconstruct/library/accessory/AccessoryCore.java index c20764e7..5d1ab51d 100644 --- a/src/main/java/tconstruct/library/accessory/AccessoryCore.java +++ b/src/main/java/tconstruct/library/accessory/AccessoryCore.java @@ -1,18 +1,21 @@ package tconstruct.library.accessory; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.relauncher.*; public abstract class AccessoryCore extends Item implements IAccessory, IModifyable { + /** * Override getArmorModel() to have render on the player. */ @@ -35,24 +38,19 @@ public abstract class AccessoryCore extends Item implements IAccessory, IModifya return "Accessory"; } - static final String[] traits = new String[] {"accessory"}; + static final String[] traits = new String[] { "accessory" }; @Override public String[] getTraits() { return traits; } - /*public void getSubItems (int id, CreativeTabs tab, List list) - { - ItemStack glove = new ItemStack(this); - NBTTagCompound baseTag = new NBTTagCompound(); - NBTTagCompound tag = new NBTTagCompound(); - tag.setBoolean("Built", true); - tag.setInteger("Modifiers", 5); - baseTag.setTag(getBaseTag(), tag); - glove.setTagCompound(baseTag); - list.add(glove); - }*/ + /* + * public void getSubItems (int id, CreativeTabs tab, List list) { ItemStack glove = new ItemStack(this); + * NBTTagCompound baseTag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound(); tag.setBoolean("Built", + * true); tag.setInteger("Modifiers", 5); baseTag.setTag(getBaseTag(), tag); glove.setTagCompound(baseTag); + * list.add(glove); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/library/accessory/IAccessory.java b/src/main/java/tconstruct/library/accessory/IAccessory.java index 3ffa3bd8..c322e186 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IAccessory.java @@ -3,7 +3,9 @@ package tconstruct.library.accessory; import net.minecraft.item.ItemStack; public interface IAccessory { - /** Accessory slots are not the same as armor slots! + + /** + * Accessory slots are not the same as armor slots! * * @param item Instance of the item * @param slot Accessory slot diff --git a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java index 2a61c3c3..962e1c5f 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java +++ b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java @@ -1,12 +1,15 @@ package tconstruct.library.accessory; -import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.*; + public interface IAccessoryModel { - /** Similar to how armor is rendered. + + /** + * Similar to how armor is rendered. * * @param stack * @param entity diff --git a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java index 965630a4..bc70d4f2 100644 --- a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java @@ -3,5 +3,6 @@ package tconstruct.library.accessory; import net.minecraft.item.ItemStack; public interface IHealthAccessory extends IAccessory { + int getHealthBoost(ItemStack item); } diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index acd7d9f4..7009062f 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -1,8 +1,8 @@ package tconstruct.library.armor; -import cpw.mods.fml.relauncher.*; import java.text.DecimalFormat; import java.util.List; + import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -14,12 +14,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; + import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.*; import tconstruct.library.tools.ToolCore; import tconstruct.tools.entity.FancyEntityItem; +import cpw.mods.fml.relauncher.*; public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IModifyable { + public final ArmorPart armorPart; private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDispenseArmorCopy(); public final int baseProtection; @@ -63,7 +66,7 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod @Override public String[] getTraits() { - return new String[] {"armor"}; + return new String[] { "armor" }; } @Override @@ -72,9 +75,8 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod ItemStack itemstack1 = player.getCurrentArmor(i); if (itemstack1 == null) { - player.setCurrentItemOrArmor( - i + 1, - stack.copy()); // Forge: Vanilla bug fix associated with fixed setCurrentItemOrArmor indexs for + player.setCurrentItemOrArmor(i + 1, stack.copy()); // Forge: Vanilla bug fix associated with fixed + // setCurrentItemOrArmor indexs for // players. stack.stackSize = 0; } @@ -102,12 +104,13 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName - + (this.armorType == 0 - ? "helmet" - : this.armorType == 1 - ? "chestplate" - : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = iconRegister.registerIcon( + "tinker:" + textureFolder + + "/" + + textureName + + (this.armorType == 0 ? "helmet" + : this.armorType == 1 ? "chestplate" + : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } @@ -156,8 +159,8 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod // ISpecialArmor overrides @Override - public ArmorProperties getProperties( - EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, + int slot) { // Priority, absorbRatio, max if (!armor.hasTagCompound() || source.isUnblockable()) return new ArmorProperties(0, 0, 0); @@ -207,8 +210,8 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod } protected int combinedArmorDisplay(EntityPlayer player, ItemStack legs) { - ItemStack[] armors = - new ItemStack[] {player.getCurrentArmor(3), player.getCurrentArmor(2), legs, player.getCurrentArmor(0)}; + ItemStack[] armors = new ItemStack[] { player.getCurrentArmor(3), player.getCurrentArmor(2), legs, + player.getCurrentArmor(0) }; int types = 0; int max = 0; int damage = 0; @@ -370,10 +373,9 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod // strip color information String locString = "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); locString = locString.replace(" ", ""); - if (StatCollector.canTranslate(locString)) - tipName = tipName.replace( - EnumChatFormatting.getTextWithoutFormattingCodes(tipName), - StatCollector.translateToLocal(locString)); + if (StatCollector.canTranslate(locString)) tipName = tipName.replace( + EnumChatFormatting.getTextWithoutFormattingCodes(tipName), + StatCollector.translateToLocal(locString)); if (!tipName.equals("")) list.add(tipName); } else displayToolTips = false; } diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java index 3bd34c9c..65761228 100644 --- a/src/main/java/tconstruct/library/armor/ArmorMod.java +++ b/src/main/java/tconstruct/library/armor/ArmorMod.java @@ -1,11 +1,14 @@ package tconstruct.library.armor; import java.util.EnumSet; + import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.*; public abstract class ArmorMod extends ItemModifier { + protected final EnumSet armorTypes; public ArmorMod(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items) { diff --git a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java index b9674545..51b6f110 100644 --- a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java +++ b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java @@ -1,13 +1,15 @@ package tconstruct.library.armor; import java.util.*; + import net.minecraft.item.ItemStack; public abstract class ArmorModTypeFilter extends ArmorMod { + public final List increase; - public ArmorModTypeFilter( - int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int[] values) { + public ArmorModTypeFilter(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, + int[] values) { super(effect, dataKey, armorTypes, items); assert items.length == values.length : "Itemstacks and their values for armor modifiers must be the same length"; @@ -18,13 +20,10 @@ public abstract class ArmorModTypeFilter extends ArmorMod { } /** - * Checks to see if the inputs match the stored items Note: Filters types, - * doesn't care about amount + * Checks to see if the inputs match the stored items Note: Filters types, doesn't care about amount * - * @param input - * The ItemStacks to compare against - * @param tool - * Item to modify, used for restrictions + * @param input The ItemStacks to compare against + * @param tool Item to modify, used for restrictions * @return Whether the recipe matches the input */ @Override @@ -79,15 +78,12 @@ public abstract class ArmorModTypeFilter extends ArmorMod { /** * Adds a new itemstack to the list for increases * - * @param stack - * ItemStack to compare against - * @param amount - * Amount to increase + * @param stack ItemStack to compare against + * @param amount Amount to increase */ public void addStackToMatchList(ItemStack stack, int amount) { - if (stack == null) - throw new NullPointerException( - "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); + if (stack == null) throw new NullPointerException( + "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); stacks.add(stack); increase.add(amount); } diff --git a/src/main/java/tconstruct/library/armor/ArmorPart.java b/src/main/java/tconstruct/library/armor/ArmorPart.java index 21b5fbe3..81b15279 100644 --- a/src/main/java/tconstruct/library/armor/ArmorPart.java +++ b/src/main/java/tconstruct/library/armor/ArmorPart.java @@ -1,6 +1,7 @@ package tconstruct.library.armor; public enum ArmorPart { + Head(0), Chest(1), Legs(2), diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index be1f6c11..a41093d5 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -1,6 +1,7 @@ package tconstruct.library.armor; import java.util.List; + import net.minecraft.block.BlockDispenser; import net.minecraft.command.IEntitySelector; import net.minecraft.dispenser.*; @@ -10,9 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { + /** - * Dispense the specified stack, play the dispense sound and spawn - * particles. + * Dispense the specified stack, play the dispense sound and spawn particles. */ @Override protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { @@ -21,10 +22,10 @@ final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { int j = par1IBlockSource.getYInt() + enumfacing.getFrontOffsetY(); int k = par1IBlockSource.getZInt() + enumfacing.getFrontOffsetZ(); AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(i, j, k, i + 1, j + 1, k + 1); - List list = par1IBlockSource - .getWorld() - .selectEntitiesWithinAABB( - EntityLivingBase.class, axisalignedbb, new IEntitySelector.ArmoredMob(par2ItemStack)); + List list = par1IBlockSource.getWorld().selectEntitiesWithinAABB( + EntityLivingBase.class, + axisalignedbb, + new IEntitySelector.ArmoredMob(par2ItemStack)); if (list.size() > 0) { EntityLivingBase entitylivingbase = list.get(0); diff --git a/src/main/java/tconstruct/library/client/FluidRenderProperties.java b/src/main/java/tconstruct/library/client/FluidRenderProperties.java index 691e3afd..c200567f 100644 --- a/src/main/java/tconstruct/library/client/FluidRenderProperties.java +++ b/src/main/java/tconstruct/library/client/FluidRenderProperties.java @@ -38,8 +38,10 @@ public class FluidRenderProperties { } public enum Applications { + TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.062F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); + public float minHeight, maxHeight, minX, maxX, minZ, maxZ; Applications(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) { diff --git a/src/main/java/tconstruct/library/client/GuiElement.java b/src/main/java/tconstruct/library/client/GuiElement.java index f5d977e3..8f427dbb 100644 --- a/src/main/java/tconstruct/library/client/GuiElement.java +++ b/src/main/java/tconstruct/library/client/GuiElement.java @@ -1,6 +1,7 @@ package tconstruct.library.client; public class GuiElement { + public final int buttonIconX; public final int buttonIconY; public final String domain; diff --git a/src/main/java/tconstruct/library/client/StencilGuiElement.java b/src/main/java/tconstruct/library/client/StencilGuiElement.java index 0a2f406c..c9a2bc6f 100644 --- a/src/main/java/tconstruct/library/client/StencilGuiElement.java +++ b/src/main/java/tconstruct/library/client/StencilGuiElement.java @@ -1,6 +1,7 @@ package tconstruct.library.client; public class StencilGuiElement extends GuiElement { + public final int stencilIndex; public StencilGuiElement(int buttonIconX, int buttonIconY, int stencilIndex, String domain, String texture) { diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index be87374e..941da55c 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -1,14 +1,18 @@ package tconstruct.library.client; import java.util.*; + import mantle.lib.client.MantleClientRegistry; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; public class TConstructClientRegistry { + public static ArrayList stencilButtons = new ArrayList<>(); public static ArrayList stencilButtons2 = new ArrayList<>(); public static ArrayList toolButtons = new ArrayList<>(20); @@ -16,8 +20,8 @@ public class TConstructClientRegistry { public static Map manualIcons = new HashMap<>(); public static ItemStack defaultStack = new ItemStack(Items.iron_ingot); - public static void addMaterialRenderMapping( - int materialID, String domain, String renderName, boolean useDefaultFolder) { + public static void addMaterialRenderMapping(int materialID, String domain, String renderName, + boolean useDefaultFolder) { for (ToolCore tool : TConstructRegistry.getToolMapping()) { String[] toolIcons = new String[tool.getPartAmount() + 1]; for (int i = 0; i < tool.getPartAmount() + 1; i++) { @@ -30,8 +34,8 @@ public class TConstructClientRegistry { } } - public static void addAlternateMaterialRenderMapping( - ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { + public static void addAlternateMaterialRenderMapping(ToolCore tool, int materialID, String domain, + String renderName, boolean useDefaultFolder) { String[] toolIcons = new String[tool.getPartAmount() + 1]; for (int i = 0; i < tool.getPartAmount() + 1; i++) { String icon = domain + ":"; @@ -42,16 +46,16 @@ public class TConstructClientRegistry { tool.registerAlternatePartPaths(materialID, toolIcons); } - public static void addEffectRenderMapping( - ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { + public static void addEffectRenderMapping(ToolCore tool, int materialID, String domain, String renderName, + boolean useDefaultFolder) { String icon = domain + ":"; if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getEffectSuffix(); tool.registerEffectPath(materialID, icon); } - public static void addEffectRenderMapping( - int materialID, String domain, String renderName, boolean useDefaultFolder) { + public static void addEffectRenderMapping(int materialID, String domain, String renderName, + boolean useDefaultFolder) { for (ToolCore tool : TConstructRegistry.getToolMapping()) { String icon = domain + ":"; if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; @@ -60,8 +64,8 @@ public class TConstructClientRegistry { } } - public static void addSingleEffectRenderMapping( - ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { + public static void addSingleEffectRenderMapping(ToolCore tool, int materialID, String domain, String renderName, + boolean useDefaultFolder) { String icon = domain + ":"; if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getEffectSuffix(); @@ -72,25 +76,27 @@ public class TConstructClientRegistry { registerManualModifier(name, output, topinput, null); } - public static void registerManualModifier( - String name, ItemStack output, ItemStack topinput, ItemStack bottominput) { + public static void registerManualModifier(String name, ItemStack output, ItemStack topinput, + ItemStack bottominput) { ItemStack[] recipe = new ItemStack[3]; - recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {topinput, bottominput - }); // ToolBuilder.instance.buildTool(output, topinput, bottominput, ""); + recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] { topinput, bottominput }); // ToolBuilder.instance.buildTool(output, + // topinput, + // bottominput, + // ""); recipe[1] = topinput; recipe[2] = bottominput; MantleClientRegistry.recipeIcons.put(name, recipe); } - public static void registerManualModifier( - String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3) { + public static void registerManualModifier(String name, ItemStack output, ItemStack input1, ItemStack input2, + ItemStack input3) { registerManualModifier(name, output, input1, input2, input3, null); } - public static void registerManualModifier( - String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3, ItemStack input4) { + public static void registerManualModifier(String name, ItemStack output, ItemStack input1, ItemStack input2, + ItemStack input3, ItemStack input4) { ItemStack[] recipe = new ItemStack[5]; - recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {input1, input2, input3, input4}); + recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] { input1, input2, input3, input4 }); recipe[1] = input1; recipe[2] = input2; recipe[3] = input3; @@ -128,16 +134,8 @@ public class TConstructClientRegistry { toolButtons.add(element); } - public static void addToolButton( - int slotType, - int xButton, - int yButton, - int[] xIcons, - int[] yIcons, - String title, - String body, - String domain, - String texture) { + public static void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, + String body, String domain, String texture) { toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); } @@ -145,18 +143,10 @@ public class TConstructClientRegistry { tierTwoButtons.add(element); } - public static void addTierTwoButton( - int slotType, - int xButton, - int yButton, - int[] xIcons, - int[] yIcons, - String title, - String body, - String domain, - String texture) { - tierTwoButtons.add( - new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); + public static void addTierTwoButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, + String title, String body, String domain, String texture) { + tierTwoButtons + .add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); } public static ArrayList getToolButtons() { diff --git a/src/main/java/tconstruct/library/client/ToolGuiElement.java b/src/main/java/tconstruct/library/client/ToolGuiElement.java index 401eaeea..866e2930 100644 --- a/src/main/java/tconstruct/library/client/ToolGuiElement.java +++ b/src/main/java/tconstruct/library/client/ToolGuiElement.java @@ -1,6 +1,7 @@ package tconstruct.library.client; public class ToolGuiElement extends GuiElement { + public final int slotType; public final int[] iconsX; public final int[] iconsY; diff --git a/src/main/java/tconstruct/library/component/IComponentHolder.java b/src/main/java/tconstruct/library/component/IComponentHolder.java index 4d7c8818..e90474d5 100644 --- a/src/main/java/tconstruct/library/component/IComponentHolder.java +++ b/src/main/java/tconstruct/library/component/IComponentHolder.java @@ -3,5 +3,6 @@ package tconstruct.library.component; import java.util.List; public interface IComponentHolder { + List getComponents(); } diff --git a/src/main/java/tconstruct/library/component/LogicComponent.java b/src/main/java/tconstruct/library/component/LogicComponent.java index 90e8f2fa..0a98ff31 100644 --- a/src/main/java/tconstruct/library/component/LogicComponent.java +++ b/src/main/java/tconstruct/library/component/LogicComponent.java @@ -4,6 +4,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class LogicComponent { + protected World world; public void setWorld(World world) { diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index 0537b50f..81de2605 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -1,11 +1,14 @@ package tconstruct.library.component; import java.util.*; + import net.minecraft.nbt.*; import net.minecraftforge.fluids.*; + import tconstruct.library.crafting.Smeltery; public class MultiFluidTank extends LogicComponent implements IFluidTank { + public ArrayList fluidlist = new ArrayList<>(); protected int maxLiquid; protected int currentLiquid; diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index a40b24b4..c8c3cf02 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,14 +1,18 @@ package tconstruct.library.component; import java.util.*; + import mantle.blocks.iface.*; import mantle.world.*; + import net.minecraft.block.Block; import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; + import tconstruct.TConstruct; public class TankLayerScan extends LogicComponent { + protected TileEntity master; protected IMasterLogic imaster; protected Block[] scanBlocks; @@ -28,10 +32,16 @@ public class TankLayerScan extends LogicComponent { protected CoordTuple returnStone; private static final boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null; - private static final int MAX_LAYER_RECURSION_DEPTH = - System.getProperty("os.arch").equals("amd64") - ? 4000 - : 2000; // Recursion causes overflows on 32-bit, so reduce if not 64-bit + private static final int MAX_LAYER_RECURSION_DEPTH = System.getProperty("os.arch").equals("amd64") ? 4000 : 2000; // Recursion + // causes + // overflows + // on + // 32-bit, + // so + // reduce + // if + // not + // 64-bit public TankLayerScan(TileEntity te, Block... ids) { assert te instanceof IMasterLogic : "TileEntity must be an instance of IMasterLogic"; @@ -39,14 +49,16 @@ public class TankLayerScan extends LogicComponent { imaster = (IMasterLogic) te; scanBlocks = ids; masterCoord = new CoordTuple(te.xCoord, te.yCoord, te.zCoord); - validAirCoords.add(new int[] {1, 0}); - validAirCoords.add(new int[] {-1, 0}); - validAirCoords.add(new int[] {0, 1}); - validAirCoords.add(new int[] {0, -1}); + validAirCoords.add(new int[] { 1, 0 }); + validAirCoords.add(new int[] { -1, 0 }); + validAirCoords.add(new int[] { 0, 1 }); + validAirCoords.add(new int[] { 0, -1 }); if (debug) { TConstruct.logger.info("In debug mode: " + this); - TConstruct.logger.info("Using recursion size " + MAX_LAYER_RECURSION_DEPTH + " on JVM arch " - + System.getProperty("os.arch")); + TConstruct.logger.info( + "Using recursion size " + MAX_LAYER_RECURSION_DEPTH + + " on JVM arch " + + System.getProperty("os.arch")); } } @@ -62,12 +74,14 @@ public class TankLayerScan extends LogicComponent { case 2: // +z case 3: // -z if (checkAir(master.xCoord, master.yCoord, master.zCoord - 1) - && checkAir(master.xCoord, master.yCoord, master.zCoord + 1)) validAir = true; + && checkAir(master.xCoord, master.yCoord, master.zCoord + 1)) + validAir = true; break; case 4: // +x case 5: // -x if (checkAir(master.xCoord - 1, master.yCoord, master.zCoord) - && checkAir(master.xCoord + 1, master.yCoord, master.zCoord)) validAir = true; + && checkAir(master.xCoord + 1, master.yCoord, master.zCoord)) + validAir = true; break; } @@ -434,19 +448,19 @@ public class TankLayerScan extends LogicComponent { super.writeToNBT(tags); NBTTagList layerAir = new NBTTagList(); for (CoordTuple coord : layerAirCoords) { - layerAir.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); + layerAir.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("AirLayer", layerAir); NBTTagList blocks = new NBTTagList(); for (CoordTuple coord : blockCoords) { - blocks.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); + blocks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Blocks", blocks); NBTTagList air = new NBTTagList(); for (CoordTuple coord : airCoords) { - air.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); + air.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Air", air); tags.setInteger("structureTop", structureTop); diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index 14849a45..a0cec9ee 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -1,9 +1,11 @@ package tconstruct.library.crafting; import java.util.*; + import net.minecraftforge.fluids.FluidStack; public class AlloyMix { + public final FluidStack result; public final List mixers; @@ -13,8 +15,7 @@ public class AlloyMix { } /* - * public boolean matches(List liquids) { ArrayList list = new - * ArrayList(mixers); return false; } + * public boolean matches(List liquids) { ArrayList list = new ArrayList(mixers); return false; } */ public FluidStack mix(ArrayList liquids) { diff --git a/src/main/java/tconstruct/library/crafting/CastingRecipe.java b/src/main/java/tconstruct/library/crafting/CastingRecipe.java index 7b82a82e..b071b92f 100644 --- a/src/main/java/tconstruct/library/crafting/CastingRecipe.java +++ b/src/main/java/tconstruct/library/crafting/CastingRecipe.java @@ -3,9 +3,11 @@ package tconstruct.library.crafting; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; + import tconstruct.library.client.FluidRenderProperties; public class CastingRecipe { + public ItemStack output; public FluidStack castingMetal; public ItemStack cast; @@ -14,14 +16,8 @@ public class CastingRecipe { public FluidRenderProperties fluidRenderProperties; public boolean ignoreNBT; - public CastingRecipe( - ItemStack replacement, - FluidStack metal, - ItemStack cast, - boolean consume, - int delay, - FluidRenderProperties props, - boolean ignoreNBT) { + public CastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, + FluidRenderProperties props, boolean ignoreNBT) { castingMetal = metal; this.cast = cast; output = replacement; @@ -31,20 +27,14 @@ public class CastingRecipe { this.ignoreNBT = ignoreNBT; } - public CastingRecipe( - ItemStack replacement, - FluidStack metal, - ItemStack cast, - boolean consume, - int delay, + public CastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) { this(replacement, metal, cast, consume, delay, props, false); } public boolean matches(FluidStack metal, ItemStack inputCast) { if (castingMetal.isFluidEqual(metal)) { - if (cast != null - && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE + if (cast != null && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE && inputCast.getItem() == cast.getItem()) { return true; } else if (!ignoreNBT && ItemStack.areItemStacksEqual(cast, inputCast)) { diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 791fd6b0..7114a5ad 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -1,13 +1,16 @@ package tconstruct.library.crafting; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.common.registry.GameRegistry; public class Detailing { + public List detailing = new ArrayList<>(); public void addDetailing(Object input, int inputMeta, Object output, int outputMeta, ToolCore tool) { @@ -73,6 +76,7 @@ public class Detailing { } public static class DetailInput { + public ItemStack input; public int inputMeta; public ItemStack output; diff --git a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java index 06a8b314..6f2f3079 100644 --- a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java +++ b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java @@ -1,10 +1,12 @@ package tconstruct.library.crafting; import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.item.*; public class DryingRackRecipes { + public static ArrayList recipes = new ArrayList<>(); public static void addDryingRecipe(Object input, int time, Object output) { @@ -41,6 +43,7 @@ public class DryingRackRecipes { } public static class DryingRecipe { + public final int time; public final ItemStack input; public final ItemStack result; diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index 9c6afe8c..a899d931 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -1,10 +1,12 @@ package tconstruct.library.crafting; import java.util.*; + import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; public class FluidType { + public final Block renderBlock; public final int renderMeta; public final int baseTemperature; @@ -25,8 +27,8 @@ public class FluidType { fluidTypes.put(name, type); } - public static void registerFluidType( - String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { + public static void registerFluidType(String name, Block block, int meta, int baseTemperature, Fluid fluid, + boolean isToolpart) { FluidType type = new FluidType(block, meta, baseTemperature, fluid, isToolpart); registerFluidType(name, type); } diff --git a/src/main/java/tconstruct/library/crafting/LiquidCasting.java b/src/main/java/tconstruct/library/crafting/LiquidCasting.java index e4652a82..e5f43efd 100644 --- a/src/main/java/tconstruct/library/crafting/LiquidCasting.java +++ b/src/main/java/tconstruct/library/crafting/LiquidCasting.java @@ -1,12 +1,15 @@ package tconstruct.library.crafting; import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; + import tconstruct.library.client.FluidRenderProperties; /* Melting becomes hardened */ public class LiquidCasting { + // public static LiquidCasting instance = new LiquidCasting(); private final ArrayList casts = new ArrayList<>(); @@ -20,26 +23,14 @@ public class LiquidCasting { /** * Adds a casting recipe * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param cast - * The empty item to cast with. ex Ingot Cast - * @param consume - * Whether the item should be consumed while casting - * @param delay - * Time to cast in ticks - * @param props - * The rendering properties for the casting fluid (may be null) + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param cast The empty item to cast with. ex Ingot Cast + * @param consume Whether the item should be consumed while casting + * @param delay Time to cast in ticks + * @param props The rendering properties for the casting fluid (may be null) */ - public void addCastingRecipe( - ItemStack output, - FluidStack metal, - ItemStack cast, - boolean consume, - int delay, + public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) { CastingRecipe cr = new CastingRecipe(output, metal, cast, consume, delay, props); if (!contains(cr)) casts.add(cr); @@ -48,17 +39,11 @@ public class LiquidCasting { /** * Adds a casting recipe * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param cast - * The empty item to cast with. ex Ingot Cast - * @param consume - * Whether the item should be consumed while casting - * @param delay - * Time to cast in ticks + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param cast The empty item to cast with. ex Ingot Cast + * @param consume Whether the item should be consumed while casting + * @param delay Time to cast in ticks */ public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { addCastingRecipe(output, metal, cast, consume, delay, null); @@ -67,69 +52,47 @@ public class LiquidCasting { /** * Adds a casting recipe. Does not consume the cast * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param cast - * The empty item to cast with. ex Ingot Cast - * @param delay - * Time to cast in ticks - * @param props - * The rendering properties for the casting fluid (may be null) + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param cast The empty item to cast with. ex Ingot Cast + * @param delay Time to cast in ticks + * @param props The rendering properties for the casting fluid (may be null) */ - public void addCastingRecipe( - ItemStack output, FluidStack metal, ItemStack cast, int delay, FluidRenderProperties props) { + public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, int delay, + FluidRenderProperties props) { addCastingRecipe(output, metal, cast, false, delay, props); } /** * Adds a casting recipe. Does not consume the cast * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param cast - * The empty item to cast with. ex Ingot Cast - * @param delay - * Time to cast in ticks + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param cast The empty item to cast with. ex Ingot Cast + * @param delay Time to cast in ticks */ public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, int delay) { addCastingRecipe(output, metal, cast, false, delay, null); } /** - * Adds a casting recipe. Does not consume the cast or have an item to cast - * against + * Adds a casting recipe. Does not consume the cast or have an item to cast against * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param delay - * Time to cast in ticks - * @param props - * The rendering properties for the casting fluid (may be null) + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param delay Time to cast in ticks + * @param props The rendering properties for the casting fluid (may be null) */ public void addCastingRecipe(ItemStack output, FluidStack metal, int delay, FluidRenderProperties props) { addCastingRecipe(output, metal, null, false, delay, props); } /** - * Adds a casting recipe. Does not consume the cast or have an item to cast - * against + * Adds a casting recipe. Does not consume the cast or have an item to cast against * - * @param output - * Result of the cast - * @param metal - * Liquid to be used in casting. This also decides how much metal - * is consumed - * @param delay - * Time to cast in ticks + * @param output Result of the cast + * @param metal Liquid to be used in casting. This also decides how much metal is consumed + * @param delay Time to cast in ticks */ public void addCastingRecipe(ItemStack output, FluidStack metal, int delay) { addCastingRecipe(output, metal, null, false, delay, null); diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java index 9bd8d247..a872c696 100644 --- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java @@ -1,12 +1,15 @@ package tconstruct.library.crafting; import java.util.*; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.event.ModifyEvent; import tconstruct.library.modifier.*; public class ModifyBuilder { + public static ModifyBuilder instance = new ModifyBuilder(); public List itemModifiers = new ArrayList<>(); @@ -27,10 +30,8 @@ public class ModifyBuilder { mod.modify(modifiers, copy); // we do not allow negative modifiers >:( - if (copy.getTagCompound() - .getCompoundTag(item.getBaseTagName()) - .getInteger("Modifiers") - < 0) return null; + if (copy.getTagCompound().getCompoundTag(item.getBaseTagName()).getInteger("Modifiers") < 0) + return null; } } if (built) return copy; diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 273c8747..83a62ae6 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -1,17 +1,20 @@ package tconstruct.library.crafting; /** How to build tool parts? With patterns! */ -import cpw.mods.fml.common.eventhandler.Event.Result; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.TConstructRegistry; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.util.IPattern; +import cpw.mods.fml.common.eventhandler.Event.Result; public class PatternBuilder { + public static PatternBuilder instance = new PatternBuilder(); // Map items to their parts with a hashmap public List materials = new ArrayList<>(); @@ -30,8 +33,8 @@ public class PatternBuilder { materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key)); } - public void registerFullMaterial( - ItemStack material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { + public void registerFullMaterial(ItemStack material, int value, String key, ItemStack shard, ItemStack rod, + int materialID) { materials.add(new ItemKey(material.getItem(), material.getItemDamage(), value, key)); materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key)); materialSets.put(key, new MaterialSet(shard, rod, materialID)); @@ -63,31 +66,23 @@ public class PatternBuilder { int totalMaterial = key.value * material.stackSize; if (totalMaterial < patternValue) // Not enough material - return null; + return null; else if (patternValue == key.value) // Material only - return new ItemStack[] {toolPart, null}; + return new ItemStack[] { toolPart, null }; else { if (patternValue % 2 == 1 && mat.shard != null) { - return new ItemStack[] {toolPart, mat.shard.copy()}; // Material + return new ItemStack[] { toolPart, mat.shard.copy() }; // Material // + // shard - } else return new ItemStack[] {toolPart, null}; + } else return new ItemStack[] { toolPart, null }; } /* - * if ( patternValue < totalMaterial ) { if (otherPattern != - * null) { int otherValue = - * ((IPattern)otherPattern.getItem() - * ).getPatternCost(otherPattern.getItemDamage()); if - * (patternValue + otherValue <= key.value) { ItemStack - * otherPart = getMatchingPattern(otherPattern, mat); return - * new ItemStack[] { toolPart, otherPart }; //Material + - * Material } } } - * - * else if ( patternValue == key.value ) return new - * ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), - * null }; //Material only - * - * else return null; //Not a valid match + * if ( patternValue < totalMaterial ) { if (otherPattern != null) { int otherValue = + * ((IPattern)otherPattern.getItem() ).getPatternCost(otherPattern.getItemDamage()); if + * (patternValue + otherValue <= key.value) { ItemStack otherPart = getMatchingPattern(otherPattern, + * mat); return new ItemStack[] { toolPart, otherPart }; //Material + Material } } } else if ( + * patternValue == key.value ) return new ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), + * null }; //Material only else return null; //Not a valid match */ } } @@ -150,6 +145,7 @@ public class PatternBuilder { // Small data classes. I would prefer the struct from C#, but we do what we // can. public static class ItemKey { + public final Item item; public final int damage; public final int value; @@ -164,6 +160,7 @@ public class PatternBuilder { } public static class MaterialSet { + public final ItemStack shard; public final ItemStack rod; public final int materialID; @@ -184,27 +181,22 @@ public class PatternBuilder { registerMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key); } - public void registerFullMaterial( - Block material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { + public void registerFullMaterial(Block material, int value, String key, ItemStack shard, ItemStack rod, + int materialID) { registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID); } - public void registerFullMaterial( - Item material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { + public void registerFullMaterial(Item material, int value, String key, ItemStack shard, ItemStack rod, + int materialID) { registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID); } /* - * public void registerFullMaterial (Block material, int value, String key, - * int materialID) { registerFullMaterial(new ItemStack(material, 1, - * Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1, - * materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID); - * } - * - * public void registerFullMaterial (Item material, int value, String key, - * int materialID) { registerFullMaterial(new ItemStack(material, 1, - * Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1, - * materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID); - * } + * public void registerFullMaterial (Block material, int value, String key, int materialID) { + * registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, + * 1, materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID); } public void registerFullMaterial + * (Item material, int value, String key, int materialID) { registerFullMaterial(new ItemStack(material, 1, + * Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1, materialID), new ItemStack(TContent.toolRod, + * 1, materialID), materialID); } */ } diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 6d7a898b..036c0294 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -1,19 +1,25 @@ package tconstruct.library.crafting; import java.util.*; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; + import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; public class ShapelessToolRecipe extends ShapelessRecipes { + static { RecipeSorter.register( - TConstruct.modID + ":" + "toolrecipe", ShapelessToolRecipe.class, RecipeSorter.Category.SHAPELESS, ""); + TConstruct.modID + ":" + "toolrecipe", + ShapelessToolRecipe.class, + RecipeSorter.Category.SHAPELESS, + ""); } public ShapelessToolRecipe(ItemStack par1ItemStack, List par2List) { @@ -40,7 +46,8 @@ public class ShapelessToolRecipe extends ShapelessRecipes { flag = true; } else if ((itemstack1.getItemDamage() == Short.MAX_VALUE - || itemstack.getItemDamage() == itemstack1.getItemDamage())) flag = true; + || itemstack.getItemDamage() == itemstack1.getItemDamage())) + flag = true; arraylist.remove(itemstack1); break; diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index e3fa7d7b..aaf4ded5 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -1,7 +1,9 @@ package tconstruct.library.crafting; import java.util.*; + import mantle.utils.ItemMetaWrapper; + import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraftforge.fluids.*; @@ -9,6 +11,7 @@ import net.minecraftforge.oredict.OreDictionary; /** Melting and hacking, churn and burn */ public class Smeltery { + public static Smeltery instance = new Smeltery(); private final Map smeltingList = new HashMap<>(); @@ -19,12 +22,13 @@ public class Smeltery { /** * Add a new fluid as a valid Smeltery fuel. - * @param fluid The fluid. - * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000. + * + * @param fluid The fluid. + * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000. * @param duration How long one "portion" of liquid fuels the smeltery. Lava is 10. */ public static void addSmelteryFuel(Fluid fluid, int power, int duration) { - instance.smelteryFuels.put(fluid, new Integer[] {power, duration}); + instance.smelteryFuels.put(fluid, new Integer[] { power, duration }); } /** @@ -51,13 +55,13 @@ public class Smeltery { } /** - * Adds mappings between an itemstack and an output liquid Example: - * Smeltery.addMelting(Block.oreIron, 0, 600, new + * Adds mappings between an itemstack and an output liquid Example: Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); * - * @param stack The itemstack to liquify. Must hold a block. - * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary - * @param output The result of the process in liquid form + * @param stack The itemstack to liquify. Must hold a block. + * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other + * structures may vary + * @param output The result of the process in liquid form */ public static void addMelting(ItemStack stack, int temperature, FluidStack output) { if (stack.getItem() instanceof ItemBlock) @@ -66,30 +70,29 @@ public class Smeltery { } /** - * Adds mappings between a block and its liquid Example: - * Smeltery.addMelting(Block.oreIron, 0, 600, new + * Adds mappings between a block and its liquid Example: Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); * - * @param block The block to liquify and render - * @param metadata The metadata of the block to liquify and render - * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary - * @param output The result of the process in liquid form + * @param block The block to liquify and render + * @param metadata The metadata of the block to liquify and render + * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other + * structures may vary + * @param output The result of the process in liquid form */ public static void addMelting(Block block, int metadata, int temperature, FluidStack output) { addMelting(new ItemStack(block, 1, metadata), block, metadata, temperature, output); } /** - * Adds mappings between an input and its liquid. Renders with the given - * input's block ID and metadata Example: Smeltery.addMelting(Block.oreIron, - * 0, 600, new FluidStack(liquidMetalStill.blockID, - * TConstruct.ingotLiquidValue * 2, 0)); + * Adds mappings between an input and its liquid. Renders with the given input's block ID and metadata Example: + * Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * + * 2, 0)); * - * @param input The item to liquify - * @param block The block to render - * @param metadata The metadata of the block to render + * @param input The item to liquify + * @param block The block to render + * @param metadata The metadata of the block to render * @param temperature How hot the block should be before liquifying - * @param liquid The result of the process + * @param liquid The result of the process */ public static void addMelting(ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) { ItemMetaWrapper in = new ItemMetaWrapper(input); @@ -99,10 +102,8 @@ public class Smeltery { } /** - * Adds an alloy mixing recipe. Example: Smeltery.addAlloyMixing(new - * FluidStack(bronzeID, 2, 0), new FluidStack(copperID, 3, 0), new - * FluidStack(tinID, 1, 0)); The example mixes 3 copper with 1 tin to make 2 - * bronze + * Adds an alloy mixing recipe. Example: Smeltery.addAlloyMixing(new FluidStack(bronzeID, 2, 0), new + * FluidStack(copperID, 3, 0), new FluidStack(tinID, 1, 0)); The example mixes 3 copper with 1 tin to make 2 bronze * * @param result The output of the combination of mixers. The quantity is used for amount of a successful mix * @param mixers the liquids to be mixed. Quantities are used as ratios @@ -196,29 +197,27 @@ public class Smeltery { * * @author samtrion * - * @param type Type of Fluid - * @param input The item to liquify - * @param temperatureDifference Difference between FluidType BaseTemperature - * @param fluidAmount Amount of Fluid + * @param type Type of Fluid + * @param input The item to liquify + * @param temperatureDifference Difference between FluidType BaseTemperature + * @param fluidAmount Amount of Fluid */ public static void addMelting(FluidType type, ItemStack input, int temperatureDifference, int fluidAmount) { int temp = type.baseTemperature + temperatureDifference; if (temp <= 20) temp = type.baseTemperature; - if (input.getItem() instanceof ItemBlock) - addMelting( - input, - ((ItemBlock) input.getItem()).field_150939_a, - input.getItemDamage(), - type.baseTemperature + temperatureDifference, - new FluidStack(type.fluid, fluidAmount)); - else - addMelting( - input, - type.renderBlock, - type.renderMeta, - type.baseTemperature + temperatureDifference, - new FluidStack(type.fluid, fluidAmount)); + if (input.getItem() instanceof ItemBlock) addMelting( + input, + ((ItemBlock) input.getItem()).field_150939_a, + input.getItemDamage(), + type.baseTemperature + temperatureDifference, + new FluidStack(type.fluid, fluidAmount)); + else addMelting( + input, + type.renderBlock, + type.renderMeta, + type.baseTemperature + temperatureDifference, + new FluidStack(type.fluid, fluidAmount)); } /** @@ -226,13 +225,13 @@ public class Smeltery { * * @author samtrion * - * @param oreName oreDictionary name e.g. oreIron - * @param type Type of Fluid + * @param oreName oreDictionary name e.g. oreIron + * @param type Type of Fluid * @param temperatureDifference Difference between FluidType BaseTemperature - * @param fluidAmount Amount of Fluid + * @param fluidAmount Amount of Fluid */ - public static void addDictionaryMelting( - String oreName, FluidType type, int temperatureDifference, int fluidAmount) { + public static void addDictionaryMelting(String oreName, FluidType type, int temperatureDifference, + int fluidAmount) { for (ItemStack is : OreDictionary.getOres(oreName)) addMelting(type, is, temperatureDifference, fluidAmount); } } diff --git a/src/main/java/tconstruct/library/crafting/StencilBuilder.java b/src/main/java/tconstruct/library/crafting/StencilBuilder.java index b22d3e1d..4837f276 100644 --- a/src/main/java/tconstruct/library/crafting/StencilBuilder.java +++ b/src/main/java/tconstruct/library/crafting/StencilBuilder.java @@ -1,22 +1,25 @@ package tconstruct.library.crafting; import java.util.*; + import net.minecraft.item.*; import net.minecraftforge.oredict.OreDictionary; public class StencilBuilder { + public static StencilBuilder instance = new StencilBuilder(); - public List blanks = - new LinkedList<>(); // i wish ItemStack would support equals so i could use a Set here... + public List blanks = new LinkedList<>(); // i wish ItemStack would support equals so i could use a Set + // here... public Map stencils = new TreeMap<>(); /** * Returns whether the given ItemStack is a blank pattern and therefore usable for stencil crafting. */ public static boolean isBlank(ItemStack stack) { - for (ItemStack blank : instance.blanks) - if (OreDictionary.itemMatches(stack, blank, false)) // this has nothing to do with the oredictionary. + for (ItemStack blank : instance.blanks) if (OreDictionary.itemMatches(stack, blank, false)) // this has nothing + // to do with the + // oredictionary. return true; return false; @@ -31,9 +34,10 @@ public class StencilBuilder { } public static void registerStencil(int id, ItemStack pattern) { - if (instance.stencils.containsKey(id)) - throw new IllegalArgumentException("[TCon API] Stencil ID " + id + " is already occupied by " - + instance.stencils.get(id).getDisplayName()); + if (instance.stencils.containsKey(id)) throw new IllegalArgumentException( + "[TCon API] Stencil ID " + id + + " is already occupied by " + + instance.stencils.get(id).getDisplayName()); instance.stencils.put(id, pattern); } diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index f9d88a53..fe64a635 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -1,19 +1,22 @@ package tconstruct.library.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ -import cpw.mods.fml.common.eventhandler.Event.Result; import java.util.*; + import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.TConstructRegistry; import tconstruct.library.event.*; import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.*; import tconstruct.library.util.IToolPart; +import cpw.mods.fml.common.eventhandler.Event.Result; public class ToolBuilder { + public static ToolBuilder instance = new ToolBuilder(); public HashMap recipeList = new HashMap<>(); @@ -73,10 +76,10 @@ public class ToolBuilder { public ToolCore getMatchingRecipe(Item head, Item handle, Item accessory, Item extra) { for (ToolRecipe recipe : combos) { - if (recipe.validHead(head) - && recipe.validHandle(handle) + if (recipe.validHead(head) && recipe.validHandle(handle) && recipe.validAccessory(accessory) - && recipe.validExtra(extra)) return recipe.getType(); + && recipe.validExtra(extra)) + return recipe.getType(); } return null; } @@ -95,14 +98,16 @@ public class ToolBuilder { return -1; } - public ItemStack buildTool( - ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { - /*if (headStack != null && headStack.getItem() instanceof ToolCore) - return modifyTool(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name);*/ + public ItemStack buildTool(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, + ItemStack extraStack, String name) { + /* + * if (headStack != null && headStack.getItem() instanceof ToolCore) return modifyTool(headStack, new + * ItemStack[] { handleStack, accessoryStack, extraStack }, name); + */ - if (headStack == null - || handleStack == null) // Nothing to build without these. All tools need at least two parts! - return null; + if (headStack == null || handleStack == null) // Nothing to build without these. All tools need at least two + // parts! + return null; if (name == null) name = ""; // fire the ToolBuild event to get the correct items @@ -140,7 +145,10 @@ public class ToolBuilder { if (extra == -1) return null; item = getMatchingRecipe( - headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem()); + headStack.getItem(), + handleStack.getItem(), + accessoryStack.getItem(), + extraStack.getItem()); } else { item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), null); } @@ -263,7 +271,9 @@ public class ToolBuilder { } ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool( - item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat}); + item, + compound, + new ToolMaterial[] { headMat, handleMat, accessoryMat, extraMat }); MinecraftForge.EVENT_BUS.post(event); if (event.getResult() == Result.DEFAULT) { @@ -277,46 +287,19 @@ public class ToolBuilder { return tool; } - /*@Deprecated - public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack bottomSlot, ItemStack extraStack, String name) - { - if (extraStack != null) - return null; + /* + * @Deprecated public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack bottomSlot, ItemStack + * extraStack, String name) { if (extraStack != null) return null; ItemStack tool = input.copy(); NBTTagCompound + * tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.removeTag("Built"); if (topSlot == null && + * bottomSlot == null) return tool; boolean built = false; for (ToolMod mod : toolMods) { ItemStack[] slots = new + * ItemStack[] { topSlot, bottomSlot }; if (mod.matches(slots, tool)) { built = true; mod.addMatchingEffect(tool); + * mod.modify(slots, tool); } } tags = tool.getTagCompound(); if (name != null && !name.equals("") && + * !tags.hasKey("display")) { tags.setCompoundTag("display", new NBTTagCompound()); + * tags.getCompoundTag("display").setString("Name", "\u00A7f" + name); } if (built) return tool; else return null; } + */ - ItemStack tool = input.copy(); - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - tags.removeTag("Built"); - - if (topSlot == null && bottomSlot == null) - return tool; - - boolean built = false; - for (ToolMod mod : toolMods) - { - ItemStack[] slots = new ItemStack[] { topSlot, bottomSlot }; - if (mod.matches(slots, tool)) - { - built = true; - mod.addMatchingEffect(tool); - mod.modify(slots, tool); - } - } - - tags = tool.getTagCompound(); - if (name != null && !name.equals("") && !tags.hasKey("display")) - { - tags.setCompoundTag("display", new NBTTagCompound()); - tags.getCompoundTag("display").setString("Name", "\u00A7f" + name); - } - - if (built) - return tool; - else - return null; - }*/ - - int buildReinforced( - ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) { + int buildReinforced(ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, + ToolMaterial extraMat) { int reinforced = 0; int dHead = headMat.reinforced(); diff --git a/src/main/java/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java index c9f82b3a..bbc5a897 100644 --- a/src/main/java/tconstruct/library/crafting/ToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ToolRecipe.java @@ -1,8 +1,10 @@ package tconstruct.library.crafting; import java.util.LinkedList; + import net.minecraft.init.Items; import net.minecraft.item.Item; + import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.ToolCore; @@ -11,6 +13,7 @@ import tconstruct.library.tools.ToolCore; */ public class ToolRecipe { + protected LinkedList headList = new LinkedList<>(); protected LinkedList handleList = new LinkedList<>(); protected LinkedList accessoryList = new LinkedList<>(); @@ -19,8 +22,7 @@ public class ToolRecipe { protected Item toolRod = TConstructRegistry.getItem("toolRod"); /* - * public ToolRecipe(Item head, ToolCore tool) { this(head, - * TContent.toolRod, null, null, tool); } + * public ToolRecipe(Item head, ToolCore tool) { this(head, TContent.toolRod, null, null, tool); } */ public ToolRecipe(Item head, Item handle, ToolCore tool) { diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 66c00d7e..2a362ce2 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -1,9 +1,7 @@ package tconstruct.library.entity; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import io.netty.buffer.ByteBuf; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -18,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -25,9 +24,13 @@ import tconstruct.library.tools.ToolCore; import tconstruct.library.weaponry.AmmoItem; import tconstruct.util.Reference; import tconstruct.weaponry.entity.ArrowEntity; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; // have to base this on EntityArrow, otherwise minecraft does derp things because everything is handled based on class. public abstract class ProjectileBase extends EntityArrow implements IEntityAdditionalSpawnData { + public static final String woodSound = Reference.resource("woodHit"); public static final String stoneSound = Reference.resource("stoneHit"); @@ -72,23 +75,14 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit returnStack = stack; /* - // fix upward default angle - motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f); - setArrowHeading(motionX, motionY, motionZ, speed, 0.0f); - - // set better position and move it a tad so we don't hit ourselves. - this.setPosition(player.posX, player.posY + player.getEyeHeight(), player.posZ); - */ + * // fix upward default angle motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f); + * setArrowHeading(motionX, motionY, motionZ, speed, 0.0f); // set better position and move it a tad so we don't + * hit ourselves. this.setPosition(player.posX, player.posY + player.getEyeHeight(), player.posZ); + */ /* - double l = Math.sqrt(motionX*motionX + motionY*motionY + motionZ*motionZ); - double vx = motionX/l; - double vy = motionY/l; - double vz = motionZ/l; - - posX += vx*1.5f; - posY += vy*1.5f; - posZ += vz*1.5f; - */ + * double l = Math.sqrt(motionX*motionX + motionY*motionY + motionZ*motionZ); double vx = motionX/l; double vy = + * motionY/l; double vz = motionZ/l; posX += vx*1.5f; posY += vy*1.5f; posZ += vz*1.5f; + */ // init(); } @@ -119,8 +113,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit } protected void doLivingHit(EntityLivingBase entityHit) { - float knockback = - returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("Knockback"); + float knockback = returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("Knockback"); if (shootingEntity instanceof EntityLivingBase) knockback += EnchantmentHelper.getKnockbackModifier((EntityLivingBase) shootingEntity, entityHit); @@ -144,12 +137,11 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit EnchantmentHelper.func_151385_b((EntityLivingBase) this.shootingEntity, entityHit); } - if (this.shootingEntity != null - && entityHit != this.shootingEntity + if (this.shootingEntity != null && entityHit != this.shootingEntity && entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { - ((EntityPlayerMP) this.shootingEntity) - .playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler + .sendPacket(new S2BPacketChangeGameState(6, 0.0F)); } } @@ -162,9 +154,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit this.motionX = movingobjectposition.hitVec.xCoord - this.posX; this.motionY = movingobjectposition.hitVec.yCoord - this.posY; this.motionZ = movingobjectposition.hitVec.zCoord - this.posZ; - double speed = getStuckDepth() - * MathHelper.sqrt_double( - this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + double speed = getStuckDepth() * MathHelper + .sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); this.posX -= this.motionX / speed * 0.05000000074505806D; this.posY -= this.motionY / speed * 0.05000000074505806D; this.posZ -= this.motionZ / speed * 0.05000000074505806D; @@ -178,14 +169,18 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit if (this.field_145790_g.getMaterial() != Material.air) { this.field_145790_g.onEntityCollidedWithBlock( - this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); + this.worldObj, + this.field_145791_d, + this.field_145792_e, + this.field_145789_f, + this); } } public void onHitEntity(MovingObjectPosition movingobjectposition) { NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool"); - float speed = MathHelper.sqrt_double( - this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + float speed = MathHelper + .sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); // absolute distance travelled minus the current tick float distance = speed * (this.ticksInAir - 1); @@ -213,8 +208,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit float baseAttack = tags.getInteger("BaseAttack"); float totalAttack = tags.getInteger("Attack"); - float damage = speed - * baseAttack; // todo: potentially change this back to MathHelper.ceiling_float_int to get 1/2 heart + float damage = speed * baseAttack; // todo: potentially change this back to MathHelper.ceiling_float_int to get + // 1/2 heart // steps back // add quartz damage @@ -232,7 +227,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // basically we pass the base damage to all modifiers and take the highest one int baseDamage = 0; if (shotByPlayer) // prevent crashes with other things reflecting/shooting them - for (ActiveToolMod toolmod : TConstructRegistry.activeModifiers) { + for (ActiveToolMod toolmod : TConstructRegistry.activeModifiers) { int dmg = toolmod.baseAttackDamage( baseDamage, (int) damage, @@ -257,7 +252,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // enchantments might add too if (shootingEntity != null && movingobjectposition.entityHit instanceof EntityLivingBase) bonusDamage += EnchantmentHelper.getEnchantmentModifierLiving( - (EntityLivingBase) this.shootingEntity, (EntityLivingBase) movingobjectposition.entityHit); + (EntityLivingBase) this.shootingEntity, + (EntityLivingBase) movingobjectposition.entityHit); damage += bonusDamage; // ensure we still have damage @@ -265,18 +261,17 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // the regular tool modifier damage stuff int modDamage = 0; - if (shotByPlayer) - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { - modDamage += mod.attackDamage( - modDamage, - (int) damage, - ammo, - returnStack.getTagCompound(), - tags, - returnStack, - (EntityPlayer) this.shootingEntity, - movingobjectposition.entityHit); - } + if (shotByPlayer) for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + modDamage += mod.attackDamage( + modDamage, + (int) damage, + ammo, + returnStack.getTagCompound(), + tags, + returnStack, + (EntityPlayer) this.shootingEntity, + movingobjectposition.entityHit); + } damage += modDamage; // calculate critical damaaage @@ -356,8 +351,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // If we don't have our rotation set correctly, infer it from our motion direction 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.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D + / Math.PI); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); } @@ -365,9 +360,15 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState( - this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.worldObj, + this.field_145791_d, + this.field_145792_e, + this.field_145789_f); AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool( - this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.worldObj, + this.field_145791_d, + this.field_145792_e, + this.field_145789_f); // we are stuck in a block. yay. if (axisalignedbb != null @@ -408,31 +409,27 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // do a raytrace from old to new position Vec3 curPos = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 newPos = - Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 newPos = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(curPos, newPos, false, true, false); // raytrace messes with the positions. get new ones! curPos = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); // if we hit something, the collision point is our new position - if (movingobjectposition != null) - newPos = Vec3.createVectorHelper( - movingobjectposition.hitVec.xCoord, - movingobjectposition.hitVec.yCoord, - movingobjectposition.hitVec.zCoord); - else - newPos = Vec3.createVectorHelper( - this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + if (movingobjectposition != null) newPos = Vec3.createVectorHelper( + movingobjectposition.hitVec.xCoord, + movingobjectposition.hitVec.yCoord, + movingobjectposition.hitVec.zCoord); + else newPos = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (!defused) { // Check all the entities we on our way 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)); + this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double distance = 0.0D; float f1; @@ -465,9 +462,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; // can we attack said player? - if (entityplayer.capabilities.disableDamage - || this.shootingEntity instanceof EntityPlayer - && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer + && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) movingobjectposition = null; // this check should probably done inside of the loop for accuracy.. @@ -590,7 +586,9 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit if (flag) { this.playSound( - "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); player.onItemPickup(this, 1); this.setDead(); } diff --git a/src/main/java/tconstruct/library/event/ModifyEvent.java b/src/main/java/tconstruct/library/event/ModifyEvent.java index 35279f12..fb646d4c 100644 --- a/src/main/java/tconstruct/library/event/ModifyEvent.java +++ b/src/main/java/tconstruct/library/event/ModifyEvent.java @@ -1,13 +1,15 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; + import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; +import cpw.mods.fml.common.eventhandler.Cancelable; +import cpw.mods.fml.common.eventhandler.Event; @Cancelable public class ModifyEvent extends Event { + public final ItemModifier modifier; public final IModifyable item; public final ItemStack itemStack; diff --git a/src/main/java/tconstruct/library/event/PartBuilderEvent.java b/src/main/java/tconstruct/library/event/PartBuilderEvent.java index f6c4290d..d3f14b72 100644 --- a/src/main/java/tconstruct/library/event/PartBuilderEvent.java +++ b/src/main/java/tconstruct/library/event/PartBuilderEvent.java @@ -1,13 +1,16 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; -/* This event fires after all of the other construction. The resulting nbttag is added to the tool - * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. +import cpw.mods.fml.common.eventhandler.Event; + +/* + * This event fires after all of the other construction. The resulting nbttag is added to the tool Note: The tag is the + * base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. */ public class PartBuilderEvent extends Event { + public final ItemStack material; public final ItemStack pattern; public final ItemStack otherPattern; @@ -21,6 +24,7 @@ public class PartBuilderEvent extends Event { @HasResult public static class NormalPart extends PartBuilderEvent { + public NormalPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) { super(material, pattern, otherPattern); } @@ -28,8 +32,8 @@ public class PartBuilderEvent extends Event { /** * Fires before other processing is done * - * Result is significant: DEFAULT: Allows part to be crafted normally - * ALLOW: Uses resultStack instead DENY: Stops part crafting altogether + * Result is significant: DEFAULT: Allows part to be crafted normally ALLOW: Uses resultStack instead DENY: + * Stops part crafting altogether */ public void overrideResult(ItemStack[] result) { resultStacks = result; diff --git a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java index c384bc7c..6cb2d882 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java @@ -1,8 +1,9 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraftforge.fluids.FluidStack; + import tconstruct.library.crafting.CastingRecipe; +import cpw.mods.fml.common.eventhandler.Event; /** * Fires when somebody tries to pour a liquid into a metal cast. @@ -10,6 +11,7 @@ import tconstruct.library.crafting.CastingRecipe; * Set result to DENY to prevent casting. */ public abstract class SmelteryCastEvent extends Event { + public final CastingRecipe recipe; public final FluidStack fluid; @@ -19,12 +21,14 @@ public abstract class SmelteryCastEvent extends Event { } public static class CastingTable extends SmelteryCastEvent { + public CastingTable(CastingRecipe recipe, FluidStack fluid) { super(recipe, fluid); } } public static class CastingBasin extends SmelteryCastEvent { + public CastingBasin(CastingRecipe recipe, FluidStack fluid) { super(recipe, fluid); } diff --git a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java index f8e14ca4..acb2d42e 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java @@ -1,14 +1,15 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; + import tconstruct.library.crafting.CastingRecipe; +import cpw.mods.fml.common.eventhandler.Event; /** - * Fired when an item is cast in the casting table. - * If consumeCast is set to true, the cast will be destroyed. + * Fired when an item is cast in the casting table. If consumeCast is set to true, the cast will be destroyed. */ public abstract class SmelteryCastedEvent extends Event { + public final CastingRecipe recipe; public ItemStack output; public boolean consumeCast; @@ -20,12 +21,14 @@ public abstract class SmelteryCastedEvent extends Event { } public static class CastingTable extends SmelteryCastedEvent { + public CastingTable(CastingRecipe recipe, ItemStack output) { super(recipe, output); } } public static class CastingBasin extends SmelteryCastedEvent { + public CastingBasin(CastingRecipe recipe, ItemStack output) { super(recipe, output); } diff --git a/src/main/java/tconstruct/library/event/SmelteryEvent.java b/src/main/java/tconstruct/library/event/SmelteryEvent.java index 90c4f54a..33ab39a0 100644 --- a/src/main/java/tconstruct/library/event/SmelteryEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryEvent.java @@ -1,10 +1,12 @@ package tconstruct.library.event; +import mantle.blocks.abstracts.InventoryLogic; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; -import mantle.blocks.abstracts.InventoryLogic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class SmelteryEvent extends Event { @@ -20,13 +22,14 @@ public class SmelteryEvent extends Event { @Cancelable public static class ItemInsertedIntoCasting extends SmelteryEvent { + /** Item that will be inserted into the casting block */ public ItemStack item; public EntityPlayer player; - public ItemInsertedIntoCasting( - InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) { + public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, + EntityPlayer player) { super(component, x, y, z); this.item = item; this.player = player; @@ -34,13 +37,14 @@ public class SmelteryEvent extends Event { } public static class ItemRemovedFromCasting extends SmelteryEvent { + /** Item that will be returned to the player */ public ItemStack item; public EntityPlayer player; - public ItemRemovedFromCasting( - InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) { + public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, + EntityPlayer player) { super(component, x, y, z); this.item = item; this.player = player; diff --git a/src/main/java/tconstruct/library/event/ToolBuildEvent.java b/src/main/java/tconstruct/library/event/ToolBuildEvent.java index 6ed7c0bf..7e3f52f2 100644 --- a/src/main/java/tconstruct/library/event/ToolBuildEvent.java +++ b/src/main/java/tconstruct/library/event/ToolBuildEvent.java @@ -1,21 +1,23 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event; + /** * Called when the ToolBuilder tries to piece together the Parts of a tool. * */ public class ToolBuildEvent extends Event { + public ItemStack headStack; public ItemStack handleStack; public ItemStack accessoryStack; public ItemStack extraStack; public String name; // to allow shenanigans - public ToolBuildEvent( - ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { + public ToolBuildEvent(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, + String name) { this.headStack = headStack; this.handleStack = handleStack; this.accessoryStack = accessoryStack; diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index 304cfa60..811d1187 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -1,15 +1,18 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.tools.*; -/* This event fires after all of the other construction. The resulting nbttag is added to the tool - * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. +import tconstruct.library.tools.*; +import cpw.mods.fml.common.eventhandler.Event; + +/* + * This event fires after all of the other construction. The resulting nbttag is added to the tool Note: The tag is the + * base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. */ public class ToolCraftEvent extends Event { + public final ToolCore tool; public final NBTTagCompound toolTag; public final ToolMaterial[] materials; @@ -23,6 +26,7 @@ public class ToolCraftEvent extends Event { @HasResult public static class NormalTool extends ToolCraftEvent { + public NormalTool(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) { super(tool, toolTag, materials); } @@ -30,8 +34,8 @@ public class ToolCraftEvent extends Event { /** * Fires just before the tool is put together * - * Result is significant: DEFAULT: Allows tool to be crafted normally - * ALLOW: Uses resultStack instead DENY: Stops tool crafting altogether + * Result is significant: DEFAULT: Allows tool to be crafted normally ALLOW: Uses resultStack instead DENY: + * Stops tool crafting altogether */ public void overrideResult(ItemStack result) { resultStack = result; diff --git a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java index da22b67f..7ea5a324 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java @@ -1,10 +1,11 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event; + public class ToolCraftedEvent extends Event { public IInventory inventory; diff --git a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java index 74b903c8..d55148f4 100644 --- a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java +++ b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java @@ -3,9 +3,11 @@ package tconstruct.library.modifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.armor.*; public class ActiveArmorMod { + /* Ticks for every armor piece on client and server */ public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) {} } diff --git a/src/main/java/tconstruct/library/modifier/IModifyable.java b/src/main/java/tconstruct/library/modifier/IModifyable.java index 768f06f6..fe644b20 100644 --- a/src/main/java/tconstruct/library/modifier/IModifyable.java +++ b/src/main/java/tconstruct/library/modifier/IModifyable.java @@ -1,6 +1,7 @@ package tconstruct.library.modifier; public interface IModifyable { + /** * @return The base tag to modify. Ex: InfiTool */ diff --git a/src/main/java/tconstruct/library/modifier/ItemModifier.java b/src/main/java/tconstruct/library/modifier/ItemModifier.java index 03d86484..f0616a31 100644 --- a/src/main/java/tconstruct/library/modifier/ItemModifier.java +++ b/src/main/java/tconstruct/library/modifier/ItemModifier.java @@ -1,19 +1,22 @@ package tconstruct.library.modifier; import java.util.*; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public abstract class ItemModifier { + public final String key; public final List stacks; public final int effectIndex; public static Random random = new Random(); - /** Default constructor + /** + * Default constructor * - * @param recipe Items to compare against when checking the modifier - * @param effect Render index for sprite layering + * @param recipe Items to compare against when checking the modifier + * @param effect Render index for sprite layering * @param dataKey NBT string to put on the item */ public ItemModifier(ItemStack[] recipe, int effect, String dataKey) { @@ -22,11 +25,11 @@ public abstract class ItemModifier { key = dataKey; } - /** Checks to see if the inputs match the stored items - * Note: Works like ShapelessRecipes + /** + * Checks to see if the inputs match the stored items Note: Works like ShapelessRecipes * * @param recipe The ItemStacks to compare against - * @param input Item to modify, used for restrictions + * @param input Item to modify, used for restrictions * @return Whether the recipe matches the input */ public boolean matches(ItemStack[] recipe, ItemStack input) { @@ -66,7 +69,7 @@ public abstract class ItemModifier { } /** - * @param input Tool to compare against + * @param input Tool to compare against * @param recipe Items to modify with * @return Whether the tool can be modified */ @@ -75,10 +78,11 @@ public abstract class ItemModifier { return tags.getInteger("Modifiers") > 0; } - /** Modifies the tool. Adds nbttags, changes existing ones, ticks down modification counter, etc + /** + * Modifies the tool. Adds nbttags, changes existing ones, ticks down modification counter, etc * * @param recipe ItemStacks to pull info from - * @param input The tool to modify + * @param input The tool to modify */ public abstract void modify(ItemStack[] recipe, ItemStack input); @@ -181,8 +185,8 @@ public abstract class ItemModifier { return ItemStack.areItemStackTagsEqual(stack1, stack2); } - public static NBTTagCompound getAttributeTag( - String attributeType, String modifierName, double amount, boolean flat, UUID uuid) { + public static NBTTagCompound getAttributeTag(String attributeType, String modifierName, double amount, boolean flat, + UUID uuid) { NBTTagCompound tag = new NBTTagCompound(); tag.setString("AttributeName", attributeType); tag.setString("Name", modifierName); diff --git a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java index 89a483d3..cbeccbb2 100644 --- a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; public abstract class AOEHarvestTool extends HarvestTool { + public int breakRadius; public int breakDepth; @@ -58,15 +59,14 @@ public abstract class AOEHarvestTool extends HarvestTool { break; } - for (int xPos = x - xRange; xPos <= x + xRange; xPos++) - for (int yPos = y - yRange; yPos <= y + yRange; yPos++) - for (int zPos = z - zRange; zPos <= z + zRange; zPos++) { - // don't break the originally already broken block, duh - if (xPos == x && yPos == y && zPos == z) continue; + for (int xPos = x - xRange; xPos <= x + xRange; xPos++) for (int yPos = y - yRange; yPos <= y + yRange; yPos++) + for (int zPos = z - zRange; zPos <= z + zRange; zPos++) { + // don't break the originally already broken block, duh + if (xPos == x && yPos == y && zPos == z) continue; - if (!super.onBlockStartBreak(stack, xPos, yPos, zPos, player)) - breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x, y, z); - } + if (!super.onBlockStartBreak(stack, xPos, yPos, zPos, player)) + breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x, y, z); + } return super.onBlockStartBreak(stack, x, y, z, player); } diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 7c02b88c..ec45a032 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -1,10 +1,8 @@ package tconstruct.library.tools; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.Event.Result; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -27,18 +25,23 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.UseHoeEvent; + import tconstruct.TConstruct; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.PiercingEntityDamage; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.Event.Result; public class AbilityHelper { + public static Random random = new Random(); public static boolean necroticUHS; /* Normal interactions */ - public static boolean onBlockChanged( - ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player, Random random) { + public static boolean onBlockChanged(ItemStack stack, World world, Block block, int x, int y, int z, + EntityLivingBase player, Random random) { if (!stack.hasTagCompound()) return false; int reinforced = 0; @@ -58,8 +61,8 @@ public class AbilityHelper { return onLeftClickEntity(stack, player, entity, tool, 0); } - public static boolean onLeftClickEntity( - ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, int baseDamage) { + public static boolean onLeftClickEntity(ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, + int baseDamage) { if (entity != null && player != null && entity.canAttackWithItem() && stack.hasTagCompound()) { if (!entity.hitByEntity(player)) // can't attack this entity { @@ -83,8 +86,7 @@ public class AbilityHelper { } if (damage > 0 || enchantDamage > 0) { - boolean criticalHit = player.fallDistance > 0.0F - && !player.onGround + boolean criticalHit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) @@ -116,14 +118,12 @@ public class AbilityHelper { int armorValue = Math.min(20, ((EntityLivingBase) entity).getTotalArmorValue()); damage = (int) (damage / (1 - (0.04 * armorValue))); - if (player instanceof EntityPlayer) - causedDamage = - entity.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage); + if (player instanceof EntityPlayer) causedDamage = entity + .attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage); else causedDamage = entity.attackEntityFrom(causePiercingDamage(player), damage); } else { - if (player instanceof EntityPlayer) - causedDamage = entity.attackEntityFrom( - DamageSource.causePlayerDamage((EntityPlayer) player), damage); + if (player instanceof EntityPlayer) causedDamage = entity + .attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) player), damage); else causedDamage = entity.attackEntityFrom(DamageSource.causeMobDamage(player), damage); } @@ -132,10 +132,8 @@ public class AbilityHelper { // damageTool(stack, 1, player, false); tool.onEntityDamaged(player.worldObj, player, entity); - if (!necroticUHS - || (entity instanceof IMob - && entity instanceof EntityLivingBase - && ((EntityLivingBase) entity).getHealth() <= 0)) { + if (!necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase + && ((EntityLivingBase) entity).getHealth() <= 0)) { if (isAlive) { int drain = toolTags.getInteger("Necrotic") * 2; if (drain > 0) player.heal(random.nextInt(drain + 1)); @@ -198,15 +196,22 @@ public class AbilityHelper { return false; } - public static int calcDamage( - Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) { + public static int calcDamage(Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, + int baseDamage) { EntityLivingBase living = user instanceof EntityLivingBase ? (EntityLivingBase) user : null; int damage = toolTags.getInteger("Attack") + baseDamage; int earlyModDamage = 0; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { earlyModDamage = mod.baseAttackDamage( - earlyModDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); + earlyModDamage, + damage, + tool, + stack.getTagCompound(), + toolTags, + stack, + living, + entity); } damage += earlyModDamage; @@ -232,16 +237,16 @@ public class AbilityHelper { int modDamage = 0; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { - modDamage = - mod.attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); + modDamage = mod + .attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); } damage += modDamage; return damage; } - public static float calcKnockback( - Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) { + public static float calcKnockback(Entity user, Entity entity, ItemStack stack, ToolCore tool, + NBTTagCompound toolTags, int baseDamage) { if (user == null) return 0; float knockback = 0; @@ -308,17 +313,15 @@ public class AbilityHelper { List var6 = player.worldObj.getEntitiesWithinAABB( EntityWolf.class, AxisAlignedBB.getBoundingBox( - player.posX, - player.posY, - player.posZ, - player.posX + 1.0D, - player.posY + 1.0D, - player.posZ + 1.0D) - .expand(16.0D, 4.0D, 16.0D)); + player.posX, + player.posY, + player.posZ, + player.posX + 1.0D, + player.posY + 1.0D, + player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); for (EntityWolf var5 : var6) { - if (var5.isTamed() - && var5.getEntityToAttack() == null + if (var5.isTamed() && var5.getEntityToAttack() == null && player.getDisplayName().equals(var5.func_152113_b()) && (!par2 || !var5.isSitting())) { var5.setSitting(false); @@ -340,8 +343,8 @@ public class AbilityHelper { damageTool(stack, -dam, tags, entity, ignoreCharge); } - public static void damageTool( - ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity, boolean ignoreCharge) { + public static void damageTool(ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity, + boolean ignoreCharge) { if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode || tags == null) return; @@ -383,7 +386,7 @@ public class AbilityHelper { int toolDamage = (damage * 100 / maxDamage) + 1; int stackDamage = stack.getItemDamage(); // if (toolDamage != stackDamage) { - // // stack.setItemDamage((damage * 100 / maxDamage) + 1); + // // stack.setItemDamage((damage * 100 / maxDamage) + 1); // } } } @@ -480,8 +483,9 @@ public class AbilityHelper { tags.setInteger("Energy", max - missing); } - private static final boolean equalityOverrideLoaded = - Loader.isModLoaded("CoFHCore"); // Mods should be loaded far enough before this is ever initialized + private static final boolean equalityOverrideLoaded = Loader.isModLoaded("CoFHCore"); // Mods should be loaded far + // enough before this is ever + // initialized public static void breakTool(ItemStack stack, NBTTagCompound tags, Entity entity) { tags.getCompoundTag("InfiTool").setBoolean("Broken", true); @@ -508,8 +512,8 @@ public class AbilityHelper { living.motionZ *= boost; } - public static boolean hoeGround( - ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, Random random) { + public static boolean hoeGround(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + Random random) { if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; } else { @@ -525,8 +529,7 @@ public class AbilityHelper { Block block = world.getBlock(x, y, z); - if (side != 0 - && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) + if (side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; world.playSoundEffect( @@ -550,8 +553,12 @@ public class AbilityHelper { public static void spawnItemAtEntity(Entity entity, ItemStack stack, int delay) { if (!entity.worldObj.isRemote) { - EntityItem entityitem = - new EntityItem(entity.worldObj, entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, stack); + EntityItem entityitem = new EntityItem( + entity.worldObj, + entity.posX + 0.5D, + entity.posY + 0.5D, + entity.posZ + 0.5D, + stack); entityitem.delayBeforeCanPickup = delay; entity.worldObj.spawnEntityInWorld(entityitem); } @@ -560,13 +567,18 @@ public class AbilityHelper { public static void spawnItemAtPlayer(EntityPlayer player, ItemStack stack) { if (!player.worldObj.isRemote) { // try to put it into the players inventory - if (player instanceof FakePlayer - || !player.inventory.addItemStackToInventory( - stack)) // note that the addItemStackToInventory is not called for fake players + if (player instanceof FakePlayer || !player.inventory.addItemStackToInventory(stack)) // note that the + // addItemStackToInventory + // is not called for + // fake players { // drop the rest as an entity EntityItem entityitem = new EntityItem( - player.worldObj, player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, stack); + player.worldObj, + player.posX + 0.5D, + player.posY + 0.5D, + player.posZ + 0.5D, + stack); player.worldObj.spawnEntityInWorld(entityitem); if (!(player instanceof FakePlayer)) entityitem.onCollideWithPlayer(player); } @@ -624,8 +636,8 @@ public class AbilityHelper { return addItemStackToWorld(world, f, f1, f2, itemstack, false); } - public static EntityItem addItemStackToWorld( - World world, float f, float f1, float f2, ItemStack itemstack, boolean flag) { + public static EntityItem addItemStackToWorld(World world, float f, float f1, float f2, ItemStack itemstack, + boolean flag) { EntityItem entityitem; if (flag) { entityitem = new EntityItem(world, f, f1, f2, itemstack); diff --git a/src/main/java/tconstruct/library/tools/ArrowMaterial.java b/src/main/java/tconstruct/library/tools/ArrowMaterial.java index b048241b..53e5d14b 100644 --- a/src/main/java/tconstruct/library/tools/ArrowMaterial.java +++ b/src/main/java/tconstruct/library/tools/ArrowMaterial.java @@ -1,6 +1,7 @@ package tconstruct.library.tools; public class ArrowMaterial { + public final float mass; public final float breakChance; diff --git a/src/main/java/tconstruct/library/tools/BowMaterial.java b/src/main/java/tconstruct/library/tools/BowMaterial.java index 25a1a93b..c0172c23 100644 --- a/src/main/java/tconstruct/library/tools/BowMaterial.java +++ b/src/main/java/tconstruct/library/tools/BowMaterial.java @@ -1,6 +1,7 @@ package tconstruct.library.tools; public class BowMaterial { + public final int drawspeed; public final float flightSpeedMax; diff --git a/src/main/java/tconstruct/library/tools/BowstringMaterial.java b/src/main/java/tconstruct/library/tools/BowstringMaterial.java index acc27aa1..ddb9e413 100644 --- a/src/main/java/tconstruct/library/tools/BowstringMaterial.java +++ b/src/main/java/tconstruct/library/tools/BowstringMaterial.java @@ -3,19 +3,13 @@ package tconstruct.library.tools; import net.minecraft.item.ItemStack; public class BowstringMaterial extends CustomMaterial { + public final float durabilityModifier; public final float drawspeedModifier; public final float flightSpeedModifier; - public BowstringMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingItem, - float durability, - float drawspeed, - float flightspeed, - int color) { + public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, + float drawspeed, float flightspeed, int color) { super(materialID, value, input, craftingItem, color); this.durabilityModifier = durability; this.drawspeedModifier = drawspeed; @@ -23,14 +17,8 @@ public class BowstringMaterial extends CustomMaterial { } @Deprecated - public BowstringMaterial( - int materialID, - int value, - 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) { super(materialID, value, input, craftingItem); this.durabilityModifier = durability; this.drawspeedModifier = drawspeed; diff --git a/src/main/java/tconstruct/library/tools/CustomMaterial.java b/src/main/java/tconstruct/library/tools/CustomMaterial.java index 8d2cbfc5..2d203529 100644 --- a/src/main/java/tconstruct/library/tools/CustomMaterial.java +++ b/src/main/java/tconstruct/library/tools/CustomMaterial.java @@ -1,10 +1,12 @@ package tconstruct.library.tools; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public abstract class CustomMaterial { + public final int materialID; public final int value; public final ItemStack input; diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 27a2789f..db355ddd 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; /* Base class for harvest tools with each head having a different purpose */ public abstract class DualHarvestTool extends HarvestTool { + public DualHarvestTool(int baseDamage) { super(baseDamage); } @@ -66,7 +67,7 @@ public abstract class DualHarvestTool extends HarvestTool { @Override public String[] getTraits() { - return new String[] {"harvest", "dualharvest"}; + return new String[] { "harvest", "dualharvest" }; } protected abstract Material[] getEffectiveSecondaryMaterials(); diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java index 9e6350f6..fc41849b 100644 --- a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java +++ b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java @@ -1,21 +1,24 @@ package tconstruct.library.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Map; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import tconstruct.library.TConstructRegistry; import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class DualMaterialToolPart extends DynamicToolPart { + public IIcon defaultIcon2; public IIcon[] icons2; @@ -69,12 +72,16 @@ public class DualMaterialToolPart extends DynamicToolPart { // register icon for each material that has one if (!PHConstruct.minimalTextures) - for (Map.Entry entry : - TConstructRegistry.toolMaterials.entrySet()) { - String tex = modTexPrefix + ":" + folder - + entry.getValue().materialName.toLowerCase() + texture + "_2"; - if (TextureHelper.itemTextureExists(tex)) this.icons2[entry.getKey()] = iconRegister.registerIcon(tex); - } + for (Map.Entry entry : TConstructRegistry.toolMaterials + .entrySet()) { + String tex = modTexPrefix + ":" + + folder + + entry.getValue().materialName.toLowerCase() + + texture + + "_2"; + if (TextureHelper.itemTextureExists(tex)) + this.icons2[entry.getKey()] = iconRegister.registerIcon(tex); + } this.defaultIcon2 = iconRegister.registerIcon(modTexPrefix + ":" + folder + texture + "_2"); } @@ -98,8 +105,7 @@ public class DualMaterialToolPart extends DynamicToolPart { int matId = getMaterialID2(stack); if (matId > icons2.length || matId < 0) return super.getColorFromItemStack(stack, renderpass); - if (icons[matId] == null) - return TConstructRegistry.getMaterial(matId).primaryColor(); + if (icons[matId] == null) return TConstructRegistry.getMaterial(matId).primaryColor(); return super.getColorFromItemStack(stack, renderpass); } diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index ae8b5ebb..72971d49 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -1,23 +1,27 @@ package tconstruct.library.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Locale; import java.util.Map; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.library.util.TextureHelper; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class DynamicToolPart extends CraftingItem implements IToolPart { + public String partName; public String texture; public IIcon defaultIcon; @@ -37,8 +41,8 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { this(texture, name, domain, null); } - public DynamicToolPart( - String texture, String name, String domain, Class customMaterialClass) { + public DynamicToolPart(String texture, String name, String domain, + Class customMaterialClass) { super(null, null, "parts/", domain, TConstructRegistry.partTab); this.setUnlocalizedName("tconstruct." + name); this.partName = name; @@ -75,8 +79,8 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { : toolmat.localizationString; // :( matName = toolmat.prefixName(); } else { - CustomMaterial customMaterial = - TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); + CustomMaterial customMaterial = TConstructRegistry + .getCustomMaterial(getMaterialID(stack), customMaterialClass); if (customMaterial == null) return super.getItemStackDisplayName(stack); if (customMaterial.input != null) { @@ -114,10 +118,10 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack)); material = toolmat.materialName; } else { - CustomMaterial customMaterial = - TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); - material = - customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict; + CustomMaterial customMaterial = TConstructRegistry + .getCustomMaterial(getMaterialID(stack), customMaterialClass); + material = customMaterial.input != null ? customMaterial.input.getUnlocalizedName() + : customMaterial.oredict; } return "toolpart." + partName + "." + material; @@ -145,12 +149,15 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { // register icon for each material that has one if (!PHConstruct.minimalTextures) - for (Map.Entry entry : - TConstructRegistry.toolMaterials.entrySet()) { - String tex = modTexPrefix + ":" + folder - + entry.getValue().materialName.toLowerCase() + texture; - if (TextureHelper.itemTextureExists(tex)) this.icons[entry.getKey()] = iconRegister.registerIcon(tex); - } + for (Map.Entry entry : TConstructRegistry.toolMaterials + .entrySet()) { + String tex = modTexPrefix + ":" + + folder + + entry.getValue().materialName.toLowerCase() + + texture; + if (TextureHelper.itemTextureExists(tex)) + this.icons[entry.getKey()] = iconRegister.registerIcon(tex); + } // default texture this.defaultIcon = iconRegister.registerIcon(modTexPrefix + ":" + folder + texture); @@ -171,8 +178,7 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { if (matId > icons.length) return super.getColorFromItemStack(stack, renderpass); if (matId >= 0 && icons[matId] == null) { - if (customMaterialClass == null) - return TConstructRegistry.getMaterial(getMaterialID(stack)).primaryColor(); + if (customMaterialClass == null) return TConstructRegistry.getMaterial(getMaterialID(stack)).primaryColor(); else return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color; } diff --git a/src/main/java/tconstruct/library/tools/FletchingMaterial.java b/src/main/java/tconstruct/library/tools/FletchingMaterial.java index febf47ea..7a403c95 100644 --- a/src/main/java/tconstruct/library/tools/FletchingMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchingMaterial.java @@ -3,19 +3,13 @@ package tconstruct.library.tools; import net.minecraft.item.ItemStack; public class FletchingMaterial extends CustomMaterial { + public final float accuracy; public final float breakChance; public final float durabilityModifier; - public FletchingMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingItem, - float accuracy, - float breakChance, - float duribalityModifier, - int color) { + public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, + float breakChance, float duribalityModifier, int color) { super(materialID, value, input, craftingItem, color); this.accuracy = accuracy; this.breakChance = breakChance; @@ -23,26 +17,13 @@ public class FletchingMaterial extends CustomMaterial { } @Deprecated - public FletchingMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingItem, - float accuracy, - float breakChance, - float mass) { + public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, + float breakChance, float mass) { this(materialID, value, input, craftingItem, accuracy, 0.01f, 1f, 0xffffffff); } - public FletchingMaterial( - int materialID, - int value, - String oredict, - ItemStack craftingItem, - float accuracy, - float breakChance, - float duribalityModifier, - int color) { + public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, + float breakChance, float duribalityModifier, int color) { super(materialID, value, oredict, craftingItem, color); this.accuracy = accuracy; this.breakChance = breakChance; @@ -50,14 +31,8 @@ public class FletchingMaterial extends CustomMaterial { } @Deprecated - public FletchingMaterial( - int materialID, - int value, - String oredict, - ItemStack craftingItem, - float accuracy, - float breakChance, - float mass) { + public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, + float breakChance, float mass) { this(materialID, value, oredict, craftingItem, accuracy, 0.01f, 1f, 0xffffffff); } diff --git a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java index 63faba05..bca70305 100644 --- a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java @@ -1,18 +1,14 @@ package tconstruct.library.tools; import mantle.blocks.BlockUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; public class FletchlingLeafMaterial extends FletchingMaterial { - public FletchlingLeafMaterial( - int materialID, - int value, - String oredict, - ItemStack craftingItem, - float accuracy, - float breakChance, - float durabilityModifier) { + + public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, + float breakChance, float durabilityModifier) { super(materialID, value, oredict, craftingItem, accuracy, breakChance, durabilityModifier, 0x5ece46); } diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index b2b57210..b31f8193 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -2,6 +2,7 @@ package tconstruct.library.tools; import java.util.HashSet; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -17,12 +18,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.world.BlockEvent; + import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; /* Base class for tools that should be harvesting blocks */ public abstract class HarvestTool extends ToolCore { + public HarvestTool(int baseDamage) { super(baseDamage); } @@ -84,7 +87,7 @@ public abstract class HarvestTool extends ToolCore { @Override public String[] getTraits() { - return new String[] {"harvest"}; + return new String[] { "harvest" }; } protected abstract Material[] getEffectiveMaterials(); @@ -115,19 +118,11 @@ public abstract class HarvestTool extends ToolCore { // Right-click @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { - /*if (world.isRemote) - return true;*/ + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { + /* + * if (world.isRemote) return true; + */ boolean used = false; int hotbarSlot = player.inventory.currentItem; @@ -165,8 +160,8 @@ public abstract class HarvestTool extends ToolCore { break; } - AxisAlignedBB blockBounds = - AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX + 1, posY + 1, posZ + 1); + AxisAlignedBB blockBounds = AxisAlignedBB + .getBoundingBox(posX, posY, posZ, posX + 1, posY + 1, posZ + 1); AxisAlignedBB playerBounds = player.boundingBox; if (item instanceof ItemBlock) { @@ -201,18 +196,15 @@ public abstract class HarvestTool extends ToolCore { } /* - if (used) //Update client - { - Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, itemSlot, nearbyStack); - ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(packet); - } - */ + * if (used) //Update client { Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, + * itemSlot, nearbyStack); ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(packet); } + */ return used; } - public void breakExtraBlock( - World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) { + public void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, + int refY, int refZ) { // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events if (world.isAirBlock(x, y, z)) return; @@ -236,8 +228,8 @@ public abstract class HarvestTool extends ToolCore { if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength / strength > 10f) return; // send the blockbreak event - BlockEvent.BreakEvent event = - ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z); + BlockEvent.BreakEvent event = ForgeHooks + .onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z); if (event.isCanceled()) return; if (player.capabilities.isCreativeMode) { @@ -265,8 +257,8 @@ public abstract class HarvestTool extends ToolCore { // ItemInWorldManager.removeBlock block.onBlockHarvested(world, x, y, z, meta, player); - if (block.removedByPlayer( - world, player, x, y, z, true)) // boolean is if block can be harvested, checked above + if (block.removedByPlayer(world, player, x, y, z, true)) // boolean is if block can be harvested, checked + // above { block.onBlockDestroyedByPlayer(world, x, y, z, meta); block.harvestBlock(world, player, x, y, z, meta); @@ -300,11 +292,8 @@ public abstract class HarvestTool extends ToolCore { } // send an update to the server, so we get an update back - if (PHConstruct.extraBlockUpdates) - Minecraft.getMinecraft() - .getNetHandler() - .addToSendQueue(new C07PacketPlayerDigging( - 2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); + if (PHConstruct.extraBlockUpdates) Minecraft.getMinecraft().getNetHandler().addToSendQueue( + new C07PacketPlayerDigging(2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); } } } diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 813bc46b..dac6984f 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -1,10 +1,7 @@ package tconstruct.library.tools; -import cofh.api.energy.IEnergyContainerItem; -import cofh.core.item.IEqualityOverrideItem; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -14,6 +11,7 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.*; @@ -22,35 +20,33 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.FancyEntityItem; import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.TinkerWeaponry; +import cofh.api.energy.IEnergyContainerItem; +import cofh.core.item.IEqualityOverrideItem; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; /** * NBTTags Main tag - InfiTool * * @see ToolBuilder * - * Required: Head: Base and render tag, above the handle Handle: Base and - * render tag, bottom layer + * Required: Head: Base and render tag, above the handle Handle: Base and render tag, bottom layer * - * Damage: Replacement for metadata MaxDamage: ItemStacks only read - * setMaxDamage() Broken: Represents whether the tool is broken (boolean) - * Attack: How much damage a mob will take MiningSpeed: The speed at which - * a tool mines + * Damage: Replacement for metadata MaxDamage: ItemStacks only read setMaxDamage() Broken: Represents whether the + * tool is broken (boolean) Attack: How much damage a mob will take MiningSpeed: The speed at which a tool mines * - * Others: Accessory: Base and tag, above head. Sword guards, binding, etc - * Effects: Render tag, top layer. Fancy effects like moss or diamond edge. - * Render order: Handle > Head > Accessory > Effect1 > Effect2 > Effect3 > - * etc Unbreaking: Reinforced in-game, 10% chance to not use durability per - * level Stonebound: Mines faster as the tool takes damage, but has less - * attack Spiny: Opposite of stonebound + * Others: Accessory: Base and tag, above head. Sword guards, binding, etc Effects: Render tag, top layer. Fancy + * effects like moss or diamond edge. Render order: Handle > Head > Accessory > Effect1 > Effect2 > Effect3 > etc + * Unbreaking: Reinforced in-game, 10% chance to not use durability per level Stonebound: Mines faster as the tool + * takes damage, but has less attack Spiny: Opposite of stonebound * - * Modifiers have their own tags. + * Modifiers have their own tags. * @see ItemModifier */ -@Optional.InterfaceList({ - @Optional.Interface(modid = "CoFHAPI|energy", iface = "cofh.api.energy.IEnergyContainerItem"), - @Optional.Interface(modid = "CoFHCore", iface = "cofh.core.item.IEqualityOverrideItem") -}) +@Optional.InterfaceList({ @Optional.Interface(modid = "CoFHAPI|energy", iface = "cofh.api.energy.IEnergyContainerItem"), + @Optional.Interface(modid = "CoFHCore", iface = "cofh.core.item.IEqualityOverrideItem") }) public abstract class ToolCore extends Item implements IEnergyContainerItem, IEqualityOverrideItem, IModifyable { + protected Random random = new Random(); protected int damageVsEntity; public static IIcon blankSprite; @@ -79,8 +75,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq } /** - * Determines crafting behavior with regards to durability 0: None 1: Adds - * handle modifier 2: Averages part with the rest of the tool (head) + * Determines crafting behavior with regards to durability 0: None 1: Adds handle modifier 2: Averages part with the + * rest of the tool (head) * * @return type */ @@ -155,8 +151,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq public abstract String getDefaultFolder(); /** - * Returns the COMPLETE resource path. - * Example: tinker:broadsword + * Returns the COMPLETE resource path. Example: tinker:broadsword * * @return */ @@ -192,16 +187,12 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq emptyIcon = iconRegister.registerIcon("tinker:blankface"); } - protected void addIcons( - HashMap textures, - HashMap icons, - IIconRegister iconRegister, - String standard, - boolean defaultOnly) { + protected void addIcons(HashMap textures, HashMap icons, + IIconRegister iconRegister, String standard, boolean defaultOnly) { icons.clear(); if (!defaultOnly) // compatibility mode: no specific textures - for (Map.Entry entry : textures.entrySet()) { + for (Map.Entry entry : textures.entrySet()) { if (TextureHelper.itemTextureExists(entry.getValue())) icons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue())); } @@ -316,13 +307,12 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq if (!tipName.equals("")) { // let's see if we can translate it somehow // strip color information - String locString = - "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); + String locString = "modifier.tooltip." + + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); locString = locString.replace(" ", ""); - if (StatCollector.canTranslate(locString)) - tipName = tipName.replace( - EnumChatFormatting.getTextWithoutFormattingCodes(tipName), - StatCollector.translateToLocal(locString)); + if (StatCollector.canTranslate(locString)) tipName = tipName.replace( + EnumChatFormatting.getTextWithoutFormattingCodes(tipName), + StatCollector.translateToLocal(locString)); list.add(tipName); } @@ -332,8 +322,10 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq } list.add(""); int attack = (int) (tags.getCompoundTag("InfiTool").getInteger("Attack") * this.getDamageModifier()); - list.add("\u00A79+" + attack + " " - + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); + list.add( + "\u00A79+" + attack + + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); } public static String getStyleForType(int type) { @@ -433,8 +425,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq @Override public void getSubItems(Item id, CreativeTabs tab, List list) { - for (Map.Entry integerToolMaterialEntry : - TConstructRegistry.toolMaterials.entrySet()) { + for (Map.Entry integerToolMaterialEntry : TConstructRegistry.toolMaterials + .entrySet()) { tconstruct.library.tools.ToolMaterial material = integerToolMaterialEntry.getValue(); buildTool(integerToolMaterialEntry.getKey(), ToolBuilder.defaultToolName(material, this), list); } @@ -497,8 +489,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, + EntityLivingBase player) { if (!itemstack.hasTagCompound()) return false; // callbacks! @@ -567,8 +559,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq case 0: return getCorrectColor(stack, renderPass, tags, "Handle", handleIcons); case 1: - return tags.getBoolean("Broken") - ? getCorrectColor(stack, renderPass, tags, "Head", brokenIcons) + return tags.getBoolean("Broken") ? getCorrectColor(stack, renderPass, tags, "Head", brokenIcons) : getCorrectColor(stack, renderPass, tags, "Head", headIcons); case 2: return getCorrectColor(stack, renderPass, tags, "Accessory", accessoryIcons); @@ -580,8 +571,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq return super.getColorFromItemStack(stack, renderPass); } - protected int getCorrectColor( - ItemStack stack, int renderPass, NBTTagCompound tags, String key, Map map) { + protected int getCorrectColor(ItemStack stack, int renderPass, NBTTagCompound tags, String key, + Map map) { // custom coloring if (tags.hasKey(key + "Color")) return tags.getInteger(key + "Color"); @@ -740,9 +731,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq NBTTagCompound tags = container.getTagCompound(); if (tags == null || !tags.hasKey("Energy")) return 0; int energy = tags.getInteger("Energy"); - int energyReceived = tags.hasKey("EnergyReceiveRate") - ? tags.getInteger("EnergyReceiveRate") - : this.maxReceive; // backup value + int energyReceived = tags.hasKey("EnergyReceiveRate") ? tags.getInteger("EnergyReceiveRate") : this.maxReceive; // backup + // value int maxEnergy = tags.hasKey("EnergyMax") ? tags.getInteger("EnergyMax") : this.capacity; // backup value // calculate how much we can receive @@ -764,8 +754,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq return 0; } int energy = tags.getInteger("Energy"); - int energyExtracted = tags.hasKey("EnergyExtractionRate") - ? tags.getInteger("EnergyExtractionRate") + int energyExtracted = tags.hasKey("EnergyExtractionRate") ? tags.getInteger("EnergyExtractionRate") : this.maxExtract; // backup value // calculate how much we can extract diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index 5ab21be7..78ac689b 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -6,6 +6,7 @@ import net.minecraft.util.StatCollector; * Dynamic substitute for an enum. It carries a lot of information */ public class ToolMaterial { + public final String materialName; public final int harvestLevel; public final int durability; @@ -26,61 +27,25 @@ public class ToolMaterial { public String ability; @Deprecated - public ToolMaterial( - String name, - String displayName, - int level, - int durability, - int speed, - int damage, - float handle, - int reinforced, - float stonebound, - String style, - String ability) { + public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, + int reinforced, float stonebound, String style, String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } @Deprecated - public ToolMaterial( - String name, - int level, - int durability, - int speed, - int damage, - float handle, - int reinforced, - float stonebound, - String style, - String ability) { + public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, + float stonebound, String style, String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } @Deprecated - public ToolMaterial( - String name, - int level, - int durability, - int speed, - int damage, - float handle, - int reinforced, - float stonebound, - String style) { + public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, + float stonebound, String style) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } - public ToolMaterial( - String name, - int level, - int durability, - int speed, - int damage, - float handle, - int reinforced, - float stonebound, - String style, - int primaryColor) { + public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, + float stonebound, String style, int primaryColor) { this( name, "material." + name.toLowerCase().replaceAll(" ", ""), @@ -95,18 +60,8 @@ public class ToolMaterial { primaryColor); } - public ToolMaterial( - String name, - String localizationString, - int level, - int durability, - int speed, - int damage, - float handle, - int reinforced, - float stonebound, - String style, - int primaryColor) { + public ToolMaterial(String name, String localizationString, int level, int durability, int speed, int damage, + float handle, int reinforced, float stonebound, String style, int primaryColor) { this.materialName = name; this.harvestLevel = level; this.durability = durability; @@ -176,8 +131,8 @@ public class ToolMaterial { } /** - * Returns the ability of the tool to display. - * ONLY USE THIS FOR DISPLAY PURPOSES. It is not data you can rely on. Use the material-ids for that. + * Returns the ability of the tool to display. ONLY USE THIS FOR DISPLAY PURPOSES. It is not data you can rely on. + * Use the material-ids for that. */ public String ability() { if (StatCollector.canTranslate(String.format("%s.ability", localizationString))) diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index fc8452fe..b1f63209 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -1,9 +1,8 @@ package tconstruct.library.tools; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; @@ -12,13 +11,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import tconstruct.tools.TinkerTools; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), - @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword"), - @Optional.Interface(modid = "DynamicSkillsAPI", iface = "dynamicswordskills.api.ISword") -}) + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), + @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword"), + @Optional.Interface(modid = "DynamicSkillsAPI", iface = "dynamicswordskills.api.ISword") }) public abstract class Weapon extends ToolCore implements IBattlegearWeapon, zeldaswordskills.api.item.ISword, dynamicswordskills.api.ISword { @@ -49,8 +50,7 @@ public abstract class Weapon extends ToolCore } /** - * returns the action that specifies what animation to play when the items - * is being used + * returns the action that specifies what animation to play when the items is being used */ @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { @@ -66,8 +66,7 @@ public abstract class Weapon extends ToolCore } /** - * Called whenever this item is equipped and the right mouse button is - * pressed. Args: itemStack, world, entityPlayer + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { @@ -76,17 +75,8 @@ public abstract class Weapon extends ToolCore } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { return false; } @@ -121,10 +111,10 @@ public abstract class Weapon extends ToolCore @Override public String[] getTraits() { - return new String[] {"weapon", "melee"}; + return new String[] { "weapon", "melee" }; } - public static Material[] web = new Material[] {Material.web, Material.cloth, Material.coral, Material.cake}; + public static Material[] web = new Material[] { Material.web, Material.cloth, Material.coral, Material.cake }; public static Material[] none = new Material[0]; /*---- Battlegear Support START ----*/ @@ -143,8 +133,8 @@ public abstract class Weapon extends ToolCore @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity( - PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, + ItemStack offhandItem) { return true; } @@ -171,9 +161,8 @@ public abstract class Weapon extends ToolCore public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { if (offhand == null) return true; - return (mainhand != null - && mainhand.getItem() != TinkerTools.cleaver - && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } diff --git a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java index e7ae0f4f..16002321 100644 --- a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java +++ b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java @@ -7,10 +7,12 @@ import net.minecraft.dispenser.IPosition; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.library.weaponry.IAmmo; public abstract class BehaviorProjectileBaseDispense extends BehaviorDefaultDispenseItem { + /** * Dispense the specified stack, play the dispense sound and spawn particles. */ diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index d44f0151..1854c029 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -1,12 +1,14 @@ package tconstruct.library.util; import java.util.*; + import net.minecraft.util.StatCollector; /** * Lookup for the name of each harvest level. Use this clientside only for display purposes. */ public final class HarvestLevels { + private HarvestLevels() {} // non-instantiable public static final Map harvestLevelNames = new HashMap<>(); diff --git a/src/main/java/tconstruct/library/util/IPattern.java b/src/main/java/tconstruct/library/util/IPattern.java index 1744307a..cd85402e 100644 --- a/src/main/java/tconstruct/library/util/IPattern.java +++ b/src/main/java/tconstruct/library/util/IPattern.java @@ -1,9 +1,11 @@ package tconstruct.library.util; import net.minecraft.item.ItemStack; + import tconstruct.library.crafting.PatternBuilder.MaterialSet; public interface IPattern { + int getPatternCost(ItemStack pattern); ItemStack getPatternOutput(ItemStack pattern, ItemStack input, MaterialSet set); diff --git a/src/main/java/tconstruct/library/util/IToolPart.java b/src/main/java/tconstruct/library/util/IToolPart.java index 7a978e0b..6dd4f680 100644 --- a/src/main/java/tconstruct/library/util/IToolPart.java +++ b/src/main/java/tconstruct/library/util/IToolPart.java @@ -3,11 +3,11 @@ package tconstruct.library.util; import net.minecraft.item.ItemStack; public interface IToolPart { + /** * Parts to build tools from. ex: Pickaxe Head * - * @param stack - * This item + * @param stack This item * @return Proper material ID. -1 for invalid */ int getMaterialID(ItemStack stack); diff --git a/src/main/java/tconstruct/library/util/PiercingArrowDamage.java b/src/main/java/tconstruct/library/util/PiercingArrowDamage.java index d9952546..52ba61be 100644 --- a/src/main/java/tconstruct/library/util/PiercingArrowDamage.java +++ b/src/main/java/tconstruct/library/util/PiercingArrowDamage.java @@ -4,6 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.EntityDamageSourceIndirect; public class PiercingArrowDamage extends EntityDamageSourceIndirect { + public PiercingArrowDamage(String p_i1568_1_, Entity p_i1568_2_, Entity p_i1568_3_) { super(p_i1568_1_, p_i1568_2_, p_i1568_3_); this.setProjectile(); diff --git a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java index ac814218..08bcc937 100644 --- a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java +++ b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java @@ -4,6 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.EntityDamageSource; public class PiercingEntityDamage extends EntityDamageSource { + public PiercingEntityDamage(String str, Entity entity) { super(str, entity); } diff --git a/src/main/java/tconstruct/library/util/TextureHelper.java b/src/main/java/tconstruct/library/util/TextureHelper.java index 078c5559..66a99dc8 100644 --- a/src/main/java/tconstruct/library/util/TextureHelper.java +++ b/src/main/java/tconstruct/library/util/TextureHelper.java @@ -1,12 +1,14 @@ package tconstruct.library.util; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + // Stolen from CofHLib RegistryUtil public final class TextureHelper { + private TextureHelper() {} @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/library/weaponry/AmmoItem.java b/src/main/java/tconstruct/library/weaponry/AmmoItem.java index aa6ca56f..91facc8a 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoItem.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoItem.java @@ -1,22 +1,24 @@ package tconstruct.library.weaponry; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") -}) + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) public abstract class AmmoItem extends ToolCore implements IBattlegearWeapon, IAmmo { + public AmmoItem(int baseDamage, String name) { super(baseDamage); this.setCreativeTab(TConstructRegistry.weaponryTab); @@ -161,8 +163,8 @@ public abstract class AmmoItem extends ToolCore implements IBattlegearWeapon, IA @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity( - PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, + ItemStack offhandItem) { event.cancelParent = false; event.swingOffhand = false; event.shouldAttack = false; @@ -193,9 +195,8 @@ public abstract class AmmoItem extends ToolCore implements IBattlegearWeapon, IA @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { if (offhand == null) return true; - return (mainhand != null - && mainhand.getItem() != TinkerTools.cleaver - && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } } diff --git a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java index 3fa5dbe7..5b0efbaa 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java @@ -1,27 +1,28 @@ package tconstruct.library.weaponry; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import tconstruct.tools.TinkerTools; import tconstruct.weaponry.client.CrosshairType; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") -}) + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) /** - * Throwing weapons that utilize the ammo system on themselves. - * Throwing knifes etc. + * Throwing weapons that utilize the ammo system on themselves. Throwing knifes etc. */ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, IAccuracy, IWindup { + public AmmoWeapon(int baseDamage, String name) { super(baseDamage, name); } @@ -43,22 +44,14 @@ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { return false; } /** - * How long it takes to "ready" the weapon. To reach the point, where holding the right mouse button any longer doesn't have an impact. + * How long it takes to "ready" the weapon. To reach the point, where holding the right mouse button any longer + * doesn't have an impact. */ @Override public int getWindupTime(ItemStack itemStack) { @@ -105,7 +98,7 @@ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, @Override public String[] getTraits() { - return new String[] {"weapon", "thrown", "ammo", "windup"}; + return new String[] { "weapon", "thrown", "ammo", "windup" }; } @Override @@ -129,10 +122,11 @@ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, if (!player.capabilities.isCreativeMode) this.consumeAmmo(1, stack); } - protected abstract Entity createProjectile( - ItemStack reference, World world, EntityPlayer player, float accuracy, int time); + protected abstract Entity createProjectile(ItemStack reference, World world, EntityPlayer player, float accuracy, + int time); - /** used for displaying the damage, return the value used for pseed in createProjectile/ProjectileBase constructor + /** + * used for displaying the damage, return the value used for pseed in createProjectile/ProjectileBase constructor */ public abstract float getProjectileSpeed(); @@ -167,8 +161,8 @@ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity( - PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, + ItemStack offhandItem) { return true; } @@ -195,9 +189,8 @@ public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { if (offhand == null) return true; - return (mainhand != null - && mainhand.getItem() != TinkerTools.cleaver - && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } } diff --git a/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java b/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java index b416f0fd..076de490 100644 --- a/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java +++ b/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java @@ -2,36 +2,31 @@ package tconstruct.library.weaponry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.library.tools.CustomMaterial; import tconstruct.weaponry.TinkerWeaponry; public class ArrowShaftMaterial extends CustomMaterial { + public final float durabilityModifier; // like the durability modifier of handles, but for arrows! public final float fragility; // 1.0 = breaks 100%, 0.0 = never breaks public final float weight; // baseline: 1.0 = default, smaller = lighter, higher = heavier - public ArrowShaftMaterial( - int materialID, - int value, - ItemStack input, - ItemStack craftingItem, - float durabilityModifier, - float weight, - float fragility, - int color) { + public ArrowShaftMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, + float durabilityModifier, float weight, float fragility, int color) { super(materialID, value, input, craftingItem, color); this.durabilityModifier = durabilityModifier; this.fragility = fragility; this.weight = weight; } - public static ArrowShaftMaterial createMaterial( - int id, Item input, float durabilityModifier, float weight, float fragility, int color) { + public static ArrowShaftMaterial createMaterial(int id, Item input, float durabilityModifier, float weight, + float fragility, int color) { return createMaterial(id, input, 0, durabilityModifier, weight, fragility, color); } - public static ArrowShaftMaterial createMaterial( - int id, Item input, int inputMeta, float durabilityModifier, float weight, float fragility, int color) { + public static ArrowShaftMaterial createMaterial(int id, Item input, int inputMeta, float durabilityModifier, + float weight, float fragility, int color) { return new ArrowShaftMaterial( id, 2, diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java index 6f9ebc61..27b545ab 100644 --- a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java +++ b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java @@ -1,8 +1,9 @@ package tconstruct.library.weaponry; -import cpw.mods.fml.common.Loader; import java.util.List; + import mods.battlegear2.api.core.InventoryPlayerBattle; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -12,14 +13,17 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.entity.ArrowEntity; +import cpw.mods.fml.common.Loader; public abstract class BowBaseAmmo extends ProjectileWeapon { + public BowBaseAmmo(int baseDamage, String name) { super(baseDamage, name); } @@ -108,8 +112,8 @@ public abstract class BowBaseAmmo extends ProjectileWeapon { } @Override - protected Entity createProjectile( - ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, + float windup) { EntityArrow arrow; if (arrows.getItem() == Items.arrow) { @@ -129,8 +133,8 @@ public abstract class BowBaseAmmo extends ProjectileWeapon { } @Override - public void playFiringSound( - World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { + public void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, + float accuracy) { world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speed * 0.5F); } @@ -144,8 +148,8 @@ public abstract class BowBaseAmmo extends ProjectileWeapon { ItemStack accessoryStack = getPartAmount() > 2 ? new ItemStack(getAccessoryItem(), 1, id) : null; ItemStack extraStack = getPartAmount() > 3 ? new ItemStack(getExtraItem(), 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool( - new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, extraStack, ""); + ItemStack tool = ToolBuilder.instance + .buildTool(new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, extraStack, ""); if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); @@ -167,6 +171,6 @@ public abstract class BowBaseAmmo extends ProjectileWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "bow", "windup"}; + return new String[] { "weapon", "bow", "windup" }; } } diff --git a/src/main/java/tconstruct/library/weaponry/IAccuracy.java b/src/main/java/tconstruct/library/weaponry/IAccuracy.java index e0fd7988..ce36f907 100644 --- a/src/main/java/tconstruct/library/weaponry/IAccuracy.java +++ b/src/main/java/tconstruct/library/weaponry/IAccuracy.java @@ -3,6 +3,7 @@ package tconstruct.library.weaponry; import net.minecraft.item.ItemStack; public interface IAccuracy { + float minAccuracy(ItemStack itemStack); float maxAccuracy(ItemStack itemStack); diff --git a/src/main/java/tconstruct/library/weaponry/IAmmo.java b/src/main/java/tconstruct/library/weaponry/IAmmo.java index 8c70a9c1..2b7e5c80 100644 --- a/src/main/java/tconstruct/library/weaponry/IAmmo.java +++ b/src/main/java/tconstruct/library/weaponry/IAmmo.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public interface IAmmo { + /** * Returns the current ammo amount of the item. */ @@ -16,12 +17,14 @@ public interface IAmmo { /** * Returns the maximum amount of ammo the item can have + * * @param tags InfiTool tag compound of the item */ int getMaxAmmo(NBTTagCompound tags); /** * Adds the given amount of ammo cache. Will not go over max-ammo. + * * @param count How much to add * @param stack The itemstack to add the ammo to. Has to have the proper NBT. * @return The amount of ammo that couldn't be added. @@ -30,6 +33,7 @@ public interface IAmmo { /** * Removes the given amount fro the ammo cache. Will not go below zero. + * * @param count How much to remove * @param stack The itemstack to add the ammo to. Has to have the proper NBT. * @return The amount of ammo that couldn't be removed. If you try to remove 5, but only 3 are left, it'll return 2. @@ -38,6 +42,7 @@ public interface IAmmo { /** * Sets the Ammo amount to that absolute value. Behaviour for values below 0 or above the max ammo is undefined. + * * @param count How much * @param stack The itemstack to set the ammo for. Has to have proper NBT. */ diff --git a/src/main/java/tconstruct/library/weaponry/IWindup.java b/src/main/java/tconstruct/library/weaponry/IWindup.java index 5878f106..fe44536e 100644 --- a/src/main/java/tconstruct/library/weaponry/IWindup.java +++ b/src/main/java/tconstruct/library/weaponry/IWindup.java @@ -2,13 +2,15 @@ package tconstruct.library.weaponry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import tconstruct.weaponry.client.CrosshairType; /** - * This class has a windup time, meaning it takes some time to reach full potency. - * Windup progress is visualized with a special crosshair. + * This class has a windup time, meaning it takes some time to reach full potency. Windup progress is visualized with a + * special crosshair. */ public interface IWindup { + int getWindupTime(ItemStack itemStack); // how long it takes to fully wind up float getWindupProgress(ItemStack itemStack, EntityPlayer player); // how far we've winded up, 0.0-1.0 diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index 2938cf49..a55e43a2 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -1,13 +1,12 @@ package tconstruct.library.weaponry; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.HashMap; import java.util.List; import java.util.Map; + import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +20,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -29,15 +29,17 @@ import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") -}) + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) /** - * Weapons that utilize ammo that uses the ammo system to shoot projectiles. - * Bows,... + * Weapons that utilize ammo that uses the ammo system to shoot projectiles. Bows,... */ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWeapon, IAccuracy, IWindup { + public ProjectileWeapon(int baseDamage, String name) { super(baseDamage); @@ -61,6 +63,7 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe /** * Searches the player for ammo to use + * * @param player the player * @return the itemstack found to be ammo */ @@ -68,15 +71,16 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe /** * Creates the projectile to be fired. - * @param ammo The ammo used - * @param world world. - * @param player player. - * @param speed the speed calculated for the projectile + * + * @param ammo The ammo used + * @param world world. + * @param player player. + * @param speed the speed calculated for the projectile * @param accuracy the accuracy calculated for the projectile * @return A banana. */ - protected abstract Entity createProjectile( - ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup); + protected abstract Entity createProjectile(ItemStack ammo, World world, EntityPlayer player, float speed, + float accuracy, float windup); /* Accuracy */ public abstract float minAccuracy(ItemStack itemStack); @@ -143,9 +147,9 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe if (getWindupTime(stack) == 0.0f) return stack; // broken tool? - if (stack.hasTagCompound() - && stack.getTagCompound().hasKey(getBaseTagName()) - && stack.getTagCompound().getCompoundTag(getBaseTagName()).getBoolean("Broken")) return stack; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey(getBaseTagName()) + && stack.getTagCompound().getCompoundTag(getBaseTagName()).getBoolean("Broken")) + return stack; // only if ammo is present if (searchForAmmo(player, stack) != null) player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); @@ -204,8 +208,8 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe if (!world.isRemote) world.spawnEntityInWorld(projectile); } - public abstract void playFiringSound( - World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy); + public abstract void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, + float speed, float accuracy); public HashMap animationHeadIcons = new HashMap<>(); public HashMap animationHandleIcons = new HashMap<>(); @@ -214,11 +218,7 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe public HashMap animationEffectIcons = new HashMap<>(); /** - * return true if the current renderpass should use animations. - * 0 == handle - * 1 == head - * 2 == accessory - * 3 == extra + * return true if the current renderpass should use animations. 0 == handle 1 == head 2 == accessory 3 == extra */ protected boolean animateLayer(int renderPass) { return false; @@ -238,11 +238,10 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe String effect = "Effect" + (1 + renderPass - getPartAmount()); if (tags.hasKey(effect)) { int index = tags.getInteger(effect); - if (animationEffectIcons.get(index) != null) - return getCorrectAnimationIcon( - animationEffectIcons, - index, - getWindupProgress(usingItem, getMaxItemUseDuration(usingItem) - useRemaining)); + if (animationEffectIcons.get(index) != null) return getCorrectAnimationIcon( + animationEffectIcons, + index, + getWindupProgress(usingItem, getMaxItemUseDuration(usingItem) - useRemaining)); else // non-animated return effectIcons.get(index); @@ -354,11 +353,8 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe animationEffectIcons.put(-1, anims); } - private void addAnimationIcons( - HashMap textures, - HashMap icons, - IIconRegister iconRegister, - String standard) { + private void addAnimationIcons(HashMap textures, HashMap icons, + IIconRegister iconRegister, String standard) { icons.clear(); // we use the standard to determine how many animations there are @@ -428,12 +424,7 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe if (currentAmmo.getItem() == TinkerWeaponry.arrowAmmo || currentAmmo.getItem() == TinkerWeaponry.boltAmmo) damage = Math.max( 0, - damage - - currentAmmo - .getTagCompound() - .getCompoundTag("InfiTool") - .getInteger("Attack") - / 2f); + damage - currentAmmo.getTagCompound().getCompoundTag("InfiTool").getInteger("Attack") / 2f); damage *= ((AmmoItem) currentAmmo.getItem()).getDamageModifier(); @@ -447,8 +438,9 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe list.remove(list.size() - 1); // remove last item (the damage of the bow itself) list.add(currentAmmo.getDisplayName()); - list.add(StatCollector.translateToLocal("attribute.name.ammo.maxAttackDamage") + ": " - + TProxyClient.df.format(damage)); + list.add( + StatCollector.translateToLocal("attribute.name.ammo.maxAttackDamage") + ": " + + TProxyClient.df.format(damage)); } /*---- Battlegear Support START ----*/ @@ -467,8 +459,8 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity( - PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, + ItemStack offhandItem) { return false; } @@ -494,9 +486,8 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { if (offhand == null) return true; - return (mainhand != null - && mainhand.getItem() != TinkerTools.cleaver - && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java index ae6c6d79..e9ff05f3 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java @@ -1,26 +1,28 @@ package tconstruct.mechworks; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.world.World; + import tconstruct.client.entity.item.ExplosiveRender; import tconstruct.common.TProxyCommon; import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.gui.GuiLandmine; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; +import cpw.mods.fml.client.registry.RenderingRegistry; public class MechworksProxyClient extends MechworksProxyCommon { + public void initialize() { registerRenderer(); registerGuiHandler(); } void registerRenderer() { - RenderingRegistry.registerEntityRenderingHandler( - EntityLandmineFirework.class, new RenderSnowball(Items.fireworks)); + RenderingRegistry + .registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.fireworks)); RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender()); } diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java index 31b09129..0e1c392f 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java @@ -1,13 +1,15 @@ package tconstruct.mechworks; -import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; + import tconstruct.common.TProxyCommon; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; +import cpw.mods.fml.common.network.IGuiHandler; public class MechworksProxyCommon implements IGuiHandler { + public void initialize() { registerGuiHandler(); } diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java index ea004e88..0d08cf0f 100644 --- a/src/main/java/tconstruct/mechworks/TinkerMechworks.java +++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java @@ -1,26 +1,29 @@ package tconstruct.mechworks; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; + import tconstruct.TConstruct; import tconstruct.mechworks.blocks.BlockLandmine; import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) // TODO handle migration of all items/blocks that were owned by the previously seperate mod @Pulse(id = "Tinkers' Mechworks", description = "Mechanical machinations and steampunk inspired shenanigans.") public class TinkerMechworks { + @SidedProxy( clientSide = "tconstruct.mechworks.MechworksProxyClient", serverSide = "tconstruct.mechworks.MechworksProxyCommon") @@ -32,67 +35,73 @@ public class TinkerMechworks { public void preInit(FMLPreInitializationEvent event) { // NetworkRegistry.INSTANCE.registerGuiHandler(TConstruct.instance, proxy); // Traps - TinkerMechworks.landmine = new BlockLandmine() - .setHardness(0.5F) - .setResistance(0F) - .setStepSound(Block.soundTypeMetal) - .setCreativeTab(CreativeTabs.tabRedstone) - .setBlockName("landmine"); + TinkerMechworks.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F) + .setStepSound(Block.soundTypeMetal).setCreativeTab(CreativeTabs.tabRedstone).setBlockName("landmine"); GameRegistry.registerBlock(TinkerMechworks.landmine, ItemBlockLandmine.class, "Redstone.Landmine"); GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); // Landmine Recipes - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerMechworks.landmine, 1, 0), - "mcm", - "rpr", - 'm', - "plankWood", - 'c', - new ItemStack(TinkerTools.blankPattern, 1, 1), - 'r', - "dustRedstone", - 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerMechworks.landmine, 1, 1), - "mcm", - "rpr", - 'm', - Blocks.stone, - 'c', - new ItemStack(TinkerTools.blankPattern, 1, 1), - 'r', - "dustRedstone", - 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerMechworks.landmine, 1, 2), - "mcm", - "rpr", - 'm', - Blocks.obsidian, - 'c', - new ItemStack(TinkerTools.blankPattern, 1, 1), - 'r', - "dustRedstone", - 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerMechworks.landmine, 1, 3), - "mcm", - "rpr", - 'm', - Items.repeater, - 'c', - new ItemStack(TinkerTools.blankPattern, 1, 1), - 'r', - "dustRedstone", - 'p', - Blocks.stone_pressure_plate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerMechworks.landmine, 1, 0), + "mcm", + "rpr", + 'm', + "plankWood", + 'c', + new ItemStack(TinkerTools.blankPattern, 1, 1), + 'r', + "dustRedstone", + 'p', + Blocks.stone_pressure_plate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerMechworks.landmine, 1, 1), + "mcm", + "rpr", + 'm', + Blocks.stone, + 'c', + new ItemStack(TinkerTools.blankPattern, 1, 1), + 'r', + "dustRedstone", + 'p', + Blocks.stone_pressure_plate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerMechworks.landmine, 1, 2), + "mcm", + "rpr", + 'm', + Blocks.obsidian, + 'c', + new ItemStack(TinkerTools.blankPattern, 1, 1), + 'r', + "dustRedstone", + 'p', + Blocks.stone_pressure_plate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerMechworks.landmine, 1, 3), + "mcm", + "rpr", + 'm', + Items.repeater, + 'c', + new ItemStack(TinkerTools.blankPattern, 1, 1), + 'r', + "dustRedstone", + 'p', + Blocks.stone_pressure_plate)); EntityRegistry.registerModEntity( - EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true); + EntityLandmineFirework.class, + "LandmineFirework", + 5, + TConstruct.instance, + 32, + 5, + true); EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true); } diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index a500f13c..e09b1673 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -2,12 +2,12 @@ package tconstruct.mechworks.blocks; import static net.minecraftforge.common.util.ForgeDirection.*; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mantle.blocks.BlockUtils; import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockPressurePlate.Sensitivity; @@ -31,12 +31,15 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.TConstruct; import tconstruct.mechworks.MechworksProxyCommon; import tconstruct.mechworks.landmine.Helper; import tconstruct.mechworks.logic.LandmineExplodeLogic; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.world.model.RenderLandmine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @@ -117,16 +120,8 @@ public class BlockLandmine extends BlockContainer { } @Override - public boolean onBlockActivated( - World par1World, - int par2, - int par3, - int par4, - EntityPlayer par5EntityPlayer, - int par6, - float par7, - float par8, - float par9) { + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, + int par6, float par7, float par8, float par9) { par5EntityPlayer.openGui(TConstruct.instance, MechworksProxyCommon.landmineID, par1World, par2, par3, par4); return true; } @@ -137,8 +132,7 @@ public class BlockLandmine extends BlockContainer { int metadata = par1World.getBlockMetadata(par2, par3, par4); - if (tileentity != null - && (!explodeOnBroken || !hasItems(par1World, par2, par3, par4)) + if (tileentity != null && (!explodeOnBroken || !hasItems(par1World, par2, par3, par4)) && par6 != 193 && !tileentity.isExploding) { ItemStack is = new ItemStack(this, 1, damageDropped(tileentity.triggerType)); @@ -163,8 +157,8 @@ public class BlockLandmine extends BlockContainer { new ItemStack(itemstack.getItem(), ss, itemstack.getItemDamage())); if (itemstack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) - itemstack.getTagCompound().copy()); + entityitem.getEntityItem() + .setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); } float f3 = 0.05F; @@ -210,8 +204,7 @@ public class BlockLandmine extends BlockContainer { @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST) - || par1World.isSideSolid(par2 + 1, par3, par4, WEST) + return par1World.isSideSolid(par2 - 1, par3, par4, EAST) || par1World.isSideSolid(par2 + 1, par3, par4, WEST) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) || par1World.isSideSolid(par2, par3 - 1, par4, UP) @@ -219,8 +212,8 @@ public class BlockLandmine extends BlockContainer { } @Override - public int onBlockPlaced( - World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { + public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, + float par8, int par9) { int j1 = par9 & 8; int k1 = par9 & 7; byte b0 = -1; @@ -253,12 +246,7 @@ public class BlockLandmine extends BlockContainer { } @Override - public void onBlockPlacedBy( - World par1World, - int par2, - int par3, - int par4, - EntityLivingBase par5EntityLivingBase, + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { int l = par1World.getBlockMetadata(par2, par3, par4); int i1 = l & 7; @@ -441,18 +429,18 @@ public class BlockLandmine extends BlockContainer { List list = null; if (triggerType == Sensitivity.everything) { - list = par1World.getEntitiesWithinAABBExcludingEntity( - null, getSensitiveAABB(par1World, par2, par3, par4)); + list = par1World + .getEntitiesWithinAABBExcludingEntity(null, getSensitiveAABB(par1World, par2, par3, par4)); } if (triggerType == Sensitivity.mobs) { - list = par1World.getEntitiesWithinAABB( - EntityLivingBase.class, getSensitiveAABB(par1World, par2, par3, par4)); + list = par1World + .getEntitiesWithinAABB(EntityLivingBase.class, getSensitiveAABB(par1World, par2, par3, par4)); } if (triggerType == Sensitivity.players) { - list = par1World.getEntitiesWithinAABB( - EntityPlayer.class, this.getSensitiveAABB(par1World, par2, par3, par4)); + list = par1World + .getEntitiesWithinAABB(EntityPlayer.class, this.getSensitiveAABB(par1World, par2, par3, par4)); } if (list != null && !list.isEmpty()) { @@ -477,11 +465,7 @@ public class BlockLandmine extends BlockContainer { int i1 = l & 7; boolean flag = (l & 8) > 0; - float minX = par2 + f, - minY = par3, - minZ = par4 + f, - maxX = par2 + 1 - f, - maxY = par3 + 0.25F, + float minX = par2 + f, minY = par3, minZ = par4 + f, maxX = par2 + 1 - f, maxY = par3 + 0.25F, maxZ = par4 + 1 - f; ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 9f8daa72..63f41edf 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -1,20 +1,21 @@ package tconstruct.mechworks.entity.item; -import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; + import tconstruct.util.DamageSourceFireworkExplode; +import cpw.mods.fml.relauncher.*; public class EntityLandmineFirework extends Entity { + /** The age of the firework in ticks. */ private int fireworkAge; /** - * The lifetime of the firework in ticks. When the age reaches the lifetime - * the firework explodes. + * The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes. */ private int lifetime; @@ -47,8 +48,8 @@ public class EntityLandmineFirework extends Entity { return par1 < 4096.0D; } - public EntityLandmineFirework( - World par1World, double par2, double par4, double par6, ItemStack par8ItemStack, int moveDirection) { + public EntityLandmineFirework(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack, + int moveDirection) { super(par1World); this.fireworkAge = 0; this.setSize(0.25F, 0.25F); @@ -166,7 +167,13 @@ public class EntityLandmineFirework extends Entity { } this.worldObj.makeFireworks( - this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound); + this.posX, + this.posY, + this.posZ, + this.motionX, + this.motionY, + this.motionZ, + nbttagcompound); } super.handleHealthUpdate(par1); diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index d01ed7d5..d7066235 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -1,13 +1,15 @@ package tconstruct.mechworks.entity.item; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.entity.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.*; + import tconstruct.world.MiningExplosion; +import cpw.mods.fml.relauncher.*; public class ExplosivePrimed extends Entity { + /** How long the fuse is */ public Block block; @@ -22,8 +24,8 @@ public class ExplosivePrimed extends Entity { this.yOffset = this.height / 2.0F; } - public ExplosivePrimed( - World par1World, double par2, double par4, double par6, EntityLivingBase par8EntityLivingBase) { + public ExplosivePrimed(World par1World, double par2, double par4, double par6, + EntityLivingBase par8EntityLivingBase) { this(par1World); this.setPosition(par2, par4, par6); float f = (float) (Math.random() * Math.PI * 2.0D); @@ -41,8 +43,8 @@ public class ExplosivePrimed extends Entity { protected void entityInit() {} /** - * returns if this entity triggers Block.onEntityWalking on the blocks they - * walk on. used for spiders and wolves to prevent them from trampling crops + * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to + * prevent them from trampling crops */ @Override protected boolean canTriggerWalking() { @@ -50,8 +52,7 @@ public class ExplosivePrimed extends Entity { } /** - * Returns true if other Entities should be prevented from moving through - * this Entity. + * Returns true if other Entities should be prevented from moving through this Entity. */ @Override public boolean canBeCollidedWith() { diff --git a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java index 171d4b8c..ba991d54 100644 --- a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java @@ -1,11 +1,14 @@ package tconstruct.mechworks.gui; import java.util.List; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; + import org.lwjgl.opengl.GL11; + import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.landmine.behavior.Behavior; diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index b58b8677..fbbcf6c3 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -1,10 +1,12 @@ package tconstruct.mechworks.inventory; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.armor.inventory.*; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.logic.TileEntityLandmine; @@ -60,31 +62,16 @@ public class ContainerLandmine extends Container { // This code actually works perfectly, but does not respect the global // TileEntity stack limit, shift clicking ability disabled. /* - * ItemStack itemstack = null; Slot slot = (Slot) - * this.inventorySlots.get(par2); - * - * if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = - * slot.getStack(); itemstack = itemstack1.copy(); - * - * if (par2 == 2) { if (!this.mergeItemStack(itemstack1, 3, 39, true)) { - * return null; } - * - * slot.onSlotChange(itemstack1, itemstack); } else if (par2 != 1 && - * par2 != 0) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { if - * (!this.mergeItemStack(itemstack1, 1, 2, false)) { if - * (!this.mergeItemStack(itemstack1, 30, 39, false)) { return null; } - * else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, - * 3, 30, false)) { return null; } } } } else if - * (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } - * - * if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); } - * else { slot.onSlotChanged(); } - * - * if (itemstack1.stackSize == itemstack.stackSize) { return null; } - * - * slot.onPickupFromSlot(par1EntityPlayer, itemstack1); } - * - * return itemstack; + * ItemStack itemstack = null; Slot slot = (Slot) this.inventorySlots.get(par2); if (slot != null && + * slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); if (par2 == 2) { + * if (!this.mergeItemStack(itemstack1, 3, 39, true)) { return null; } slot.onSlotChange(itemstack1, itemstack); + * } else if (par2 != 1 && par2 != 0) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { if + * (!this.mergeItemStack(itemstack1, 1, 2, false)) { if (!this.mergeItemStack(itemstack1, 30, 39, false)) { + * return null; } else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, 3, 30, false)) { return + * null; } } } } else if (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } if + * (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); } else { slot.onSlotChanged(); } if + * (itemstack1.stackSize == itemstack.stackSize) { return null; } slot.onPickupFromSlot(par1EntityPlayer, + * itemstack1); } return itemstack; */ return null; } @@ -117,8 +104,7 @@ public class ContainerLandmine extends Container { } else if (this.field_94536_g == 1) { Slot slot = (Slot) this.inventorySlots.get(par1); - if (slot != null - && func_94527_a(slot, inventoryplayer.getItemStack(), true) + if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) { @@ -130,8 +116,7 @@ public class ContainerLandmine extends Container { l = inventoryplayer.getItemStack().stackSize; for (Slot slot1 : this.field_94537_h) { - if (slot1 != null - && func_94527_a(slot1, inventoryplayer.getItemStack(), true) + if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) { @@ -182,7 +167,8 @@ public class ContainerLandmine extends Container { if (par2 == 1) { par4EntityPlayer.dropPlayerItemWithRandomChoice( - inventoryplayer.getItemStack().splitStack(1), false); + inventoryplayer.getItemStack().splitStack(1), + false); if (inventoryplayer.getItemStack().stackSize == 0) { inventoryplayer.setItemStack(null); @@ -242,24 +228,23 @@ public class ContainerLandmine extends Container { if (itemstack4.stackSize == 0) { inventoryplayer.setItemStack(null); } - } else if (shouldDoStuff - && itemstack4 != null + } else if (shouldDoStuff && itemstack4 != null && slot2.isItemValid( new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) { - k1 = par2 == 0 ? 1 : 1; + k1 = par2 == 0 ? 1 : 1; - if (k1 > slot2.getSlotStackLimit()) { - k1 = slot2.getSlotStackLimit(); - } + if (k1 > slot2.getSlotStackLimit()) { + k1 = slot2.getSlotStackLimit(); + } - if (itemstack4.stackSize >= k1) { - slot2.putStack(itemstack4.splitStack(k1)); - } + if (itemstack4.stackSize >= k1) { + slot2.putStack(itemstack4.splitStack(k1)); + } - if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack(null); - } - } + if (itemstack4.stackSize == 0) { + inventoryplayer.setItemStack(null); + } + } } else if (slot2.canTakeStack(par4EntityPlayer)) { if (itemstack4 == null) { k1 = par2 == 0 ? itemstack1.stackSize : (itemstack1.stackSize + 1) / 2; @@ -318,8 +303,8 @@ public class ContainerLandmine extends Container { if (slot2.canTakeStack(par4EntityPlayer)) { itemstack1 = inventoryplayer.getStackInSlot(par2); - boolean flag = - itemstack1 == null || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); + boolean flag = itemstack1 == null + || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); k1 = -1; if (!flag) { @@ -349,67 +334,62 @@ public class ContainerLandmine extends Container { slot2.putStack(itemstack1); } } - } else if (par3 == 3 - && par4EntityPlayer.capabilities.isCreativeMode + } else if (par3 == 3 && par4EntityPlayer.capabilities.isCreativeMode && inventoryplayer.getItemStack() == null && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); + slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2 != null && slot2.getHasStack()) { - itemstack1 = slot2.getStack().copy(); - itemstack1.stackSize = itemstack1.getMaxStackSize(); - inventoryplayer.setItemStack(itemstack1); - } - } else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); + if (slot2 != null && slot2.getHasStack()) { + itemstack1 = slot2.getStack().copy(); + itemstack1.stackSize = itemstack1.getMaxStackSize(); + inventoryplayer.setItemStack(itemstack1); + } + } else + if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) { + slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) { - itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize); - slot2.onPickupFromSlot(par4EntityPlayer, itemstack1); - par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1, false); - } - } else if (par3 == 6 && par1 >= 0) { - slot2 = (Slot) this.inventorySlots.get(par1); - itemstack1 = inventoryplayer.getItemStack(); + if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) { + itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize); + slot2.onPickupFromSlot(par4EntityPlayer, itemstack1); + par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1, false); + } + } else if (par3 == 6 && par1 >= 0) { + slot2 = (Slot) this.inventorySlots.get(par1); + itemstack1 = inventoryplayer.getItemStack(); - if (itemstack1 != null - && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) { - l = par2 == 0 ? 0 : this.inventorySlots.size() - 1; - k1 = par2 == 0 ? 1 : -1; + if (itemstack1 != null + && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) { + l = par2 == 0 ? 0 : this.inventorySlots.size() - 1; + k1 = par2 == 0 ? 1 : -1; - for (int l1 = 0; l1 < 2; ++l1) { - for (int i2 = l; - i2 >= 0 - && i2 < this.inventorySlots.size() - && itemstack1.stackSize < itemstack1.getMaxStackSize(); - i2 += k1) { - Slot slot3 = (Slot) this.inventorySlots.get(i2); + for (int l1 = 0; l1 < 2; ++l1) { + for (int i2 = l; i2 >= 0 && i2 < this.inventorySlots.size() + && itemstack1.stackSize < itemstack1.getMaxStackSize(); i2 += k1) { + Slot slot3 = (Slot) this.inventorySlots.get(i2); - if (slot3.getHasStack() - && func_94527_a(slot3, itemstack1, true) - && slot3.canTakeStack(par4EntityPlayer) - && this.func_94530_a(itemstack1, slot3) - && (l1 != 0 - || slot3.getStack().stackSize - != slot3.getStack().getMaxStackSize())) { - int j2 = Math.min( - itemstack1.getMaxStackSize() - itemstack1.stackSize, - slot3.getStack().stackSize); - ItemStack itemstack5 = slot3.decrStackSize(j2); - itemstack1.stackSize += j2; + if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) + && slot3.canTakeStack(par4EntityPlayer) + && this.func_94530_a(itemstack1, slot3) + && (l1 != 0 + || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) { + int j2 = Math.min( + itemstack1.getMaxStackSize() - itemstack1.stackSize, + slot3.getStack().stackSize); + ItemStack itemstack5 = slot3.decrStackSize(j2); + itemstack1.stackSize += j2; - if (itemstack5.stackSize <= 0) { - slot3.putStack(null); + if (itemstack5.stackSize <= 0) { + slot3.putStack(null); + } + + slot3.onPickupFromSlot(par4EntityPlayer, itemstack5); } - - slot3.onPickupFromSlot(par4EntityPlayer, itemstack5); } } } - } - this.detectAndSendChanges(); - } + this.detectAndSendChanges(); + } } return itemstack; diff --git a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java index d2caaf01..5e028f9e 100644 --- a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java @@ -1,11 +1,13 @@ package tconstruct.mechworks.itemblocks; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.logic.TileEntityLandmine; @@ -49,18 +51,8 @@ public class ItemBlockLandmine extends ItemBlock { } @Override - public boolean placeBlockAt( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ, - int metadata) { + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { if (!world.setBlock(x, y, z, TinkerMechworks.landmine, metadata, 3)) { return false; } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index c3a0b417..a1e20d90 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior; import java.util.*; + import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.init.*; @@ -8,6 +9,7 @@ import net.minecraft.item.*; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.mechworks.landmine.*; /** @@ -54,8 +56,7 @@ public abstract class Behavior { for (Object ob : Block.blockRegistry) { if (ob instanceof Block) { Block b = (Block) ob; - if (b.getMaterial().isOpaque() - && b.renderAsNormalBlock() + if (b.getMaterial().isOpaque() && b.renderAsNormalBlock() && !b.canProvidePower() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new LandmineStack(b))) { @@ -73,8 +74,7 @@ public abstract class Behavior { if (par1ItemStack.getItem() instanceof ItemBlock) { if (!behaviorsListBlocks.isEmpty()) { for (int i = 0; i < behaviorsListBlocks.size(); i++) { - LandmineStack st = - (LandmineStack) behaviorsListBlocks.keySet().toArray()[i]; + LandmineStack st = (LandmineStack) behaviorsListBlocks.keySet().toArray()[i]; if (st.equals(par1ItemStack)) { return (Behavior) behaviorsListBlocks.values().toArray()[i]; } @@ -83,8 +83,7 @@ public abstract class Behavior { } else { if (!behaviorsListItems.isEmpty()) { for (int i = 0; i < behaviorsListItems.size(); i++) { - LandmineStack st = - (LandmineStack) behaviorsListItems.keySet().toArray()[i]; + LandmineStack st = (LandmineStack) behaviorsListItems.keySet().toArray()[i]; if (st.equals(par1ItemStack)) { return (Behavior) behaviorsListItems.values().toArray()[i]; } @@ -110,14 +109,8 @@ public abstract class Behavior { } } - public abstract void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, - boolean willBlockBeRemoved); + public abstract void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, + Entity triggerer, boolean willBlockBeRemoved); public int getStackLimit(ItemStack par1ItemStack) { return 1; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index 6e48e9fa..aba37a30 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior; import mantle.blocks.BlockUtils; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.item.ItemStack; @@ -14,13 +15,7 @@ import net.minecraft.world.World; public class BehaviorBlockThrow extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { for (int i = 0; i < par5ItemStack.stackSize; i++) { int direction = par1World.rand.nextInt(8); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java index 68d67f4a..f5436e3b 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java @@ -3,18 +3,13 @@ package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.util.DamageSourceLandmine; public class BehaviorDefault extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { if (triggerer != null) { triggerer.attackEntityFrom(new DamageSourceLandmine("Landmine"), 5F); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java index eae0d6aa..67824982 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java @@ -12,12 +12,6 @@ import net.minecraft.world.World; public class BehaviorDummy extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) {} } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index 7fa9292a..4cdb6f38 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior; import java.util.List; + import net.minecraft.entity.*; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.*; @@ -15,13 +16,7 @@ import net.minecraft.world.World; public class BehaviorExplosive extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { float explodeStrenght = 0; if (par5ItemStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) { @@ -31,7 +26,12 @@ public class BehaviorExplosive extends Behavior { } par1World.createExplosion( - new EntityTNTPrimed(par1World, par2, par3, par4, null), par2, par3, par4, explodeStrenght, true); + new EntityTNTPrimed(par1World, par2, par3, par4, null), + par2, + par3, + par4, + explodeStrenght, + true); } @Override diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java index 0833648a..e2fcdd35 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java @@ -1,12 +1,14 @@ package tconstruct.mechworks.landmine.behavior; import java.util.Random; + import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** @@ -17,13 +19,7 @@ import tconstruct.mechworks.itemblocks.ItemBlockLandmine; public class BehaviorFirecharge extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { EnumFacing face = getFacing(par1World, par2, par3, par4); @@ -41,9 +37,8 @@ public class BehaviorFirecharge extends Behavior { for (int i = par2 - 2; i <= (par2 + 2); i++) { for (int j = par4 - 2; j <= (par4 + 2); j++) { - if ((par1World.getBlock(i, par3, j) == null - || (par1World.getBlock(i, par3, j) != null - && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) + if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null + && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) { par1World.setBlock(i, par3, j, Blocks.fire); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java index dda2bba1..94a802b6 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; + import tconstruct.mechworks.entity.item.EntityLandmineFirework; /** @@ -15,21 +16,19 @@ import tconstruct.mechworks.entity.item.EntityLandmineFirework; public class BehaviorFirework extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { EnumFacing facing = getFacing(par1World, par2, par3, par4); for (int i = 0; i < par5ItemStack.stackSize; i++) { // TODO entity registration and stuffs EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework( - par1World, par2, par3, par4, par5ItemStack, facing.ordinal()) - .setRider(i == 0 ? triggerer : null); + par1World, + par2, + par3, + par4, + par5ItemStack, + facing.ordinal()).setRider(i == 0 ? triggerer : null); par1World.spawnEntityInWorld(entityfireworkrocket); boolean shouldRun = true; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index bfddd1cb..cbdeb24e 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior; import java.util.*; + import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityPotion; @@ -8,6 +9,7 @@ import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; + import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** @@ -18,13 +20,7 @@ import tconstruct.mechworks.itemblocks.ItemBlockLandmine; public class BehaviorPotion extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { if (ItemPotion.isSplash(par5ItemStack.getItemDamage())) { par1World.playSoundAtEntity( diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java index 53e6a921..e0d7fd0b 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java @@ -7,13 +7,7 @@ import net.minecraft.world.World; public class BehaviorPreventExplode extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) {} @Override diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index a3fecf59..5258dae2 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -16,13 +16,7 @@ import net.minecraft.world.World; public class BehaviorProjectile extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { IProjectile entity = null; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java index fe39875e..796e93e0 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior; import java.util.*; + import net.minecraft.enchantment.*; import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; @@ -8,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; + import tconstruct.mechworks.itemblocks.ItemBlockLandmine; // TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not @@ -21,13 +23,7 @@ import tconstruct.mechworks.itemblocks.ItemBlockLandmine; public class BehaviorShears extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { Random rand = ItemBlockLandmine.getRandom(); @@ -78,7 +74,11 @@ public class BehaviorShears extends Behavior { double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; EntityItem entityitem = new EntityItem( - par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); + par1World, + (double) par2 + d0, + (double) par3 + d1, + (double) par4 + d2, + par5ItemStack); entityitem.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(entityitem); } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 5fdd4dba..9bfa04e5 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -13,13 +13,7 @@ import net.minecraft.world.World; public class BehaviorSpawnEgg extends Behavior { @Override - public void executeLogic( - World par1World, - int par2, - int par3, - int par4, - ItemStack par5ItemStack, - Entity triggerer, + public void executeLogic(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) { EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); double d0 = par2 + Math.random() + (double) enumfacing.getFrontOffsetX(); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java index 249bc833..fe3638da 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -1,11 +1,13 @@ package tconstruct.mechworks.landmine.behavior.stackCombo; import java.util.ArrayList; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.mechworks.landmine.Helper; import tconstruct.mechworks.landmine.behavior.Behavior; import tconstruct.mechworks.logic.TileEntityLandmine; @@ -29,8 +31,8 @@ public abstract class SpecialStackHandler { } } - public abstract void checkStack( - World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks); + public abstract void checkStack(World par1World, int par2, int par3, int par4, Entity triggerer, + ArrayList stacks); public EnumFacing getFacing(World par1World, int par2, int par3, int par4) { ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 2744ec05..0ce0c37a 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.landmine.behavior.stackCombo; import java.util.*; + import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.*; @@ -12,8 +13,8 @@ import net.minecraft.world.World; public class SpecialStackHandlerRocketFireball extends SpecialStackHandler { @Override - public void checkStack( - World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks) { + public void checkStack(World par1World, int par2, int par3, int par4, Entity triggerer, + ArrayList stacks) { if (stacks.isEmpty()) { return; } diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 3b12809e..98acd299 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -1,15 +1,18 @@ package tconstruct.mechworks.logic; import java.util.*; + import mantle.world.WorldHelper; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.mechworks.landmine.behavior.Behavior; /** - * This logic is designed only for blocks having TileEntityLandmine as their - * tileEntity(otherwise ClassCastException will be awarded) + * This logic is designed only for blocks having TileEntityLandmine as their tileEntity(otherwise ClassCastException + * will be awarded) * * @author fuj1n * @@ -73,8 +76,14 @@ public class LandmineExplodeLogic { } } - LandmineSpecialStackLogic specialStacks = - new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); + LandmineSpecialStackLogic specialStacks = new LandmineSpecialStackLogic( + worldObj, + x, + y, + z, + triggerer, + isOffensive, + stacks); specialStacks.handleSpecialStacks(); for (ItemStack currentStack : stacks) { diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index df429c29..8d8c0bbb 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -1,9 +1,11 @@ package tconstruct.mechworks.logic; import java.util.*; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; public class LandmineSpecialStackLogic { @@ -15,14 +17,8 @@ public class LandmineSpecialStackLogic { private final boolean isOffensive; private final ArrayList stackEffects; - public LandmineSpecialStackLogic( - World par1World, - int par2, - int par3, - int par4, - Entity entity, - boolean mayHurtPlayer, - ArrayList items) { + public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, Entity entity, + boolean mayHurtPlayer, ArrayList items) { worldObj = par1World; this.tileEntity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); this.x = par2; diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index b6ff67a2..3fbf9f22 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -165,10 +165,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory { @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this - && par1EntityPlayer.getDistanceSq( - (double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) - <= 64.0D; + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && par1EntityPlayer + .getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override @@ -187,12 +186,12 @@ public class TileEntityLandmine extends TileEntity implements IInventory { public boolean isItemValidForSlot(int i, ItemStack itemstack) { //// Should automatic camo insertion be allowed. // if (i == 3) { - // return false; + // return false; // } else { - // // Here for mDiyo to decide if he wants automation for - // // insertion/extraction of the items to be an option. - // // Would be useful for building automated mine laying machines. - // return false; + // // Here for mDiyo to decide if he wants automation for + // // insertion/extraction of the items to be an option. + // // Would be useful for building automated mine laying machines. + // return false; // } return false; } diff --git a/src/main/java/tconstruct/mechworks/model/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java index cb2538df..8cd9c5d8 100644 --- a/src/main/java/tconstruct/mechworks/model/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -1,17 +1,20 @@ package tconstruct.mechworks.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.*; + import org.lwjgl.opengl.GL11; + import tconstruct.world.entity.CartEntity; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class CartRender extends Render { + protected ModelBase modelCart; RenderBlocks renderblocks; @@ -107,12 +110,10 @@ public class CartRender extends Render { } /** - * 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 0 && matchingAmount(modifiers) <= max; // This line fails? + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(modifiers) <= max; // This + // line + // fails? int[] keyPair = tags.getIntArray(key); if (keyPair[0] + matchingAmount(modifiers) <= keyPair[1]) return true; @@ -61,7 +65,7 @@ public class GloveSpeed extends ItemModTypeFilter { tags.setInteger("Modifiers", mods); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(input, tooltipName, modName); - keyPair = new int[] {increase, max, tooltipIndex}; + keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } diff --git a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java index de0d5f0c..0edbe718 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java +++ b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java @@ -1,13 +1,16 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; + import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.armor.*; /* Adds a boolean NBTTag */ public class AModBoolean extends ArmorMod { + String color; String tooltipName; @@ -24,8 +27,8 @@ public class AModBoolean extends ArmorMod { ArmorCore item = (ArmorCore) armor.getItem(); if (!armorTypes.contains(item.armorPart)) return false; NBTTagCompound tags = getModifierTag(armor); - return tags.getInteger("Modifiers") > 0 - && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); // Will fail if the modifier is false or the + // tag doesn't exist } @Override diff --git a/src/main/java/tconstruct/modifiers/armor/AModInteger.java b/src/main/java/tconstruct/modifiers/armor/AModInteger.java index 964a9083..e5677e31 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModInteger.java +++ b/src/main/java/tconstruct/modifiers/armor/AModInteger.java @@ -1,41 +1,31 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.armor.*; /* Adds an integer NBTTag */ public class AModInteger extends ArmorMod { + String color; String tooltipName; int initialIncrease; int secondaryIncrease; - public AModInteger( - int effect, - String dataKey, - EnumSet armorTypes, - ItemStack[] items, - int increase, - String c, - String tip) { + public AModInteger(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int increase, + String c, String tip) { super(effect, dataKey, armorTypes, items); initialIncrease = secondaryIncrease = increase; color = c; tooltipName = tip; } - public AModInteger( - int effect, - String dataKey, - EnumSet armorTypes, - ItemStack[] items, - int increase1, - int increase2, - String c, - String tip) { + public AModInteger(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int increase1, + int increase2, String c, String tip) { super(effect, dataKey, armorTypes, items); initialIncrease = increase1; secondaryIncrease = increase2; diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java index 9fe30883..36ca309a 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java +++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java @@ -1,8 +1,10 @@ package tconstruct.modifiers.armor; import java.util.*; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.*; + import tconstruct.library.armor.ArmorPart; public class AModLeadBoots extends AModBoolean { diff --git a/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java b/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java index 3330c6eb..e79ef1bc 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java +++ b/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java @@ -1,22 +1,25 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; + import tconstruct.armor.TinkerArmor; import tconstruct.library.armor.ArmorMod; import tconstruct.library.armor.ArmorPart; public class AModThaumicVision extends ArmorMod { + private final AModBoolean thaumicSensesMod; private final AModBoolean thaumicVisionMod; private final Item thaumometer; public AModThaumicVision(ItemStack thaumometer) { - super(-1, "", EnumSet.of(ArmorPart.Head), new ItemStack[] {thaumometer}); + super(-1, "", EnumSet.of(ArmorPart.Head), new ItemStack[] { thaumometer }); // super(effect, "Thaumic Vision", EnumSet.of(ArmorPart.Head), new ItemStack[]{}, // EnumChatFormatting.DARK_PURPLE.toString(), "Thaumic Vision"); @@ -83,18 +86,15 @@ public class AModThaumicVision extends ArmorMod { // fix the effect display NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); int i = 1; - for (; i <= 6; i++) - if (tags.getInteger("Effect" + i) == -1) { - tags.setInteger("Effect" + i, effect); - break; - } + for (; i <= 6; i++) if (tags.getInteger("Effect" + i) == -1) { + tags.setInteger("Effect" + i, effect); + break; + } } private boolean hasThaumicSenses(ItemStack stack) { - return stack != null - && stack.hasTagCompound() - && stack.getTagCompound() - .getCompoundTag(TinkerArmor.travelGoggles.getBaseTagName()) + return stack != null && stack.hasTagCompound() + && stack.getTagCompound().getCompoundTag(TinkerArmor.travelGoggles.getBaseTagName()) .getBoolean(thaumicSensesMod.key); } diff --git a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java index 1a437e39..83333abc 100644 --- a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java +++ b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java @@ -5,17 +5,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.*; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.armor.*; import tconstruct.library.modifier.*; public class ActiveTinkerArmor extends ActiveArmorMod { + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) { if (!itemStack.hasTagCompound()) return; - NBTTagCompound tag = - itemStack.getTagCompound().getCompoundTag(((IModifyable) itemStack.getItem()).getBaseTagName()); + NBTTagCompound tag = itemStack.getTagCompound() + .getCompoundTag(((IModifyable) itemStack.getItem()).getBaseTagName()); if (tag == null) return; if (tag.hasKey("Moss")) { int chance = tag.getInteger("Moss"); @@ -36,20 +38,21 @@ public class ActiveTinkerArmor extends ActiveArmorMod { player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0, true)); } - /*List list = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.addCoord(0.0D, 0.0D, 0.0D).expand(5.0D, 5.0D, 5.0D)); //TODO: Add modifier code - for (int k = 0; k < list.size(); k++) - { - EntityItem entity = (EntityItem) list.get(k); - entity.onCollideWithPlayer(player); - }*/ + /* + * List list = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.addCoord(0.0D, 0.0D, + * 0.0D).expand(5.0D, 5.0D, 5.0D)); //TODO: Add modifier code for (int k = 0; k < list.size(); k++) { + * EntityItem entity = (EntityItem) list.get(k); entity.onCollideWithPlayer(player); } + */ } if (type == ArmorPart.Chest) { if (player.isSneaking() && tag.getBoolean("Stealth")) player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 2, 0, true)); - /*int sprintboost = tag.getInteger("Sprint Assist"); - if (player.isSprinting() && sprintboost > 0) - player.moveEntityWithHeading(-player.moveStrafing * 0.1f * sprintboost, player.moveForward * 0.2F * sprintboost); //Max of 0-1*/ + /* + * int sprintboost = tag.getInteger("Sprint Assist"); if (player.isSprinting() && sprintboost > 0) + * player.moveEntityWithHeading(-player.moveStrafing * 0.1f * sprintboost, player.moveForward * 0.2F * + * sprintboost); //Max of 0-1 + */ } if (type == ArmorPart.Feet) { if (player.isInWater()) { diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java index ee03fc16..10d50c9a 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java @@ -1,12 +1,15 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.armor.*; import tconstruct.library.modifier.IModifyable; public class TravelModDoubleJump extends ArmorMod { + String color = "\u00a77"; String tooltipName = "Double-Jump"; diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java index 06d7b14e..8cdf04ff 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java @@ -2,6 +2,7 @@ package tconstruct.modifiers.armor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.armor.items.TravelGear; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java index 8398bc51..dad37eee 100644 --- a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java +++ b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java @@ -1,10 +1,13 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.item.ItemStack; + import tconstruct.library.modifier.ItemModifier; public abstract class ItemModTypeFilter extends ItemModifier { + public final List increase; public ItemModTypeFilter(int effect, String dataKey, ItemStack[] items, int[] values) { @@ -16,11 +19,11 @@ public abstract class ItemModTypeFilter extends ItemModifier { } } - /** Checks to see if the inputs match the stored items - * Note: Filters types, doesn't care about amount + /** + * Checks to see if the inputs match the stored items Note: Filters types, doesn't care about amount * * @param input The ItemStacks to compare against - * @param tool Item to modify, used for restrictions + * @param tool Item to modify, used for restrictions * @return Whether the recipe matches the input */ @Override @@ -64,15 +67,15 @@ public abstract class ItemModTypeFilter extends ItemModifier { return amount; } - /** Adds a new itemstack to the list for increases + /** + * Adds a new itemstack to the list for increases * - * @param stack ItemStack to compare against + * @param stack ItemStack to compare against * @param amount Amount to increase */ public void addStackToMatchList(ItemStack stack, int amount) { - if (stack == null) - throw new NullPointerException( - "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); + if (stack == null) throw new NullPointerException( + "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); stacks.add(stack); increase.add(amount); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java index daa6dc75..2d486fcd 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java @@ -2,8 +2,10 @@ package tconstruct.modifiers.tools; import java.util.HashSet; import java.util.Set; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; @@ -13,6 +15,7 @@ import tconstruct.library.weaponry.IAmmo; import tconstruct.weaponry.weapons.Shuriken; public class ModAmmoRestock extends ItemModifier { + public ModAmmoRestock() { super(new ItemStack[0], 0, ""); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index dadcbc6f..36f987b2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class ModAntiSpider extends ItemModTypeFilter { + String tooltipName; int max = 4; String guiType; @@ -54,7 +55,7 @@ public class ModAntiSpider extends ItemModTypeFilter { tags.setInteger("Modifiers", modifiers); String modName = "\u00a72" + guiType + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] {increase, max, tooltipIndex}; + int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java index ac252240..71b6cdf9 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -1,12 +1,15 @@ package tconstruct.modifiers.tools; import java.util.Arrays; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; public class ModAttack extends ItemModTypeFilter { + String tooltipName; int max; int threshold; @@ -37,8 +40,8 @@ public class ModAttack extends ItemModTypeFilter { } // gloves - public ModAttack( - String type, int effect, ItemStack[] items, int[] value, int max, int threshold, String modifierType) { + public ModAttack(String type, int effect, ItemStack[] items, int[] value, int max, int threshold, + String modifierType) { super(effect, "ModAttack", items, value); tooltipName = "\u00a7fKnuckles"; guiType = type; @@ -112,7 +115,7 @@ public class ModAttack extends ItemModTypeFilter { int increase = matchingAmount(input); String modName = "\u00a7f" + guiType + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] {increase, max, tooltipIndex}; + int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); int attack = tags.getInteger("Attack"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java index 7f78bdb2..1e73dfc7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java @@ -13,7 +13,7 @@ public class ModAutoSmelt extends ModBoolean { protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); if (tags.getBoolean("Silk Touch")) return false; - return tags.getInteger("Modifiers") > 0 - && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); // Will fail if the modifier is false or the + // tag doesn't exist } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index 0d973045..c0cbbcf6 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -1,11 +1,14 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.tools.ToolCore; public class ModBlaze extends ItemModTypeFilter { + String tooltipName; int max; @@ -58,7 +61,7 @@ public class ModBlaze extends ItemModTypeFilter { tags.setInteger("Modifiers", modifiers); String modName = "\u00a76Blaze (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] {increase, max, tooltipIndex}; + int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java index 5d67d5bb..c7717937 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java @@ -2,11 +2,13 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.ItemModifier; /* Adds a boolean NBTTag */ public class ModBoolean extends ItemModifier { + String color; String tooltipName; @@ -19,8 +21,8 @@ public class ModBoolean extends ItemModifier { @Override protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - return tags.getInteger("Modifiers") > 0 - && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); // Will fail if the modifier is false or the + // tag doesn't exist } @Override diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 6d4932ca..0c2ac4e4 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -1,9 +1,11 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.enchantment.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.*; + import tconstruct.library.tools.ToolCore; public class ModButtertouch extends ModBoolean { @@ -57,7 +59,7 @@ public class ModButtertouch extends ModBoolean { } public void addEnchantment(ItemStack tool, Enchantment enchant, int level) // TODO: Move this to ItemModifier - { + { NBTTagList tags = new NBTTagList(); Map enchantMap = EnchantmentHelper.getEnchantments(tool); Iterator> iterator = enchantMap.entrySet().iterator(); diff --git a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java b/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java index 2244137c..131fff07 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java @@ -2,10 +2,12 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.ToolCore; public class ModCreativeToolModifier extends ItemModifier { + public ModCreativeToolModifier(ItemStack[] items) { super(items, 0, ""); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModDurability.java b/src/main/java/tconstruct/modifiers/tools/ModDurability.java index 6941e3f6..3660fc23 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModDurability.java +++ b/src/main/java/tconstruct/modifiers/tools/ModDurability.java @@ -2,12 +2,14 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.ItemModifier; import tconstruct.util.config.PHConstruct; /* Adds an integer NBTTag */ public class ModDurability extends ItemModifier { + String tooltipName; String color; int durability; diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index 33a49536..9991f8c2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -2,9 +2,11 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.*; public class ModExtraModifier extends ItemModifier { + public ModExtraModifier(ItemStack[] items, String dataKey) { super(items, 0, dataKey); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 8704c484..e7014399 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -1,16 +1,19 @@ package tconstruct.modifiers.tools; -import cofh.api.energy.IEnergyContainerItem; import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; import tconstruct.util.config.PHConstruct; +import cofh.api.energy.IEnergyContainerItem; /* TE3 support */ public class ModFlux extends ModBoolean { + public ArrayList batteries = new ArrayList<>(); public int modifiersRequired = 1; // LALALALA totally not hidden IguanaTweaks Support LALALALA @@ -28,17 +31,16 @@ public class ModFlux extends ModBoolean { ItemStack foundBattery = null; // try to find the battery in the input - for (ItemStack stack : input) - for (ItemStack battery : batteries) { - if (stack == null) continue; - if (stack.getItem() != battery.getItem()) continue; - if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; - // we don't allow multiple batteries to be added - if (foundBattery != null) return false; + for (ItemStack stack : input) for (ItemStack battery : batteries) { + if (stack == null) continue; + if (stack.getItem() != battery.getItem()) continue; + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; + // we don't allow multiple batteries to be added + if (foundBattery != null) return false; - // battery found, gogogo - foundBattery = stack; - } + // battery found, gogogo + foundBattery = stack; + } // no battery present if (foundBattery == null) return false; @@ -46,10 +48,11 @@ public class ModFlux extends ModBoolean { int maxEnergy = ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery); // battery too big for our tool? - if (PHConstruct.balancedFluxModifier - && tags.getInteger("TotalDurability") - < maxEnergy / 1000) // durability needs to be at least 1/1000th of the charge - return false; + if (PHConstruct.balancedFluxModifier && tags.getInteger("TotalDurability") < maxEnergy / 1000) // durability + // needs to be at + // least 1/1000th + // of the charge + return false; // check if we already have a flux modifier if (tags.getBoolean(key)) { @@ -83,15 +86,14 @@ public class ModFlux extends ModBoolean { // find the battery in the input ItemStack inputBattery = null; - for (ItemStack stack : input) - for (ItemStack battery : batteries) { - if (stack == null) continue; - if (stack.getItem() != battery.getItem()) continue; - if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; + for (ItemStack stack : input) for (ItemStack battery : batteries) { + if (stack == null) continue; + if (stack.getItem() != battery.getItem()) continue; + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; - // we're guaranteed to only find one battery because more are prevented above - inputBattery = stack; - } + // we're guaranteed to only find one battery because more are prevented above + inputBattery = stack; + } // get the energy interface IEnergyContainerItem energyContainer = (IEnergyContainerItem) inputBattery.getItem(); diff --git a/src/main/java/tconstruct/modifiers/tools/ModInteger.java b/src/main/java/tconstruct/modifiers/tools/ModInteger.java index ea2ff1ae..cf74378a 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModInteger.java +++ b/src/main/java/tconstruct/modifiers/tools/ModInteger.java @@ -2,11 +2,13 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.ItemModifier; /* Adds an integer NBTTag */ public class ModInteger extends ItemModifier { + String color; String tooltipName; int initialIncrease; @@ -19,8 +21,8 @@ public class ModInteger extends ItemModifier { tooltipName = tip; } - public ModInteger( - ItemStack[] items, int effect, String dataKey, int increase1, int increase2, String c, String tip) { + public ModInteger(ItemStack[] items, int effect, String dataKey, int increase1, int increase2, String c, + String tip) { super(items, effect, dataKey); initialIncrease = increase1; secondaryIncrease = increase2; diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index d50dc14a..4b918366 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -1,12 +1,15 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.enchantment.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.*; + import tconstruct.library.tools.ToolCore; public class ModLapis extends ItemModTypeFilter { + String tooltipName; int max = 450; @@ -43,7 +46,7 @@ public class ModLapis extends ItemModTypeFilter { String modName = "\u00a79Lapis (0/450)"; int tooltipIndex = addToolTip(tool, "\u00a79Luck", modName); - int[] keyPair = new int[] {0, tooltipIndex}; + int[] keyPair = new int[] { 0, tooltipIndex }; tags.setIntArray(key, keyPair); int modifiers = tags.getInteger("Modifiers"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index 821e5e9f..a5c41f0e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -1,11 +1,14 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.tools.ToolCore; public class ModPiston extends ItemModTypeFilter { + String tooltipName; int max = 10; @@ -57,7 +60,7 @@ public class ModPiston extends ItemModTypeFilter { tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Knockback (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] {increase, max, tooltipIndex}; + int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java index 4f168bdc..b01e722e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java @@ -3,12 +3,13 @@ package tconstruct.modifiers.tools; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.ItemModifier; public class ModPotion extends ItemModifier { public ModPotion(ItemStack[] items, int effect, String dataKey) { - super(new ItemStack[] {new ItemStack(Items.potionitem, 1, Short.MAX_VALUE)}, 0, ""); + super(new ItemStack[] { new ItemStack(Items.potionitem, 1, Short.MAX_VALUE) }, 0, ""); } protected boolean canModify(ItemStack tool, ItemStack[] input) { diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 764fea84..f1ee874d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -1,12 +1,15 @@ package tconstruct.modifiers.tools; import java.util.*; + import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; public class ModRedstone extends ItemModTypeFilter { + public String tooltipName; public int max = 50; @@ -63,7 +66,7 @@ public class ModRedstone extends ItemModTypeFilter { tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - keyPair = new int[] {increase, max, tooltipIndex}; + keyPair = new int[] { increase, max, tooltipIndex }; current = keyPair[0]; tags.setIntArray(key, keyPair); } @@ -80,7 +83,7 @@ public class ModRedstone extends ItemModTypeFilter { miningSpeed += (increase * boost); tags.setInteger("MiningSpeed", miningSpeed); - String[] type = {"MiningSpeed2", "MiningSpeedHandle", "MiningSpeedExtra"}; + String[] type = { "MiningSpeed2", "MiningSpeedHandle", "MiningSpeedExtra" }; for (int i = 0; i < 3; i++) { if (tags.hasKey(type[i])) { diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index cd88deb3..5d039004 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -2,6 +2,7 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.*; diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java index c72c69b4..35027830 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModSmite.java +++ b/src/main/java/tconstruct/modifiers/tools/ModSmite.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class ModSmite extends ItemModTypeFilter { + String tooltipName; int max = 36; String tagName; @@ -54,7 +55,7 @@ public class ModSmite extends ItemModTypeFilter { tags.setInteger("Modifiers", modifiers); String modName = "\u00a7e" + tagName + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] {increase, max, tooltipIndex}; + int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java index 288ee88b..f37a2fa6 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java @@ -2,6 +2,7 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/tconstruct/modifiers/tools/ModWindup.java b/src/main/java/tconstruct/modifiers/tools/ModWindup.java index 22be2d0e..9d17431d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModWindup.java +++ b/src/main/java/tconstruct/modifiers/tools/ModWindup.java @@ -2,11 +2,14 @@ package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.tools.ToolCore; public class ModWindup extends ModRedstone { + public ModWindup(int effect, ItemStack[] items, int[] values) { super(effect, items, values); } @@ -52,7 +55,7 @@ public class ModWindup extends ModRedstone { tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - keyPair = new int[] {increase, max, tooltipIndex}; + keyPair = new int[] { increase, max, tooltipIndex }; current = keyPair[0]; tags.setIntArray(key, keyPair); } diff --git a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java index b2e14eb2..ed8d5124 100644 --- a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java @@ -1,14 +1,16 @@ package tconstruct.plugins; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; + import net.minecraft.item.ItemStack; + import tconstruct.TConstruct; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.modifiers.armor.AModThaumicVision; import tconstruct.world.TinkerWorld; import thaumcraft.api.ItemApi; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -31,10 +33,10 @@ public class TinkerThaumcraft { FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 13)); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 14)); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 15)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13)); } private void registerModifiers() { diff --git a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java index 997e213e..eb075ffe 100644 --- a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java +++ b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java @@ -1,13 +1,13 @@ package tconstruct.plugins.fmp; -import codechicken.microblock.BlockMicroMaterial; -import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; +import codechicken.microblock.BlockMicroMaterial; +import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse( id = "Tinkers FMP Compatibility", @@ -15,6 +15,7 @@ import tconstruct.world.TinkerWorld; modsRequired = "ForgeMultipart", forced = true) public class TinkerFMP { + @Handler public void init(FMLInitializationEvent event) { diff --git a/src/main/java/tconstruct/plugins/gears/GearCast.java b/src/main/java/tconstruct/plugins/gears/GearCast.java index ded49c75..08df5971 100644 --- a/src/main/java/tconstruct/plugins/gears/GearCast.java +++ b/src/main/java/tconstruct/plugins/gears/GearCast.java @@ -2,11 +2,13 @@ package tconstruct.plugins.gears; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; public class GearCast extends Item implements IPattern { + public GearCast() { setTextureName("tinker:materials/gear_cast"); setUnlocalizedName("tconstruct.GearPattern"); diff --git a/src/main/java/tconstruct/plugins/gears/TinkerGears.java b/src/main/java/tconstruct/plugins/gears/TinkerGears.java index 19ecfae1..3bc3b863 100644 --- a/src/main/java/tconstruct/plugins/gears/TinkerGears.java +++ b/src/main/java/tconstruct/plugins/gears/TinkerGears.java @@ -1,29 +1,33 @@ package tconstruct.plugins.gears; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; + import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; @Pulse( id = "Tinkers Gears", description = "Adds a gear cast if other mods provide gears", pulsesRequired = "Tinkers' Smeltery") public class TinkerGears { + public static Item gearCast; @Handler diff --git a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java index 5c915b9c..9ec1ed54 100644 --- a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java +++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java @@ -1,14 +1,16 @@ package tconstruct.plugins.ic2; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -17,6 +19,7 @@ import tconstruct.library.crafting.LiquidCasting; modsRequired = "IC2", forced = true) public class TinkerIC2 { + private static final String IC2_UUM_FLUIDNAME = "ic2fluiduumatter"; @Handler @@ -31,6 +34,10 @@ public class TinkerIC2 { // Block casting basinCasting.addCastingRecipe( - new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50); + new ItemStack(Blocks.diamond_block), + fluidStackBlock, + new ItemStack(Blocks.dirt), + true, + 50); } } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index 10663d69..a7e48cf9 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -1,10 +1,11 @@ package tconstruct.plugins.imc; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import java.util.*; + import mantle.pulsar.pulse.*; import tconstruct.TConstruct; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -13,6 +14,7 @@ import tconstruct.TConstruct; modsRequired = "appliedenergistics2", forced = true) public class TinkerAE2 { + private static final List spatialIOLogics = Arrays.asList( "EssenceExtractorLogic", "GolemPedestalLogic", // TODO What happened to these? diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java index 2674d57c..e12138fb 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java @@ -1,11 +1,13 @@ package tconstruct.plugins.imc; -import cpw.mods.fml.common.event.*; import mantle.pulsar.pulse.*; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; + import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.common.event.*; @Pulse( id = "Tinkers BuildCraft Compatibility", @@ -13,6 +15,7 @@ import tconstruct.smeltery.TinkerSmeltery; modsRequired = "BuildCraft|Transport", forced = true) public class TinkerBuildCraft { + @Handler public void init(FMLInitializationEvent event) { TConstruct.logger.info("BuildCraft detected. Registering facades."); diff --git a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java index ec87dd4c..f809390f 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java @@ -2,10 +2,12 @@ package tconstruct.plugins.imc; import static tconstruct.smeltery.TinkerSmeltery.*; -import cpw.mods.fml.common.event.*; import mantle.pulsar.pulse.*; + import net.minecraftforge.fluids.Fluid; + import tconstruct.TConstruct; +import cpw.mods.fml.common.event.*; @Pulse( id = "Tinkers Mystcraft Compatibility", @@ -13,33 +15,18 @@ import tconstruct.TConstruct; modsRequired = "Mystcraft", pulsesRequired = "Tinkers' Smeltery") public class TinkerMystcraft { + @Handler public void init(FMLInitializationEvent event) { final Fluid[] fluids = new Fluid[] { - // precious tinker fluids - moltenGoldFluid, - moltenSteelFluid, - moltenEmeraldFluid, - moltenQuartzFluid, - moltenArditeFluid, - moltenCobaltFluid, - // all alloys - pigIronFluid, - moltenBronzeFluid, - moltenAlumiteFluid, - moltenAlubrassFluid, - moltenManyullynFluid, - // precious TE fluids - moltenEnderFluid, - moltenSilverFluid, - moltenInvarFluid, - moltenElectrumFluid, - moltenShinyFluid, - moltenSignalumFluid, - moltenLumiumFluid, - moltenMithrilFluid, - moltenEnderiumFluid - }; + // precious tinker fluids + moltenGoldFluid, moltenSteelFluid, moltenEmeraldFluid, moltenQuartzFluid, moltenArditeFluid, + moltenCobaltFluid, + // all alloys + pigIronFluid, moltenBronzeFluid, moltenAlumiteFluid, moltenAlubrassFluid, moltenManyullynFluid, + // precious TE fluids + moltenEnderFluid, moltenSilverFluid, moltenInvarFluid, moltenElectrumFluid, moltenShinyFluid, + moltenSignalumFluid, moltenLumiumFluid, moltenMithrilFluid, moltenEnderiumFluid }; TConstruct.logger.info("Mystcraft detected. Blacklisting Mystcraft fluid symbols."); for (Fluid fluid : fluids) { diff --git a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java index 6ae68e4a..f0ca8d05 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java @@ -2,15 +2,18 @@ package tconstruct.plugins.imc; import static tconstruct.smeltery.TinkerSmeltery.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraftforge.fluids.Fluid; + import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Pulse(id = "Tinkers RF-Tools Compatibility", forced = true, modsRequired = TinkerRfTools.modid) public class TinkerRfTools { + static final String modid = "rftools"; @Handler @@ -64,13 +67,17 @@ public class TinkerRfTools { "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore1", 500000, 25000, 15000, 5)); FMLInterModComms.sendMessage( - modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore1")); + modid, + "dimlet_preventloot", + String.format("Material.%s", "tile.tconstruct.stoneore1")); FMLInterModComms.sendMessage( modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore2", 400000, 20000, 10000, 5)); FMLInterModComms.sendMessage( - modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore2")); + modid, + "dimlet_preventloot", + String.format("Material.%s", "tile.tconstruct.stoneore2")); FMLInterModComms.sendMessage( modid, "dimlet_configure", @@ -114,27 +121,18 @@ public class TinkerRfTools { private void blacklist() { // blacklist alloys final Fluid[] fluidBlacklist = { - // all alloys - pigIronFluid, - moltenBronzeFluid, - moltenAlumiteFluid, - moltenAlubrassFluid, - moltenManyullynFluid, - moltenInvarFluid, - moltenElectrumFluid, - moltenSignalumFluid, - moltenLumiumFluid, - moltenMithrilFluid, - moltenEnderiumFluid, - // and shiny - moltenShinyFluid - }; + // all alloys + pigIronFluid, moltenBronzeFluid, moltenAlumiteFluid, moltenAlubrassFluid, moltenManyullynFluid, + moltenInvarFluid, moltenElectrumFluid, moltenSignalumFluid, moltenLumiumFluid, moltenMithrilFluid, + moltenEnderiumFluid, + // and shiny + moltenShinyFluid }; for (Fluid fluid : fluidBlacklist) { if (fluid == null) continue; FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Liquid." + fluid.getName()); - FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Liquid." + fluid.getName() + "=999999,999999,999999,6"); + FMLInterModComms + .sendMessage(modid, "dimlet_configure", "Liquid." + fluid.getName() + "=999999,999999,999999,6"); FMLInterModComms.sendMessage(modid, "dimlet_preventworldgen", "Liquid." + fluid.getName()); FMLInterModComms.sendMessage(modid, "dimlet_preventloot", "Liquid." + fluid.getName()); } @@ -142,13 +140,21 @@ public class TinkerRfTools { // blacklist oreberry bushes if (TinkerWorld.oreBerry != null) { FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.one=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.one=123456,123456,123456,6"); FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.one1=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.one1=123456,123456,123456,6"); FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.one2=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.one2=123456,123456,123456,6"); FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.one3=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.one3=123456,123456,123456,6"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one1"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one2"); @@ -164,9 +170,13 @@ public class TinkerRfTools { } if (TinkerWorld.oreBerrySecond != null) { FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.two=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.two=123456,123456,123456,6"); FMLInterModComms.sendMessage( - modid, "dimlet_configure", "Material." + "tile.ore.berries.two1=123456,123456,123456,6"); + modid, + "dimlet_configure", + "Material." + "tile.ore.berries.two1=123456,123456,123456,6"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.two"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.two1"); FMLInterModComms.sendMessage(modid, "dimlet_preventworldgen", "Material." + "tile.ore.berries.two"); diff --git a/src/main/java/tconstruct/plugins/mfr/Drinkables.java b/src/main/java/tconstruct/plugins/mfr/Drinkables.java index b8292ede..a29f7169 100644 --- a/src/main/java/tconstruct/plugins/mfr/Drinkables.java +++ b/src/main/java/tconstruct/plugins/mfr/Drinkables.java @@ -2,6 +2,7 @@ package tconstruct.plugins.mfr; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.*; + import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler; public class Drinkables implements ILiquidDrinkHandler { diff --git a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java index 7449c3ff..b395372e 100644 --- a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java @@ -1,14 +1,17 @@ package tconstruct.plugins.mfr; import java.util.*; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.*; import tconstruct.tools.TinkerTools; public class GrindableHorse implements IFactoryGrindable { + @Override public Class getGrindableEntity() { return EntityHorse.class; diff --git a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java index 7457db84..80806327 100644 --- a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java @@ -1,12 +1,15 @@ package tconstruct.plugins.mfr; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.*; public class HarvestableOreBerry implements IFactoryHarvestable { + private final Block _sourceBlock; private final Item _berryItem; private final int _metaOffset; @@ -38,9 +41,9 @@ public class HarvestableOreBerry implements IFactoryHarvestable { } @Override - public List getDrops( - World world, Random rand, Map harvesterSettings, int x, int y, int z) { - ItemStack[] returnItems = {new ItemStack(_berryItem, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset)}; + public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, + int z) { + ItemStack[] returnItems = { new ItemStack(_berryItem, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset) }; return Arrays.asList(returnItems); } diff --git a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java index 4b9b1a76..0e48664d 100644 --- a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java +++ b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java @@ -5,13 +5,17 @@ import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; public class MFRRegister { + public static void registerWithMFR() { FactoryRegistry.sendMessage( - "registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerry, TinkerWorld.oreBerries, 0)); + "registerHarvestable", + new HarvestableOreBerry(TinkerWorld.oreBerry, TinkerWorld.oreBerries, 0)); FactoryRegistry.sendMessage( - "registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerrySecond, TinkerWorld.oreBerries, 4)); + "registerHarvestable", + new HarvestableOreBerry(TinkerWorld.oreBerrySecond, TinkerWorld.oreBerries, 4)); FactoryRegistry.sendMessage("registerGrindable", new GrindableHorse()); FactoryRegistry.sendMessage( - "registerLiquidDrinkHandler", new ValuedItem(TinkerSmeltery.bloodFluid.getName(), new Drinkables())); + "registerLiquidDrinkHandler", + new ValuedItem(TinkerSmeltery.bloodFluid.getName(), new Drinkables())); } } diff --git a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java index 427b7c19..0ce33983 100644 --- a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java +++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java @@ -1,9 +1,9 @@ package tconstruct.plugins.mfr; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; import tconstruct.TConstruct; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -12,14 +12,15 @@ import tconstruct.TConstruct; modsRequired = "MineFactoryReloaded", forced = true) public class TinkerMFR { + @Handler public void init(FMLInitializationEvent event) { TConstruct.logger.info( "MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); MFRRegister.registerWithMFR(); /* - * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. - * Syntax: FarmingRegistry.registerLaserOre(int weight, ItemStack droppedStack)); + * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things + * would be suitable for that. Syntax: FarmingRegistry.registerLaserOre(int weight, ItemStack droppedStack)); * Currently used weights are from about 50 (emerald) to 175 (coal). */ } diff --git a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java index f6f77e41..e6206210 100644 --- a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java +++ b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java @@ -1,11 +1,12 @@ package tconstruct.plugins.nei; +import net.minecraft.client.gui.inventory.GuiContainer; + +import tconstruct.client.ArmorControls; import codechicken.nei.NEIClientConfig; import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import tconstruct.client.ArmorControls; public class BeltToggleFromGuiInputHandler implements IContainerInputHandler { diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java index 0a3aa4dc..07655558 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java @@ -1,17 +1,19 @@ package tconstruct.plugins.nei; -import codechicken.nei.recipe.DefaultOverlayHandler; -import codechicken.nei.recipe.IRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; + import tconstruct.tools.gui.CraftingStationGui; import tconstruct.tools.inventory.CraftingStationContainer; import tconstruct.tools.logic.CraftingStationLogic; +import codechicken.nei.recipe.DefaultOverlayHandler; +import codechicken.nei.recipe.IRecipeHandler; /** * Modified copy of DefaultOverlayHandler from NotEnoughItems */ public class CraftingStationOverlayHandler extends DefaultOverlayHandler { + @Override public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift) { if (gui.inventorySlots instanceof CraftingStationContainer) { diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java index 2a4c0178..443feec5 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java @@ -1,12 +1,14 @@ package tconstruct.plugins.nei; +import java.util.ArrayList; + +import net.minecraft.client.Minecraft; + +import tconstruct.TConstruct; +import tconstruct.tools.gui.CraftingStationGui; import codechicken.nei.PositionedStack; import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.GuiRecipe; -import java.util.ArrayList; -import net.minecraft.client.Minecraft; -import tconstruct.TConstruct; -import tconstruct.tools.gui.CraftingStationGui; public class CraftingStationStackPositioner implements IStackPositioner { diff --git a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java index b475f38d..042d5286 100644 --- a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java +++ b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java @@ -1,8 +1,8 @@ package tconstruct.plugins.nei; +import tconstruct.tools.gui.CraftingStationGui; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; -import tconstruct.tools.gui.CraftingStationGui; public class NEITConstructConfig implements IConfigureNEI { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index 41c9bb1c..b5b73a7d 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -1,21 +1,25 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; + import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.opengl.GL11; + import tconstruct.library.crafting.AlloyMix; import tconstruct.library.crafting.Smeltery; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; public class RecipeHandlerAlloying extends RecipeHandlerBase { public static final Rectangle OUTPUT_TANK = new Rectangle(118, 9, 18, 32); public class CachedAlloyingRecipe extends CachedBaseRecipe { + private final List fluidTanks; private int minAmount; @@ -42,10 +46,14 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase { for (FluidStack stack : recipe.mixers) { if (counter == recipe.mixers.size() - 1) { tank = new FluidTankElement( - new Rectangle(21 + width * counter, 9, 36 - width * counter, 32), maxAmount * mult, stack); + new Rectangle(21 + width * counter, 9, 36 - width * counter, 32), + maxAmount * mult, + stack); } else { tank = new FluidTankElement( - new Rectangle(21 + width * counter, 9, width, 32), maxAmount * mult, stack); + new Rectangle(21 + width * counter, 9, width, 32), + maxAmount * mult, + stack); } tank.fluid.amount *= mult; this.fluidTanks.add(tank); diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java index 75f55b6f..f99a855d 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java @@ -1,16 +1,10 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; import java.awt.Point; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -23,11 +17,21 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidContainerItem; + import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; + public abstract class RecipeHandlerBase extends TemplateRecipeHandler { public abstract class CachedBaseRecipe extends CachedRecipe { + public List getFluidTanks() { return null; } @@ -202,6 +206,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { } public static class FluidTankElement { + public Rectangle position; public FluidStack fluid; public int capacity; @@ -240,8 +245,8 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); GL11.glDisable(GL11.GL_BLEND); - int amount = Math.max( - Math.min(this.position.height, this.fluid.amount * this.position.height / this.capacity), 1); + int amount = Math + .max(Math.min(this.position.height, this.fluid.amount * this.position.height / this.capacity), 1); int posY = this.position.y + this.position.height - amount; for (int i = 0; i < this.position.width; i += 16) { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 27c0d471..1ce92f84 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -1,19 +1,23 @@ package tconstruct.plugins.nei; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; + import tconstruct.library.crafting.CastingRecipe; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { + public static final Rectangle MOLTEN_FLOW = new Rectangle(60, 8, 6, 11); public static final Rectangle MOLTEN_FLOW_NO_ITEM = new Rectangle(60, 8, 6, 27); public class CachedCastingRecipe extends CachedBaseRecipe { + private final List resources; private final FluidTankElement metal; private PositionedStack output; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java index 8d0f214d..c85d6fbd 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java @@ -1,13 +1,16 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; import java.util.ArrayList; import java.util.List; + import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; +import codechicken.lib.gui.GuiDraw; public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java index c74b3018..77d8edcc 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java @@ -1,13 +1,16 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; import java.util.ArrayList; import java.util.List; + import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; +import codechicken.lib.gui.GuiDraw; public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index e69cea32..264cda8d 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -1,14 +1,17 @@ package tconstruct.plugins.nei; +import java.awt.Rectangle; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + +import tconstruct.library.crafting.DryingRackRecipes; +import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.Rectangle; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; public class RecipeHandlerDryingRack extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index d659ebcb..9d2fe449 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -1,24 +1,29 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; + import mantle.utils.ItemMetaWrapper; + import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.opengl.GL11; + import tconstruct.library.crafting.Smeltery; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; public class RecipeHandlerMelting extends RecipeHandlerBase { public static final Rectangle MOLTEN_TANK = new Rectangle(115, 20, 18, 18); public class CachedMeltingRecipe extends CachedBaseRecipe { + private final PositionedStack input; private final int temperature; private final FluidTankElement output; @@ -94,8 +99,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase { @Override public void loadCraftingRecipes(FluidStack result) { - for (Entry pair : - Smeltery.getSmeltingList().entrySet()) { + for (Entry pair : Smeltery.getSmeltingList().entrySet()) { if (areFluidsEqual(pair.getValue(), result)) { this.arecipes.add(new CachedMeltingRecipe(new ItemStack(pair.getKey().item, 1, pair.getKey().meta))); } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 4438a96d..3d3478eb 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -1,14 +1,15 @@ package tconstruct.plugins.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.PatternBuilder; @@ -22,6 +23,8 @@ import tconstruct.library.util.HarvestLevels; import tconstruct.library.util.IToolPart; import tconstruct.tools.items.ToolPart; import tconstruct.util.config.PHConstruct; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; public class RecipeHandlerToolMaterials extends RecipeHandlerBase { @@ -129,8 +132,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { 60, 0x404040, false); - String heart = crecipe.material.attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = crecipe.material.attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (crecipe.material.attack() % 2 == 0) { GuiDraw.drawString( @@ -229,8 +231,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase { } } if (!PHConstruct.craftMetalTools) { - for (CastingRecipe recipe : - TConstructRegistry.getTableCasting().getCastingRecipes()) { + for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) { ItemStack castResult = recipe.getResult(); if (castResult.getItem() instanceof IToolPart) { if (((IToolPart) castResult.getItem()).getMaterialID(castResult) == matID) { diff --git a/src/main/java/tconstruct/plugins/te4/TE4Helper.java b/src/main/java/tconstruct/plugins/te4/TE4Helper.java index b9840b82..c7f3d2ed 100644 --- a/src/main/java/tconstruct/plugins/te4/TE4Helper.java +++ b/src/main/java/tconstruct/plugins/te4/TE4Helper.java @@ -1,10 +1,11 @@ package tconstruct.plugins.te4; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.event.FMLInterModComms; + /** * Taken from CoFHLib */ @@ -31,14 +32,14 @@ public class TE4Helper { addPulverizerRecipe(energy, input, primaryOutput, null, 0); } - public static void addPulverizerRecipe( - int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { + public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, + ItemStack secondaryOutput) { addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addPulverizerRecipe( - int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { + public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, + ItemStack secondaryOutput, int secondaryChance) { if (input == null || primaryOutput == null || secondaryOutput == null) { return; @@ -63,14 +64,14 @@ public class TE4Helper { addSawmillRecipe(energy, input, primaryOutput, null, 0); } - public static void addSawmillRecipe( - int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { + public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, + ItemStack secondaryOutput) { addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addSawmillRecipe( - int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { + public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, + int secondaryChance) { if (input == null || primaryOutput == null || secondaryOutput == null) { return; @@ -90,29 +91,20 @@ public class TE4Helper { FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend); } - public static void addSmelterRecipe( - int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) { + public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, + ItemStack primaryOutput) { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0); } - public static void addSmelterRecipe( - int energy, - ItemStack primaryInput, - ItemStack secondaryInput, - ItemStack primaryOutput, - ItemStack secondaryOutput) { + public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, + ItemStack primaryOutput, ItemStack secondaryOutput) { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100); } - public static void addSmelterRecipe( - int energy, - ItemStack primaryInput, - ItemStack secondaryInput, - ItemStack primaryOutput, - ItemStack secondaryOutput, - int secondaryChance) { + public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, + ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) { return; @@ -135,8 +127,8 @@ public class TE4Helper { } /** - * Use this to register an Ore TYPE as a "Blast" recipe - it will require Pyrotheum Dust to smelt. Do not add the prefix. This is an opt-in for ores which - * do NOT have vanilla furnace recipes. + * Use this to register an Ore TYPE as a "Blast" recipe - it will require Pyrotheum Dust to smelt. Do not add the + * prefix. This is an opt-in for ores which do NOT have vanilla furnace recipes. * * Ex: "Steel" or "ElectrumFlux", not "dustSteel" or "dustElectrumFlux" * @@ -168,8 +160,8 @@ public class TE4Helper { FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend); } - public static void addTransposerFill( - int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) { + public static void addTransposerFill(int energy, ItemStack input, ItemStack output, FluidStack fluid, + boolean reversible) { if (input == null || output == null || fluid == null) { return; @@ -189,8 +181,8 @@ public class TE4Helper { FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend); } - public static void addTransposerExtract( - int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) { + public static void addTransposerExtract(int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, + boolean reversible) { if (input == null || output == null || fluid == null) { return; diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java index e135f6e7..3bbb7739 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java +++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java @@ -1,9 +1,7 @@ package tconstruct.plugins.te4; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -11,11 +9,15 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -24,6 +26,7 @@ import tconstruct.world.TinkerWorld; modsRequired = "ThermalExpansion", forced = true) public class TinkerTE4 { + @Handler public void init() { TConstruct.logger.info("Thermal Expansion detected. Adding Pulverizer & Induction Smelter recipes"); @@ -36,9 +39,17 @@ public class TinkerTE4 { null, 0); TE4Helper.addPulverizerRecipe( - 1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0); + 1000, + new ItemStack(TinkerTools.materials, 1, 3), + new ItemStack(TinkerTools.materials, 1, 39), + null, + 0); TE4Helper.addPulverizerRecipe( - 1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0); + 1000, + new ItemStack(TinkerTools.materials, 1, 4), + new ItemStack(TinkerTools.materials, 1, 38), + null, + 0); TE4Helper.addPulverizerRecipe( 12000, @@ -85,12 +96,13 @@ public class TinkerTE4 { // Dust Recipes GameRegistry.addRecipe( new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerTools.materials, 4, 42), - "dustAluminum", - "dustAluminum", - "dustAluminum", - "dustCopper")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerTools.materials, 4, 42), + "dustAluminum", + "dustAluminum", + "dustAluminum", + "dustCopper")); } @Handler diff --git a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java index b47f85ab..f4d4bcd8 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java +++ b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java @@ -1,10 +1,8 @@ package tconstruct.plugins.te4; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -12,11 +10,15 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; + import tconstruct.TConstruct; import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID) @Pulse( @@ -25,6 +27,7 @@ import tconstruct.world.TinkerWorld; modsRequired = TinkersThermalFoundation.TF_MOD_ID, forced = true) public class TinkersThermalFoundation { + static final String TF_MOD_ID = "ThermalFoundation"; @Handler @@ -55,33 +58,32 @@ public class TinkersThermalFoundation { Smeltery.addSmelteryFuel(pyrotheumFluid, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb // liquid redstone - for (ItemStack stack : OreDictionary.getOres("blockRedstone")) - Smeltery.addMelting( - stack, - Block.getBlockFromItem(stack.getItem()), - stack.getItemDamage(), - 3000, - new FluidStack(redstoneFluid, 900)); - for (ItemStack stack : OreDictionary.getOres("dustRedstone")) - Smeltery.addMelting( - stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100)); + for (ItemStack stack : OreDictionary.getOres("blockRedstone")) Smeltery.addMelting( + stack, + Block.getBlockFromItem(stack.getItem()), + stack.getItemDamage(), + 3000, + new FluidStack(redstoneFluid, 900)); + for (ItemStack stack : OreDictionary.getOres("dustRedstone")) Smeltery.addMelting( + stack, + Blocks.redstone_block, + stack.getItemDamage(), + 2500, + new FluidStack(redstoneFluid, 100)); // liquid glowstone - for (ItemStack stack : OreDictionary.getOres("glowstone")) - Smeltery.addMelting( - stack, - Block.getBlockFromItem(stack.getItem()), - stack.getItemDamage(), - 3000, - new FluidStack(glowstoneFluid, 1000)); - for (ItemStack stack : OreDictionary.getOres("dustGlowstone")) - Smeltery.addMelting( - stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250)); + for (ItemStack stack : OreDictionary.getOres("glowstone")) Smeltery.addMelting( + stack, + Block.getBlockFromItem(stack.getItem()), + stack.getItemDamage(), + 3000, + new FluidStack(glowstoneFluid, 1000)); + for (ItemStack stack : OreDictionary.getOres("dustGlowstone")) Smeltery + .addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250)); // liquid pyrotheum - for (ItemStack stack : OreDictionary.getOres("dustPyrotheum")) - Smeltery.addMelting( - stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100)); + for (ItemStack stack : OreDictionary.getOres("dustPyrotheum")) Smeltery + .addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100)); // liquid cryotheum for (ItemStack stack : OreDictionary.getOres("dustCryotheum")) @@ -134,6 +136,11 @@ public class TinkersThermalFoundation { if (stack == null || stack.getItem() == null) stack = new ItemStack(TinkerWorld.metalBlock); FluidType.registerFluidType( - name, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), temp, fluid, false); + name, + Block.getBlockFromItem(stack.getItem()), + stack.getItemDamage(), + temp, + fluid, + false); } } diff --git a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java index 656834d6..c6964c56 100644 --- a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java +++ b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java @@ -1,12 +1,12 @@ package tconstruct.plugins.ubc; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import exterminatorJeff.undergroundBiomes.api.UBAPIHook; -import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer.BlocksAreAlreadySet; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import exterminatorJeff.undergroundBiomes.api.UBAPIHook; +import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer.BlocksAreAlreadySet; @Pulse( id = "Tinkers' Underground Biomes Compatiblity", @@ -15,6 +15,7 @@ import tconstruct.world.TinkerWorld; pulsesRequired = "Tinkers' World", forced = true) public class TinkerUBC { + @Handler public void preInit(FMLPreInitializationEvent event) { registerBlock(3, "Copper"); @@ -26,7 +27,10 @@ public class TinkerUBC { String overlayTexture = blockName.toLowerCase(); try { UBAPIHook.ubAPIHook.ubOreTexturizer.requestUBOreSetup( - TinkerWorld.oreSlag, meta, "tinker:ore_" + overlayTexture + "_overlay", "MetalOre." + blockName); + TinkerWorld.oreSlag, + meta, + "tinker:ore_" + overlayTexture + "_overlay", + "MetalOre." + blockName); } catch (RuntimeException exception) { // we have to work around this because otherwise FML would access this for some reason // and crash because BlocksAreAlreadySet Exception is not present without UBC diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index b05f7963..4a62565f 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -1,10 +1,12 @@ package tconstruct.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.SpecialChars; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,6 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; + import tconstruct.smeltery.logic.CastingBasinLogic; public class BasinDataProvider implements IWailaDataProvider { @@ -25,28 +28,32 @@ public class BasinDataProvider implements IWailaDataProvider { } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true)) { CastingBasinLogic te = (CastingBasinLogic) accessor.getTileEntity(); if (te.getFluidAmount() != 0) { FluidStack fs = te.getFluid(); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") - + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" - + te.getCapacity()); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + + "/" + + te.getCapacity()); final int progress = te.getProgress(); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); } else { if (te.getStackInSlot(0) != null) { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") - + te.getStackInSlot(0).getDisplayName()); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.contains") + + te.getStackInSlot(0).getDisplayName()); } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } @@ -56,14 +63,14 @@ public class BasinDataProvider implements IWailaDataProvider { } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index dfa67960..f80bf930 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -1,7 +1,9 @@ package tconstruct.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.*; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +12,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import tconstruct.smeltery.logic.CastingChannelLogic; public class CastingChannelDataProvider implements IWailaDataProvider { @@ -20,14 +23,14 @@ public class CastingChannelDataProvider implements IWailaDataProvider { } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (accessor.getTileEntity() instanceof CastingChannelLogic) { CastingChannelLogic te = (CastingChannelLogic) accessor.getTileEntity(); FluidTankInfo internalTank = te.getTankInfo(null)[0]; @@ -38,10 +41,13 @@ public class CastingChannelDataProvider implements IWailaDataProvider { if (internalTank.fluid != null && internalTank.fluid.amount > 0) { FluidStack fs = internalTank.fluid; - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") - + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" - + internalTank.capacity); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + + "/" + + internalTank.capacity); } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } @@ -61,14 +67,14 @@ public class CastingChannelDataProvider implements IWailaDataProvider { } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index 907cb6fd..225c0d9b 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -1,7 +1,9 @@ package tconstruct.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.*; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,6 +11,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; + import tconstruct.smeltery.logic.LavaTankLogic; public class SearedTankDataProvider implements IWailaDataProvider { @@ -19,22 +22,25 @@ public class SearedTankDataProvider implements IWailaDataProvider { } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (accessor.getTileEntity() instanceof LavaTankLogic && config.getConfig("tcon.searedtank", true)) { LavaTankLogic te = (LavaTankLogic) accessor.getTileEntity(); if (te.containsFluid()) { FluidStack fs = te.tank.getFluid(); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") - + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" - + te.tank.getCapacity()); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + + "/" + + te.tank.getCapacity()); } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } @@ -43,14 +49,14 @@ public class SearedTankDataProvider implements IWailaDataProvider { } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index db31a0ca..bcbd3665 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -1,7 +1,9 @@ package tconstruct.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.*; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,6 +11,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; + import tconstruct.smeltery.logic.SmelteryLogic; public class SmelteryDataProvider implements IWailaDataProvider { @@ -19,14 +22,14 @@ public class SmelteryDataProvider implements IWailaDataProvider { } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (accessor.getTileEntity() instanceof SmelteryLogic && config.getConfig("tcon.smeltery", true)) { SmelteryLogic te = (SmelteryLogic) accessor.getTileEntity(); if (te.validStructure) { @@ -39,8 +42,8 @@ public class SmelteryDataProvider implements IWailaDataProvider { } } } else { - currenttip.add( - SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure")); + currenttip + .add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure")); } } @@ -48,14 +51,14 @@ public class SmelteryDataProvider implements IWailaDataProvider { } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index 9046c27b..7d786696 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -1,15 +1,18 @@ package tconstruct.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.smeltery.logic.CastingTableLogic; public class TableDataProvider implements IWailaDataProvider { @@ -24,25 +27,29 @@ public class TableDataProvider implements IWailaDataProvider { } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (accessor.getTileEntity() instanceof CastingTableLogic && config.getConfig("tcon.table", true)) { CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity(); if (te.getStackInSlot(1) != null) { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") - + te.getStackInSlot(1).getDisplayName()); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.contains") + + te.getStackInSlot(1).getDisplayName()); } if (te.getFluid() != null) { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") - + WailaRegistrar.fluidNameHelper(te.getFluid())); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + "/" - + te.getCapacity()); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(te.getFluid())); + currenttip.add( + StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + + "/" + + te.getCapacity()); final int progress = te.getProgress(); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); } @@ -51,14 +58,14 @@ public class TableDataProvider implements IWailaDataProvider { } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 2d37b56e..d6c296ec 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -1,9 +1,9 @@ package tconstruct.plugins.waila; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; import tconstruct.TConstruct; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -12,6 +12,7 @@ import tconstruct.TConstruct; modsRequired = "Waila", forced = true) public class TinkerWaila { + @Handler public void init(FMLInitializationEvent event) { TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry."); diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index 3c0754ec..9427870b 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -1,12 +1,15 @@ package tconstruct.plugins.waila; import mcp.mobius.waila.api.IWailaRegistrar; + import net.minecraftforge.fluids.FluidStack; + import tconstruct.TConstruct; import tconstruct.smeltery.blocks.*; import tconstruct.smeltery.logic.*; public class WailaRegistrar { + public static void wailaCallback(IWailaRegistrar registrar) { TConstruct.logger.info("[Waila-Compat] Got registrar: " + registrar); diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index c79a2d7f..99631031 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -2,9 +2,11 @@ package tconstruct.smeltery; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.*; + import tconstruct.library.tools.AbilityHelper; public class SmelteryDamageSource extends DamageSource { + public SmelteryDamageSource() { super("smeltery"); } diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java index b4bb7be2..3e2f5048 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java @@ -1,8 +1,8 @@ package tconstruct.smeltery; -import cpw.mods.fml.client.registry.*; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.*; import net.minecraft.item.Item; @@ -12,6 +12,7 @@ import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.RenderBlockFluid; + import tconstruct.armor.TinkerArmor; import tconstruct.armor.modelblock.*; import tconstruct.blocks.logic.DryingRackLogic; @@ -21,8 +22,10 @@ import tconstruct.smeltery.gui.*; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.*; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.client.registry.*; public class SmelteryProxyClient extends SmelteryProxyCommon { + @Override public void initialize() { registerRenderer(); @@ -43,8 +46,8 @@ public class SmelteryProxyClient extends SmelteryProxyCommon { IItemRenderer tankItemRenderer = new TankItemRenderer(); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTank), tankItemRenderer); - MinecraftForgeClient.registerItemRenderer( - Item.getItemFromBlock(TinkerSmeltery.lavaTankNether), tankItemRenderer); + MinecraftForgeClient + .registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTankNether), tankItemRenderer); RenderingRegistry.registerBlockHandler(new SmelteryRender()); diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java index 4b1a860e..447461f1 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java @@ -1,13 +1,16 @@ package tconstruct.smeltery; -import cpw.mods.fml.common.network.IGuiHandler; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import tconstruct.common.TProxyCommon; +import cpw.mods.fml.common.network.IGuiHandler; public class SmelteryProxyCommon implements IGuiHandler { + public static final int smelteryGuiID = 7; public void initialize() { diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index b9501272..695df9d0 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1,17 +1,12 @@ package tconstruct.smeltery; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import java.util.*; + import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.MultiServantLogic; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -30,6 +25,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; @@ -47,10 +43,18 @@ import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; import tconstruct.world.items.OreBerries; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Smeltery", description = "Liquid metals, casting, and the multiblock structure.") public class TinkerSmeltery { + @SidedProxy( clientSide = "tconstruct.smeltery.SmelteryProxyClient", serverSide = "tconstruct.smeltery.SmelteryProxyCommon") @@ -166,16 +170,16 @@ public class TinkerSmeltery { TinkerSmeltery.speedSlab = new SpeedSlab().setBlockName("SpeedSlab"); TinkerSmeltery.speedSlab.stepSound = Block.soundTypeStone; - TinkerSmeltery.glueBlock = - new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); + TinkerSmeltery.glueBlock = new GlueBlock().setBlockName("GlueBlock") + .setCreativeTab(TConstructRegistry.blockTab); // Smeltery TinkerSmeltery.smeltery = new SmelteryBlock().setBlockName("Smeltery"); TinkerSmeltery.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery"); TinkerSmeltery.lavaTank = new LavaTankBlock().setBlockName("LavaTank"); TinkerSmeltery.lavaTank.setStepSound(Block.soundTypeGlass); - TinkerSmeltery.lavaTankNether = - new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); + TinkerSmeltery.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass) + .setBlockName("LavaTank"); TinkerSmeltery.searedBlock = new SearedBlock().setBlockName("SearedBlock"); TinkerSmeltery.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock"); @@ -235,16 +239,37 @@ public class TinkerSmeltery { TinkerSmeltery.moltenGlassFluid = registerFluid("glass"); TinkerSmeltery.moltenGlass = TinkerSmeltery.moltenGlassFluid.getBlock(); - TinkerSmeltery.moltenStoneFluid = - registerFluid("stone", "stone.seared", "molten.stone", "liquid_stone", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenStoneFluid = registerFluid( + "stone", + "stone.seared", + "molten.stone", + "liquid_stone", + 3000, + 6000, + 1300, + Material.lava); TinkerSmeltery.moltenStone = TinkerSmeltery.moltenStoneFluid.getBlock(); TinkerSmeltery.moltenEmeraldFluid = registerFluid( - "emerald", "emerald.liquid", "molten.emerald", "liquid_villager", 3000, 6000, 1300, Material.lava); + "emerald", + "emerald.liquid", + "molten.emerald", + "liquid_villager", + 3000, + 6000, + 1300, + Material.lava); TinkerSmeltery.moltenEmerald = TinkerSmeltery.moltenEmeraldFluid.getBlock(); TinkerSmeltery.moltenQuartzFluid = registerFluid( - "quartz", "quartz.molten", "molten.quartz", "liquid_quartz", 3000, 6000, 1300, Material.lava); + "quartz", + "quartz.molten", + "molten.quartz", + "liquid_quartz", + 3000, + 6000, + 1300, + Material.lava); TinkerSmeltery.moltenQuartz = TinkerSmeltery.moltenQuartzFluid.getBlock(); TinkerSmeltery.moltenNickelFluid = registerFluid("nickel", "liquid_ferrous"); @@ -257,7 +282,14 @@ public class TinkerSmeltery { TinkerSmeltery.moltenSilver = TinkerSmeltery.moltenSilverFluid.getBlock(); TinkerSmeltery.moltenShinyFluid = registerFluid( - "platinum", "platinum.molten", "fluid.molten.shiny", "liquid_shiny", 3000, 6000, 1300, Material.lava); + "platinum", + "platinum.molten", + "fluid.molten.shiny", + "liquid_shiny", + 3000, + 6000, + 1300, + Material.lava); TinkerSmeltery.moltenShiny = TinkerSmeltery.moltenShinyFluid.getBlock(); TinkerSmeltery.moltenInvarFluid = registerFluid("invar"); @@ -266,8 +298,15 @@ public class TinkerSmeltery { TinkerSmeltery.moltenElectrumFluid = registerFluid("electrum"); TinkerSmeltery.moltenElectrum = TinkerSmeltery.moltenElectrumFluid.getBlock(); - TinkerSmeltery.moltenEnderFluid = - registerFluid("ender", "ender", "fluid.ender", "liquid_ender", 3000, 6000, 295, Material.water); + TinkerSmeltery.moltenEnderFluid = registerFluid( + "ender", + "ender", + "fluid.ender", + "liquid_ender", + 3000, + 6000, + 295, + Material.water); TinkerSmeltery.moltenEnder = TinkerSmeltery.moltenEnderFluid.getBlock(); TinkerSmeltery.moltenLumiumFluid = registerFluid("lumium"); @@ -284,11 +323,10 @@ public class TinkerSmeltery { // Special liquids with different properties/blocks than the rest - TinkerSmeltery.bloodFluid = - new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); + TinkerSmeltery.bloodFluid = new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isBloodPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.bloodFluid); - TinkerSmeltery.blood = - new BloodBlock(TinkerSmeltery.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); + TinkerSmeltery.blood = new BloodBlock(TinkerSmeltery.bloodFluid, Material.water, "liquid_cow") + .setBlockName("liquid.blood"); GameRegistry.registerBlock(TinkerSmeltery.blood, "liquid.blood"); if (isBloodPreReg) { TinkerSmeltery.bloodFluid = FluidRegistry.getFluid("blood"); @@ -298,21 +336,20 @@ public class TinkerSmeltery { TinkerSmeltery.blood = regBloodBlock; } else TinkerSmeltery.bloodFluid.setBlock(TinkerSmeltery.blood); } - if (FluidContainerRegistry.fillFluidContainer( - new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(Items.bucket)) + if (FluidContainerRegistry + .fillFluidContainer(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData( - new FluidStack(TinkerSmeltery.bloodFluid, 1000), - new ItemStack(TinkerSmeltery.buckets, 1, 16), - new ItemStack(Items.bucket))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerData( + new FluidStack(TinkerSmeltery.bloodFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 16), + new ItemStack(Items.bucket))); // Glue - TinkerSmeltery.glueFluid = - new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + TinkerSmeltery.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); boolean isGluePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.glueFluid); TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water) - .setCreativeTab(TConstructRegistry.blockTab) - .setStepSound(TinkerWorld.slimeStep) + .setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep) .setBlockName("liquid.glue"); GameRegistry.registerBlock(TinkerSmeltery.glueFluidBlock, "liquid.glue"); if (isGluePreReg) { @@ -323,17 +360,18 @@ public class TinkerSmeltery { TinkerSmeltery.glueFluidBlock = regGlueFluidBlock; } else TinkerSmeltery.glueFluid.setBlock(TinkerSmeltery.glueFluidBlock); } - if (FluidContainerRegistry.fillFluidContainer( - new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(Items.bucket)) + if (FluidContainerRegistry + .fillFluidContainer(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData( - new FluidStack(TinkerSmeltery.glueFluid, 1000), - new ItemStack(TinkerSmeltery.buckets, 1, 25), - new ItemStack(Items.bucket))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerData( + new FluidStack(TinkerSmeltery.glueFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 25), + new ItemStack(Items.bucket))); // PigIron - TinkerSmeltery.pigIronFluid = - new Fluid("pigiron.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); + TinkerSmeltery.pigIronFluid = new Fluid("pigiron.molten").setDensity(3000).setViscosity(6000) + .setTemperature(1300); boolean isPigIronPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.pigIronFluid); TinkerSmeltery.pigIronFluidBlock = new PigIronMoltenBlock(pigIronFluid, Material.water, "liquid_pigiron") .setBlockName("fluid.molten.pigiron"); @@ -346,87 +384,46 @@ public class TinkerSmeltery { TinkerSmeltery.pigIronFluidBlock = regPigIronFluid; } else TinkerSmeltery.pigIronFluid.setBlock(TinkerSmeltery.pigIronFluidBlock); } - if (FluidContainerRegistry.fillFluidContainer( - new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(Items.bucket)) + if (FluidContainerRegistry + .fillFluidContainer(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData( - new FluidStack(TinkerSmeltery.pigIronFluid, 1000), - new ItemStack(TinkerSmeltery.buckets, 1, 26), - new ItemStack(Items.bucket))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerData( + new FluidStack(TinkerSmeltery.pigIronFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 26), + new ItemStack(Items.bucket))); // blueslime is registered here too because we have the bucket here - if (FluidContainerRegistry.fillFluidContainer( - new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(Items.bucket)) + if (FluidContainerRegistry + .fillFluidContainer(new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( - new FluidStack(TinkerWorld.blueSlimeFluid, 1000), - new ItemStack(TinkerSmeltery.buckets, 1, 24), - new ItemStack(Items.bucket))); + FluidContainerRegistry.registerFluidContainer( + new FluidContainerRegistry.FluidContainerData( + new FluidStack(TinkerWorld.blueSlimeFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 24), + new ItemStack(Items.bucket))); - TinkerSmeltery.fluids = new Fluid[] { - TinkerSmeltery.moltenIronFluid, - TinkerSmeltery.moltenGoldFluid, - TinkerSmeltery.moltenCopperFluid, - TinkerSmeltery.moltenTinFluid, - TinkerSmeltery.moltenAluminumFluid, - TinkerSmeltery.moltenCobaltFluid, - TinkerSmeltery.moltenArditeFluid, - TinkerSmeltery.moltenBronzeFluid, - TinkerSmeltery.moltenAlubrassFluid, - TinkerSmeltery.moltenManyullynFluid, - TinkerSmeltery.moltenAlumiteFluid, - TinkerSmeltery.moltenObsidianFluid, - TinkerSmeltery.moltenSteelFluid, - TinkerSmeltery.moltenGlassFluid, - TinkerSmeltery.moltenStoneFluid, - TinkerSmeltery.moltenEmeraldFluid, - TinkerSmeltery.bloodFluid, - TinkerSmeltery.moltenNickelFluid, - TinkerSmeltery.moltenLeadFluid, - TinkerSmeltery.moltenSilverFluid, - TinkerSmeltery.moltenShinyFluid, - TinkerSmeltery.moltenInvarFluid, - TinkerSmeltery.moltenElectrumFluid, - TinkerSmeltery.moltenEnderFluid, - TinkerWorld.blueSlimeFluid, - TinkerSmeltery.glueFluid, - TinkerSmeltery.pigIronFluid, - TinkerSmeltery.moltenQuartzFluid - }; - TinkerSmeltery.fluidBlocks = new Block[] { - TinkerSmeltery.moltenIron, - TinkerSmeltery.moltenGold, - TinkerSmeltery.moltenCopper, - TinkerSmeltery.moltenTin, - TinkerSmeltery.moltenAluminum, - TinkerSmeltery.moltenCobalt, - TinkerSmeltery.moltenArdite, - TinkerSmeltery.moltenBronze, - TinkerSmeltery.moltenAlubrass, - TinkerSmeltery.moltenManyullyn, - TinkerSmeltery.moltenAlumite, - TinkerSmeltery.moltenObsidian, - TinkerSmeltery.moltenSteel, - TinkerSmeltery.moltenGlass, - TinkerSmeltery.moltenStone, - TinkerSmeltery.moltenEmerald, - TinkerSmeltery.blood, - TinkerSmeltery.moltenNickel, - TinkerSmeltery.moltenLead, - TinkerSmeltery.moltenSilver, - TinkerSmeltery.moltenShiny, - TinkerSmeltery.moltenInvar, - TinkerSmeltery.moltenElectrum, - TinkerSmeltery.moltenEnder, - TinkerWorld.slimePool, - TinkerSmeltery.glueFluidBlock, - TinkerSmeltery.pigIronFluidBlock, - TinkerSmeltery.moltenLumium, - TinkerSmeltery.moltenSignalum, - TinkerSmeltery.moltenMithril, - TinkerSmeltery.moltenEnderium, - TinkerSmeltery.moltenQuartz - }; + TinkerSmeltery.fluids = new Fluid[] { TinkerSmeltery.moltenIronFluid, TinkerSmeltery.moltenGoldFluid, + TinkerSmeltery.moltenCopperFluid, TinkerSmeltery.moltenTinFluid, TinkerSmeltery.moltenAluminumFluid, + TinkerSmeltery.moltenCobaltFluid, TinkerSmeltery.moltenArditeFluid, TinkerSmeltery.moltenBronzeFluid, + TinkerSmeltery.moltenAlubrassFluid, TinkerSmeltery.moltenManyullynFluid, + TinkerSmeltery.moltenAlumiteFluid, TinkerSmeltery.moltenObsidianFluid, TinkerSmeltery.moltenSteelFluid, + TinkerSmeltery.moltenGlassFluid, TinkerSmeltery.moltenStoneFluid, TinkerSmeltery.moltenEmeraldFluid, + TinkerSmeltery.bloodFluid, TinkerSmeltery.moltenNickelFluid, TinkerSmeltery.moltenLeadFluid, + TinkerSmeltery.moltenSilverFluid, TinkerSmeltery.moltenShinyFluid, TinkerSmeltery.moltenInvarFluid, + TinkerSmeltery.moltenElectrumFluid, TinkerSmeltery.moltenEnderFluid, TinkerWorld.blueSlimeFluid, + TinkerSmeltery.glueFluid, TinkerSmeltery.pigIronFluid, TinkerSmeltery.moltenQuartzFluid }; + TinkerSmeltery.fluidBlocks = new Block[] { TinkerSmeltery.moltenIron, TinkerSmeltery.moltenGold, + TinkerSmeltery.moltenCopper, TinkerSmeltery.moltenTin, TinkerSmeltery.moltenAluminum, + TinkerSmeltery.moltenCobalt, TinkerSmeltery.moltenArdite, TinkerSmeltery.moltenBronze, + TinkerSmeltery.moltenAlubrass, TinkerSmeltery.moltenManyullyn, TinkerSmeltery.moltenAlumite, + TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, + TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, + TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, + TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, + TinkerSmeltery.moltenEnder, TinkerWorld.slimePool, TinkerSmeltery.glueFluidBlock, + TinkerSmeltery.pigIronFluidBlock, TinkerSmeltery.moltenLumium, TinkerSmeltery.moltenSignalum, + TinkerSmeltery.moltenMithril, TinkerSmeltery.moltenEnderium, TinkerSmeltery.moltenQuartz }; FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false); FluidType.registerFluidType("Iron", Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true); @@ -434,16 +431,36 @@ public class TinkerSmeltery { FluidType.registerFluidType("Tin", TinkerWorld.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false); FluidType.registerFluidType("Copper", TinkerWorld.metalBlock, 3, 550, TinkerSmeltery.moltenCopperFluid, true); FluidType.registerFluidType( - "Aluminum", TinkerWorld.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + "Aluminum", + TinkerWorld.metalBlock, + 6, + 350, + TinkerSmeltery.moltenAluminumFluid, + false); FluidType.registerFluidType( - "NaturalAluminum", TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + "NaturalAluminum", + TinkerWorld.oreSlag, + 6, + 350, + TinkerSmeltery.moltenAluminumFluid, + false); FluidType.registerFluidType("Cobalt", TinkerWorld.metalBlock, 0, 650, TinkerSmeltery.moltenCobaltFluid, true); FluidType.registerFluidType("Ardite", TinkerWorld.metalBlock, 1, 650, TinkerSmeltery.moltenArditeFluid, true); FluidType.registerFluidType( - "AluminumBrass", TinkerWorld.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false); + "AluminumBrass", + TinkerWorld.metalBlock, + 7, + 350, + TinkerSmeltery.moltenAlubrassFluid, + false); FluidType.registerFluidType("Alumite", TinkerWorld.metalBlock, 8, 800, TinkerSmeltery.moltenAlumiteFluid, true); FluidType.registerFluidType( - "Manyullyn", TinkerWorld.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true); + "Manyullyn", + TinkerWorld.metalBlock, + 2, + 750, + TinkerSmeltery.moltenManyullynFluid, + true); FluidType.registerFluidType("Bronze", TinkerWorld.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true); FluidType.registerFluidType("Steel", TinkerWorld.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true); FluidType.registerFluidType("Obsidian", Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true); @@ -462,25 +479,24 @@ public class TinkerSmeltery { TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass; TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false); TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta( - "stained", - true, - "white", - "orange", - "magenta", - "light_blue", - "yellow", - "lime", - "pink", - "gray", - "light_gray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black") - .setBlockName("GlassBlock.StainedClear"); + "stained", + true, + "white", + "orange", + "magenta", + "light_blue", + "yellow", + "lime", + "pink", + "gray", + "light_gray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black").setBlockName("GlassBlock.StainedClear"); TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass; TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained(); @@ -517,68 +533,39 @@ public class TinkerSmeltery { GameRegistry.registerBlock(TinkerSmeltery.clearGlass, GlassBlockItem.class, "GlassBlock"); GameRegistry.registerBlock(TinkerSmeltery.glassPane, GlassPaneItem.class, "GlassPane"); GameRegistry.registerBlock( - TinkerSmeltery.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); + TinkerSmeltery.stainedGlassClear, + StainedGlassClearItem.class, + "GlassBlock.StainedClear"); GameRegistry.registerBlock( - TinkerSmeltery.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + TinkerSmeltery.stainedGlassClearPane, + StainedGlassClearPaneItem.class, + "GlassPaneClearStained"); // Items - TinkerSmeltery.metalPattern = - new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + TinkerSmeltery.metalPattern = new MetalPattern("cast_", "materials/") + .setUnlocalizedName("tconstruct.MetalPattern"); GameRegistry.registerItem(TinkerSmeltery.metalPattern, "metalPattern"); TConstructRegistry.addItemToDirectory("metalPattern", TinkerSmeltery.metalPattern); - String[] patternTypes = { - "ingot", - "toolRod", - "pickaxeHead", - "shovelHead", - "hatchetHead", - "swordBlade", - "wideGuard", - "handGuard", - "crossbar", - "binding", - "frypanHead", - "signHead", - "knifeBlade", - "chiselHead", - "toughRod", - "toughBinding", - "largePlate", - "broadAxeHead", - "scytheHead", - "excavatorHead", - "largeBlade", - "hammerHead", - "fullGuard" - }; + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", + "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", + "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", + "hammerHead", "fullGuard" }; for (int i = 0; i < patternTypes.length; i++) { TConstructRegistry.addItemStackToDirectory( - patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i)); + patternTypes[i] + "Cast", + new ItemStack(TinkerSmeltery.metalPattern, 1, i)); } - TinkerSmeltery.clayPattern = - new ClayPattern("clay_cast_", "materials/").setUnlocalizedName("tconstruct.ClayPattern"); + TinkerSmeltery.clayPattern = new ClayPattern("clay_cast_", "materials/") + .setUnlocalizedName("tconstruct.ClayPattern"); GameRegistry.registerItem(TinkerSmeltery.clayPattern, "clayPattern"); TConstructRegistry.addItemToDirectory("clayPattern", TinkerSmeltery.clayPattern); - String[] clayPatternTypes = { - "ingot", - "toolRod", - "pickaxeHead", - "shovelHead", - "hatchetHead", - "swordBlade", - "wideGuard", - "handGuard", - "crossbar", - "binding", - "frypanHead", - "signHead", - "knifeBlade", - "chiselHead" - }; + String[] clayPatternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", + "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead" }; for (int i = 0; i < clayPatternTypes.length; i++) { TConstructRegistry.addItemStackToDirectory( - clayPatternTypes[i] + "clayCast", new ItemStack(TinkerSmeltery.clayPattern, 1, i)); + clayPatternTypes[i] + "clayCast", + new ItemStack(TinkerSmeltery.clayPattern, 1, i)); } oreRegistry(); @@ -602,85 +589,83 @@ public class TinkerSmeltery { private void craftingTableRecipes() { - String[] patSurround = {"###", "#m#", "###"}; + String[] patSurround = { "###", "#m#", "###" }; // stained Glass Recipes - String[] dyeTypes = { - "dyeBlack", - "dyeRed", - "dyeGreen", - "dyeBrown", - "dyeBlue", - "dyePurple", - "dyeCyan", - "dyeLightGray", - "dyeGray", - "dyePink", - "dyeLime", - "dyeYellow", - "dyeLightBlue", - "dyeMagenta", - "dyeOrange", - "dyeWhite" - }; + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", + "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", + "dyeWhite" }; String color; for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), - patSurround, - 'm', - color, - '#', - TinkerSmeltery.clearGlass)); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, TinkerSmeltery.clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), - patSurround, - 'm', - color, - '#', - new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), - color, - new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), - patSurround, - 'm', - color, - '#', - TinkerSmeltery.glassPane)); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, TinkerSmeltery.glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), - patSurround, - 'm', - color, - '#', - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), - color, - new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), + patSurround, + 'm', + color, + '#', + TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), + color, + TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), + color, + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), + patSurround, + 'm', + color, + '#', + TinkerSmeltery.glassPane)); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), + color, + TinkerSmeltery.glassPane)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), + color, + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); } // Glass Recipes GameRegistry.addRecipe(new ItemStack(Items.glass_bottle, 3), "# #", " # ", '#', TinkerSmeltery.clearGlass); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Blocks.daylight_detector), - "GGG", - "QQQ", - "WWW", - 'G', - "blockGlass", - 'Q', - "gemQuartz", - 'W', - "slabWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Blocks.daylight_detector), + "GGG", + "QQQ", + "WWW", + 'G', + "blockGlass", + 'Q', + "gemQuartz", + 'W', + "slabWood")); GameRegistry.addRecipe( new ItemStack(Blocks.beacon, 1), "GGG", @@ -692,95 +677,102 @@ public class TinkerSmeltery { Items.nether_star, 'O', Blocks.obsidian); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.glassPane, 16, 0), "GGG", "GGG", 'G', TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.glassPane, 16, 0), + "GGG", + "GGG", + 'G', + TinkerSmeltery.clearGlass)); // Smeltery Components Recipes ItemStack searedBrick = new ItemStack(TinkerTools.materials, 1, 2); - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTank, 1, 0), - patSurround, - '#', - searedBrick, - 'm', - "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTank, 1, 1), - "bgb", - "ggg", - "bgb", - 'b', - searedBrick, - 'g', - "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTank, 1, 2), - "bgb", - "bgb", - "bgb", - 'b', - searedBrick, - 'g', - "blockGlass")); // Window GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 0), + patSurround, + '#', + searedBrick, + 'm', + "blockGlass")); // Tank GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 1), + "bgb", + "ggg", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Glass GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 2), + "bgb", + "bgb", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Window + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel searedBrick = new ItemStack(TinkerTools.materials, 1, 37); + GameRegistry + .addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller + GameRegistry + .addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.smelteryNether, 1, 0), + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 0), + patSurround, + '#', + searedBrick, + 'm', + "blockGlass")); // Tank + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 1), + "bgb", + "ggg", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Glass + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 2), + "bgb", + "bgb", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Window + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlockNether, 1, 0), "bbb", "b b", + "b b", + 'b', + searedBrick); // Table + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), + "b b", + "b b", "bbb", 'b', - searedBrick); // Controller - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTankNether, 1, 0), - patSurround, - '#', - searedBrick, - 'm', - "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTankNether, 1, 1), - "bgb", - "ggg", - "bgb", - 'b', - searedBrick, - 'g', - "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerSmeltery.lavaTankNether, 1, 2), - "bgb", - "bgb", - "bgb", - 'b', - searedBrick, - 'g', - "blockGlass")); // Window - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.castingChannel, 4, 1), "b b", "bbb", 'b', searedBrick); // Channel + searedBrick); // Basin + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 1), "b b", "bbb", 'b', searedBrick); // Channel // Slab Smeltery Components Recipes for (int i = 0; i < 7; i++) { @@ -861,19 +853,31 @@ public class TinkerSmeltery { // Ores Smeltery.addDictionaryMelting( - "ore" + fluidTypeName, ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); + "ore" + fluidTypeName, + ft, + 0, + (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, (int) - (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); - - // DenseOres support - Smeltery.addDictionaryMelting("denseore" + fluidTypeName, ft, 75, (int) - (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 3)); + Smeltery.addDictionaryMelting( + "oreNether" + fluidTypeName, + ft, + 75, + (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); // DenseOres support Smeltery.addDictionaryMelting( - "orePoor" + fluidTypeName, ft, 75, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre)); + "denseore" + fluidTypeName, + ft, + 75, + (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 3)); + + // DenseOres support + Smeltery.addDictionaryMelting( + "orePoor" + fluidTypeName, + ft, + 75, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre)); // Blocks registerBlockCasting(ft, "block" + fluidTypeName); @@ -901,11 +905,17 @@ public class TinkerSmeltery { // Ores Smeltery.addDictionaryMelting( - "ore" + fluidTypeName, ft, 0, (TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); + "ore" + fluidTypeName, + ft, + 0, + (TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); // Poor ores - Smeltery.addDictionaryMelting("orePoor" + fluidTypeName, ft, 0, (int) - (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre * 1.5f)); + Smeltery.addDictionaryMelting( + "orePoor" + fluidTypeName, + ft, + 0, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre * 1.5f)); // NetherOres support Smeltery.addDictionaryMelting( @@ -932,9 +942,15 @@ public class TinkerSmeltery { TConstruct.stoneLiquidValue * (int) Math.pow(9, i)); } Smeltery.addDictionaryMelting( - "compressedSand1x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9); + "compressedSand1x", + FluidType.getFluidType("Glass"), + 175, + FluidContainerRegistry.BUCKET_VOLUME * 9); Smeltery.addDictionaryMelting( - "compressedSand2x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9 * 9); + "compressedSand2x", + FluidType.getFluidType("Glass"), + 175, + FluidContainerRegistry.BUCKET_VOLUME * 9 * 9); } private void addRecipesForTableCasting() { @@ -984,9 +1000,15 @@ public class TinkerSmeltery { // Misc tableCasting.addCastingRecipe( - new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), gemcast, 80); + new ItemStack(Items.emerald), + new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), + gemcast, + 80); tableCasting.addCastingRecipe( - new ItemStack(Items.quartz), new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), gemcast, 50); + new ItemStack(Items.quartz), + new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), + gemcast, + 50); tableCasting.addCastingRecipe( new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), @@ -1006,7 +1028,10 @@ public class TinkerSmeltery { null, 50); tableCasting.addCastingRecipe( - new ItemStack(TinkerWorld.strangeFood, 1, 1), new FluidStack(TinkerSmeltery.bloodFluid, 160), null, 50); + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new FluidStack(TinkerSmeltery.bloodFluid, 160), + null, + 50); // Buckets ItemStack bucket = new ItemStack(Items.bucket); @@ -1024,13 +1049,12 @@ public class TinkerSmeltery { bucket, true, 10); - else - tableCasting.addCastingRecipe( - new ItemStack(TinkerSmeltery.buckets, 1, sc), - new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), - bucket, - true, - 10); + else tableCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.buckets, 1, sc), + new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), + bucket, + true, + 10); } } @@ -1056,19 +1080,16 @@ public class TinkerSmeltery { 80); // Metal toolpart casting - TinkerSmeltery.liquids = new FluidStack[] { - new FluidStack(TinkerSmeltery.moltenIronFluid, 1), - new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), - new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), - new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), - new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), - new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), - new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), - new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), - new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), - new FluidStack(TinkerSmeltery.pigIronFluid, 1) - }; - int[] liquidDamage = new int[] {2, 13, 10, 11, 12, 14, 15, 6, 16, 18}; // ItemStack + TinkerSmeltery.liquids = new FluidStack[] { new FluidStack(TinkerSmeltery.moltenIronFluid, 1), + new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), + new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), + new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), + new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), + new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), + new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), + new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), + new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), new FluidStack(TinkerSmeltery.pigIronFluid, 1) }; + int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; // ItemStack // damage // value int fluidAmount; @@ -1085,13 +1106,12 @@ public class TinkerSmeltery { new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - cast, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), + false, + 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { fs = TinkerSmeltery.liquids[iterTwo].getFluid(); @@ -1132,12 +1152,8 @@ public class TinkerSmeltery { true, 50); - ItemStack[] ingotShapes = { - new ItemStack(Items.brick), - new ItemStack(Items.netherbrick), - new ItemStack(TinkerTools.materials, 1, 2), - new ItemStack(TinkerTools.materials, 1, 37) - }; + ItemStack[] ingotShapes = { new ItemStack(Items.brick), new ItemStack(Items.netherbrick), + new ItemStack(TinkerTools.materials, 1, 2), new ItemStack(TinkerTools.materials, 1, 37) }; for (ItemStack ingotShape : ingotShapes) { tableCasting.addCastingRecipe( ingotcast, @@ -1145,13 +1161,12 @@ public class TinkerSmeltery { ingotShape, false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - ingotcast, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - ingotShape, - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + ingotcast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + ingotShape, + false, + 50); } ItemStack fullguardCast = new ItemStack(TinkerSmeltery.metalPattern, 1, 22); @@ -1161,34 +1176,45 @@ public class TinkerSmeltery { new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - fullguardCast, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + fullguardCast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), + false, + 50); // Golden Food Stuff // 9 gold nuggets FluidStack goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); tableCasting.addCastingRecipe( - new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); + new ItemStack(Items.golden_carrot, 1), + goldAmount, + new ItemStack(Items.carrot), + true, + 50); tableCasting.addCastingRecipe( - new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); + new ItemStack(Items.speckled_melon, 1), + goldAmount, + new ItemStack(Items.melon), + true, + 50); // 8 gold ingots goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); tableCasting.addCastingRecipe( - new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); - if (TinkerWorld.goldHead != null) - tableCasting.addCustomCastingRecipe(new CastingRecipe( - new ItemStack(TinkerWorld.goldHead), - goldAmount, - new ItemStack(Items.skull, 1, 3), - true, - 50, - null, - true)); + new ItemStack(Items.golden_apple, 1), + goldAmount, + new ItemStack(Items.apple), + true, + 50); + if (TinkerWorld.goldHead != null) tableCasting.addCustomCastingRecipe( + new CastingRecipe( + new ItemStack(TinkerWorld.goldHead), + goldAmount, + new ItemStack(Items.skull, 1, 3), + true, + 50, + null, + true)); // Ensure TConstruct ingots are always first. Otherwise you might get ingots from other mods from casting if (PHConstruct.tconComesFirst && TinkerTools.materials != null) { @@ -1471,18 +1497,13 @@ public class TinkerSmeltery { // Armor casts /* - * FluidRenderProperties frp = new - * FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, - * Applications.BASIN); FluidStack aluFlu = new - * FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue * - * 10); FluidStack gloFlu = new FluidStack(TRepo.moltenGoldFluid, - * TConstruct.ingotLiquidValue * 10); ItemStack[] armor = { new - * ItemStack(helmetWood), new ItemStack(chestplateWood), new - * ItemStack(leggingsWood), new ItemStack(bootsWood) }; for (int sc = 0; - * sc < armor.length; sc++) { basinCasting.addCastingRecipe(new - * ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], 50, frp); - * basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), - * gloFlu, armor[sc], 50, frp); } + * FluidRenderProperties frp = new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, + * Applications.BASIN); FluidStack aluFlu = new FluidStack(TRepo.moltenAlubrassFluid, + * TConstruct.ingotLiquidValue * 10); FluidStack gloFlu = new FluidStack(TRepo.moltenGoldFluid, + * TConstruct.ingotLiquidValue * 10); ItemStack[] armor = { new ItemStack(helmetWood), new + * ItemStack(chestplateWood), new ItemStack(leggingsWood), new ItemStack(bootsWood) }; for (int sc = 0; sc < + * armor.length; sc++) { basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], + * 50, frp); basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), gloFlu, armor[sc], 50, frp); } */ } @@ -1493,7 +1514,11 @@ public class TinkerSmeltery { // BLOOD FOR THE BLOOD GOD if (TinkerWorld.meatBlock != null) { Smeltery.addMelting( - new ItemStack(Items.rotten_flesh), TinkerWorld.meatBlock, 0, 200, new FluidStack(bloodFluid, 5)); + new ItemStack(Items.rotten_flesh), + TinkerWorld.meatBlock, + 0, + 200, + new FluidStack(bloodFluid, 5)); Smeltery.addMelting( new ItemStack(TinkerWorld.strangeFood, 1, 1), TinkerWorld.meatBlock, @@ -1504,29 +1529,34 @@ public class TinkerSmeltery { // Alloy Smelting Smeltery.addAlloyMixing( - new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) - (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), + new FluidStack( + TinkerSmeltery.moltenBronzeFluid, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze Smeltery.addAlloyMixing( - new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) - (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), + new FluidStack( + TinkerSmeltery.moltenAlubrassFluid, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass Smeltery.addAlloyMixing( - new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) - (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), + new FluidStack( + TinkerSmeltery.moltenAlumiteFluid, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite Smeltery.addAlloyMixing( - new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) - (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), + new FluidStack( + TinkerSmeltery.moltenManyullynFluid, + (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn Smeltery.addAlloyMixing( - new FluidStack(TinkerSmeltery.pigIronFluid, (int) - (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), + new FluidStack( + TinkerSmeltery.pigIronFluid, + (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron @@ -1542,10 +1572,8 @@ public class TinkerSmeltery { stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, - (8 - * ((IPattern) TinkerTools.woodPattern) - .getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) - / 2); + (8 * ((IPattern) TinkerTools.woodPattern) + .getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); } } @@ -1702,18 +1730,22 @@ public class TinkerSmeltery { new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); Smeltery.addMelting(Blocks.glass_pane, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); Smeltery.addMelting( - Blocks.stone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); + Blocks.stone, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); Smeltery.addMelting( Blocks.cobblestone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); Smeltery.addMelting(Blocks.emerald_block, 0, 800, new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9)); - Smeltery.addMelting( - Blocks.emerald_ore, - 0, - 800, - new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 2)); // the ore also is done here + Smeltery.addMelting(Blocks.emerald_ore, 0, 800, new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 2)); // the + // ore + // also + // is + // done + // here Smeltery.addMelting(Blocks.quartz_block, 0, 800, new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 4)); Smeltery.addMelting(Blocks.quartz_ore, 0, 800, new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 2)); Smeltery.addMelting( @@ -1732,9 +1764,15 @@ public class TinkerSmeltery { for (int i = 0; i < 16; i++) { Smeltery.addMelting( - TinkerSmeltery.stainedGlassClear, i, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); + TinkerSmeltery.stainedGlassClear, + i, + 500, + new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); Smeltery.addMelting( - TinkerSmeltery.stainedGlassClearPane, i, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); + TinkerSmeltery.stainedGlassClearPane, + i, + 350, + new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); } // Bricks @@ -1837,13 +1875,12 @@ public class TinkerSmeltery { new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - pattern, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(ore.getItem(), 1, ore.getItemDamage()), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); tableCasting.addCastingRecipe( new ItemStack(ore.getItem(), 1, ore.getItemDamage()), @@ -1871,13 +1908,12 @@ public class TinkerSmeltery { new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - pattern, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(ore.getItem(), 1, ore.getItemDamage()), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); tableCasting.addCastingRecipe( new ItemStack(ore.getItem(), 1, ore.getItemDamage()), @@ -1889,41 +1925,24 @@ public class TinkerSmeltery { private void registerBlockCasting(FluidType ft, String name) { for (ItemStack ore : OreDictionary.getOres(name)) { - TConstructRegistry.getBasinCasting() - .addCastingRecipe( - new ItemStack(ore.getItem(), 1, ore.getItemDamage()), - new FluidStack(ft.fluid, TConstruct.blockLiquidValue), - 100); + TConstructRegistry.getBasinCasting().addCastingRecipe( + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + new FluidStack(ft.fluid, TConstruct.blockLiquidValue), + 100); } } public void addRecipesForFurnace() { - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerSmeltery.speedBlock, 1, 0), - new ItemStack(TinkerSmeltery.speedBlock, 1, 2), - 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerSmeltery.speedBlock, 1, 0), + new ItemStack(TinkerSmeltery.speedBlock, 1, 2), + 0.2f); } public void oreRegistry() { - String[] glassTypes = { - "glassBlack", - "glassRed", - "glassGreen", - "glassBrown", - "glassBlue", - "glassPurple", - "glassCyan", - "glassLightGray", - "glassGray", - "glassPink", - "glassLime", - "glassYellow", - "glassLightBlue", - "glassMagenta", - "glassOrange", - "glassWhite" - }; + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", + "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", + "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) { OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i)); } @@ -1935,9 +1954,11 @@ public class TinkerSmeltery { /* Natura */ Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted"); Block heatSand = GameRegistry.findBlock("Natura", "heatsand"); - if (taintedSoil != null && heatSand != null) - GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); + if (taintedSoil != null && heatSand != null) GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 2, 6), + Items.nether_wart, + taintedSoil, + heatSand); LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); ArrayList ores; @@ -1990,18 +2011,10 @@ public class TinkerSmeltery { return registerFluid(name, name + ".molten", "fluid.molten." + name, texture, 3000, 6000, 1300, Material.lava); } - public static Fluid registerFluid( - String name, - String fluidName, - String blockName, - String texture, - int density, - int viscosity, - int temperature, - Material material) { + public static Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, + int viscosity, int temperature, Material material) { // create the new fluid - Fluid fluid = - new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature); + Fluid fluid = new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature); if (material == Material.lava) fluid.setLuminosity(12); @@ -2033,14 +2046,14 @@ public class TinkerSmeltery { if (name.equals("aluminiumbrass")) name = "alubrass"; if (name.equals("platinum")) name = "shiny"; boolean reg = false; - for (int i = 0; i < FilledBucket.textureNames.length; i++) - if (FilledBucket.textureNames[i].equals(name)) { - FluidContainerRegistry.registerFluidContainer(new FluidContainerData( - new FluidStack(fluid, 1000), - new ItemStack(TinkerSmeltery.buckets, 1, i), - new ItemStack(Items.bucket))); - reg = true; - } + for (int i = 0; i < FilledBucket.textureNames.length; i++) if (FilledBucket.textureNames[i].equals(name)) { + FluidContainerRegistry.registerFluidContainer( + new FluidContainerData( + new FluidStack(fluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, i), + new ItemStack(Items.bucket))); + reg = true; + } if (!reg) TConstruct.logger.error("Couldn't register fluid container for " + name); } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java index 729daaaa..c8df5cf8 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java @@ -1,20 +1,23 @@ package tconstruct.smeltery; -import cpw.mods.fml.common.eventhandler.*; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraftforge.event.entity.player.*; + import tconstruct.armor.player.TPlayerStats; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TinkerSmelteryEvents { + @SubscribeEvent public void onCrafting(ItemCraftedEvent event) { if (!PHConstruct.beginnerBook) { diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index 38e3e528..efecd473 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -1,8 +1,7 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,10 +11,13 @@ import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingChannelLogic; import tconstruct.smeltery.model.BlockRenderCastingChannel; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author BluSunrize @@ -30,7 +32,7 @@ public class CastingChannelBlock extends BlockContainer { setCreativeTab(TConstructRegistry.blockTab); } - public String[] textureNames = new String[] {"searedstone", "nether_searedstone"}; + public String[] textureNames = new String[] { "searedstone", "nether_searedstone" }; public IIcon[] icons; /* Rendering */ @@ -39,8 +41,8 @@ public class CastingChannelBlock extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, + float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index bb8b4f9b..5caa5978 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -1,16 +1,18 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; public class GlassBlock extends TConstructBlock { - static String[] blockTextures = {"glass_clear", "soulglass", "soulglass_clear"}; + + static String[] blockTextures = { "glass_clear", "soulglass", "soulglass_clear" }; public GlassBlock() { super(Material.glass, 3f, blockTextures); @@ -43,8 +45,8 @@ public class GlassBlock extends TConstructBlock { } @Override - public float getExplosionResistance( - Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, + double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index ef7bffb1..fd67fe59 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -1,20 +1,23 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.*; /** * @author fuj1n * */ public class GlassBlockConnected extends MantleBlock { + protected IIcon[] icons = new IIcon[16]; private final boolean shouldRenderSelectionBox = true; protected String folder; @@ -51,6 +54,7 @@ public class GlassBlockConnected extends MantleBlock { /** * This is checked to see if the texture should connect to this block + * * @param par2 x * @param par3 y * @param par4 z @@ -58,21 +62,20 @@ public class GlassBlockConnected extends MantleBlock { * @param par6 Metadata of the block this block is trying to connect to * @return true if should connect */ - public boolean shouldConnectToBlock( - IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { + public boolean shouldConnectToBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, + int par6) { return par5 == this; } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 - ? icons[0] + return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons); } - public IIcon getConnectedBlockTexture( - IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) { + public IIcon getConnectedBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, + IIcon[] icons) { if (PHConstruct.connectedTexturesMode == 0) { return icons[0]; } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index 22a0721c..bd73af51 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -1,20 +1,23 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.*; /** * @author fuj1n * */ public class GlassBlockConnectedMeta extends GlassBlockConnected { + public String[] textures; public IIcon[][] icons; boolean ignoreMetaForConnectedGlass = PHConstruct.connectedTexturesMode == 2; @@ -37,8 +40,8 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected { } @Override - public boolean shouldConnectToBlock( - IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { + public boolean shouldConnectToBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, + int par6) { return par5 == this && (par6 == par1IBlockAccess.getBlockMetadata(par2, par3, par4) || ignoreMetaForConnectedGlass); } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index c5245de2..f7092e51 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -1,32 +1,18 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; public class GlassBlockStained extends TConstructBlock { - static String[] blockTextures = { - "white", - "orange", - "magenta", - "lightblue", - "yellow", - "lime", - "pink", - "gray", - "lightgray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black" - }; + + static String[] blockTextures = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", + "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; String textureName; public GlassBlockStained(String tex) { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPane.java b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java index fc1feb86..afa30e20 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPane.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java @@ -1,10 +1,12 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; + import tconstruct.library.TConstructRegistry; public class GlassPane extends PaneBase { - static String[] blockTextures = {"glass_clear", "soulglass", "soulglass_clear"}; + + static String[] blockTextures = { "glass_clear", "soulglass", "soulglass_clear" }; public GlassPane() { super(Material.glass, "glass/", blockTextures); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 7335580a..76e05e12 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -1,7 +1,7 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -9,8 +9,10 @@ import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.*; public class GlassPaneConnected extends GlassBlockConnected { @@ -30,10 +32,8 @@ public class GlassPaneConnected extends GlassBlockConnected { @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 0 || par5 == 1) { - return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 - ? icons[15] - : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 - ? icons[15] + return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] + : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex(); } else { return super.getIcon(par1IBlockAccess, par2, par3, par4, par5); @@ -41,8 +41,8 @@ public class GlassPaneConnected extends GlassBlockConnected { } @Override - public IIcon getConnectedBlockTexture( - IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) { + public IIcon getConnectedBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, + IIcon[] icons) { if (par5 == 0 || par5 == 1) { return getSideTextureIndex(); } @@ -498,14 +498,8 @@ public class GlassPaneConnected extends GlassBlockConnected { } @Override - public void addCollisionBoxesToList( - World par1World, - int par2, - int par3, - int par4, - AxisAlignedBB par5AxisAlignedBB, - List par6List, - Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, + List par6List, Entity par7Entity) { boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH); boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH); boolean flag2 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.WEST); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java index 8c15a27b..09bb6775 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java @@ -1,27 +1,13 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; + import tconstruct.library.TConstructRegistry; public class GlassPaneStained extends PaneBase { - static String[] blockTextures = { - "white", - "orange", - "magenta", - "lightblue", - "yellow", - "lime", - "pink", - "gray", - "lightgray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black" - }; + + static String[] blockTextures = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", + "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; public GlassPaneStained() { super(Material.glass, "glass/", assembleBlockTextures()); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java index be411d04..70304f1c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java @@ -6,12 +6,13 @@ import net.minecraft.init.Blocks; import net.minecraft.potion.*; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + import tconstruct.blocks.TConstructBlock; public class GlueBlock extends TConstructBlock { public GlueBlock() { - super(Material.ground, 4.0f, new String[] {"glue"}); + super(Material.ground, 4.0f, new String[] { "glue" }); } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java index 8fe1de59..3d1b3e9d 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java @@ -1,6 +1,5 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; @@ -9,6 +8,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.*; +import cpw.mods.fml.relauncher.*; + public class GlueFluid extends BlockFluidFinite { IIcon stillIcon; diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 7fd6ef9c..9865e3b4 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.iface.IServantLogic; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,12 +22,16 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; + import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.itemblocks.LavaTankItemBlock; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.smeltery.model.TankRender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LavaTankBlock extends BlockContainer { + public IIcon[] icons; String texturePrefix = ""; @@ -46,16 +50,8 @@ public class LavaTankBlock extends BlockContainer { } public String[] getTextureNames() { - String[] textureNames = { - "lavatank_side", - "lavatank_top", - "searedgague_top", - "searedgague_side", - "searedgague_bottom", - "searedwindow_top", - "searedwindow_side", - "searedwindow_bottom" - }; + String[] textureNames = { "lavatank_side", "lavatank_top", "searedgague_top", "searedgague_side", + "searedgague_bottom", "searedwindow_top", "searedwindow_side", "searedwindow_bottom" }; if (!texturePrefix.equals("")) for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; @@ -144,8 +140,8 @@ public class LavaTankBlock extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, + float par8, float par9) { ItemStack current = entityplayer.inventory.getCurrentItem(); if (current != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); @@ -155,9 +151,8 @@ public class LavaTankBlock extends BlockContainer { int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false); if (amount == liquid.amount) { logic.fill(ForgeDirection.UNKNOWN, liquid, true); - if (!entityplayer.capabilities.isCreativeMode) - entityplayer.inventory.setInventorySlotContents( - entityplayer.inventory.currentItem, consumeItem(current)); + if (!entityplayer.capabilities.isCreativeMode) entityplayer.inventory + .setInventorySlotContents(entityplayer.inventory.currentItem, consumeItem(current)); // update entityplayer.inventoryContainer.detectAndSendChanges(); @@ -179,11 +174,12 @@ public class LavaTankBlock extends BlockContainer { true); if (!entityplayer.capabilities.isCreativeMode && !world.isRemote) { if (current.stackSize == 1) { - entityplayer.inventory.setInventorySlotContents( - entityplayer.inventory.currentItem, fillStack); + entityplayer.inventory + .setInventorySlotContents(entityplayer.inventory.currentItem, fillStack); } else { entityplayer.inventory.setInventorySlotContents( - entityplayer.inventory.currentItem, consumeItem(current)); + entityplayer.inventory.currentItem, + consumeItem(current)); if (!entityplayer.inventory.addItemStackToInventory(fillStack)) { entityplayer.dropPlayerItemWithRandomChoice(fillStack, false); diff --git a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index 8adabc10..cb6d92e9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -1,16 +1,18 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.*; + import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.relauncher.*; public class LiquidMetalFinite extends BlockFluidFinite { + String texture; public IIcon stillIcon; public IIcon flowIcon; diff --git a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java index 159d64cf..4eeae1a4 100644 --- a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -1,13 +1,16 @@ package tconstruct.smeltery.blocks; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.world.World; + import tconstruct.blocks.TConstructBlock; public class MetalOre extends TConstructBlock { + public MetalOre(Material material, float hardness, String[] tex) { super(material, hardness, tex); } diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index 0043eacb..7af220ed 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -1,16 +1,19 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; + import tconstruct.smeltery.model.PaneRender; +import cpw.mods.fml.relauncher.*; public class PaneBase extends BlockStainedGlassPane { + public String[] textureNames; public String folder; public IIcon[] icons; diff --git a/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java b/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java index 5d7fb4db..f1dcf8fc 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java @@ -23,8 +23,10 @@ public class PigIronMoltenBlock extends TConstructFluid { @Override public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (!world.isRemote && entity != null && !entity.isWet()) entity.setFire(40); - if (!entity.isWet() || world.rand.nextInt(100) > 73) - world.playSoundAtEntity( - entity, "random.fizz", 0.7F, 1.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.4F); + if (!entity.isWet() || world.rand.nextInt(100) > 73) world.playSoundAtEntity( + entity, + "random.fizz", + 0.7F, + 1.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.4F); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 936b04a0..0331d0ce 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -1,8 +1,9 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -11,10 +12,12 @@ import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.CastingBlockRender; +import cpw.mods.fml.relauncher.*; public class SearedBlock extends InventoryBlock { @@ -62,8 +65,8 @@ public class SearedBlock extends InventoryBlock { /* Activation */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float clickX, + float clickY, float clickZ) { int md = world.getBlockMetadata(x, y, z); // casting table or basin if (md == 0 || md == 2) { @@ -100,15 +103,8 @@ public class SearedBlock extends InventoryBlock { @Override public String[] getTextureNames() { - String[] textureNames = { - "castingtable_top", - "castingtable_side", - "castingtable_bottom", - "faucet", - "blockcast_top", - "blockcast_side", - "blockcast_bottom" - }; + String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", + "blockcast_top", "blockcast_side", "blockcast_bottom" }; if (!texturePrefix.equals("")) for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index f0e575f5..aedd58b3 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -1,17 +1,20 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; + import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.relauncher.*; public class SearedSlab extends SlabBase { + public SearedSlab() { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index 415dc407..e75ecbd0 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -1,9 +1,10 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.*; + import mantle.blocks.abstracts.*; import mantle.blocks.iface.*; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -14,13 +15,16 @@ import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.SmelteryProxyCommon; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.SmelteryRender; +import cpw.mods.fml.relauncher.*; public class SmelteryBlock extends InventoryBlock { + Random rand; String texturePrefix = ""; @@ -48,23 +52,9 @@ public class SmelteryBlock extends InventoryBlock { @Override public String[] getTextureNames() { - String[] textureNames = { - "smeltery_side", - "smeltery_inactive", - "smeltery_active", - "drain_side", - "drain_out", - "drain_basin", - "searedbrick", - "searedstone", - "searedcobble", - "searedpaver", - "searedbrickcracked", - "searedroad", - "searedbrickfancy", - "searedbricksquare", - "searedcreeper" - }; + String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", + "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver", "searedbrickcracked", + "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" }; if (!texturePrefix.equals("")) for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; @@ -189,8 +179,8 @@ public class SmelteryBlock extends InventoryBlock { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float clickX, + float clickY, float clickZ) { if (world.getBlockMetadata(x, y, z) != 0) return false; return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); @@ -221,9 +211,8 @@ public class SmelteryBlock extends InventoryBlock { } /* - * @Override public void breakBlock (World world, int x, int y, int z, int - * par5, int par6) //Don't drop inventory { world.removeBlockTileEntity(x, - * y, z); } + * @Override public void breakBlock (World world, int x, int y, int z, int par5, int par6) //Don't drop inventory { + * world.removeBlockTileEntity(x, y, z); } */ @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index 50e9413f..c05392b6 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -1,24 +1,21 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.*; import net.minecraft.world.World; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; public class SpeedBlock extends TConstructBlock { - public static String[] textureNames = new String[] { - "brownstone_rough", - "brownstone_rough_road", - "brownstone_smooth", - "brownstone_smooth_brick", - "brownstone_smooth_road", - "brownstone_smooth_fancy", - "brownstone_smooth_chiseled" - }; + + public static String[] textureNames = new String[] { "brownstone_rough", "brownstone_rough_road", + "brownstone_smooth", "brownstone_smooth_brick", "brownstone_smooth_road", "brownstone_smooth_fancy", + "brownstone_smooth_chiseled" }; public SpeedBlock() { super(Material.rock, 3.0f, textureNames); diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index 8ac17402..4f81a8e8 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -1,7 +1,7 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,11 +9,14 @@ import net.minecraft.entity.Entity; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.relauncher.*; public class SpeedSlab extends SlabBase { + public SpeedSlab() { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index 5604ca27..63b5e2f3 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -1,13 +1,15 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.*; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class TConstructFluid extends BlockFluidClassic { + String texture; boolean alpha; public IIcon stillIcon; diff --git a/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java index 183e631d..edfeaaf8 100644 --- a/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java +++ b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java @@ -2,6 +2,7 @@ package tconstruct.smeltery.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; + import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.smeltery.inventory.ActiveSlot; diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 08524aba..80fa3b17 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -1,7 +1,7 @@ package tconstruct.smeltery.gui; -import cpw.mods.fml.common.Loader; import java.util.*; + import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; @@ -9,15 +9,19 @@ import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.*; + import tconstruct.TConstruct; import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; +import cpw.mods.fml.common.Loader; public class SmelteryGui extends ActiveContainerGui { + public SmelteryLogic logic; private boolean isScrolling = false; private boolean wasClicking; @@ -69,8 +73,7 @@ public class SmelteryGui extends ActiveContainerGui { int scrollWidth = xScroll + 14; int scrollHeight = yScroll + 144; - if (!this.wasClicking - && mouseDown + if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollWidth @@ -110,7 +113,10 @@ public class SmelteryGui extends ActiveContainerGui { int baseX = 86 + (columns - 3) * 22; fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Smeltery"), baseX, 5, 0x404040); fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), baseX + 4, (ySize - 96) + 2, 0x404040); + StatCollector.translateToLocal("container.inventory"), + baseX + 4, + (ySize - 96) + 2, + 0x404040); int cornerX = (width - xSize) / 2 + 36 + (columns - 3) * 22; int cornerY = (height - ySize) / 2; @@ -140,8 +146,9 @@ public class SmelteryGui extends ActiveContainerGui { } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/smeltery.png"); - private static final ResourceLocation backgroundSide = - new ResourceLocation("tinker", "textures/gui/smelteryside.png"); + private static final ResourceLocation backgroundSide = new ResourceLocation( + "tinker", + "textures/gui/smelteryside.png"); @Override protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { @@ -383,8 +390,7 @@ public class SmelteryGui extends ActiveContainerGui { private boolean isMolten(String fluidName) { boolean molten = false; - String[] moltenNames = - StatCollector.translateToLocal("gui.smeltery.molten.check").split(","); + String[] moltenNames = StatCollector.translateToLocal("gui.smeltery.molten.check").split(","); for (String moltenName : moltenNames) { if (fluidName.contains(moltenName.trim())) { molten = true; @@ -489,13 +495,14 @@ public class SmelteryGui extends ActiveContainerGui { if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) { fluidToBeBroughtUp = logic.moltenMetal.get(i).getFluidID(); - TConstruct.packetPipeline.sendToServer(new SmelteryPacket( - logic.getWorldObj().provider.dimensionId, - logic.xCoord, - logic.yCoord, - logic.zCoord, - isShiftKeyDown(), - fluidToBeBroughtUp)); + TConstruct.packetPipeline.sendToServer( + new SmelteryPacket( + logic.getWorldObj().provider.dimensionId, + logic.xCoord, + logic.yCoord, + logic.zCoord, + isShiftKeyDown(), + fluidToBeBroughtUp)); } base += fluidHeights[i]; } diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index 7cb598c5..1a036234 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -1,10 +1,12 @@ package tconstruct.smeltery.inventory; import java.util.*; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; public class ActiveContainer extends Container { + public List activeInventorySlots = new ArrayList<>(); @Override diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java index b1faa955..d909f917 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java @@ -3,6 +3,7 @@ package tconstruct.smeltery.inventory; import net.minecraft.inventory.*; public class ActiveSlot extends Slot { + protected boolean active; public int activeSlotNumber; diff --git a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index f857ca86..dc162041 100644 --- a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -4,11 +4,13 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.gui.SmelteryGui; import tconstruct.smeltery.logic.SmelteryLogic; public class SmelteryContainer extends ActiveContainer { + public SmelteryLogic logic; public InventoryPlayer playerInv; public int fuel = 0; @@ -57,8 +59,9 @@ public class SmelteryContainer extends ActiveContainer { int basePos = invRow * columns; for (int iter = 0; iter < activeInventorySlots.size(); iter++) { ActiveSlot slot = activeInventorySlots.get(iter); - slot.setActive(slot.activeSlotNumber >= basePos - && slot.activeSlotNumber < basePos + columns * SmelteryGui.maxRows); + slot.setActive( + slot.activeSlotNumber >= basePos + && slot.activeSlotNumber < basePos + columns * SmelteryGui.maxRows); int xPos = (iter - basePos) % columns; int yPos = (iter - basePos) / columns; @@ -80,20 +83,16 @@ public class SmelteryContainer extends ActiveContainer { @Override public void detectAndSendChanges() // TODO: Sync with this - { + { // we only update if the size is the same, since the screen is getting closed on sizechange and would cause a // crash otherwise if (smelterySize == this.inventorySlots.size()) super.detectAndSendChanges(); /* - * for (int i = 0; i < crafters.size(); i++) { ICrafting icrafting = - * (ICrafting)crafters.get(i); if (progress != logic.progress) { - * icrafting.sendProgressBarUpdate(this, 0, logic.progress); } if (fuel - * != logic.fuel) { icrafting.sendProgressBarUpdate(this, 1, - * logic.fuel); } if (fuelGague != logic.fuelGague) { - * icrafting.sendProgressBarUpdate(this, 2, logic.fuelGague); } } - * - * progress = logic.progress; fuel = logic.fuel; fuelGague = - * logic.fuelGague; + * for (int i = 0; i < crafters.size(); i++) { ICrafting icrafting = (ICrafting)crafters.get(i); if (progress != + * logic.progress) { icrafting.sendProgressBarUpdate(this, 0, logic.progress); } if (fuel != logic.fuel) { + * icrafting.sendProgressBarUpdate(this, 1, logic.fuel); } if (fuelGague != logic.fuelGague) { + * icrafting.sendProgressBarUpdate(this, 2, logic.fuelGague); } } progress = logic.progress; fuel = logic.fuel; + * fuelGague = logic.fuelGague; */ } @@ -158,25 +157,15 @@ public class SmelteryContainer extends ActiveContainer { ItemStack slotStack; /* - * if (inputStack.isStackable() && startSlot >= - * logic.getSizeInventory()) { TConstruct.logger.info("Rawr!"); while - * (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && - * slotPos >= startSlot)) { slot = (Slot) - * this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - * - * if (slotStack != null && ItemStack.areItemStacksEqual(inputStack, - * slotStack) && !inputStack.getHasSubtypes()) { int totalSize = - * slotStack.stackSize + inputStack.stackSize; - * - * if (totalSize <= inputStack.getMaxStackSize()) { inputStack.stackSize - * = 0; slotStack.stackSize = totalSize; slot.onSlotChanged(); merged = - * true; } else if (slotStack.stackSize < inputStack.getMaxStackSize()) - * { inputStack.stackSize -= inputStack.getMaxStackSize() - - * slotStack.stackSize; slotStack.stackSize = - * inputStack.getMaxStackSize(); slot.onSlotChanged(); merged = true; } - * } - * - * if (flag) { --slotPos; } else { ++slotPos; } } } + * if (inputStack.isStackable() && startSlot >= logic.getSizeInventory()) { TConstruct.logger.info("Rawr!"); + * while (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && slotPos >= startSlot)) { slot = + * (Slot) this.inventorySlots.get(slotPos); slotStack = slot.getStack(); if (slotStack != null && + * ItemStack.areItemStacksEqual(inputStack, slotStack) && !inputStack.getHasSubtypes()) { int totalSize = + * slotStack.stackSize + inputStack.stackSize; if (totalSize <= inputStack.getMaxStackSize()) { + * inputStack.stackSize = 0; slotStack.stackSize = totalSize; slot.onSlotChanged(); merged = true; } else if + * (slotStack.stackSize < inputStack.getMaxStackSize()) { inputStack.stackSize -= inputStack.getMaxStackSize() - + * slotStack.stackSize; slotStack.stackSize = inputStack.getMaxStackSize(); slot.onSlotChanged(); merged = true; + * } } if (flag) { --slotPos; } else { ++slotPos; } } } */ if (inputStack.isStackable() && startSlot >= logic.getSizeInventory()) { @@ -184,8 +173,7 @@ public class SmelteryContainer extends ActiveContainer { slot = (Slot) this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - if (slotStack != null - && slotStack.isItemEqual(inputStack) + if (slotStack != null && slotStack.isItemEqual(inputStack) && ItemStack.areItemStackTagsEqual(slotStack, inputStack)) { int l = slotStack.stackSize + inputStack.stackSize; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java index 8cf7a110..3c384932 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java @@ -1,10 +1,12 @@ package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class CastingChannelItem extends MultiItemBlock { - public static final String[] blockTypes = {"Channel"}; + + public static final String[] blockTypes = { "Channel" }; public CastingChannelItem(Block b) { super(b, "Smeltery", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java index d1648de9..a4f34cd8 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java @@ -1,14 +1,17 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class GlassBlockItem extends MultiItemBlock { - public static final String[] blockTypes = {"pure"}; // , "soul", + + public static final String[] blockTypes = { "pure" }; // , "soul", // "soul.pure" }; public GlassBlockItem(Block b) { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java index 1fb3e139..436edbc4 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java @@ -1,10 +1,12 @@ package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class GlassPaneItem extends MultiItemBlock { - public static final String[] blockTypes = {"pure", "soul", "soul.pure"}; + + public static final String[] blockTypes = { "pure", "soul", "soul.pure" }; public GlassPaneItem(Block b) { super(b, "block.glass", "pane", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java index 93077f95..9d689ee7 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java @@ -1,7 +1,9 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,10 +11,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; + import tconstruct.smeltery.logic.LavaTankLogic; public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainerItem { - public static final String[] blockTypes = {"Tank", "Gague", "Window"}; + + public static final String[] blockTypes = { "Tank", "Gague", "Window" }; public LavaTankItemBlock(Block b) { super(b, "LavaTank", blockTypes); @@ -25,8 +29,9 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer if (stack.hasTagCompound()) { NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid"); if (liquidTag != null) { - list.add(StatCollector.translateToLocal("searedtank1.tooltip") + " " - + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); + list.add( + StatCollector.translateToLocal("searedtank1.tooltip") + " " + + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); list.add(liquidTag.getInteger("Amount") + " mB"); } } else { @@ -36,8 +41,7 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer } /** - * @param container - * ItemStack which is the fluid container. + * @param container ItemStack which is the fluid container. * @return FluidStack representing the fluid in the container, null if the container is empty. */ @Override @@ -52,10 +56,8 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer } /** - * @param container - * ItemStack which is the fluid container. - * @param resource - * FluidStack attempting to set to the container. + * @param container ItemStack which is the fluid container. + * @param resource FluidStack attempting to set to the container. */ public void setFluid(ItemStack container, FluidStack resource) { if (container == null) return; @@ -73,8 +75,7 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer } /** - * @param container - * ItemStack which is the fluid container. + * @param container ItemStack which is the fluid container. * @return Capacity of this fluid container. */ @Override @@ -83,14 +84,10 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer } /** - * @param container - * ItemStack which is the fluid container. - * @param resource - * FluidStack attempting to fill the container. - * @param doFill - * If false, the fill will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) filled into the - * container. + * @param container ItemStack which is the fluid container. + * @param resource FluidStack attempting to fill the container. + * @param doFill If false, the fill will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) filled into the container. */ @Override public int fill(ItemStack container, FluidStack resource, boolean doFill) { @@ -108,14 +105,10 @@ public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainer } /** - * @param container - * ItemStack which is the fluid container. - * @param maxDrain - * Maximum amount of fluid to be removed from the container. - * @param doDrain - * If false, the drain will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) drained from the - * container. + * @param container ItemStack which is the fluid container. + * @param maxDrain Maximum amount of fluid to be removed from the container. + * @param doDrain If false, the drain will only be simulated. + * @return Amount of fluid that was (or would have been, if simulated) drained from the container. */ @Override public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java index be1170f0..9d3bfefb 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java @@ -1,16 +1,18 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; public class MetalItemBlock extends MultiItemBlock { - public static final String[] blockTypes = { - "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" - }; + + public static final String[] blockTypes = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", + "AlBrass", "Alumite", "Steel", "Ender" }; public MetalItemBlock(Block b) { super(b, "StorageMetals", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java index c94358e5..580c0247 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java @@ -1,11 +1,13 @@ package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class SearedSlabItem extends MultiItemBlock { - public static final String[] blockTypes = {"brick", "stone", "cobble", "paver", "road", "fancy", "square", "creeper" - }; + + public static final String[] blockTypes = { "brick", "stone", "cobble", "paver", "road", "fancy", "square", + "creeper" }; public SearedSlabItem(Block b) { super(b, "block.searedstone.slab", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java index 40c47263..d029469f 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java @@ -1,14 +1,17 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; public class SearedTableItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"Table", "Faucet", "Basin"}; + + public static final String[] blockTypes = { "Table", "Faucet", "Basin" }; public SearedTableItemBlock(Block b) { super(b, "SearedBlock", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index 1c34ab9a..d5acb975 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -1,29 +1,22 @@ package tconstruct.smeltery.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.achievements.TAchievements; +import cpw.mods.fml.relauncher.*; public class SmelteryItemBlock extends MultiItemBlock { - public static final String[] blockTypes = { - "Controller", - "Drain", - "Brick", - "Furnace", - "Stone", - "Cobblestone", - "Paver", - "Brick.Cracked", - "Road", - "Brick.Fancy", - "Brick.Square" - }; + + public static final String[] blockTypes = { "Controller", "Drain", "Brick", "Furnace", "Stone", "Cobblestone", + "Paver", "Brick.Cracked", "Road", "Brick.Fancy", "Brick.Square" }; public SmelteryItemBlock(Block b) { super(b, "Smeltery", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java index 7bb696c1..f5790f49 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java @@ -1,22 +1,19 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; public class SpeedBlockItem extends MultiItemBlock { - public static final String[] blockTypes = { - "brownstone.rough", - "brownstone.rough.road", - "brownstone.smooth", - "brownstone.smooth.brick", - "brownstone.smooth.road", - "brownstone.smooth.fancy", - "brownstone.smooth.chiseled" - }; + + public static final String[] blockTypes = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", + "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", + "brownstone.smooth.chiseled" }; public SpeedBlockItem(Block b) { super(b, "block", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java index 0a30904d..9266e87f 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java @@ -1,22 +1,19 @@ package tconstruct.smeltery.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; public class SpeedSlabItem extends MultiItemBlock { - public static final String[] blockTypes = { - "brownstone.rough", - "brownstone.rough.road", - "brownstone.smooth", - "brownstone.smooth.brick", - "brownstone.smooth.road", - "brownstone.smooth.fancy", - "brownstone.smooth.chiseled" - }; + + public static final String[] blockTypes = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", + "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", + "brownstone.smooth.chiseled" }; public SpeedSlabItem(Block b) { super(b, "block", "slab", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java index 3f0d9576..252a79cb 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java @@ -1,27 +1,13 @@ package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class StainedGlassClearItem extends MultiItemBlock { - public static final String[] blockTypes = { - "white", - "orange", - "magenta", - "lightblue", - "yellow", - "lime", - "pink", - "gray", - "lightgray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black" - }; + + public static final String[] blockTypes = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", + "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; public StainedGlassClearItem(Block b) { super(b, "block.stainedglass", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java index a8a37d76..82f3f6ce 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java @@ -1,27 +1,13 @@ package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class StainedGlassClearPaneItem extends MultiItemBlock { - public static final String[] blockTypes = { - "white", - "orange", - "magenta", - "lightblue", - "yellow", - "lime", - "pink", - "gray", - "lightgray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black" - }; + + public static final String[] blockTypes = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", + "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; public StainedGlassClearPaneItem(Block b) { super(b, "block.stainedglass", "pane", blockTypes); diff --git a/src/main/java/tconstruct/smeltery/items/ClayPattern.java b/src/main/java/tconstruct/smeltery/items/ClayPattern.java index 249f30cb..5b988fec 100644 --- a/src/main/java/tconstruct/smeltery/items/ClayPattern.java +++ b/src/main/java/tconstruct/smeltery/items/ClayPattern.java @@ -1,8 +1,10 @@ package tconstruct.smeltery.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; + import tconstruct.tools.items.Pattern; public class ClayPattern extends Pattern { @@ -19,36 +21,9 @@ public class ClayPattern extends Pattern { return names; } - private static final String[] patternName = new String[] { - "ingot", - "rod", - "pickaxe", - "shovel", - "axe", - "swordblade", - "largeguard", - "mediumguard", - "crossbar", - "binding", - "frypan", - "sign", - "knifeblade", - "chisel", - "", - "", - "", - "", - "", - "", - "", - "", - "fullguard", - "", - "", - "arrowhead", - "gem", - "nugget" - }; + private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", + "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "", "", "", + "", "", "", "", "", "fullguard", "", "", "arrowhead", "gem", "nugget" }; @Override public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index cfb78d1d..eebae0e7 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -1,8 +1,9 @@ package tconstruct.smeltery.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -12,8 +13,10 @@ import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; + import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.relauncher.*; public class FilledBucket extends ItemBucket { @@ -30,27 +33,20 @@ public class FilledBucket extends ItemBucket { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { float var4 = 1.0F; double trueX = player.prevPosX + (player.posX - player.prevPosX) * (double) var4; - double trueY = - player.prevPosY + (player.posY - player.prevPosY) * (double) var4 + 1.62D - (double) player.yOffset; + double trueY = player.prevPosY + (player.posY - player.prevPosY) * (double) var4 + + 1.62D + - (double) player.yOffset; double trueZ = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) var4; boolean wannabeFull = false; MovingObjectPosition position = this.getMovingObjectPositionFromPlayer(world, player, wannabeFull); if (position != null) { /* - * FillBucketEvent event = new FillBucketEvent(player, stack, world, - * position); if (MinecraftForge.EVENT_BUS.post(event)) { return - * stack; } - * - * if (event.getResult() == Event.Result.ALLOW) { if - * (player.capabilities.isCreativeMode) { return stack; } - * - * if (--stack.stackSize <= 0) { return event.result; } - * - * if (!player.inventory.addItemStackToInventory(event.result)) { - * player.dropPlayerItem(event.result); } - * - * return stack; } + * FillBucketEvent event = new FillBucketEvent(player, stack, world, position); if + * (MinecraftForge.EVENT_BUS.post(event)) { return stack; } if (event.getResult() == Event.Result.ALLOW) { + * if (player.capabilities.isCreativeMode) { return stack; } if (--stack.stackSize <= 0) { return + * event.result; } if (!player.inventory.addItemStackToInventory(event.result)) { + * player.dropPlayerItem(event.result); } return stack; } */ if (position.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { @@ -110,8 +106,8 @@ public class FilledBucket extends ItemBucket { int metadata = 0; if (TinkerSmeltery.fluidBlocks[type] instanceof BlockFluidFinite) metadata = 7; - world.setBlock( - clickX, clickY, clickZ, TinkerSmeltery.fluidBlocks[type], metadata, 3); // TODO: Merge liquids + world.setBlock(clickX, clickY, clickZ, TinkerSmeltery.fluidBlocks[type], metadata, 3); // TODO: Merge + // liquids } catch (ArrayIndexOutOfBoundsException ex) { TConstruct.logger.warn("AIOBE occured when placing bucket into world; " + ex); return false; @@ -150,73 +146,13 @@ public class FilledBucket extends ItemBucket { return getUnlocalizedName() + "." + materialNames[arr]; } - public static final String[] materialNames = new String[] { - "Iron", - "Gold", - "Copper", - "Tin", - "Aluminum", - "Cobalt", - "Ardite", - "Bronze", - "AluBrass", - "Manyullyn", - "Alumite", - "Obsidian", - "Steel", - "Glass", - "Stone", - "Villager", - "Cow", - "Nickel", - "Lead", - "Silver", - "Shiny", - "Invar", - "Electrum", - "Ender", - "Slime", - "Glue", - "PigIron", - "Lumium", - "Signalum", - "Mithril", - "Enderium", - "Quartz" - }; + public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", + "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", + "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", + "Lumium", "Signalum", "Mithril", "Enderium", "Quartz" }; - public static final String[] textureNames = new String[] { - "iron", - "gold", - "copper", - "tin", - "aluminum", - "cobalt", - "ardite", - "bronze", - "alubrass", - "manyullyn", - "alumite", - "obsidian", - "steel", - "glass", - "stone", - "emerald", - "blood", - "nickel", - "lead", - "silver", - "shiny", - "invar", - "electrum", - "ender", - "slime", - "glue", - "pigiron", - "lumium", - "signalum", - "mithril", - "enderium", - "quartz" - }; + public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", + "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", + "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", + "lumium", "signalum", "mithril", "enderium", "quartz" }; } diff --git a/src/main/java/tconstruct/smeltery/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java index bca375ff..d37951e1 100644 --- a/src/main/java/tconstruct/smeltery/items/MetalPattern.java +++ b/src/main/java/tconstruct/smeltery/items/MetalPattern.java @@ -1,8 +1,10 @@ package tconstruct.smeltery.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; + import tconstruct.tools.items.Pattern; public class MetalPattern extends Pattern { @@ -19,36 +21,10 @@ public class MetalPattern extends Pattern { 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", - "gem", - "nugget" - }; + 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", "gem", "nugget" }; @Override public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java index d11cfe24..7f38d27b 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java @@ -2,11 +2,13 @@ package tconstruct.smeltery.logic; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.event.*; public class CastingBasinLogic extends CastingBlockLogic { + public CastingBasinLogic() { super(TConstructRegistry.getBasinCasting()); } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 649f58c0..e79ab444 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -1,7 +1,7 @@ package tconstruct.smeltery.logic; -import cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; @@ -13,13 +13,16 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import tconstruct.TConstruct; import tconstruct.library.crafting.*; import tconstruct.library.event.*; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.util.IPattern; +import cpw.mods.fml.common.eventhandler.Event; public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory { + public FluidStack liquid; protected int maxCastingDelay = 0; protected int castingDelay = 0; @@ -37,7 +40,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid } public int updateCapacity() // Only used to initialize - { + { ItemStack inv = inventory[0]; int ret = TConstruct.ingotLiquidValue; int rec = liquidCasting.getCastingAmount(this.liquid, inv); @@ -105,7 +108,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid /* Tank stuff */ @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] {getInfo()}; + return new FluidTankInfo[] { getInfo() }; } @Override @@ -219,9 +222,15 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid // Reset liquid if emptied if (liquid.amount <= 0) liquid = null; - if (doDrain) - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent( - drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, used)); + if (doDrain) FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + drained, + this.worldObj, + this.xCoord, + this.yCoord, + this.zCoord, + this, + used)); return drained; } @@ -240,13 +249,17 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid // put stuff in? if (!isStackInSlot(0) && !isStackInSlot(1)) { ItemStack stack = player.inventory.decrStackSize(player.inventory.currentItem, stackSizeLimit); - SmelteryEvent.ItemInsertedIntoCasting event = - new SmelteryEvent.ItemInsertedIntoCasting(this, xCoord, yCoord, zCoord, stack, player); + SmelteryEvent.ItemInsertedIntoCasting event = new SmelteryEvent.ItemInsertedIntoCasting( + this, + xCoord, + yCoord, + zCoord, + stack, + player); MinecraftForge.EVENT_BUS.post(event); if (!event.isCanceled()) setInventorySlotContents(0, event.item); - else - player.inventory.addItemStackToInventory( - stack); // should never return false, since the itemstack was taken from the inventory + else player.inventory.addItemStackToInventory(stack); // should never return false, since the itemstack was + // taken from the inventory } // take stuff out. else { @@ -259,7 +272,12 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid // we therefore spill the whole contents on extraction SmelteryEvent.ItemRemovedFromCasting event = new SmelteryEvent.ItemRemovedFromCasting( - this, xCoord, yCoord, zCoord, getStackInSlot(slot), player); + this, + xCoord, + yCoord, + zCoord, + getStackInSlot(slot), + player); MinecraftForge.EVENT_BUS.post(event); // try to transfer thes tack to the player inventory @@ -280,7 +298,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[] {0, 1}; + return new int[] { 0, 1 }; } @Override @@ -333,7 +351,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid /* NBT, Updating */ @Override public void markDirty() // Isn't actually called? - { + { super.markDirty(); worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index c2e42bba..d0e513cb 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -1,7 +1,7 @@ package tconstruct.smeltery.logic; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; @@ -9,12 +9,15 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import tconstruct.TConstruct; +import cpw.mods.fml.relauncher.*; /** * @author BluSunrize */ public class CastingChannelLogic extends TileEntity implements IFluidHandler { + public static final int fillMax = TConstruct.ingotLiquidValue * 3; public static final int outputMax = TConstruct.ingotLiquidValue; FluidTank internalTank = new FluidTank(fillMax); @@ -24,8 +27,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { public int ticks = 0; public int recentlyFilledDelay; - /* UNUSED - public CastingChannelMode mode = CastingChannelMode.SINGLEDRAIN; + /* + * UNUSED public CastingChannelMode mode = CastingChannelMode.SINGLEDRAIN; */ public CastingChannelLogic() { @@ -50,11 +53,11 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { TileEntity possibleFaucet = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); // if (possibleFaucet instanceof FaucetLogic) { - // flagActiveFaucet = ((FaucetLogic) possibleFaucet).active; + // flagActiveFaucet = ((FaucetLogic) possibleFaucet).active; // } if (ticks == 6) // && !flagActiveFaucet) - this.distributeFluids(); + this.distributeFluids(); if (ticks >= 12) // && !flagActiveFaucet) { if (recentlyFilledDelay != 0) recentlyFilledDelay--; @@ -66,19 +69,10 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { public void changeOutputs(EntityPlayer player, int side, float hitX, float hitY, float hitZ) { /* - * UNUSED - if(player.isSneaking()) - { - - if(mode == null || mode == CastingChannelMode.SINGLEDRAIN) - mode = CastingChannelMode.CONTINUEDRAIN; - else - mode = CastingChannelMode.SINGLEDRAIN; - - String s = "Casting Channel Mode "+(worldObj.isRemote?"client side: ":"server side: "); - player.addChatMessage(s+mode.toString()); - return; - } + * UNUSED if(player.isSneaking()) { if(mode == null || mode == CastingChannelMode.SINGLEDRAIN) mode = + * CastingChannelMode.CONTINUEDRAIN; else mode = CastingChannelMode.SINGLEDRAIN; String s = + * "Casting Channel Mode "+(worldObj.isRemote?"client side: ":"server side: "); + * player.addChatMessage(s+mode.toString()); return; } */ ForgeDirection toggle = ForgeDirection.UNKNOWN; @@ -110,27 +104,25 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { } if (toggle != ForgeDirection.UNKNOWN && toggle != ForgeDirection.UP) { - TileEntity tile = - worldObj.getTileEntity(xCoord + toggle.offsetX, yCoord + toggle.offsetY, zCoord + toggle.offsetZ); - if (tile instanceof IFluidHandler) - if (validOutputs.contains(toggle)) { - validOutputs.remove(toggle); - if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) - ((CastingChannelLogic) tile).validOutputs.remove(toggle.getOpposite()); - } else { - validOutputs.add(toggle); - if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) - if (!((CastingChannelLogic) tile).validOutputs.contains(toggle.getOpposite())) - ((CastingChannelLogic) tile).validOutputs.add(toggle.getOpposite()); - } + TileEntity tile = worldObj + .getTileEntity(xCoord + toggle.offsetX, yCoord + toggle.offsetY, zCoord + toggle.offsetZ); + if (tile instanceof IFluidHandler) if (validOutputs.contains(toggle)) { + validOutputs.remove(toggle); + if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) + ((CastingChannelLogic) tile).validOutputs.remove(toggle.getOpposite()); + } else { + validOutputs.add(toggle); + if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) + if (!((CastingChannelLogic) tile).validOutputs.contains(toggle.getOpposite())) + ((CastingChannelLogic) tile).validOutputs.add(toggle.getOpposite()); + } } markDirtyForRendering(); } private void distributeFluids() { - /* DEBUG - boolean printDebugLog = false; - ArrayList debugLog = new ArrayList(); + /* + * DEBUG boolean printDebugLog = false; ArrayList debugLog = new ArrayList(); */ // Move Fluid to Output Tanks Set connected = this.getOutputs().keySet(); @@ -146,92 +138,78 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { for (ForgeDirection dirOut : connected) { if (this.internalTank.getFluid() == null) break; - /* DEBUG - debugLog.add("Moving to "+dirOut+"ern SubTank"); + /* + * DEBUG debugLog.add("Moving to "+dirOut+"ern SubTank"); */ FluidStack tempFS = new FluidStack(internalTank.getFluid().getFluid(), scaledAmount); int fit = subTanks.get(dirOut).fill(tempFS, false); - /* DEBUG - debugLog.add("SubTank will accept "+fit+"mb"); + /* + * DEBUG debugLog.add("SubTank will accept "+fit+"mb"); */ if (fit > 0) fit = internalTank.drain(fit, true).amount; - /* DEBUG - debugLog.add("Internal Tank was drained by "+fit+"mb"); + /* + * DEBUG debugLog.add("Internal Tank was drained by "+fit+"mb"); */ tempFS.amount = fit; fit = subTanks.get(dirOut).fill(tempFS, true); - /* DEBUG - debugLog.add("SubTank was filled by "+fit+"mb"); - if(fit > 0) - printDebugLog = true; - debugLog.add("Internal Tank now contains: "+internalTank.getFluidAmount()+"mb"); - debugLog.add("SubTank now contains: "+subTanks.get(dirOut).getFluidAmount()+"mb"); + /* + * DEBUG debugLog.add("SubTank was filled by "+fit+"mb"); if(fit > 0) printDebugLog = true; + * debugLog.add("Internal Tank now contains: "+internalTank.getFluidAmount()+"mb"); + * debugLog.add("SubTank now contains: "+subTanks.get(dirOut).getFluidAmount()+"mb"); */ markDirtyForRendering(); } - /* DEBUG - if(printDebugLog) - { - for(String s: debugLog) - System.out.println(s); - debugLog.clear(); - } - printDebugLog = false; + /* + * DEBUG if(printDebugLog) { for(String s: debugLog) System.out.println(s); debugLog.clear(); } printDebugLog = + * false; */ // Get Fluid from most recent InputTank FluidTank inputTank = subTanks.get(lastProvider); if (inputTank != null && inputTank.getFluid() != null) // Tank can be null if input was received from top { - /* DEBUG - debugLog.add("Importing from "+lastProvider+"ern SubTank"); + /* + * DEBUG debugLog.add("Importing from "+lastProvider+"ern SubTank"); */ - FluidStack tempFS = - new FluidStack(inputTank.getFluid().getFluid(), Math.min(inputTank.getFluidAmount(), outputMax)); + FluidStack tempFS = new FluidStack( + inputTank.getFluid().getFluid(), + Math.min(inputTank.getFluidAmount(), outputMax)); int fit = internalTank.fill(tempFS, false); - /* DEBUG - debugLog.add("Internal Tank will accept "+fit+"mb"); + /* + * DEBUG debugLog.add("Internal Tank will accept "+fit+"mb"); */ if (fit > 0) fit = inputTank.drain(fit, true).amount; - /* DEBUG - debugLog.add("Import Tank was drained by "+fit+"mb"); + /* + * DEBUG debugLog.add("Import Tank was drained by "+fit+"mb"); */ tempFS.amount = fit; fit = internalTank.fill(tempFS, true); - /* DEBUG - debugLog.add("Internal Tank was filled by "+fit+"mb"); - if(fit > 0) - printDebugLog = true; - debugLog.add("Internal Tank now contains: "+internalTank.getFluidAmount()+"mb"); - debugLog.add("SubTank now contains: "+inputTank.getFluidAmount()+"mb"); + /* + * DEBUG debugLog.add("Internal Tank was filled by "+fit+"mb"); if(fit > 0) printDebugLog = true; + * debugLog.add("Internal Tank now contains: "+internalTank.getFluidAmount()+"mb"); + * debugLog.add("SubTank now contains: "+inputTank.getFluidAmount()+"mb"); */ markDirtyForRendering(); } - /* DEBUG - if(printDebugLog) - { - for(String s: debugLog) - System.out.println(s); - debugLog.clear(); - } + /* + * DEBUG if(printDebugLog) { for(String s: debugLog) System.out.println(s); debugLog.clear(); } */ } private void outputFluids() { - /* DEBUG - boolean printDebugLog = false; - ArrayList debugLog = new ArrayList(); + /* + * DEBUG boolean printDebugLog = false; ArrayList debugLog = new ArrayList(); */ HashMap connected = this.getOutputs(); connected.remove(lastProvider); - if (connected.containsKey(ForgeDirection.DOWN) - && this.internalTank.getFluid() != null) // Prioritizes FluidHandlers below + if (connected.containsKey(ForgeDirection.DOWN) && this.internalTank.getFluid() != null) // Prioritizes + // FluidHandlers below { int output = Math.min(internalTank.getFluid().amount, outputMax); FluidStack tempFS = new FluidStack(internalTank.getFluid().getFluid(), output); - int fittingBelow = - ((IFluidHandler) connected.get(ForgeDirection.DOWN)).fill(ForgeDirection.UP, tempFS, false); + int fittingBelow = ((IFluidHandler) connected.get(ForgeDirection.DOWN)) + .fill(ForgeDirection.UP, tempFS, false); if (fittingBelow > 0) fittingBelow = this.drain(ForgeDirection.DOWN, fittingBelow, true).amount; tempFS.amount = fittingBelow; fittingBelow = ((IFluidHandler) connected.get(ForgeDirection.DOWN)).fill(ForgeDirection.UP, tempFS, true); @@ -242,34 +220,30 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { for (ForgeDirection dir : connected.keySet()) // Iterates to connected FluidHandlers { if (subTanks.get(dir) != null && subTanks.get(dir).getFluid() != null) { - /* DEBUG - debugLog.add("Exporting from "+dir+"ern SubTank"); + /* + * DEBUG debugLog.add("Exporting from "+dir+"ern SubTank"); */ FluidStack tempFS = new FluidStack( subTanks.get(dir).getFluid().getFluid(), Math.min(subTanks.get(dir).getFluidAmount(), outputMax)); int fit = ((IFluidHandler) connected.get(dir)).fill(dir.getOpposite(), tempFS, false); - /* DEBUG - debugLog.add("New Channel will accept "+fit+"mb"); + /* + * DEBUG debugLog.add("New Channel will accept "+fit+"mb"); */ if (fit > 0) fit = this.drain(dir, fit, true).amount; - /* DEBUG - debugLog.add("OldSubTank was drained by "+fit+"mb"); + /* + * DEBUG debugLog.add("OldSubTank was drained by "+fit+"mb"); */ tempFS.amount = fit; fit = ((IFluidHandler) connected.get(dir)).fill(dir.getOpposite(), tempFS, true); - /* DEBUG - debugLog.add("New Channel was filled by "+fit+"mb"); - - debugLog.add("OldSubTank now contains: "+drain(dir, 100000, false).amount+"mb"); - if(fit > 0) - printDebugLog = true; + /* + * DEBUG debugLog.add("New Channel was filled by "+fit+"mb"); + * debugLog.add("OldSubTank now contains: "+drain(dir, 100000, false).amount+"mb"); if(fit > 0) + * printDebugLog = true; */ } - /* DEBUG - for(String s: debugLog) - System.out.println(s); - debugLog.clear(); + /* + * DEBUG for(String s: debugLog) System.out.println(s); debugLog.clear(); */ } } @@ -314,12 +288,11 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { if (from == ForgeDirection.UP) { return this.internalTank.fill(resource, doFill); - } else if (from == ForgeDirection.NORTH - || from == ForgeDirection.SOUTH + } else if (from == ForgeDirection.NORTH || from == ForgeDirection.SOUTH || from == ForgeDirection.WEST || from == ForgeDirection.EAST) { - return this.subTanks.get(from).fill(resource, doFill); - } + return this.subTanks.get(from).fill(resource, doFill); + } return 0; } @@ -328,8 +301,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { FluidStack fluidStack = null; if (from == ForgeDirection.DOWN) if (this.internalTank.getFluid() != null) fluidStack = this.internalTank.getFluid(); - else if (validOutputs.contains(from)) - fluidStack = this.subTanks.get(from).getFluid(); + else if (validOutputs.contains(from)) fluidStack = this.subTanks.get(from).getFluid(); // wrong fluid if (fluidStack != null && fluidStack.getFluid() != resource.getFluid()) return null; @@ -340,14 +312,13 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { // if(doDrain) - // this.worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + // this.worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); if (from == ForgeDirection.DOWN) return this.internalTank.drain(maxDrain, doDrain); - else if (from == ForgeDirection.NORTH - || from == ForgeDirection.SOUTH + else if (from == ForgeDirection.NORTH || from == ForgeDirection.SOUTH || from == ForgeDirection.WEST || from == ForgeDirection.EAST) { - return this.subTanks.get(from).drain(maxDrain, doDrain); - } + return this.subTanks.get(from).drain(maxDrain, doDrain); + } return null; } @@ -368,8 +339,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { if (from == null || from == ForgeDirection.UP || from == ForgeDirection.DOWN || from == ForgeDirection.UNKNOWN) - return new FluidTankInfo[] {new FluidTankInfo(internalTank)}; - else return new FluidTankInfo[] {new FluidTankInfo(subTanks.get(from))}; + return new FluidTankInfo[] { new FluidTankInfo(internalTank) }; + else return new FluidTankInfo[] { new FluidTankInfo(subTanks.get(from)) }; } @Override @@ -393,8 +364,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { validOutputs = new ArrayList<>(); for (int i : validFDs) validOutputs.add(convertIntToFD(i)); } - /* UNUSED - this.mode = CastingChannelMode.readFromNBT(tags); + /* + * UNUSED this.mode = CastingChannelMode.readFromNBT(tags); */ this.lastProvider = this.convertIntToFD(tags.getInteger("LastProvider")); } @@ -422,8 +393,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { it++; } tags.setIntArray("validOutputs", validFDs); - /* UNUSED - CastingChannelMode.writeToNBT(tags, this.mode); + /* + * UNUSED CastingChannelMode.writeToNBT(tags, this.mode); */ tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider)); } @@ -478,25 +449,12 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { return ForgeDirection.UNKNOWN; } } - /* UNUSED - public enum CastingChannelMode - { - //Will not output while being filled by Faucet, hence only taking one ingots worth from the Smeltery - SINGLEDRAIN, - //Will keep the Faucet above it open - CONTINUEDRAIN; - - public static void writeToNBT(NBTTagCompound tag, CastingChannelMode mode) - { - if(mode == SINGLEDRAIN) - tag.setString("CastingChannelMode","single"); - else - tag.setString("CastingChannelMode","continue"); - } - public static CastingChannelMode readFromNBT(NBTTagCompound tag) - { - return (!tag.hasKey("CastingChannelMode") || tag.getString("CastingChannelMode")=="single") ? SINGLEDRAIN : CONTINUEDRAIN ; - } - } + /* + * UNUSED public enum CastingChannelMode { //Will not output while being filled by Faucet, hence only taking one + * ingots worth from the Smeltery SINGLEDRAIN, //Will keep the Faucet above it open CONTINUEDRAIN; public static + * void writeToNBT(NBTTagCompound tag, CastingChannelMode mode) { if(mode == SINGLEDRAIN) + * tag.setString("CastingChannelMode","single"); else tag.setString("CastingChannelMode","continue"); } public + * static CastingChannelMode readFromNBT(NBTTagCompound tag) { return (!tag.hasKey("CastingChannelMode") || + * tag.getString("CastingChannelMode")=="single") ? SINGLEDRAIN : CONTINUEDRAIN ; } } */ } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java index a94ca009..37ff03ba 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java @@ -2,11 +2,13 @@ package tconstruct.smeltery.logic; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.event.*; public class CastingTableLogic extends CastingBlockLogic { + public CastingTableLogic() { super(TConstructRegistry.getTableCasting()); } diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index 9b10304b..b5f6ea86 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.logic; import mantle.blocks.iface.*; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; @@ -8,9 +9,11 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import tconstruct.TConstruct; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler { + byte direction; boolean active; public FluidStack liquid; @@ -38,8 +41,8 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi TileEntity tankte = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); if (drainte instanceof IFluidHandler && tankte instanceof IFluidHandler) { - FluidStack templiquid = - ((IFluidHandler) drainte).drain(getForgeDirection(), TConstruct.ingotLiquidValue, false); + FluidStack templiquid = ((IFluidHandler) drainte) + .drain(getForgeDirection(), TConstruct.ingotLiquidValue, false); if (templiquid != null) { int drained = ((IFluidHandler) tankte).fill(ForgeDirection.UP, templiquid, false); if (drained > 0) { @@ -91,25 +94,10 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi @Override public void setDirection(float yaw, float pitch, EntityLivingBase player) { - /*int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; - switch (facing) - { - case 0: - direction = 2; - break; - - case 1: - direction = 5; - break; - - case 2: - direction = 3; - break; - - case 3: - direction = 4; - break; - }*/ + /* + * int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; switch (facing) { case 0: direction = + * 2; break; case 1: direction = 5; break; case 2: direction = 3; break; case 3: direction = 4; break; } + */ } @Override diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index a2e985c1..1c5ad811 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; @@ -8,6 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { + public FluidTank tank; public int renderOffset; public static final int tankCapacity = FluidContainerRegistry.BUCKET_VOLUME * 4; @@ -63,15 +65,12 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidStack fluid = null; if (tank.getFluid() != null) fluid = tank.getFluid().copy(); - return new FluidTankInfo[] {new FluidTankInfo(fluid, tank.getCapacity())}; + return new FluidTankInfo[] { new FluidTankInfo(fluid, tank.getCapacity()) }; } /* - * @Override public IFluidTank[] getTanks (ForgeDirection direction) { - * return new IFluidTank[] { tank }; } - * - * @Override public IFluidTank getTank (ForgeDirection direction, FluidStack - * type) { return tank; } + * @Override public IFluidTank[] getTanks (ForgeDirection direction) { return new IFluidTank[] { tank }; } + * @Override public IFluidTank getTank (ForgeDirection direction, FluidStack type) { return tank; } */ public float getFluidAmountScaled() { diff --git a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java index 1dfd2624..8030a25b 100644 --- a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java @@ -6,6 +6,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; public class LiquidTextureLogic extends TileEntity { + int texturePos; @Override diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index cfca2196..3065eeac 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -3,6 +3,7 @@ package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IFacingLogic; import mantle.world.CoordTuple; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; @@ -12,6 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { + byte direction; @Override @@ -22,8 +24,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) { - SmelteryLogic smeltery = (SmelteryLogic) - worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj + .getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.fill(resource, doFill); } else { return 0; @@ -33,8 +35,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { if (hasValidMaster() && canDrain(from, null)) { - SmelteryLogic smeltery = (SmelteryLogic) - worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj + .getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.drain(maxDrain, doDrain); } return null; @@ -43,8 +45,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { if (hasValidMaster() && canDrain(from, resource.getFluid())) { - SmelteryLogic smeltery = (SmelteryLogic) - worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj + .getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); if (resource.getFluid() == smeltery.getFluid().getFluid()) { return smeltery.drain(resource.amount, doDrain); } @@ -66,8 +68,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl boolean containsFluid = fluid == null; if (fluid != null) { - SmelteryLogic smeltery = (SmelteryLogic) - worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj + .getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); for (FluidStack fstack : smeltery.moltenMetal) { if (fstack.getFluidID() == fluid.getID()) { containsFluid = true; @@ -81,12 +83,10 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if (hasValidMaster() - && (from == getForgeDirection() - || from == getForgeDirection().getOpposite() - || from == ForgeDirection.UNKNOWN)) { - SmelteryLogic smeltery = (SmelteryLogic) - worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() + || from == ForgeDirection.UNKNOWN)) { + SmelteryLogic smeltery = (SmelteryLogic) worldObj + .getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getMultiTankInfo(); // return new FluidTankInfo[] { smeltery.getInfo() }; } diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 26893210..2d90c278 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -1,10 +1,9 @@ package tconstruct.smeltery.logic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import mantle.blocks.abstracts.InventoryLogic; import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IActiveLogic; @@ -12,6 +11,7 @@ import mantle.blocks.iface.IFacingLogic; import mantle.blocks.iface.IMasterLogic; import mantle.blocks.iface.IServantLogic; import mantle.world.CoordTuple; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -36,17 +36,22 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import tconstruct.TConstruct; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.SmelteryDamageSource; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -/* Simple class for storing items in the block +/* + * Simple class for storing items in the block */ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, IFluidTank, IMasterLogic { + private static final int MAX_SMELTERY_SIZE = 7; public static final int MB_PER_BLOCK_CAPACITY = TConstruct.ingotLiquidValue * 10; @@ -174,8 +179,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) - stack.getTagCompound().copy()); + entityitem.getEntityItem() + .setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } float offset = 0.05F; @@ -317,8 +322,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci void detectEntities() { if (minPos == null || maxPos == null) return; - AxisAlignedBB box = AxisAlignedBB.getBoundingBox( - minPos.x, minPos.y, minPos.z, maxPos.x + 1, minPos.y + layers, maxPos.z + 1); + AxisAlignedBB box = AxisAlignedBB + .getBoundingBox(minPos.x, minPos.y, minPos.z, maxPos.x + 1, minPos.y + layers, maxPos.z + 1); List list = worldObj.getEntitiesWithinAABB(Entity.class, box); for (Entity o : list) { @@ -398,11 +403,10 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci private void checkHasItems() { inUse = false; - for (int i = 0; i < maxBlockCapacity; i++) - if (this.isStackInSlot(i) && meltingTemps[i] > 200) { - inUse = true; - break; - } + for (int i = 0; i < maxBlockCapacity; i++) if (this.isStackInSlot(i) && meltingTemps[i] > 200) { + inUse = true; + break; + } } private void heatItems() { @@ -486,8 +490,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci private void updateTemperatures() { for (int i = 0; i < maxBlockCapacity && i < meltingTemps.length; i++) { - meltingTemps[i] = - Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more progress control + meltingTemps[i] = Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more + // progress control } } @@ -501,8 +505,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } // checks are all done before in verifyFuelTank. Don't do this without checks! - IFluidHandler tankContainer = - (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + IFluidHandler tankContainer = (IFluidHandler) worldObj + .getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); FluidTankInfo[] info = tankContainer.getTankInfo(ForgeDirection.DOWN); int capacity = info[0].capacity; @@ -520,8 +524,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (activeLavaTank == null) return; // checks are all done before in verifyFuelTank. Don't do this without checks! - IFluidHandler tankContainer = - (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + IFluidHandler tankContainer = (IFluidHandler) worldObj + .getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); // get liquid from the tank FluidStack liquid = tankContainer.drain(ForgeDirection.DOWN, 15, false); @@ -532,8 +536,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci liquid = tankContainer.drain(ForgeDirection.DOWN, 15, true); // we try to do it as long as we don't have enough. Only needed for rapid-use fuels. if (liquid == null || liquid.amount == 0) break; - useTime += (int) - ((float) Smeltery.getFuelDuration(liquid.getFluid()) * Math.round(15f / (float) liquid.amount)); + useTime += (int) ((float) Smeltery.getFuelDuration(liquid.getFluid()) + * Math.round(15f / (float) liquid.amount)); internalTemp = Smeltery.getFuelPower(liquid.getFluid()); } while (useTime < 0); @@ -599,9 +603,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci /* Inventory */ /* - * public int getMaxStackStackSize (ItemStack stack) { FluidStack liquid = - * getResultFor(stack); if (liquid == null) return 0; return liquid.amount; - * } + * public int getMaxStackStackSize (ItemStack stack) { FluidStack liquid = getResultFor(stack); if (liquid == null) + * return 0; return liquid.amount; } */ @Override @@ -621,10 +624,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } /* - * @Override public void setInventorySlotContents (int slot, ItemStack - * itemstack) { inventory[slot] = itemstack != null ? - * itemstack.splitStack(1) : null; //May include unintended side effects. - * Possible fix for max stack size of 1? } + * @Override public void setInventorySlotContents (int slot, ItemStack itemstack) { inventory[slot] = itemstack != + * null ? itemstack.splitStack(1) : null; //May include unintended side effects. Possible fix for max stack size of + * 1? } */ /* Multiblock */ @@ -699,15 +701,15 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } // do the check - int[] sides = new int[] {xd1, xd2, zd1, zd2}; + int[] sides = new int[] { xd1, xd2, zd1, zd2 }; checkValidStructure(x, y, z, sides); } /** * - * @param x x-center of the smeltery +-1 - * @param y y-position of the controller block - * @param z z-center of the smeltery +-1 + * @param x x-center of the smeltery +-1 + * @param y y-position of the controller block + * @param z z-center of the smeltery +-1 * @param sides distance between the center point and the wall. [-x,+x,-z,+z] */ public void checkValidStructure(int x, int y, int z, int[] sides) { @@ -866,8 +868,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } /* - * Returns whether the brick is a lava tank or not. Increments bricks, sets - * them as part of the structure, and adds tanks to the list. + * Returns whether the brick is a lava tank or not. Increments bricks, sets them as part of the structure, and adds + * tanks to the list. */ int checkBricks(int x, int y, int z) { int tempBricks = 0; @@ -1037,13 +1039,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } // if(maxBlockCapacity != meltingTemps.length) - // adjustLayers(layers, true); + // adjustLayers(layers, true); - if (!tags.getBoolean("ValidStructure")) - validStructure = false; // only negative update because we want to do a clientside structure check too - else if (!validStructure - && worldObj - != null) // if the worldobj is null it happens on loading of a world. check shouldn't be done + if (!tags.getBoolean("ValidStructure")) validStructure = false; // only negative update because we want to do a + // clientside structure check too + else if (!validStructure && worldObj != null) // if the worldobj is null it happens on loading of a world. check + // shouldn't be done // there checkValidPlacement(); @@ -1060,12 +1061,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci tags.setBoolean("InUse", inUse); int[] pos; - if (minPos == null) pos = new int[] {xCoord, yCoord, zCoord}; - else pos = new int[] {minPos.x, minPos.y, minPos.z}; + if (minPos == null) pos = new int[] { xCoord, yCoord, zCoord }; + else pos = new int[] { minPos.x, minPos.y, minPos.z }; tags.setIntArray("MinPos", pos); - if (maxPos == null) pos = new int[] {xCoord, yCoord, zCoord}; - else pos = new int[] {maxPos.x, maxPos.y, maxPos.z}; + if (maxPos == null) pos = new int[] { xCoord, yCoord, zCoord }; + else pos = new int[] { maxPos.x, maxPos.y, maxPos.z }; tags.setIntArray("MaxPos", pos); tags.setByte("Direction", direction); diff --git a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index 4e9eec6e..a9703362 100644 --- a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -1,20 +1,24 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.*; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; + import org.lwjgl.opengl.GL11; + import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.CastingChannelLogic; +import cpw.mods.fml.client.registry.*; /** * @author BluSunrize */ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { + public static int renderID = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -45,8 +49,8 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == renderID) { CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); @@ -146,27 +150,20 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { private double[] getRenderboundsForLiquid(ForgeDirection dir) { switch (dir) { case NORTH: - return new double[] {0.375, 0, 0.625, 0.375}; + return new double[] { 0.375, 0, 0.625, 0.375 }; case SOUTH: - return new double[] {0.375, 0.625, 0.625, 1}; + return new double[] { 0.375, 0.625, 0.625, 1 }; case WEST: - return new double[] {0, 0.375, 0.375, 0.625}; + return new double[] { 0, 0.375, 0.375, 0.625 }; case EAST: - return new double[] {0.625, 0.375, 1, 0.625}; + return new double[] { 0.625, 0.375, 1, 0.625 }; default: return null; } } - private void renderLiquidPart( - IBlockAccess world, - int x, - int y, - int z, - Block block, - RenderBlocks renderer, - FluidStack fluidStack, - boolean useFlowingTexture) { + private void renderLiquidPart(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, + FluidStack fluidStack, boolean useFlowingTexture) { int color = block.colorMultiplier(world, x, y, z); float red = (color >> 16 & 0xFF) / 255.0F; float green = (color >> 8 & 0xFF) / 255.0F; @@ -174,28 +171,26 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { Fluid fluid = fluidStack.getFluid(); if (fluid.canBePlacedInWorld() && !useFlowingTexture) BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); - else if (useFlowingTexture) - BlockSkinRenderHelper.renderLiquidBlock( - fluid.getFlowingIcon(), - fluid.getFlowingIcon(), - x, - y, - z, - renderer, - world, - false, - fluid.getColor(fluidStack)); - else - BlockSkinRenderHelper.renderLiquidBlock( - fluid.getStillIcon(), - fluid.getFlowingIcon(), - x, - y, - z, - renderer, - world, - false, - fluid.getColor(fluidStack)); + else if (useFlowingTexture) BlockSkinRenderHelper.renderLiquidBlock( + fluid.getFlowingIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(fluidStack)); + else BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(fluidStack)); } private void renderStandardBlock(Block block, int meta, RenderBlocks renderer) { diff --git a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index 6993b9e7..f3252167 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -1,19 +1,22 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; + import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.logic.CastingBasinLogic; import tconstruct.tools.entity.FancyEntityItem; +import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ @SideOnly(Side.CLIENT) public class CastingBasinSpecialRender extends TileEntitySpecialRenderer { + @Override public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { this.render((CastingBasinLogic) logic, var2, var4, var6, var8); diff --git a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java index 3716b725..fd3eaff5 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java @@ -1,19 +1,21 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; + import tconstruct.TConstruct; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.CastingRecipe; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.*; import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class CastingBlockRender implements ISimpleBlockRenderingHandler { + public static int searedModel = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -56,41 +58,33 @@ public class CastingBlockRender implements ISimpleBlockRenderingHandler { ItemHelper.renderStandardInvBlock(renderer, block, metadata); // Details - /*renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - - renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - - renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - - renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); - ItemHelper.renderStandardInvBlock(renderer, block, metadata);*/ + /* + * renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.001f, + * 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.001f, + * 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.8755f, + * 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.8755f, + * 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.5625f, + * 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.4375f, + * 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.5625f, + * 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); + * ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.4375f, + * 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); ItemHelper.renderStandardInvBlock(renderer, block, + * metadata); + */ // Legs renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); @@ -119,8 +113,8 @@ public class CastingBlockRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == searedModel) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 0) { @@ -248,12 +242,13 @@ public class CastingBlockRender implements ISimpleBlockRenderingHandler { yMin = -0.125F; } else if ((uBlock == TinkerSmeltery.searedBlock || uBlock == TinkerSmeltery.searedBlockNether) && uMeta == 2) { - yMin = -0.75F; - } else if (uBlock == TinkerSmeltery.lavaTank || uBlock == TinkerSmeltery.lavaTankNether) { - yMin = -1F; - } else if (uBlock == TinkerSmeltery.castingChannel) { - yMin = -0.5F; - } + yMin = -0.75F; + } else + if (uBlock == TinkerSmeltery.lavaTank || uBlock == TinkerSmeltery.lavaTankNether) { + yMin = -1F; + } else if (uBlock == TinkerSmeltery.castingChannel) { + yMin = -0.5F; + } if (logic.liquid != null) { Fluid fluid = logic.liquid.getFluid(); diff --git a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index dfe9c9ec..dd1717a4 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -1,20 +1,23 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; + import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingTableLogic; import tconstruct.tools.entity.FancyEntityItem; +import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ @SideOnly(Side.CLIENT) public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer { + @Override public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { // TConstruct.logger.info("Render!!!"); diff --git a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index 03dbb09d..1e136108 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -2,12 +2,13 @@ package tconstruct.smeltery.model; import static net.minecraftforge.common.util.ForgeDirection.*; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import tconstruct.smeltery.blocks.GlassPaneConnected; +import cpw.mods.fml.client.registry.*; public class PaneConnectedRender implements ISimpleBlockRenderingHandler { @@ -17,8 +18,8 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler { public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { boolean temp = renderer.renderAllFaces; renderer.renderAllFaces = true; @@ -37,9 +38,9 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler { renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 1D); renderer.renderStandardBlock(block, x, y, z); } // else { - // renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); - // renderer.renderStandardBlock(block, x, y, z); - // } + // renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); + // renderer.renderStandardBlock(block, x, y, z); + // } // renderer.setOverrideBlockTexture(sideTexture); diff --git a/src/main/java/tconstruct/smeltery/model/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java index cad653a0..df048e93 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -1,12 +1,14 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class PaneRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -18,8 +20,8 @@ public class PaneRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { // renderer.setOverrideBlockTexture(((PaneBase)block).getIcon(0, world.getBlockMetadata(x,y,z))); return renderer.renderBlockStainedGlassPane(block, x, y, z); diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index 771cd48a..71ee2847 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -1,19 +1,22 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.*; import mantle.world.CoordTuple; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.*; + import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class SmelteryRender implements ISimpleBlockRenderingHandler { + public static int smelteryModel = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -24,8 +27,8 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == smelteryModel) { if (world.getBlockMetadata(x, y, z) == 0) return renderSmeltery(world, x, y, z, block, modelID, renderer); else renderer.renderStandardBlock(block, x, y, z); @@ -33,8 +36,8 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { return true; } - public boolean renderSmeltery( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderSmeltery(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { boolean ret = renderer.renderStandardBlock(block, x, y, z); SmelteryLogic logic = (SmelteryLogic) world.getTileEntity(x, y, z); if (logic.validStructure) { @@ -70,28 +73,25 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { renderer.setRenderBounds(0, renderBase, 0, 1, renderHeight, 1); Fluid fluid = liquid.getFluid(); - for (int xi = from.x; xi <= to.x; xi++) - for (int zi = from.z; zi <= to.z; zi++) { - float minX = xi == from.x ? -0.001F : 0F; - float minZ = zi == from.z ? -0.001F : 0F; - float maxX = xi == to.x ? 1.001F : 1F; - float maxZ = zi == to.z ? 1.001F : 1F; - renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); - if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock( - fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); - else - BlockSkinRenderHelper.renderLiquidBlock( - fluid.getStillIcon(), - fluid.getFlowingIcon(), - xi, - from.y + yBase, - zi, - renderer, - world, - false, - fluid.getColor(liquid)); - } + for (int xi = from.x; xi <= to.x; xi++) for (int zi = from.z; zi <= to.z; zi++) { + float minX = xi == from.x ? -0.001F : 0F; + float minZ = zi == from.z ? -0.001F : 0F; + float maxX = xi == to.x ? 1.001F : 1F; + float maxZ = zi == to.z ? 1.001F : 1F; + renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); + if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper + .renderMetadataBlock(fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); + else BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + xi, + from.y + yBase, + zi, + renderer, + world, + false, + fluid.getColor(liquid)); + } if (countSize == room) { base = 0F; @@ -105,35 +105,39 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { return ret; } - void renderLayer( - SmelteryLogic logic, - int start, - CoordTuple from, - CoordTuple to, - int posY, - RenderBlocks renderer, + void renderLayer(SmelteryLogic logic, int start, CoordTuple from, CoordTuple to, int posY, RenderBlocks renderer, IBlockAccess world) { renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); int i = start; - for (int x = from.x; x <= to.x; x++) - for (int z = from.z; z <= to.z; z++) { - // safety because of changes. - if (i > logic.getSizeInventory()) return; - ItemStack input = logic.getStackInSlot(i); - if (input != null && logic.getTempForSlot(i) > 20) { - ItemStack blockToRender = Smeltery.getRenderIndex(input); - if (blockToRender != null) { - float blockHeight = input.stackSize / (float) blockToRender.stackSize; - renderer.setRenderBounds( - 0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); + for (int x = from.x; x <= to.x; x++) for (int z = from.z; z <= to.z; z++) { + // safety because of changes. + if (i > logic.getSizeInventory()) return; + ItemStack input = logic.getStackInSlot(i); + if (input != null && logic.getTempForSlot(i) > 20) { + ItemStack blockToRender = Smeltery.getRenderIndex(input); + if (blockToRender != null) { + float blockHeight = input.stackSize / (float) blockToRender.stackSize; + renderer.setRenderBounds( + 0.0F, + 0.0F, + 0.0F, + 1.0F, + MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), + 1.0F); - Block liquidBlock = Block.getBlockFromItem(blockToRender.getItem()); - BlockSkinRenderHelper.renderMetadataBlock( - liquidBlock, blockToRender.getItemDamage(), x, posY, z, renderer, world); - } + Block liquidBlock = Block.getBlockFromItem(blockToRender.getItem()); + BlockSkinRenderHelper.renderMetadataBlock( + liquidBlock, + blockToRender.getItemDamage(), + x, + posY, + z, + renderer, + world); } - i++; } + i++; + } } @Override diff --git a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java index 239ec5ac..31e8ec44 100644 --- a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java @@ -1,15 +1,18 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.opengl.GL11; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.RenderingRegistry; public class TankItemRenderer implements IItemRenderer { + @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type == ItemRenderType.INVENTORY || type == ItemRenderType.ENTITY; @@ -29,14 +32,12 @@ public class TankItemRenderer implements IItemRenderer { int meta = item.getItemDamage(); if (item.hasTagCompound() && item.getTagCompound().hasKey("Fluid")) { - FluidStack liquid = - FluidStack.loadFluidStackFromNBT(item.getTagCompound().getCompoundTag("Fluid")); + FluidStack liquid = FluidStack.loadFluidStackFromNBT(item.getTagCompound().getCompoundTag("Fluid")); if (liquid != null && liquid.getFluid().getBlock() != null) { GL11.glEnable(GL11.GL_BLEND); float height = (float) liquid.amount / 4000f - 0.01f; renderblocks.setRenderBounds(0.01, 0.01, 0.01, 0.99, height, 0.99); - ItemHelper.renderStandardInvBlock( - renderblocks, liquid.getFluid().getBlock(), 0); + ItemHelper.renderStandardInvBlock(renderblocks, liquid.getFluid().getBlock(), 0); GL11.glDisable(GL11.GL_BLEND); } } diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java index 4dbf80dd..785f3475 100644 --- a/src/main/java/tconstruct/smeltery/model/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -1,17 +1,20 @@ package tconstruct.smeltery.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.*; + import org.lwjgl.opengl.GL11; + import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class TankRender implements ISimpleBlockRenderingHandler { + public static int tankModelID = RenderingRegistry.getNextAvailableRenderId(); public static int renderPass = 0; @@ -28,8 +31,8 @@ public class TankRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == tankModelID) { // Liquid if (renderPass == 0) { diff --git a/src/main/java/tconstruct/tools/BowRecipe.java b/src/main/java/tconstruct/tools/BowRecipe.java index 955ff0a0..470693dd 100644 --- a/src/main/java/tconstruct/tools/BowRecipe.java +++ b/src/main/java/tconstruct/tools/BowRecipe.java @@ -2,6 +2,7 @@ package tconstruct.tools; import net.minecraft.init.Items; import net.minecraft.item.Item; + import tconstruct.library.crafting.ToolRecipe; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java index 9a55c9de..ea6f2f19 100644 --- a/src/main/java/tconstruct/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java @@ -1,6 +1,7 @@ package tconstruct.tools; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.enchantment.*; import net.minecraft.entity.*; @@ -13,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; + import tconstruct.library.ActiveToolMod; import tconstruct.library.tools.*; import tconstruct.library.weaponry.IAmmo; @@ -21,28 +23,28 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; public class TActiveOmniMod extends ActiveToolMod { + Random random = new Random(); /* Updating */ @Override public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) { - if (!world.isRemote - && entity instanceof EntityLivingBase + if (!world.isRemote && entity instanceof EntityLivingBase && !((EntityLivingBase) entity).isSwingInProgress && stack.getTagCompound() != null) { if (entity instanceof EntityPlayer && (((EntityPlayer) entity).isUsingItem())) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); if (tags.hasKey("Moss")) { int chance = tags.getInteger("Moss"); - int check = - world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150; + int check = world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 + : 1150; // REGROWING AMMO :OOoo - if (tool instanceof IAmmo - && random.nextInt(check * 3) < chance) // ammo regenerates at a much slower rate + if (tool instanceof IAmmo && random.nextInt(check * 3) < chance) // ammo regenerates at a much slower + // rate { IAmmo ammothing = (IAmmo) tool; if (ammothing.getAmmoCount(stack) > 0) // must have ammo - ammothing.addAmmo(1, stack); + ammothing.addAmmo(1, stack); } // selfrepairing tool. LAAAAAME else if (random.nextInt(check) < chance) { @@ -63,14 +65,14 @@ public class TActiveOmniMod extends ActiveToolMod { } @Override - public void afterBlockBreak( - ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) { + public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, + EntityLivingBase entity) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); slimify(tool, tags, block, x, y, z, entity.worldObj); } - private boolean autoSmelt( - ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) { + private boolean autoSmelt(ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, + EntityLivingBase entity) { World world = entity.worldObj; Block block = world.getBlock(x, y, z); if (block == null) return false; @@ -98,8 +100,10 @@ public class TActiveOmniMod extends ActiveToolMod { if (entity instanceof EntityPlayer && !((EntityPlayer) entity).capabilities.isCreativeMode) tool.onBlockDestroyed(stack, world, block, x, y, z, entity); if (!world.isRemote) { - ItemStack spawnme = - new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage()); + ItemStack spawnme = new ItemStack( + result.getItem(), + amount * result.stackSize, + result.getItemDamage()); if (result.hasTagCompound()) spawnme.setTagCompound(result.getTagCompound()); if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction) { int loot = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); @@ -163,15 +167,8 @@ public class TActiveOmniMod extends ActiveToolMod { /* Attacking */ @Override - public int baseAttackDamage( - int earlyModDamage, - int damage, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public int baseAttackDamage(int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { TinkerTools.modLapis.midStreamModify(stack, tool); baconator(tool, stack, player, tags); return 0; @@ -231,15 +228,8 @@ public class TActiveOmniMod extends ActiveToolMod { } @Override - public int attackDamage( - int modDamage, - int currentDamage, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public int attackDamage(int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { int bonus = modDamage; if (entity instanceof EntityLivingBase) { EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute(); @@ -266,15 +256,8 @@ public class TActiveOmniMod extends ActiveToolMod { } @Override - public float knockback( - float modKnockback, - float currentKnockback, - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public float knockback(float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, + NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { float bonus = modKnockback; if (toolTags.hasKey("Knockback")) { float level = toolTags.getFloat("Knockback"); @@ -284,13 +267,8 @@ public class TActiveOmniMod extends ActiveToolMod { } @Override - public boolean doesCriticalHit( - ToolCore tool, - NBTTagCompound tags, - NBTTagCompound toolTags, - ItemStack stack, - EntityLivingBase player, - Entity entity) { + public boolean doesCriticalHit(ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, + EntityLivingBase player, Entity entity) { return tool == TinkerTools.cutlass && random.nextInt(10) == 0; } } diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index 033a7097..cf1c6a84 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -1,9 +1,7 @@ package tconstruct.tools; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; @@ -23,6 +21,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; + import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.TConstructRegistry; @@ -34,14 +33,18 @@ import tconstruct.library.tools.*; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.MovementUpdatePacket; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TinkerToolEvents { + @SubscribeEvent public void onCrafting(ItemCraftedEvent event) { - if (event.crafting == null - || event.player == null + if (event.crafting == null || event.player == null || event.player.worldObj == null - || event.craftMatrix == null) return; + || event.craftMatrix == null) + return; Item item = event.crafting.getItem(); if (!event.player.worldObj.isRemote) { @@ -84,11 +87,10 @@ public class TinkerToolEvents { // check if the handle is a stick List sticks = OreDictionary.getOres("stickWood"); - for (ItemStack stick : sticks) - if (OreDictionary.itemMatches(stick, event.handleStack, false)) { - event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 0); // wooden tool rod - return; - } + for (ItemStack stick : sticks) if (OreDictionary.itemMatches(stick, event.handleStack, false)) { + event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 0); // wooden tool rod + return; + } } @SubscribeEvent @@ -149,7 +151,7 @@ public class TinkerToolEvents { } private boolean allowCrafting(int head, int handle, int accessory) { - int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; for (int nonMetal : nonMetals) { if (head == nonMetal || handle == nonMetal || accessory == nonMetal) return false; } @@ -162,7 +164,7 @@ public class TinkerToolEvents { if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23) { ItemStack result = craftBowString(event.material); if (result != null) { - event.overrideResult(new ItemStack[] {result, null}); + event.overrideResult(new ItemStack[] { result, null }); } } @@ -170,7 +172,7 @@ public class TinkerToolEvents { if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24) { ItemStack result = craftFletching(event.material); if (result != null) { - event.overrideResult(new ItemStack[] {result, null}); + event.overrideResult(new ItemStack[] { result, null }); } } } @@ -178,15 +180,15 @@ public class TinkerToolEvents { public static ItemStack craftBowString(ItemStack stack) { if (stack.stackSize < 3) return null; - BowstringMaterial mat = - (BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class); + 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); + FletchingMaterial mat = (FletchingMaterial) TConstructRegistry + .getCustomMaterial(stack, FletchingMaterial.class); // maybe it's a leaf fletchling if (mat == null) mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchlingLeafMaterial.class); @@ -203,16 +205,16 @@ public class TinkerToolEvents { ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && stack.getItem() == TinkerTools.battlesign) { // broken battlesign? - if (!stack.hasTagCompound() - || stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return; + if (!stack.hasTagCompound() || stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) + return; DamageSource source = event.source; if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion()) { if (source.isProjectile()) { Entity projectile = source.getSourceOfDamage(); if (projectile == null) return; - Vec3 motion = - Vec3.createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ); + Vec3 motion = Vec3 + .createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ); Vec3 look = player.getLookVec(); // this gives a factor of how much we're looking at the incoming arrow @@ -223,8 +225,7 @@ public class TinkerToolEvents { // no damage, hooraaay event.setCanceled(true); - double speed = projectile.motionX * projectile.motionX - + projectile.motionY * projectile.motionY + double speed = projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ; speed = Math.sqrt(speed); @@ -235,8 +236,8 @@ public class TinkerToolEvents { projectile.motionY = look.yCoord * speed; projectile.motionZ = look.zCoord * speed; - projectile.rotationYaw = - (float) (Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI); + projectile.rotationYaw = (float) (Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D + / Math.PI); projectile.rotationPitch = (float) (Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI); // send the current status to the client @@ -250,8 +251,8 @@ public class TinkerToolEvents { projectile.motionX /= -0.10000000149011612D; projectile.motionY /= -0.10000000149011612D; projectile.motionZ /= -0.10000000149011612D; - // projectile.rotationYaw -= 180.0F; - // projectile.prevRotationYaw -= 180.0F; + // projectile.rotationYaw -= 180.0F; + // projectile.prevRotationYaw -= 180.0F; // not needed at the client since it gets the absolute values sent @@ -285,9 +286,7 @@ public class TinkerToolEvents { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { - int beheading = stack.getTagCompound() - .getCompoundTag("InfiTool") - .getInteger("Beheading"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, enemy.getSkeletonType())); @@ -308,9 +307,7 @@ public class TinkerToolEvents { ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { - int beheading = stack.getTagCompound() - .getCompoundTag("InfiTool") - .getInteger("Beheading"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) { @@ -318,8 +315,7 @@ public class TinkerToolEvents { } } - if (stack != null - && stack.hasTagCompound() + if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver && TConstruct.random.nextInt(100) < 10) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 2)); @@ -334,9 +330,7 @@ public class TinkerToolEvents { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { - int beheading = stack.getTagCompound() - .getCompoundTag("InfiTool") - .getInteger("Beheading"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 5) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 4)); @@ -359,8 +353,7 @@ public class TinkerToolEvents { EntityPlayer source = (EntityPlayer) event.source.getEntity(); ItemStack stack = source.getCurrentEquippedItem(); if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { - int beheading = - stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 50) { ItemStack dropStack = new ItemStack(Items.skull, 1, 3); @@ -408,8 +401,8 @@ public class TinkerToolEvents { boolean damaged = false; for (EntityItem drop : event.drops) { // we're only interested in tools - if (!(drop.getEntityItem().getItem() instanceof ToolCore) - || !drop.getEntityItem().hasTagCompound()) continue; + if (!(drop.getEntityItem().getItem() instanceof ToolCore) || !drop.getEntityItem().hasTagCompound()) + continue; // damage tools by 10% of their total durability! NBTTagCompound tags = drop.getEntityItem().getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index c9b5ff7f..307f4b60 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -2,12 +2,9 @@ package tconstruct.tools; import static net.minecraft.util.EnumChatFormatting.*; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.Material; @@ -17,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.*; + import tconstruct.TConstruct; import tconstruct.achievements.items.CraftAchievementItem; import tconstruct.common.itemblocks.MetadataItemBlock; @@ -39,6 +37,10 @@ import tconstruct.world.TDispenserBehaviorSpawnEgg; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SoilBlock; import tconstruct.world.itemblocks.CraftedSoilItemBlock; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( @@ -46,6 +48,7 @@ import tconstruct.world.itemblocks.CraftedSoilItemBlock; description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", forced = true) public class TinkerTools { + /* Proxies for sides, used for graphics processing */ @SidedProxy(clientSide = "tconstruct.tools.ToolProxyClient", serverSide = "tconstruct.tools.ToolProxyCommon") public static ToolProxyCommon proxy; @@ -186,10 +189,14 @@ public class TinkerTools { // Items TinkerTools.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TinkerTools.titleIcon, "titleIcon"); - String[] blanks = new String[] {"blank_pattern", "blank_cast", "blank_cast", "blank_clay_cast"}; + String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast", "blank_clay_cast" }; TinkerTools.blankPattern = new CraftAchievementItem( - blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab, "tconstruct.pattern") - .setUnlocalizedName("tconstruct.Pattern"); + blanks, + blanks, + "materials/", + "tinker", + TConstructRegistry.materialTab, + "tconstruct.pattern").setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TinkerTools.blankPattern, "blankPattern"); TinkerTools.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); @@ -201,38 +208,14 @@ public class TinkerTools { TConstructRegistry.addItemToDirectory("blankPattern", TinkerTools.blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", TinkerTools.woodPattern); - String[] patternTypes = { - "ingot", - "toolRod", - "pickaxeHead", - "shovelHead", - "hatchetHead", - "swordBlade", - "wideGuard", - "handGuard", - "crossbar", - "binding", - "frypanHead", - "signHead", - "knifeBlade", - "chiselHead", - "toughRod", - "toughBinding", - "largePlate", - "broadAxeHead", - "scytheHead", - "excavatorHead", - "largeBlade", - "hammerHead", - "fullGuard", - "bowString", - "fletching", - "arrowHead" - }; + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", + "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", + "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", + "hammerHead", "fullGuard", "bowString", "fletching", "arrowHead" }; for (int i = 1; i < patternTypes.length; i++) { - TConstructRegistry.addItemStackToDirectory( - patternTypes[i] + "Pattern", new ItemStack(TinkerTools.woodPattern, 1, i)); + TConstructRegistry + .addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(TinkerTools.woodPattern, 1, i)); } TinkerTools.manualBook = new Manual(); @@ -261,46 +244,14 @@ public class TinkerTools { TinkerTools.arrow = new Arrow(); // to prevent nullpointers - Item[] tools = { - TinkerTools.pickaxe, - TinkerTools.shovel, - TinkerTools.hatchet, - TinkerTools.broadsword, - TinkerTools.longsword, - TinkerTools.rapier, - TinkerTools.dagger, - TinkerTools.cutlass, - TinkerTools.frypan, - TinkerTools.battlesign, - TinkerTools.mattock, - TinkerTools.chisel, - TinkerTools.lumberaxe, - TinkerTools.cleaver, - TinkerTools.scythe, - TinkerTools.excavator, - TinkerTools.hammer, - TinkerTools.battleaxe - }; - String[] toolStrings = { - "pickaxe", - "shovel", - "hatchet", - "broadsword", - "longsword", - "rapier", - "dagger", - "cutlass", - "frypan", - "battlesign", - "mattock", - "chisel", - "lumberaxe", - "cleaver", - "scythe", - "excavator", - "hammer", - "battleaxe" - }; + Item[] tools = { TinkerTools.pickaxe, TinkerTools.shovel, TinkerTools.hatchet, TinkerTools.broadsword, + TinkerTools.longsword, TinkerTools.rapier, TinkerTools.dagger, TinkerTools.cutlass, TinkerTools.frypan, + TinkerTools.battlesign, TinkerTools.mattock, TinkerTools.chisel, TinkerTools.lumberaxe, + TinkerTools.cleaver, TinkerTools.scythe, TinkerTools.excavator, TinkerTools.hammer, + TinkerTools.battleaxe }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", + "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", "excavator", + "hammer", "battleaxe" }; for (int i = 0; i < tools.length; i++) { GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat @@ -337,56 +288,17 @@ public class TinkerTools { TinkerTools.largeSwordBlade = new DynamicToolPart("_large_sword_blade", "LargeSwordBlade"); TinkerTools.hammerHead = new DynamicToolPart("_hammer_head", "HammerHead"); - Item[] toolParts = { - TinkerTools.toolRod, - TinkerTools.toolShard, - TinkerTools.pickaxeHead, - TinkerTools.shovelHead, - TinkerTools.hatchetHead, - TinkerTools.binding, - TinkerTools.toughBinding, - TinkerTools.toughRod, - TinkerTools.largePlate, - TinkerTools.swordBlade, - TinkerTools.wideGuard, - TinkerTools.handGuard, - TinkerTools.crossbar, - TinkerTools.knifeBlade, - TinkerTools.fullGuard, - TinkerTools.frypanHead, - TinkerTools.signHead, - TinkerTools.chiselHead, - TinkerTools.scytheBlade, - TinkerTools.broadAxeHead, - TinkerTools.excavatorHead, - TinkerTools.largeSwordBlade, - TinkerTools.hammerHead - }; - 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" - }; + Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, + TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, + TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.swordBlade, TinkerTools.wideGuard, + TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, + TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, + TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, + TinkerTools.hammerHead }; + 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" }; for (int i = 0; i < toolParts.length; i++) { GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 @@ -397,45 +309,13 @@ public class TinkerTools { TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); GameRegistry.registerItem(TinkerTools.creativeModifier, "creativeModifier"); - String[] materialStrings = { - "paperStack", - "greenSlimeCrystal", - "searedBrick", - "ingotCobalt", - "ingotArdite", - "ingotManyullyn", - "mossBall", - "lavaCrystal", - "necroticBone", - "ingotCopper", - "ingotTin", - "ingotAluminum", - "rawAluminum", - "ingotBronze", - "ingotAluminumBrass", - "ingotAlumite", - "ingotSteel", - "blueSlimeCrystal", - "ingotObsidian", - "nuggetIron", - "nuggetCopper", - "nuggetTin", - "nuggetAluminum", - "nuggetSilver", - "nuggetAluminumBrass", - "silkyCloth", - "silkyJewel", - "nuggetObsidian", - "nuggetCobalt", - "nuggetArdite", - "nuggetManyullyn", - "nuggetBronze", - "nuggetAlumite", - "nuggetSteel", - "ingotPigIron", - "nuggetPigIron", - "glueball" - }; + String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", + "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", + "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", + "ingotObsidian", "nuggetIron", "nuggetCopper", "nuggetTin", "nuggetAluminum", "nuggetSilver", + "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", + "nuggetManyullyn", "nuggetBronze", "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", + "glueball" }; for (int i = 0; i < materialStrings.length; i++) { TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TinkerTools.materials, 1, i)); @@ -446,34 +326,13 @@ public class TinkerTools { registerStencils(); // this array is only used to register the remaining pattern-part-interactions - TinkerTools.patternOutputs = new Item[] { - TinkerTools.toolRod, - TinkerTools.pickaxeHead, - TinkerTools.shovelHead, - TinkerTools.hatchetHead, - TinkerTools.swordBlade, - TinkerTools.wideGuard, - TinkerTools.handGuard, - TinkerTools.crossbar, - TinkerTools.binding, - TinkerTools.frypanHead, - TinkerTools.signHead, - TinkerTools.knifeBlade, - TinkerTools.chiselHead, - TinkerTools.toughRod, - TinkerTools.toughBinding, - TinkerTools.largePlate, - TinkerTools.broadAxeHead, - TinkerTools.scytheBlade, - TinkerTools.excavatorHead, - TinkerTools.largeSwordBlade, - TinkerTools.hammerHead, - TinkerTools.fullGuard, - null, - null, - TinkerWeaponry.arrowhead, - null - }; + TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, + TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, + TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, + TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod, TinkerTools.toughBinding, + TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, + TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.fullGuard, null, null, + TinkerWeaponry.arrowhead, null }; // Moved temporarily to deal with AE2 Quartz TinkerTools.modFlux = new ModFlux(); @@ -481,14 +340,14 @@ public class TinkerTools { ItemStack lapisItem = new ItemStack(Items.dye, 1, 4); ItemStack lapisBlock = new ItemStack(Blocks.lapis_block); - TinkerTools.modLapis = new ModLapis(10, new ItemStack[] {lapisItem, lapisBlock}, new int[] {1, 9}); + TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); ModifyBuilder.registerModifier(TinkerTools.modLapis); TinkerTools.modAttack = new ModAttack( "Quartz", 11, - new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, - new int[] {1, 4}); + new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, + new int[] { 1, 4 }); ModifyBuilder.registerModifier(TinkerTools.modAttack); oreRegistry(); @@ -540,26 +399,8 @@ public class TinkerTools { OreDictionary.registerOre("dustAluminiumBrass", new ItemStack(TinkerTools.materials, 1, 42)); OreDictionary.registerOre("dustAluminumBrass", new ItemStack(TinkerTools.materials, 1, 42)); - String[] matNames = { - "Wood", - "Stone", - "Iron", - "Flint", - "Cactus", - "Bone", - "Obsidian", - "Netherrack", - "Slime", - "Paper", - "Cobalt", - "Ardite", - "Manyullyn", - "Copper", - "Bronze", - "Alumite", - "Steel", - "Blueslime" - }; + String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", + "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blueslime" }; for (int i = 0; i < matNames.length; i++) { // TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) OreDictionary.registerOre(matNames[i].toLowerCase() + "Rod", new ItemStack(TinkerTools.toolRod, 1, i)); @@ -621,28 +462,26 @@ public class TinkerTools { private void addPartMapping() { /* Tools */ - int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; if (PHConstruct.craftMetalTools) { for (int mat = 0; mat < 18; mat++) { for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { - if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping( - TinkerTools.woodPattern, - meta + 1, - mat, - new ItemStack(TinkerTools.patternOutputs[meta], 1, mat)); + if (TinkerTools.patternOutputs[meta] != null) TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + mat, + new ItemStack(TinkerTools.patternOutputs[meta], 1, mat)); } } } else { for (int nonMetal : nonMetals) { for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { - if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping( - TinkerTools.woodPattern, - meta + 1, - nonMetal, - new ItemStack(TinkerTools.patternOutputs[meta], 1, nonMetal)); + if (TinkerTools.patternOutputs[meta] != null) TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + nonMetal, + new ItemStack(TinkerTools.patternOutputs[meta], 1, nonMetal)); } } } @@ -660,7 +499,8 @@ public class TinkerTools { private void metalPartCraftingIntegration() { if (TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery") || !PHConstruct.craftMetalTools) return; - String[] metals = {"Iron", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "PigIron"}; + String[] metals = { "Iron", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", + "PigIron" }; for (String metal : metals) { TinkerTools.registerPatternMaterial("ingot" + metal, 2, metal); @@ -670,23 +510,44 @@ public class TinkerTools { private void addRecipesForToolBuilder() { ToolBuilder.addNormalToolRecipe( - TinkerTools.pickaxe, TinkerTools.pickaxeHead, TinkerTools.toolRod, TinkerTools.binding); + TinkerTools.pickaxe, + TinkerTools.pickaxeHead, + TinkerTools.toolRod, + TinkerTools.binding); ToolBuilder.addNormalToolRecipe( - TinkerTools.broadsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.wideGuard); + TinkerTools.broadsword, + TinkerTools.swordBlade, + TinkerTools.toolRod, + TinkerTools.wideGuard); ToolBuilder.addNormalToolRecipe(TinkerTools.hatchet, TinkerTools.hatchetHead, TinkerTools.toolRod); ToolBuilder.addNormalToolRecipe(TinkerTools.shovel, TinkerTools.shovelHead, TinkerTools.toolRod); ToolBuilder.addNormalToolRecipe( - TinkerTools.longsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.handGuard); + TinkerTools.longsword, + TinkerTools.swordBlade, + TinkerTools.toolRod, + TinkerTools.handGuard); ToolBuilder.addNormalToolRecipe( - TinkerTools.rapier, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.crossbar); + TinkerTools.rapier, + TinkerTools.swordBlade, + TinkerTools.toolRod, + TinkerTools.crossbar); ToolBuilder.addNormalToolRecipe(TinkerTools.frypan, TinkerTools.frypanHead, TinkerTools.toolRod); ToolBuilder.addNormalToolRecipe(TinkerTools.battlesign, TinkerTools.signHead, TinkerTools.toolRod); ToolBuilder.addNormalToolRecipe( - TinkerTools.mattock, TinkerTools.hatchetHead, TinkerTools.toolRod, TinkerTools.shovelHead); + TinkerTools.mattock, + TinkerTools.hatchetHead, + TinkerTools.toolRod, + TinkerTools.shovelHead); ToolBuilder.addNormalToolRecipe( - TinkerTools.dagger, TinkerTools.knifeBlade, TinkerTools.toolRod, TinkerTools.crossbar); + TinkerTools.dagger, + TinkerTools.knifeBlade, + TinkerTools.toolRod, + TinkerTools.crossbar); ToolBuilder.addNormalToolRecipe( - TinkerTools.cutlass, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.fullGuard); + TinkerTools.cutlass, + TinkerTools.swordBlade, + TinkerTools.toolRod, + TinkerTools.fullGuard); ToolBuilder.addNormalToolRecipe(TinkerTools.chisel, TinkerTools.chiselHead, TinkerTools.toolRod); ToolBuilder.addNormalToolRecipe( @@ -728,86 +589,94 @@ public class TinkerTools { ItemStack diamond = new ItemStack(Items.diamond); ModifyBuilder.registerModifier(new ModToolRepair()); - ModifyBuilder.registerModifier(new ModDurability( - new ItemStack[] {diamond}, - 0, - 500, - 0f, - 3, - "Diamond", - "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), - "\u00a7b")); - ModifyBuilder.registerModifier(new ModDurability( - new ItemStack[] {new ItemStack(Items.emerald)}, - 1, - 0, - 0.5f, - 2, - "Emerald", - "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), - "\u00a72")); + ModifyBuilder.registerModifier( + new ModDurability( + new ItemStack[] { diamond }, + 0, + 500, + 0f, + 3, + "Diamond", + "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), + "\u00a7b")); + ModifyBuilder.registerModifier( + new ModDurability( + new ItemStack[] { new ItemStack(Items.emerald) }, + 1, + 0, + 0.5f, + 2, + "Emerald", + "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), + "\u00a72")); ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); ModifyBuilder.registerModifier( - new ModRedstone(2, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); + new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); - ModifyBuilder.registerModifier(new ModInteger( - new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 6)}, - 4, - "Moss", - 3, - "\u00a72", - StatCollector.translateToLocal("modifier.tool.moss"))); + ModifyBuilder.registerModifier( + new ModInteger( + new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, + 4, + "Moss", + 3, + "\u00a72", + StatCollector.translateToLocal("modifier.tool.moss"))); ItemStack blazePowder = new ItemStack(Items.blaze_powder); - ModifyBuilder.registerModifier(new ModBlaze(7, new ItemStack[] {blazePowder}, new int[] {1})); - ModifyBuilder.registerModifier(new ModAutoSmelt( - new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 7)}, - 6, - "Lava", - "\u00a74", - StatCollector.translateToLocal("modifier.tool.lava"))); - ModifyBuilder.registerModifier(new ModInteger( - new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 8)}, - 8, - "Necrotic", - 1, - "\u00a78", - StatCollector.translateToLocal("modifier.tool.necro"))); + ModifyBuilder.registerModifier(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); + ModifyBuilder.registerModifier( + new ModAutoSmelt( + new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 7) }, + 6, + "Lava", + "\u00a74", + StatCollector.translateToLocal("modifier.tool.lava"))); + ModifyBuilder.registerModifier( + new ModInteger( + new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, + 8, + "Necrotic", + 1, + "\u00a78", + StatCollector.translateToLocal("modifier.tool.necro"))); ModifyBuilder.registerModifier( - new ModExtraModifier(new ItemStack[] {diamond, new ItemStack(Blocks.gold_block)}, "Tier1Free")); - ModifyBuilder.registerModifier(new ModExtraModifier( - new ItemStack[] {new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1)}, - "Tier1.5Free")); + new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); ModifyBuilder.registerModifier( - new ModExtraModifier(new ItemStack[] {new ItemStack(Items.nether_star)}, "Tier2Free")); + new ModExtraModifier( + new ItemStack[] { new ItemStack(Blocks.diamond_block), + new ItemStack(Items.golden_apple, 1, 1) }, + "Tier1.5Free")); ModifyBuilder.registerModifier( - new ModCreativeToolModifier(new ItemStack[] {new ItemStack(TinkerTools.creativeModifier)})); + new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free")); + ModifyBuilder.registerModifier( + new ModCreativeToolModifier(new ItemStack[] { new ItemStack(TinkerTools.creativeModifier) })); ItemStack silkyJewel = new ItemStack(TinkerTools.materials, 1, 26); - ModifyBuilder.registerModifier(new ModButtertouch(new ItemStack[] {silkyJewel}, 12)); + ModifyBuilder.registerModifier(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); ItemStack piston = new ItemStack(Blocks.piston); - ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] {piston}, new int[] {1})); + ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); - ModifyBuilder.registerModifier(new ModInteger( - new ItemStack[] {new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl)}, - 13, - "Beheading", - 1, - "\u00a7d", - "Beheading")); + ModifyBuilder.registerModifier( + new ModInteger( + new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, + 13, + "Beheading", + 1, + "\u00a7d", + "Beheading")); ItemStack holySoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); - ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] {holySoil}, new int[] {1})); + ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 })); ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye); ModifyBuilder.registerModifier( - new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] {spidereyeball}, new int[] {1})); + new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); ItemStack obsidianPlate = new ItemStack(TinkerTools.largePlate, 1, 6); - ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] {obsidianPlate}, 16, 1)); + ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); } @@ -852,9 +721,8 @@ public class TinkerTools { chiseling.addDetailing(TinkerTools.multiBrickFancy, 15, TinkerTools.multiBrickFancy, 14, TinkerTools.chisel); chiseling.addDetailing(TinkerTools.multiBrickFancy, 14, Blocks.stonebrick, 3, TinkerTools.chisel); /* - * chiseling.addDetailing(TRepo.multiBrick, 14, TRepo.multiBrickFancy, - * 14, TRepo.chisel); chiseling.addDetailing(TRepo.multiBrick, 15, - * TRepo.multiBrickFancy, 15, TRepo.chisel); + * chiseling.addDetailing(TRepo.multiBrick, 14, TRepo.multiBrickFancy, 14, TRepo.chisel); + * chiseling.addDetailing(TRepo.multiBrick, 15, TRepo.multiBrickFancy, 15, TRepo.chisel); */ if (TinkerSmeltery.smeltery != null) { @@ -953,74 +821,64 @@ public class TinkerTools { } private void craftingTableRecipes() { - String[] patBlock = {"###", "###", "###"}; - String[] patSurround = {"###", "#m#", "###"}; + String[] patBlock = { "###", "###", "###" }; + String[] patSurround = { "###", "#m#", "###" }; - Object[] toolForgeBlocks = { - "blockIron", - "blockGold", - Blocks.diamond_block, - Blocks.emerald_block, - "blockCobalt", - "blockArdite", - "blockManyullyn", - "blockCopper", - "blockBronze", - "blockTin", - "blockAluminum", - "blockAluminumBrass", - "blockAlumite", - "blockSteel" - }; + Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, + "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", + "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; - ItemStack smelteryStack = TinkerSmeltery.smeltery != null - ? new ItemStack(TinkerSmeltery.smeltery, 1, 2) + ItemStack smelteryStack = TinkerSmeltery.smeltery != null ? new ItemStack(TinkerSmeltery.smeltery, 1, 2) : new ItemStack(Blocks.obsidian, 1, 0); // ToolForge Recipes (Metal Version) for (int sc = 0; sc < toolForgeBlocks.length; sc++) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolForge, 1, sc), - "bbb", - "msm", - "m m", - 'b', - smelteryStack, - 's', - new ItemStack(TinkerTools.toolStationWood, 1, 0), - 'm', - toolForgeBlocks[sc])); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolForge, 1, sc), + "bbb", + "msm", + "m m", + 'b', + smelteryStack, + 's', + new ItemStack(TinkerTools.toolStationWood, 1, 0), + 'm', + toolForgeBlocks[sc])); // adding slab version recipe - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.craftingSlabWood, 1, 5), - "bbb", - "msm", - "m m", - 'b', - smelteryStack, - 's', - new ItemStack(TinkerTools.craftingSlabWood, 1, 1), - 'm', - toolForgeBlocks[sc])); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 5), + "bbb", + "msm", + "m m", + 'b', + smelteryStack, + 's', + new ItemStack(TinkerTools.craftingSlabWood, 1, 1), + 'm', + toolForgeBlocks[sc])); } // ToolStation Recipes (Wooden Version) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolStationWood, 1, 0), - "p", - "w", - 'p', - new ItemStack(TinkerTools.blankPattern, 1, 0), - 'w', - "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolStationWood, 1, 0), - "p", - "w", - 'p', - new ItemStack(TinkerTools.blankPattern, 1, 0), - 'w', - "craftingTableWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "crafterWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "craftingTableWood")); GameRegistry.addRecipe( new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", @@ -1061,22 +919,24 @@ public class TinkerTools { new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolStationWood, 1, 5), - "p", - "w", - 'p', - new ItemStack(TinkerTools.blankPattern, 1, 0), - 'w', - "chestWood")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolStationWood, 1, 1), - "p", - "w", - 'p', - new ItemStack(TinkerTools.blankPattern, 1, 0), - 'w', - "logWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 5), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "chestWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 1), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "logWood")); GameRegistry.addRecipe( new ItemStack(TinkerTools.toolStationWood, 1, 10), "p", @@ -1109,14 +969,15 @@ public class TinkerTools { new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.toolStationWood, 1, 10), - "p", - "w", - 'p', - new ItemStack(TinkerTools.blankPattern, 1, 0), - 'w', - "plankWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 10), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "plankWood")); GameRegistry.addRecipe( new ItemStack(TinkerTools.furnaceSlab, 1, 0), "###", @@ -1126,8 +987,15 @@ public class TinkerTools { new ItemStack(Blocks.stone_slab, 1, 3)); // Blank Pattern Recipe - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.blankPattern, 4, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.blankPattern, 4, 0), + "ps", + "sp", + 'p', + "plankWood", + 's', + "stickWood")); // Manual Book Recipes GameRegistry.addRecipe( new ItemStack(TinkerTools.manualBook), @@ -1137,21 +1005,33 @@ public class TinkerTools { 'p', Items.paper); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 2, 0), new ItemStack(TinkerTools.manualBook, 1, 0), Items.book); + new ItemStack(TinkerTools.manualBook, 2, 0), + new ItemStack(TinkerTools.manualBook, 1, 0), + Items.book); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0)); + new ItemStack(TinkerTools.manualBook, 1, 1), + new ItemStack(TinkerTools.manualBook, 1, 0)); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 2, 1), new ItemStack(TinkerTools.manualBook, 1, 1), Items.book); + new ItemStack(TinkerTools.manualBook, 2, 1), + new ItemStack(TinkerTools.manualBook, 1, 1), + Items.book); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1)); + new ItemStack(TinkerTools.manualBook, 1, 2), + new ItemStack(TinkerTools.manualBook, 1, 1)); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 2, 2), new ItemStack(TinkerTools.manualBook, 1, 2), Items.book); + new ItemStack(TinkerTools.manualBook, 2, 2), + new ItemStack(TinkerTools.manualBook, 1, 2), + Items.book); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 2, 4), new ItemStack(TinkerTools.manualBook, 1, 4), Items.book); + new ItemStack(TinkerTools.manualBook, 2, 4), + new ItemStack(TinkerTools.manualBook, 1, 4), + Items.book); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 1, 4), new ItemStack(TinkerTools.manualBook, 1, 2)); + new ItemStack(TinkerTools.manualBook, 1, 4), + new ItemStack(TinkerTools.manualBook, 1, 2)); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.manualBook, 1, 3), new ItemStack(TinkerTools.manualBook, 1, 4)); + new ItemStack(TinkerTools.manualBook, 1, 3), + new ItemStack(TinkerTools.manualBook, 1, 4)); // alternative Vanilla Book Recipe GameRegistry.addShapelessRecipe( new ItemStack(Items.book), @@ -1161,17 +1041,18 @@ public class TinkerTools { Items.string, TinkerTools.blankPattern, TinkerTools.blankPattern); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Items.name_tag), - "P~ ", - "~O ", - " ~", - '~', - Items.string, - 'P', - Items.paper, - 'O', - "slimeball")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Items.name_tag), + "P~ ", + "~O ", + " ~", + '~', + Items.string, + 'P', + Items.paper, + 'O', + "slimeball")); // Paperstack Recipe GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 0), "pp", "pp", 'p', Items.paper); @@ -1220,7 +1101,10 @@ public class TinkerTools { Blocks.dirt); // Grout Recipes GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); + new ItemStack(TinkerTools.craftedSoil, 2, 1), + Items.clay_ball, + Blocks.sand, + Blocks.gravel); GameRegistry.addShapelessRecipe( new ItemStack(TinkerTools.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), @@ -1233,7 +1117,10 @@ public class TinkerTools { Blocks.gravel, Blocks.gravel); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); + new ItemStack(TinkerTools.craftedSoil, 2, 6), + Items.nether_wart, + Blocks.soul_sand, + Blocks.gravel); // Graveyard Soil Recipes GameRegistry.addShapelessRecipe( new ItemStack(TinkerTools.craftedSoil, 1, 3), @@ -1248,34 +1135,44 @@ public class TinkerTools { new ItemStack(TinkerTools.materials, 1, 24), '#', new ItemStack(Items.string)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.materials, 1, 25), - patSurround, - 'm', - "nuggetGold", - '#', - new ItemStack(Items.string))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.materials, 1, 25), + patSurround, + 'm', + "nuggetGold", + '#', + new ItemStack(Items.string))); // Silky Jewel Recipes - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.materials, 1, 26), - " c ", - "cec", - " c ", - 'c', - new ItemStack(TinkerTools.materials, 1, 25), - 'e', - "gemEmerald")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.materials, 1, 26), + " c ", + "cec", + " c ", + 'c', + new ItemStack(TinkerTools.materials, 1, 25), + 'e', + "gemEmerald")); // Advanced WorkBench Recipes GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingStationWood, 1, 0), + "b", + 'b', + "craftingTableWood")); // Slab crafters GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 6, 0), + "bbb", + 'b', + "craftingTableWood")); GameRegistry.addRecipe( new ItemStack(TinkerTools.craftingSlabWood, 1, 0), "b", @@ -1339,12 +1236,13 @@ public class TinkerTools { GameRegistry.addRecipe( new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerTools.materials, 4, 42), - "dustAluminium", - "dustAluminium", - "dustAluminium", - "dustCopper")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerTools.materials, 4, 42), + "dustAluminium", + "dustAluminium", + "dustAluminium", + "dustCopper")); } private void modIntegration() { @@ -1373,8 +1271,8 @@ public class TinkerTools { TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); TinkerTools.thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(MaterialID.Thaumium, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial( - MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", 0x51437c); + TConstructRegistry + .addToolMaterial(MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", 0x51437c); PatternBuilder.instance.registerFullMaterial( new ItemStack((Item) obj, 1, 2), 2, @@ -1383,22 +1281,20 @@ public class TinkerTools { new ItemStack(TinkerTools.toolRod, 1, 31), 31); for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { - if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping( - TinkerTools.woodPattern, - meta + 1, - 31, - new ItemStack(TinkerTools.patternOutputs[meta], 1, 31)); + if (TinkerTools.patternOutputs[meta] != null) TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + 31, + new ItemStack(TinkerTools.patternOutputs[meta], 1, 31)); } // Thaumium weaponry toolparts if (TConstruct.pulsar.isPulseLoaded("Tinkers' Weaponry")) { - for (int m = 0; m < TinkerWeaponry.patternOutputs.length; m++) - TConstructRegistry.addPartMapping( - TinkerWeaponry.woodPattern, - m, - MaterialID.Thaumium, - new ItemStack(TinkerWeaponry.patternOutputs[m], 1, MaterialID.Thaumium)); + for (int m = 0; m < TinkerWeaponry.patternOutputs.length; m++) TConstructRegistry.addPartMapping( + TinkerWeaponry.woodPattern, + m, + MaterialID.Thaumium, + new ItemStack(TinkerWeaponry.patternOutputs[m], 1, MaterialID.Thaumium)); TConstructRegistry.addPartMapping( TinkerTools.woodPattern, @@ -1437,8 +1333,7 @@ public class TinkerTools { 1.1F, 1.2f, 0xf3414f); - } catch (Exception ignored) { - } // No need to handle + } catch (Exception ignored) {} // No need to handle } // OpenBlocks @@ -1448,44 +1343,134 @@ public class TinkerTools { void registerMaterials() { // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style // color, primary color for block use + TConstructRegistry + .addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString(), 0x755821); + TConstructRegistry + .addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString(), 0x7F7F7F); + TConstructRegistry + .addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString(), 0xDADADA); TConstructRegistry.addToolMaterial( - MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString(), 0x755821); + MaterialID.Flint, + "Flint", + 1, + 171, + 525, + 2, + 0.7F, + 0, + 0f, + DARK_GRAY.toString(), + 0x484848); TConstructRegistry.addToolMaterial( - MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString(), 0x7F7F7F); + MaterialID.Cactus, + "Cactus", + 1, + 150, + 500, + 2, + 1.0F, + 0, + -1f, + DARK_GREEN.toString(), + 0x12690b); + TConstructRegistry + .addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString(), 0xEDEBCA); TConstructRegistry.addToolMaterial( - MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString(), 0xDADADA); + MaterialID.Obsidian, + "Obsidian", + 3, + 89, + 700, + 2, + 0.8F, + 3, + 0f, + LIGHT_PURPLE.toString(), + 0xaa7ff5); TConstructRegistry.addToolMaterial( - MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, DARK_GRAY.toString(), 0x484848); + MaterialID.Netherrack, + "Netherrack", + 2, + 131, + 400, + 1, + 1.2F, + 0, + 1f, + DARK_RED.toString(), + 0x833238); + TConstructRegistry + .addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString(), 0x6EB065); + TConstructRegistry + .addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString(), 0xFFFFFF); TConstructRegistry.addToolMaterial( - MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, DARK_GREEN.toString(), 0x12690b); + MaterialID.Cobalt, + "Cobalt", + 4, + 800, + 1400, + 3, + 1.75F, + 2, + 0f, + DARK_AQUA.toString(), + 0x2376DD); TConstructRegistry.addToolMaterial( - MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString(), 0xEDEBCA); + MaterialID.Ardite, + "Ardite", + 4, + 500, + 800, + 3, + 2.0F, + 0, + 2f, + DARK_RED.toString(), + 0xA53000); TConstructRegistry.addToolMaterial( - MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, LIGHT_PURPLE.toString(), 0xaa7ff5); + MaterialID.Manyullyn, + "Manyullyn", + 5, + 1200, + 900, + 4, + 2.5F, + 0, + 0f, + DARK_PURPLE.toString(), + 0x7338A5); + TConstructRegistry + .addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString(), 0xCC6410); + TConstructRegistry + .addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString(), 0xCA9956); TConstructRegistry.addToolMaterial( - MaterialID.Netherrack, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, DARK_RED.toString(), 0x833238); + MaterialID.Alumite, + "Alumite", + 4, + 700, + 800, + 3, + 1.3F, + 2, + 0f, + LIGHT_PURPLE.toString(), + 0xffa7e9); + TConstructRegistry + .addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString(), 0xA0A0A0); TConstructRegistry.addToolMaterial( - MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString(), 0x6EB065); - TConstructRegistry.addToolMaterial( - MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString(), 0xFFFFFF); - TConstructRegistry.addToolMaterial( - MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, DARK_AQUA.toString(), 0x2376DD); - TConstructRegistry.addToolMaterial( - MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, DARK_RED.toString(), 0xA53000); - TConstructRegistry.addToolMaterial( - MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString(), 0x7338A5); - TConstructRegistry.addToolMaterial( - MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString(), 0xCC6410); - TConstructRegistry.addToolMaterial( - MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString(), 0xCA9956); - TConstructRegistry.addToolMaterial( - MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString(), 0xffa7e9); - TConstructRegistry.addToolMaterial( - MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString(), 0xA0A0A0); - TConstructRegistry.addToolMaterial( - MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString(), 0x66AEB0); - TConstructRegistry.addToolMaterial( - MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4); + MaterialID.BlueSlime, + "BlueSlime", + 0, + 1200, + 150, + 0, + 2.0F, + 0, + 0f, + AQUA.toString(), + 0x66AEB0); + TConstructRegistry + .addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4); // Register all the materials for default toolparts TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Wood); @@ -1533,9 +1518,13 @@ public class TinkerTools { } PatternBuilder pb = PatternBuilder.instance; - if (PHConstruct.enableTWood) - pb.registerFullMaterial( - Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0); + if (PHConstruct.enableTWood) pb.registerFullMaterial( + Blocks.planks, + 2, + "Wood", + new ItemStack(Items.stick), + new ItemStack(Items.stick), + 0); else pb.registerMaterialSet("Wood", new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); if (PHConstruct.enableTStone) { pb.registerFullMaterial( @@ -1546,9 +1535,11 @@ public class TinkerTools { new ItemStack(TinkerTools.toolRod, 1, 1), 1); pb.registerMaterial(Blocks.cobblestone, 2, "Stone"); - } else - pb.registerMaterialSet( - "Stone", new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 1); + } else pb.registerMaterialSet( + "Stone", + new ItemStack(TinkerTools.toolShard, 1, 1), + new ItemStack(TinkerTools.toolRod, 1, 1), + 1); pb.registerFullMaterial( Items.iron_ingot, 2, @@ -1556,31 +1547,37 @@ public class TinkerTools { new ItemStack(TinkerTools.toolShard, 1, 2), new ItemStack(TinkerTools.toolRod, 1, 2), 2); - if (PHConstruct.enableTFlint) - pb.registerFullMaterial( - Items.flint, - 2, - "Flint", - new ItemStack(TinkerTools.toolShard, 1, 3), - new ItemStack(TinkerTools.toolRod, 1, 3), - 3); - else - pb.registerMaterialSet( - "Flint", new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); - if (PHConstruct.enableTCactus) - pb.registerFullMaterial( - Blocks.cactus, - 2, - "Cactus", - new ItemStack(TinkerTools.toolShard, 1, 4), - new ItemStack(TinkerTools.toolRod, 1, 4), - 4); - else - pb.registerMaterialSet( - "Cactus", new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); - if (PHConstruct.enableTBone) - pb.registerFullMaterial( - Items.bone, 2, "Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + if (PHConstruct.enableTFlint) pb.registerFullMaterial( + Items.flint, + 2, + "Flint", + new ItemStack(TinkerTools.toolShard, 1, 3), + new ItemStack(TinkerTools.toolRod, 1, 3), + 3); + else pb.registerMaterialSet( + "Flint", + new ItemStack(TinkerTools.toolShard, 1, 3), + new ItemStack(TinkerTools.toolRod, 1, 3), + 3); + if (PHConstruct.enableTCactus) pb.registerFullMaterial( + Blocks.cactus, + 2, + "Cactus", + new ItemStack(TinkerTools.toolShard, 1, 4), + new ItemStack(TinkerTools.toolRod, 1, 4), + 4); + else pb.registerMaterialSet( + "Cactus", + new ItemStack(TinkerTools.toolShard, 1, 4), + new ItemStack(TinkerTools.toolRod, 1, 4), + 4); + if (PHConstruct.enableTBone) pb.registerFullMaterial( + Items.bone, + 2, + "Bone", + new ItemStack(Items.dye, 1, 15), + new ItemStack(Items.bone), + 5); else pb.registerMaterialSet("Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); pb.registerFullMaterial( Blocks.obsidian, @@ -1590,41 +1587,42 @@ public class TinkerTools { new ItemStack(TinkerTools.toolRod, 1, 6), 6); pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian"); - if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial( - Blocks.netherrack, - 2, - "Netherrack", - new ItemStack(TinkerTools.toolShard, 1, 7), - new ItemStack(TinkerTools.toolRod, 1, 7), - 7); - else - pb.registerMaterialSet( - "Netherrack", - new ItemStack(TinkerTools.toolShard, 1, 7), - new ItemStack(TinkerTools.toolRod, 1, 7), - 7); - if (PHConstruct.enableTSlime) - pb.registerFullMaterial( - new ItemStack(materials, 1, 1), - 2, - "Slime", - new ItemStack(toolShard, 1, 8), - new ItemStack(toolRod, 1, 8), - 8); - else - pb.registerMaterialSet( - "Slime", new ItemStack(TinkerTools.toolShard, 1, 8), new ItemStack(TinkerTools.toolRod, 1, 17), 8); - if (PHConstruct.enableTPaper) - pb.registerFullMaterial( - new ItemStack(materials, 1, 0), - 2, - "Paper", - new ItemStack(Items.paper, 2), - new ItemStack(toolRod, 1, 9), - 9); - else - pb.registerMaterialSet("Paper", new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); + if (PHConstruct.enableTNetherrack) pb.registerFullMaterial( + Blocks.netherrack, + 2, + "Netherrack", + new ItemStack(TinkerTools.toolShard, 1, 7), + new ItemStack(TinkerTools.toolRod, 1, 7), + 7); + else pb.registerMaterialSet( + "Netherrack", + new ItemStack(TinkerTools.toolShard, 1, 7), + new ItemStack(TinkerTools.toolRod, 1, 7), + 7); + if (PHConstruct.enableTSlime) pb.registerFullMaterial( + new ItemStack(materials, 1, 1), + 2, + "Slime", + new ItemStack(toolShard, 1, 8), + new ItemStack(toolRod, 1, 8), + 8); + else pb.registerMaterialSet( + "Slime", + new ItemStack(TinkerTools.toolShard, 1, 8), + new ItemStack(TinkerTools.toolRod, 1, 17), + 8); + if (PHConstruct.enableTPaper) pb.registerFullMaterial( + new ItemStack(materials, 1, 0), + 2, + "Paper", + new ItemStack(Items.paper, 2), + new ItemStack(toolRod, 1, 9), + 9); + else pb.registerMaterialSet( + "Paper", + new ItemStack(Items.paper, 2), + new ItemStack(TinkerTools.toolRod, 1, 9), + 9); pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11); pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12); @@ -1632,20 +1630,18 @@ public class TinkerTools { pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); - if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial( - new ItemStack(materials, 1, 17), - 2, - "BlueSlime", - new ItemStack(toolShard, 1, 17), - new ItemStack(toolRod, 1, 17), - 17); - else - pb.registerMaterialSet( - "BlueSlime", - new ItemStack(TinkerTools.toolShard, 1, 17), - new ItemStack(TinkerTools.toolRod, 1, 17), - 17); + if (PHConstruct.enableTBlueSlime) pb.registerFullMaterial( + new ItemStack(materials, 1, 17), + 2, + "BlueSlime", + new ItemStack(toolShard, 1, 17), + new ItemStack(toolRod, 1, 17), + 17); + else pb.registerMaterialSet( + "BlueSlime", + new ItemStack(TinkerTools.toolShard, 1, 17), + new ItemStack(TinkerTools.toolRod, 1, 17), + 17); pb.registerFullMaterial( new ItemStack(materials, 1, 34), 2, @@ -1690,6 +1686,7 @@ public class TinkerTools { } public static final class MaterialID { + public static final int Wood = 0; public static final int Stone = 1; public static final int Iron = 2; diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index 83186603..d52ccfdc 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -2,10 +2,9 @@ package tconstruct.tools; import static tconstruct.tools.TinkerTools.*; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.*; @@ -15,6 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.common.MinecraftForge; + import tconstruct.client.FlexibleToolRenderer; import tconstruct.client.entity.projectile.*; import tconstruct.client.pages.*; @@ -30,8 +30,11 @@ import tconstruct.tools.gui.*; import tconstruct.tools.logic.*; import tconstruct.tools.model.*; import tconstruct.weaponry.TinkerWeaponry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ToolProxyClient extends ToolProxyCommon { + @Override public void initialize() { MinecraftForge.EVENT_BUS.register(this); @@ -49,8 +52,8 @@ public class ToolProxyClient extends ToolProxyCommon { RenderingRegistry.registerBlockHandler(new FrypanRender()); RenderingRegistry.registerBlockHandler(new BattlesignRender()); - RenderingRegistry.registerEntityRenderingHandler( - LaunchedPotion.class, new LaunchedItemRender(Items.potionitem, 16384)); + RenderingRegistry + .registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Items.potionitem, 16384)); RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerEntityRenderer()); // RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom()); // RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom()); @@ -334,13 +337,33 @@ public class ToolProxyClient extends ToolProxyCommon { null); MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); MantleClientRegistry.registerManualSmallRecipe( - "toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0), null, pattern, null, workbench); + "toolstation", + new ItemStack(TinkerTools.toolStationWood, 1, 0), + null, + pattern, + null, + workbench); MantleClientRegistry.registerManualSmallRecipe( - "partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log); + "partcrafter", + new ItemStack(TinkerTools.toolStationWood, 1, 1), + null, + pattern, + null, + log); MantleClientRegistry.registerManualSmallRecipe( - "patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest); + "patternchest", + new ItemStack(TinkerTools.toolStationWood, 1, 5), + null, + pattern, + null, + chest); MantleClientRegistry.registerManualSmallRecipe( - "stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank); + "stenciltable", + new ItemStack(TinkerTools.toolStationWood, 1, 10), + null, + pattern, + null, + plank); MantleClientRegistry.registerManualLargeRecipe( "toolforge", @@ -356,11 +379,26 @@ public class ToolProxyClient extends ToolProxyCommon { ironblock); // TODO: Alternate recipe for Smeltery disabled MantleClientRegistry.registerManualLargeRecipe( - "slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - MantleClientRegistry.registerManualFurnaceRecipe( - "slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); + "slimymud", + slimyMud, + null, + slimeball, + slimeball, + null, + slimeball, + slimeball, + null, + dirt, + sand); + MantleClientRegistry + .registerManualFurnaceRecipe("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); MantleClientRegistry.registerManualSmallRecipe( - "paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper); + "paperstack", + new ItemStack(TinkerTools.materials, 1, 0), + paper, + paper, + paper, + paper); MantleClientRegistry.registerManualLargeRecipe( "mossball", new ItemStack(TinkerTools.materials, 1, 6), @@ -427,46 +465,63 @@ public class ToolProxyClient extends ToolProxyCommon { TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Items.diamond)); TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Items.emerald)); TConstructClientRegistry.registerManualModifier( - "redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block)); + "redstonemod", + ironpick.copy(), + new ItemStack(Items.redstone), + new ItemStack(Blocks.redstone_block)); + TConstructClientRegistry + .registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7)); TConstructClientRegistry.registerManualModifier( - "lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7)); + "lapismod", + ironpick.copy(), + new ItemStack(Items.dye, 1, 4), + new ItemStack(Blocks.lapis_block)); + TConstructClientRegistry + .registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6)); TConstructClientRegistry.registerManualModifier( - "lapismod", ironpick.copy(), new ItemStack(Items.dye, 1, 4), new ItemStack(Blocks.lapis_block)); + "quartzmod", + ironlongsword.copy(), + new ItemStack(Items.quartz), + new ItemStack(Blocks.quartz_block)); + TConstructClientRegistry + .registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder)); TConstructClientRegistry.registerManualModifier( - "mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6)); - TConstructClientRegistry.registerManualModifier( - "quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block)); - TConstructClientRegistry.registerManualModifier( - "blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder)); - TConstructClientRegistry.registerManualModifier( - "necroticmod", ironlongsword.copy(), new ItemStack(TinkerTools.materials, 1, 8)); - TConstructClientRegistry.registerManualModifier( - "silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); - TConstructClientRegistry.registerManualModifier( - "reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); + "necroticmod", + ironlongsword.copy(), + new ItemStack(TinkerTools.materials, 1, 8)); + TConstructClientRegistry + .registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); + TConstructClientRegistry + .registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); + TConstructClientRegistry + .registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); TConstructClientRegistry.registerManualModifier( - "pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); - TConstructClientRegistry.registerManualModifier( - "beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian)); - TConstructClientRegistry.registerManualModifier( - "spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye)); - TConstructClientRegistry.registerManualModifier( - "smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4)); + "beheadingmod", + ironlongsword.copy(), + new ItemStack(Items.ender_pearl), + new ItemStack(Blocks.obsidian)); + TConstructClientRegistry + .registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye)); + TConstructClientRegistry + .registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4)); TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Blocks.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Blocks.dirt)); TConstructClientRegistry.registerManualModifier( - "tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block)); + "tier1free", + ironpick.copy(), + new ItemStack(Items.diamond), + new ItemStack(Blocks.gold_block)); TConstructClientRegistry.registerManualModifier( "tier1.5free", ironpick.copy(), new ItemStack(Items.golden_apple, 1, 1), new ItemStack(Blocks.diamond_block)); TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Items.nether_star)); - TConstructClientRegistry.registerManualModifier( - "creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier)); + TConstructClientRegistry + .registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier)); TConstructClientRegistry.registerManualSmeltery( "brownstone", @@ -511,28 +566,48 @@ public class ToolProxyClient extends ToolProxyCommon { @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - if (ID == ToolProxyCommon.toolStationID) - return new ToolStationGui( - player.inventory, (ToolStationLogic) world.getTileEntity(x, y, z), world, x, y, z); - if (ID == ToolProxyCommon.partBuilderID) - return new PartCrafterGui( - player.inventory, (PartBuilderLogic) world.getTileEntity(x, y, z), world, x, y, z); - if (ID == ToolProxyCommon.patternChestID) - return new PatternChestGui( - player.inventory, (PatternChestLogic) world.getTileEntity(x, y, z), world, x, y, z); + if (ID == ToolProxyCommon.toolStationID) return new ToolStationGui( + player.inventory, + (ToolStationLogic) world.getTileEntity(x, y, z), + world, + x, + y, + z); + if (ID == ToolProxyCommon.partBuilderID) return new PartCrafterGui( + player.inventory, + (PartBuilderLogic) world.getTileEntity(x, y, z), + world, + x, + y, + z); + if (ID == ToolProxyCommon.patternChestID) return new PatternChestGui( + player.inventory, + (PatternChestLogic) world.getTileEntity(x, y, z), + world, + x, + y, + z); if (ID == ToolProxyCommon.frypanGuiID) return new FrypanGui(player.inventory, (FrypanLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.battlesignTextID) return new BattlesignGui((BattlesignLogic) world.getTileEntity(x, y, z)); - if (ID == ToolProxyCommon.stencilTableID) - return new StencilTableGui( - player.inventory, (StencilTableLogic) world.getTileEntity(x, y, z), world, x, y, z); + if (ID == ToolProxyCommon.stencilTableID) return new StencilTableGui( + player.inventory, + (StencilTableLogic) world.getTileEntity(x, y, z), + world, + x, + y, + z); if (ID == ToolProxyCommon.toolForgeID) return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getTileEntity(x, y, z), world, x, y, z); - if (ID == ToolProxyCommon.craftingStationID) - return new CraftingStationGui( - player.inventory, (CraftingStationLogic) world.getTileEntity(x, y, z), world, x, y, z); + if (ID == ToolProxyCommon.craftingStationID) return new CraftingStationGui( + player.inventory, + (CraftingStationLogic) world.getTileEntity(x, y, z), + world, + x, + y, + z); if (ID == ToolProxyCommon.furnaceID) return new FurnaceGui(player.inventory, (FurnaceLogic) world.getTileEntity(x, y, z)); @@ -544,42 +619,39 @@ public class ToolProxyClient extends ToolProxyCommon { public void onSound(SoundLoadEvent event) { // try { /* - * SoundManager soundmanager = event.manager; - * soundmanager.addSound("tinker:frypan_hit.ogg"); - * soundmanager.addSound("tinker:little_saw.ogg"); - * soundmanager.addSound("tinker:launcher_clank.ogg"); + * SoundManager soundmanager = event.manager; soundmanager.addSound("tinker:frypan_hit.ogg"); + * soundmanager.addSound("tinker:little_saw.ogg"); soundmanager.addSound("tinker:launcher_clank.ogg"); * TConstruct.logger.info("Successfully loaded sounds."); */ // } catch (Exception e) { - // TConstruct.logger.error("Failed to register one or more sounds"); + // TConstruct.logger.error("Failed to register one or more sounds"); // } MinecraftForge.EVENT_BUS.unregister(this); } void addStencilButtons() { - int[][] icons = { - {0, 3}, // tool rod - {1, 3}, // binding - {8, 3}, // large tool rod - {9, 3}, // large binding - {0, 2}, // pickaxe head - {3, 2}, // shovel head - {2, 2}, // hatchet head - {8, 2}, // scythe - {11, 2}, // hammer head - {10, 2}, // excavator head - {6, 2}, // lumberaxe head - {9, 2}, // large plate - {}, {4, 2}, // frying pan - {5, 2}, // battlesign - {7, 3}, // chisel - {}, {7, 2}, // knifeblade - {1, 2}, // swordblade - {6, 3}, // cleaver blade - {}, {4, 3}, // crossbar - {3, 3}, // small guard - {2, 3}, // wide guard + int[][] icons = { { 0, 3 }, // tool rod + { 1, 3 }, // binding + { 8, 3 }, // large tool rod + { 9, 3 }, // large binding + { 0, 2 }, // pickaxe head + { 3, 2 }, // shovel head + { 2, 2 }, // hatchet head + { 8, 2 }, // scythe + { 11, 2 }, // hammer head + { 10, 2 }, // excavator head + { 6, 2 }, // lumberaxe head + { 9, 2 }, // large plate + {}, { 4, 2 }, // frying pan + { 5, 2 }, // battlesign + { 7, 3 }, // chisel + {}, { 7, 2 }, // knifeblade + { 1, 2 }, // swordblade + { 6, 3 }, // cleaver blade + {}, { 4, 3 }, // crossbar + { 3, 3 }, // small guard + { 2, 3 }, // wide guard }; int i = 0; @@ -595,84 +667,66 @@ public class ToolProxyClient extends ToolProxyCommon { TConstructClientRegistry.addStencilButton(xButton, yButton, index, "tinker", "textures/gui/icons.png"); } - static int[][] itemIconsT1 = { - new int[] {1, 4, 0}, // Pickaxe - new int[] {2, 5, 0}, // Shovel - new int[] {2, 6, 0}, // Hatchet - new int[] {3, 8, 0}, // Mattock - new int[] {1, 0, 1}, // Broadsword - new int[] {1, 1, 1}, // Longsword - new int[] {1, 2, 1}, // Rapier - new int[] {1, 5, 1}, // Dagger - new int[] {2, 3, 1}, // Frying pan - new int[] {2, 4, 1}, // Battlesign - new int[] {2, 6, 1} // Chisel + static int[][] itemIconsT1 = { new int[] { 1, 4, 0 }, // Pickaxe + new int[] { 2, 5, 0 }, // Shovel + new int[] { 2, 6, 0 }, // Hatchet + new int[] { 3, 8, 0 }, // Mattock + new int[] { 1, 0, 1 }, // Broadsword + new int[] { 1, 1, 1 }, // Longsword + new int[] { 1, 2, 1 }, // Rapier + new int[] { 1, 5, 1 }, // Dagger + new int[] { 2, 3, 1 }, // Frying pan + new int[] { 2, 4, 1 }, // Battlesign + new int[] { 2, 6, 1 } // Chisel }; - static int[][] iconCoordsT1 = { - new int[] {0, 0, 1, 13}, new int[] {2, 3, 3, 13}, // Pickaxe - new int[] {3, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Shovel - new int[] {2, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Hatchet - new int[] {2, 0, 3, 13}, new int[] {2, 3, 2, 13}, // Mattock - new int[] {1, 0, 2, 13}, new int[] {2, 3, 3, 13}, // Broadsword - new int[] {1, 0, 3, 13}, new int[] {2, 3, 3, 13}, // Longsword - new int[] {1, 0, 4, 13}, new int[] {2, 3, 3, 13}, // Rapier - new int[] {7, 0, 4, 13}, new int[] {2, 3, 3, 13}, // Dagger - new int[] {4, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Frying Pan - new int[] {5, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Battlesign - new int[] {7, 0, 13, 13}, new int[] {3, 3, 13, 13} // Chisel + static int[][] iconCoordsT1 = { new int[] { 0, 0, 1, 13 }, new int[] { 2, 3, 3, 13 }, // Pickaxe + new int[] { 3, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Shovel + new int[] { 2, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Hatchet + new int[] { 2, 0, 3, 13 }, new int[] { 2, 3, 2, 13 }, // Mattock + new int[] { 1, 0, 2, 13 }, new int[] { 2, 3, 3, 13 }, // Broadsword + new int[] { 1, 0, 3, 13 }, new int[] { 2, 3, 3, 13 }, // Longsword + new int[] { 1, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Rapier + new int[] { 7, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Dagger + new int[] { 4, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Frying Pan + new int[] { 5, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Battlesign + new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel }; - static int[][] itemIconsT2 = { - new int[] { - 6, 13, 0, - }, // Hammer - new int[] { - 5, 11, 0, - }, // Lumberaxe - new int[] { - 5, 12, 0, - }, // Excavator - new int[] { - 4, 10, 0, - }, // Scythe - new int[] { - 5, 7, 1, - }, // Cleaver - new int[] { - 5, 8, 1, - }, // Battleaxe + static int[][] itemIconsT2 = { new int[] { 6, 13, 0, }, // Hammer + new int[] { 5, 11, 0, }, // Lumberaxe + new int[] { 5, 12, 0, }, // Excavator + new int[] { 4, 10, 0, }, // Scythe + new int[] { 5, 7, 1, }, // Cleaver + new int[] { 5, 8, 1, }, // Battleaxe }; - static int[][] iconCoordsT2 = { - new int[] {11, 8, 9, 9}, new int[] {2, 3, 2, 2}, // Hammer - new int[] {6, 8, 9, 9}, new int[] {2, 3, 2, 3}, // Lumberaxe - new int[] {10, 8, 9, 9}, new int[] {2, 3, 2, 3}, // Excavator - new int[] {8, 8, 9, 8}, new int[] {2, 3, 3, 3}, // Scythe - new int[] {6, 8, 9, 8}, new int[] {3, 3, 2, 3}, // Cleaver - new int[] {6, 8, 6, 9}, new int[] {2, 3, 2, 3}, // Battleaxe + static int[][] iconCoordsT2 = { new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, // Hammer + new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, // Lumberaxe + new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, // Excavator + new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, // Scythe + new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, // Cleaver + new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, // Battleaxe }; void addToolButtons() { - final ToolCore[] tier1Tools = { - pickaxe, shovel, hatchet, mattock, broadsword, longsword, rapier, dagger, frypan, battlesign, chisel - }; - final ToolCore[] tier2Tools = {hammer, lumberaxe, excavator, scythe, cleaver, battleaxe}; + final ToolCore[] tier1Tools = { pickaxe, shovel, hatchet, mattock, broadsword, longsword, rapier, dagger, + frypan, battlesign, chisel }; + final ToolCore[] tier2Tools = { hammer, lumberaxe, excavator, scythe, cleaver, battleaxe }; // repair addToolButton( 0, 3, 0, - new int[] {0, 1, 2, 13}, - new int[] {13, 13, 13, 13}, + new int[] { 0, 1, 2, 13 }, + new int[] { 13, 13, 13, 13 }, StatCollector.translateToLocal("gui.toolforge1"), "gui.toolforge2"); // tier 1 tools for (int i = 0; i < tier1Tools.length; i++) { - String locString = String.format( - "gui.toolstation.%s.desc", tier1Tools[i].getToolName().toLowerCase()); + String locString = String.format("gui.toolstation.%s.desc", tier1Tools[i].getToolName().toLowerCase()); addToolButton( itemIconsT1[i][0], itemIconsT1[i][1], @@ -685,8 +739,7 @@ public class ToolProxyClient extends ToolProxyCommon { // tier 2 tools for (int i = 0; i < tier2Tools.length; i++) { - String locString = String.format( - "gui.toolstation.%s.desc", tier2Tools[i].getToolName().toLowerCase()); + String locString = String.format("gui.toolstation.%s.desc", tier2Tools[i].getToolName().toLowerCase()); addTierTwoButton( itemIconsT2[i][0], itemIconsT2[i][1], @@ -699,62 +752,44 @@ public class ToolProxyClient extends ToolProxyCommon { } void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) { - TConstructClientRegistry.addToolButton(new ToolGuiElement( - slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + TConstructClientRegistry.addToolButton( + new ToolGuiElement( + slotType, + xButton, + yButton, + xIcons, + yIcons, + title, + body, + "tinker", + "textures/gui/icons.png")); } - void addTierTwoButton( - int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) { - TConstructClientRegistry.addTierTwoButton(new ToolGuiElement( - slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + void addTierTwoButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, + String body) { + TConstructClientRegistry.addTierTwoButton( + new ToolGuiElement( + slotType, + xButton, + yButton, + xIcons, + yIcons, + title, + body, + "tinker", + "textures/gui/icons.png")); } void addToolRenderMappings() { - String[] partTypes = { - "wood", - "stone", - "iron", - "flint", - "cactus", - "bone", - "obsidian", - "netherrack", - "slime", - "paper", - "cobalt", - "ardite", - "manyullyn", - "copper", - "bronze", - "alumite", - "steel", - "blueslime", - "pigiron" - }; - String[] effectTypes = { - "diamond", - "emerald", - "redstone", - "piston", - "moss", - "ice", - "lava", - "blaze", - "necrotic", - "flux", - "lapis", - "quartz", - "silk", - "beheading", - "smite", - "spider", - "reinforced", - "flux" - }; - int[] universalEffects = {0, 1, 4, 9, 16}; - int[] weaponEffects = {3, 5, 7, 13, 14, 15}; - int[] harvestEffects = {2}; - int[] nonUtility = {6, 8, 10, 11, 12}; + String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", + "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", + "pigiron" }; + String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", + "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced", "flux" }; + int[] universalEffects = { 0, 1, 4, 9, 16 }; + int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; + int[] harvestEffects = { 2 }; + int[] nonUtility = { 6, 8, 10, 11, 12 }; for (int partIter = 0; partIter < partTypes.length; partIter++) { TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java index e5385a69..bb1a7e75 100644 --- a/src/main/java/tconstruct/tools/ToolProxyCommon.java +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -1,13 +1,16 @@ package tconstruct.tools; -import cpw.mods.fml.common.network.IGuiHandler; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import tconstruct.common.TProxyCommon; +import cpw.mods.fml.common.network.IGuiHandler; public class ToolProxyCommon implements IGuiHandler { + public static final int toolStationID = 0; public static final int partBuilderID = 1; public static final int patternChestID = 2; diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index 8c49898c..1d9107e9 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -1,7 +1,7 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.tools.logic.BattlesignLogic; import tconstruct.tools.model.BattlesignRender; +import cpw.mods.fml.relauncher.*; public class BattlesignBlock extends EquipBlock { @@ -27,23 +29,14 @@ public class BattlesignBlock extends EquipBlock { @SideOnly(Side.CLIENT) @Override - public boolean shouldSideBeRendered( - IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return p_149646_5_ == 0 && this.minY > 0.0D - || (p_149646_5_ == 1 && this.maxY < 1.0D - || (p_149646_5_ == 2 && this.minZ > 0.0D - || (p_149646_5_ == 3 && this.maxZ < 1.0D - || (p_149646_5_ == 4 && this.minX > 0.0D - || (p_149646_5_ == 5 && this.maxX < 1.0D - || !(p_149646_1_ - .getBlock(p_149646_2_, p_149646_3_, p_149646_4_) - .isOpaqueCube() - && p_149646_1_ - .getBlock( - p_149646_2_, - p_149646_3_ + 1, - p_149646_4_) - .isOpaqueCube())))))); + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, + int p_149646_5_) { + return p_149646_5_ == 0 && this.minY > 0.0D || (p_149646_5_ == 1 && this.maxY < 1.0D || (p_149646_5_ == 2 + && this.minZ > 0.0D + || (p_149646_5_ == 3 && this.maxZ < 1.0D || (p_149646_5_ == 4 && this.minX > 0.0D || (p_149646_5_ == 5 + && this.maxX < 1.0D + || !(p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_).isOpaqueCube() + && p_149646_1_.getBlock(p_149646_2_, p_149646_3_ + 1, p_149646_4_).isOpaqueCube())))))); } @Override @@ -52,12 +45,7 @@ public class BattlesignBlock extends EquipBlock { } @Override - public void onBlockPlacedBy( - World par1World, - int par2, - int par3, - int par4, - EntityLivingBase par5EntityLivingBase, + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; @@ -100,8 +88,8 @@ public class BattlesignBlock extends EquipBlock { } @Override - public void addCollisionBoxesToList( - World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index 527e2555..d0c774db 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -1,8 +1,9 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventorySlab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -14,13 +15,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.*; import tconstruct.tools.logic.*; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.*; public class CraftingSlab extends InventorySlab { + public CraftingSlab(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); @@ -31,26 +35,11 @@ public class CraftingSlab extends InventorySlab { /* Rendering */ @Override public String[] getTextureNames() { - return new String[] { - "craftingstation_top", - "craftingstation_slab_side", - "craftingstation_bottom", - "toolstation_top", - "toolstation_slab_side", - "toolstation_bottom", - "partbuilder_oak_top", - "partbuilder_slab_side", - "partbuilder_oak_bottom", - "stenciltable_oak_top", - "stenciltable_slab_side", - "stenciltable_oak_bottom", - "patternchest_top", - "patternchest_slab_side", - "patternchest_bottom", - "toolforge_top", - "toolforge_slab_side", - "toolforge_top" - }; + return new String[] { "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", + "toolstation_top", "toolstation_slab_side", "toolstation_bottom", "partbuilder_oak_top", + "partbuilder_slab_side", "partbuilder_oak_bottom", "stenciltable_oak_top", "stenciltable_slab_side", + "stenciltable_oak_bottom", "patternchest_top", "patternchest_slab_side", "patternchest_bottom", + "toolforge_top", "toolforge_slab_side", "toolforge_top" }; } @Override @@ -74,14 +63,13 @@ public class CraftingSlab extends InventorySlab { @Override public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 5) - return AxisAlignedBB.getBoundingBox( - (double) x + this.minX, - (double) y + this.minY, - (double) z + this.minZ, - (double) x + this.maxX, - (double) y + this.maxY - 0.125, - (double) z + this.maxZ); + if (metadata == 5) return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY - 0.125, + (double) z + this.maxZ); return AxisAlignedBB.getBoundingBox( (double) x + this.minX, (double) y + this.minY, @@ -218,8 +206,12 @@ public class CraftingSlab extends InventorySlab { double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = - new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); + EntityItem entityitem = new EntityItem( + world, + (double) x + d0, + (double) y + d1, + (double) z + d2, + chest); entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); } diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index 77085982..710bfc7c 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -1,8 +1,9 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -11,13 +12,16 @@ import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.CraftingStationLogic; import tconstruct.tools.model.TableRender; +import cpw.mods.fml.relauncher.*; public class CraftingStationBlock extends InventoryBlock { + public CraftingStationBlock(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); @@ -30,7 +34,7 @@ public class CraftingStationBlock extends InventoryBlock { /* Rendering */ @Override public String[] getTextureNames() { - return new String[] {"craftingstation_top", "craftingstation_side", "craftingstation_bottom"}; + return new String[] { "craftingstation_top", "craftingstation_side", "craftingstation_bottom" }; } @Override diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 33e4da82..96a3e7bf 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -1,8 +1,9 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.Random; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,11 +16,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.*; import tconstruct.tools.model.FrypanRender; +import cpw.mods.fml.relauncher.*; public class EquipBlock extends InventoryBlock { @@ -32,7 +35,7 @@ public class EquipBlock extends InventoryBlock { @Override public String[] getTextureNames() { - return new String[] {"toolstation_top"}; + return new String[] { "toolstation_top" }; } @Override @@ -91,12 +94,7 @@ public class EquipBlock extends InventoryBlock { } @Override - public void onBlockPlacedBy( - World par1World, - int par2, - int par3, - int par4, - EntityLivingBase par5EntityLivingBase, + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; @@ -150,8 +148,7 @@ public class EquipBlock extends InventoryBlock { new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) - stack.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } float offset = 0.05F; @@ -190,9 +187,7 @@ public class EquipBlock extends InventoryBlock { if (te instanceof EquipLogic) { EquipLogic logic = (EquipLogic) te; ItemStack stack = logic.getEquipmentItem(); - if (stack != null - && stack.hasTagCompound() - && stack.getTagCompound().hasKey("InfiTool")) { + if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("InfiTool")) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag("InfiTool"); if (tag != null) { diff --git a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index 1d67e6e4..a056b306 100644 --- a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -1,19 +1,22 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.Random; + import mantle.blocks.abstracts.InventorySlab; import mantle.blocks.iface.*; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.FurnaceLogic; +import cpw.mods.fml.relauncher.*; public class FurnaceSlab extends InventorySlab { @@ -43,7 +46,7 @@ public class FurnaceSlab extends InventorySlab { @Override public String[] getTextureNames() { - return new String[] {"furnaceslab_front", "furnaceslab_front_active", "furnaceslab_side", "furnace_top"}; + return new String[] { "furnaceslab_front", "furnaceslab_front_active", "furnaceslab_side", "furnace_top" }; } @Override diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index c76ffc89..629fe2d5 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -1,31 +1,20 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; public class MultiBrick extends TConstructBlock { - static String[] blockTextures = { - "brick_obsidian", - "brick_sandstone", - "brick_netherrack", - "brick_stone_refined", - "brick_iron", - "brick_gold", - "brick_lapis", - "brick_diamond", - "brick_redstone", - "brick_bone", - "brick_slime", - "brick_blueslime", - "brick_endstone", - "brick_obsidian_ingot" - }; + + static String[] blockTextures = { "brick_obsidian", "brick_sandstone", "brick_netherrack", "brick_stone_refined", + "brick_iron", "brick_gold", "brick_lapis", "brick_diamond", "brick_redstone", "brick_bone", "brick_slime", + "brick_blueslime", "brick_endstone", "brick_obsidian_ingot" }; public MultiBrick() { super(Material.rock, 3f, blockTextures); @@ -67,46 +56,46 @@ public class MultiBrick extends TConstructBlock { } @Override - public float getExplosionResistance( - Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, + double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: case 13: - return Blocks.obsidian.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.obsidian + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 1: - return Blocks.sandstone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.sandstone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 2: - return Blocks.netherrack.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.netherrack + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 3: - return Blocks.stone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 4: - return Blocks.iron_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.iron_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 5: - return Blocks.gold_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.gold_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 6: - return Blocks.lapis_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.lapis_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 7: - return Blocks.diamond_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.diamond_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 8: - return Blocks.redstone_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.redstone_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 9: return 1.0F; case 10: case 11: return 1.5F; case 12: - return Blocks.end_stone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.end_stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); default: return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); } diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index 6fac42a0..7f2084c0 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -1,33 +1,21 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; public class MultiBrickFancy extends TConstructBlock { - static String[] blockTextures = { - "fancybrick_obsidian", - "fancybrick_sandstone", - "fancybrick_netherrack", - "fancybrick_stone_refined", - "fancybrick_iron", - "fancybrick_gold", - "fancybrick_lapis", - "fancybrick_diamond", - "fancybrick_redstone", - "fancybrick_bone", - "fancybrick_slime", - "fancybrick_blueslime", - "fancybrick_endstone", - "fancybrick_obsidian_ingot", - "fancybrick_stone", - "road_stone" - }; + + static String[] blockTextures = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", + "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", "fancybrick_diamond", + "fancybrick_redstone", "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", + "fancybrick_obsidian_ingot", "fancybrick_stone", "road_stone" }; public MultiBrickFancy() { super(Material.rock, 3f, blockTextures); @@ -72,48 +60,48 @@ public class MultiBrickFancy extends TConstructBlock { } @Override - public float getExplosionResistance( - Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, + double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: case 13: - return Blocks.obsidian.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.obsidian + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 1: - return Blocks.sandstone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.sandstone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 2: - return Blocks.netherrack.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.netherrack + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 4: - return Blocks.iron_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.iron_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 5: - return Blocks.gold_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.gold_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 6: - return Blocks.lapis_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.lapis_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 7: - return Blocks.diamond_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.diamond_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 8: - return Blocks.redstone_block.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.redstone_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 9: return 1.0F; case 10: case 11: return 1.5F; case 12: - return Blocks.end_stone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.end_stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); case 3: case 14: case 15: - return Blocks.stone.getExplosionResistance( - entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + return Blocks.stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); default: return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); } diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java index 047897e8..419cbe0e 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java @@ -1,24 +1,18 @@ package tconstruct.tools.blocks; -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.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; + import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class MultiBrickMetal extends TConstructBlock { - static String[] blockTextures = { - "brick_alumite", - "brick_ardite", - "brick_cobalt", - "brick_manyullyn", - "fancybrick_alumite", - "fancybrick_ardite", - "fancybrick_cobalt", - "fancybrick_manyullyn" - }; + + static String[] blockTextures = { "brick_alumite", "brick_ardite", "brick_cobalt", "brick_manyullyn", + "fancybrick_alumite", "fancybrick_ardite", "fancybrick_cobalt", "fancybrick_manyullyn" }; public MultiBrickMetal() { super(Material.iron, 10f, blockTextures); diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index 4c985647..e1b4d685 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -1,8 +1,9 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,12 +15,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.ToolForgeLogic; import tconstruct.tools.model.TableRender; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class ToolForgeBlock extends InventoryBlock { @@ -30,22 +33,9 @@ public class ToolForgeBlock extends InventoryBlock { this.setStepSound(Block.soundTypeMetal); } - String[] textureNames = { - "toolforge_iron", - "toolforge_gold", - "toolforge_diamond", - "toolforge_emerald", - "toolforge_cobalt", - "toolforge_ardite", - "toolforge_manyullyn", - "toolforge_copper", - "toolforge_bronze", - "toolforge_tin", - "toolforge_aluminum", - "toolforge_alubrass", - "toolforge_alumite", - "toolforge_steel" - }; + String[] textureNames = { "toolforge_iron", "toolforge_gold", "toolforge_diamond", "toolforge_emerald", + "toolforge_cobalt", "toolforge_ardite", "toolforge_manyullyn", "toolforge_copper", "toolforge_bronze", + "toolforge_tin", "toolforge_aluminum", "toolforge_alubrass", "toolforge_alumite", "toolforge_steel" }; /* Rendering */ @Override diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index d28298cb..154197a2 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -1,8 +1,9 @@ package tconstruct.tools.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -15,14 +16,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.*; import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.*; public class ToolStationBlock extends InventoryBlock { + public ToolStationBlock(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); @@ -35,38 +39,15 @@ public class ToolStationBlock extends InventoryBlock { /* Rendering */ @Override public String[] getTextureNames() { - return new String[] { - "toolstation_top", - "toolstation_side", - "toolstation_bottom", - "partbuilder_oak_top", - "partbuilder_oak_side", - "partbuilder_oak_bottom", - "partbuilder_spruce_top", - "partbuilder_spruce_side", - "partbuilder_spruce_bottom", - "partbuilder_birch_top", - "partbuilder_birch_side", - "partbuilder_birch_bottom", - "partbuilder_jungle_top", - "partbuilder_jungle_side", - "partbuilder_jungle_bottom", - "patternchest_top", - "patternchest_side", - "patternchest_bottom", - "stenciltable_oak_top", - "stenciltable_oak_side", - "stenciltable_oak_bottom", - "stenciltable_spruce_top", - "stenciltable_spruce_side", - "stenciltable_spruce_bottom", - "stenciltable_birch_top", - "stenciltable_birch_side", - "stenciltable_birch_bottom", - "stenciltable_jungle_top", - "stenciltable_jungle_side", - "stenciltable_jungle_bottom" - }; + return new String[] { "toolstation_top", "toolstation_side", "toolstation_bottom", "partbuilder_oak_top", + "partbuilder_oak_side", "partbuilder_oak_bottom", "partbuilder_spruce_top", "partbuilder_spruce_side", + "partbuilder_spruce_bottom", "partbuilder_birch_top", "partbuilder_birch_side", + "partbuilder_birch_bottom", "partbuilder_jungle_top", "partbuilder_jungle_side", + "partbuilder_jungle_bottom", "patternchest_top", "patternchest_side", "patternchest_bottom", + "stenciltable_oak_top", "stenciltable_oak_side", "stenciltable_oak_bottom", "stenciltable_spruce_top", + "stenciltable_spruce_side", "stenciltable_spruce_bottom", "stenciltable_birch_top", + "stenciltable_birch_side", "stenciltable_birch_bottom", "stenciltable_jungle_top", + "stenciltable_jungle_side", "stenciltable_jungle_bottom" }; } @Override @@ -116,14 +97,13 @@ public class ToolStationBlock extends InventoryBlock { @Override public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 5) - return AxisAlignedBB.getBoundingBox( - (double) x + this.minX, - (double) y + this.minY, - (double) z + this.minZ, - (double) x + this.maxX, - (double) y + this.maxY - 0.125, - (double) z + this.maxZ); + if (metadata == 5) return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY - 0.125, + (double) z + this.maxZ); return AxisAlignedBB.getBoundingBox( (double) x + this.minX, (double) y + this.minY, @@ -154,8 +134,9 @@ public class ToolStationBlock extends InventoryBlock { case 12: case 11: return new StencilTableLogic(); - /*case 14: - return new CastingTableLogic();*/ + /* + * case 14: return new CastingTableLogic(); + */ default: return null; } @@ -188,24 +169,14 @@ public class ToolStationBlock extends InventoryBlock { } } - /*@Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) - { - if (PHConstruct.freePatterns) - { - int meta = world.getBlockMetadata(x, y, z); - if (meta == 5) - { - PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); - for (int i = 1; i <= 13; i++) - { - logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); - } - logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); - } - } - super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); - }*/ + /* + * @Override public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase par5EntityLiving, + * ItemStack par6ItemStack) { if (PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); if (meta + * == 5) { PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); for (int i = 1; i <= 13; i++) + * { logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); } + * logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); } } + * super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); } + */ @Override public String getTextureDomain(int textureNameIndex) { @@ -238,8 +209,12 @@ public class ToolStationBlock extends InventoryBlock { double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = - new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); + EntityItem entityitem = new EntityItem( + world, + (double) x + d0, + (double) y + d1, + (double) z + d2, + chest); entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); } diff --git a/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java b/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java index 015ddeac..dd464346 100644 --- a/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java +++ b/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java @@ -1,10 +1,12 @@ package tconstruct.tools.client; import org.lwjgl.opengl.GL11; + import tconstruct.tools.entity.DaggerEntity; import tconstruct.weaponry.client.entity.ProjectileBaseRenderer; public class DaggerEntityRenderer extends ProjectileBaseRenderer { + @Override public void customRendering(DaggerEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index 5c694556..bf5f1bdd 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -1,9 +1,7 @@ package tconstruct.tools.entity; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import io.netty.buffer.ByteBuf; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.crash.*; import net.minecraft.entity.*; @@ -17,8 +15,13 @@ import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; + @Deprecated public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData { + public ItemStack returnStack; public float mass; public int baseDamage; @@ -48,8 +51,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa @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; + boolean flag = this.canBePickedUp == 1 + || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(returnStack)) { flag = false; @@ -57,7 +60,9 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (flag) { this.playSound( - "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); par1EntityPlayer.onItemPickup(this, 1); if (returnStack.stackSize <= 0 || this.canBePickedUp == 2) this.setDead(); } @@ -73,8 +78,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa 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.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D + / Math.PI); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); } @@ -82,7 +87,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool( - this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.worldObj, + this.field_145791_d, + this.field_145792_e, + this.field_145789_f); if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { @@ -116,12 +124,12 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa } else { ++this.ticksInAir; Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec31 = Vec3.createVectorHelper( - this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 vec31 = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false); vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec31 = Vec3.createVectorHelper( - this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + vec31 = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { vec31 = Vec3.createVectorHelper( @@ -133,9 +141,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa 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)); + this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; int l; float ySpeed; @@ -166,9 +172,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (movingobjectposition != null && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - if (entityplayer.capabilities.disableDamage - || this.shootingEntity instanceof EntityPlayer - && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer + && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { movingobjectposition = null; } } @@ -234,8 +239,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (f3 > 0.0F) { float knockback = knockbackStrength + knockbackStrengthMod; movingobjectposition.entityHit.addVelocity( - this.motionX - * (double) this.knockbackStrength + this.motionX * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3, 0.1D, @@ -249,12 +253,11 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); } - if (this.shootingEntity != null - && movingobjectposition.entityHit != this.shootingEntity + if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { - ((EntityPlayerMP) this.shootingEntity) - .playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0)); + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler + .sendPacket(new S2BPacketChangeGameState(6, 0)); // TConstruct.packetPipeline.sendTo(new // S2BPacketChangeGameState(6, 0), // (EntityPlayerMP) this.shootingEntity); @@ -287,10 +290,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa this.field_145791_d = movingobjectposition.blockX; this.field_145792_e = movingobjectposition.blockY; this.field_145789_f = movingobjectposition.blockZ; - this.field_145790_g = - this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.inData = this.worldObj.getBlockMetadata( - this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.field_145790_g = this.worldObj + .getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.inData = this.worldObj + .getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); this.motionX = (float) (movingobjectposition.hitVec.xCoord - this.posX); this.motionY = (float) (movingobjectposition.hitVec.yCoord - this.posY); this.motionZ = (float) (movingobjectposition.hitVec.zCoord - this.posZ); @@ -306,7 +309,11 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (this.field_145790_g != Blocks.air) { this.field_145790_g.onEntityCollidedWithBlock( - this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); + this.worldObj, + this.field_145791_d, + this.field_145792_e, + this.field_145789_f, + this); } } } @@ -470,8 +477,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa private int storeItemStack(ItemStack par1ItemStack, EntityLivingBase living) { for (int slotID = 0; slotID < 5; ++slotID) { ItemStack stack = living.getEquipmentInSlot(slotID); - if (stack != null - && stack.isItemEqual(par1ItemStack) + if (stack != null && stack.isItemEqual(par1ItemStack) && ItemStack.areItemStackTagsEqual(stack, par1ItemStack) && stack.isStackable() && stack.stackSize < stack.getMaxStackSize()) { diff --git a/src/main/java/tconstruct/tools/entity/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java index 83dcc4df..16a2654c 100644 --- a/src/main/java/tconstruct/tools/entity/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -4,10 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.library.tools.*; public class DaggerEntity extends ProjectileBase { + public int roll; public DaggerEntity(World world) { @@ -24,7 +26,11 @@ public class DaggerEntity extends ProjectileBase { float pitch = Math.max(-90f, player.rotationPitch - 20f); // same as in the others, but with pitch upped this.setLocationAndAngles( - player.posX, player.posY + (double) player.getEyeHeight(), player.posZ, player.rotationYaw, pitch); + player.posX, + player.posY + (double) player.getEyeHeight(), + player.posZ, + player.rotationYaw, + pitch); this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.posY -= 0.10000000149011612D; this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; @@ -49,8 +55,10 @@ public class DaggerEntity extends ProjectileBase { @Override public void onHitEntity(MovingObjectPosition movingobjectposition) { AbilityHelper.onLeftClickEntity( - returnStack, (EntityPlayer) shootingEntity, movingobjectposition.entityHit, (ToolCore) - returnStack.getItem()); + returnStack, + (EntityPlayer) shootingEntity, + movingobjectposition.entityHit, + (ToolCore) returnStack.getItem()); // super.onHitEntity(movingobjectposition); } diff --git a/src/main/java/tconstruct/tools/entity/FancyEntityItem.java b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java index 773b5779..eb9aaee8 100644 --- a/src/main/java/tconstruct/tools/entity/FancyEntityItem.java +++ b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java @@ -7,6 +7,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class FancyEntityItem extends EntityItem { + public FancyEntityItem(World par1World, double par2, double par4, double par6) { super(par1World, par2, par4, par6); this.isImmuneToFire = true; @@ -16,8 +17,7 @@ public class FancyEntityItem extends EntityItem { public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { this(par1World, par2, par4, par6); this.setEntityItemStack(par8ItemStack); - this.lifespan = (par8ItemStack.getItem() == null - ? 6000 + this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); } diff --git a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java index d0145208..5b9a30ed 100644 --- a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -1,7 +1,7 @@ package tconstruct.tools.entity; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; @@ -11,7 +11,10 @@ import net.minecraft.potion.*; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class LaunchedPotion extends EntityThrowable { + /** * The damage value of the thrown potion that this EntityPotion represents. */ @@ -67,8 +70,7 @@ public class LaunchedPotion extends EntityThrowable { } /** - * Returns the damage value of the thrown potion that this EntityPotion - * represents. + * Returns the damage value of the thrown potion that this EntityPotion represents. */ public int getPotionDamage() { if (this.potionDamage == null) { @@ -88,8 +90,8 @@ public class LaunchedPotion extends EntityThrowable { if (list != null && !list.isEmpty()) { AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D); - List list1 = - this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + List list1 = this.worldObj + .getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); if (list1 != null && !list1.isEmpty()) { @@ -108,13 +110,16 @@ public class LaunchedPotion extends EntityThrowable { if (Potion.potionTypes[i].isInstant()) { Potion.potionTypes[i].affectEntity( - this.getThrower(), entityliving, potioneffect.getAmplifier(), d1); + this.getThrower(), + entityliving, + potioneffect.getAmplifier(), + d1); } else { int j = (int) (d1 * (double) potioneffect.getDuration() + 0.5D); if (j > 20) { - entityliving.addPotionEffect( - new PotionEffect(i, j, potioneffect.getAmplifier())); + entityliving + .addPotionEffect(new PotionEffect(i, j, potioneffect.getAmplifier())); } } } diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index 14a79a44..54f30e59 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -1,9 +1,7 @@ package tconstruct.tools.entity; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import io.netty.buffer.ByteBuf; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -12,7 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.library.tools.AbilityHelper; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; @Deprecated public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { @@ -56,20 +58,17 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { posZ -= MathHelper.sin((rotationYaw / 180F) * 3.141593F) * 0.16F; setPosition(posX, posY, posZ); yOffset = 0.0F; - motionX = - -MathHelper.sin((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F); + motionX = -MathHelper.sin((rotationYaw / 180F) * 3.141593F) + * MathHelper.cos((rotationPitch / 180F) * 3.141593F); motionZ = MathHelper.cos((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F); motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f); setArrowHeading(motionX, motionY, motionZ, f, f1); } /* - * public void setOnGround(boolean flag) { onGround = flag; - * this.dataWatcher.updateObject(6, Byte.valueOf((byte) (flag == true ? 1 : - * 0))); } - * - * public boolean getOnGround() { return - * this.dataWatcher.getWatchableObjectByte(0) == 1 ? true : false; } + * public void setOnGround(boolean flag) { onGround = flag; this.dataWatcher.updateObject(6, Byte.valueOf((byte) + * (flag == true ? 1 : 0))); } public boolean getOnGround() { return this.dataWatcher.getWatchableObjectByte(0) == 1 + * ? true : false; } */ @Override @@ -89,11 +88,9 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { } /* - * public void returnToPlayer() { damageDagger(0, true); - * if(returnStack.stackSize < 1) { return; } if(returnStackSlot > 0) { - * mod_Infi2x2.forceAddToInv((EntityPlayer)returnsTo, returnStack, - * returnStackSlot, true); } else { - * mod_Infi2x2.addToInv((EntityPlayer)returnsTo, returnStack, true); } } + * public void returnToPlayer() { damageDagger(0, true); if(returnStack.stackSize < 1) { return; } + * if(returnStackSlot > 0) { mod_Infi2x2.forceAddToInv((EntityPlayer)returnsTo, returnStack, returnStackSlot, true); + * } else { mod_Infi2x2.addToInv((EntityPlayer)returnsTo, returnStack, true); } } */ public void determineRotation() { @@ -161,8 +158,8 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { * this.motionX = 0; this.motionY = 0; this.motionZ = 0; */ /* - * ticksInGround++; if (ticksInGround == 1200) { setDead(); } if - * (ticksInGround == maxGroundTicks) { setDead(); } + * ticksInGround++; if (ticksInGround == 1200) { setDead(); } if (ticksInGround == maxGroundTicks) { + * setDead(); } */ if (!hasHitGround) { hasHitGround = true; @@ -187,7 +184,8 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { } Entity entity = null; List list = worldObj.getEntitiesWithinAABBExcludingEntity( - this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + this, + boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double d = 0.0D; for (Entity entity1 : list) { if (!entity1.canBeCollidedWith() || entity1 == owner && ticksInAir < 5) { @@ -265,22 +263,12 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { } /* - * public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { - * super.readEntityFromNBT(par1NBTTagCompound); - * - * if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage = - * ItemStack.loadItemStackFromNBT + * public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { super.readEntityFromNBT(par1NBTTagCompound); + * if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage = ItemStack.loadItemStackFromNBT * (par1NBTTagCompound.getCompoundTag("Potion")); } else { - * this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); } - * - * if (this.potionDamage == null) { this.setDead(); } } - * - * public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { - * super.writeEntityToNBT(par1NBTTagCompound); - * - * if (this.potionDamage != null) { - * - * } } + * this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); } if (this.potionDamage == null) { + * this.setDead(); } } public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { + * super.writeEntityToNBT(par1NBTTagCompound); if (this.potionDamage != null) { } } */ @Override @@ -325,7 +313,10 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { } if (!doNotRetrieve) AbilityHelper.addToInv(entityplayer, returnStack, true); worldObj.playSoundAtEntity( - this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + this, + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); entityplayer.onItemPickup(this, 1); kill(); } diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java index 06e73cb9..9190b0b1 100644 --- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java +++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java @@ -5,21 +5,24 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.logic.BattlesignLogic; import tconstruct.util.network.SignDataPacket; public class BattlesignGui extends GuiScreen { + private final BattlesignLogic battlesign; private float bgColR = 1F; private float bgColG = 1F; private float bgColB = 1F; private static final ResourceLocation background = new ResourceLocation("tinker:textures/gui/battlesignText.png"); - private final String[] text = {"", "", "", "", ""}; + private final String[] text = { "", "", "", "", "" }; int currentLine = 0; public BattlesignGui(BattlesignLogic logic) { @@ -72,19 +75,14 @@ public class BattlesignGui extends GuiScreen { float lum = calcLuminance(bgColR, bgColG, bgColB); for (int i = 0; i < text.length; i++) { - final EnumChatFormatting chatFormatting = lum >= 35F - ? EnumChatFormatting.BLACK + final EnumChatFormatting chatFormatting = lum >= 35F ? EnumChatFormatting.BLACK : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE; fontRendererObj.drawString( - chatFormatting - + (i == currentLine ? "> " : "") + chatFormatting + (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " " + EnumChatFormatting.RESET + chatFormatting + "<" : ""), - k - - fontRendererObj.getStringWidth( - (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " <" : "")) - / 2 - + 51, + k - fontRendererObj.getStringWidth( + (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " <" : "")) / 2 + 51, l + 4 + 10 * i, 0); } @@ -97,8 +95,7 @@ public class BattlesignGui extends GuiScreen { super.keyTyped(c, i); if (fontRendererObj.getStringWidth(text[currentLine]) < 90 && ChatAllowedCharacters.isAllowedCharacter(c)) { - if (Keyboard.isKeyDown(56) - && c == 'f' + if (Keyboard.isKeyDown(56) && c == 'f' && (text[currentLine].length() == 0 || text[currentLine].charAt(text[currentLine].length() - 1) != '\u00A7')) { text[currentLine] += "\u00A7"; @@ -146,12 +143,13 @@ public class BattlesignGui extends GuiScreen { Keyboard.enableRepeatEvents(false); - TConstruct.packetPipeline.sendToServer(new SignDataPacket( - battlesign.getWorldObj().provider.dimensionId, - battlesign.xCoord, - battlesign.yCoord, - battlesign.zCoord, - text)); + TConstruct.packetPipeline.sendToServer( + new SignDataPacket( + battlesign.getWorldObj().provider.dimensionId, + battlesign.xCoord, + battlesign.yCoord, + battlesign.zCoord, + text)); } private float calcLuminance(float r, float g, float b) { diff --git a/src/main/java/tconstruct/tools/gui/ChestSlot.java b/src/main/java/tconstruct/tools/gui/ChestSlot.java index 310b7147..78788be9 100644 --- a/src/main/java/tconstruct/tools/gui/ChestSlot.java +++ b/src/main/java/tconstruct/tools/gui/ChestSlot.java @@ -1,14 +1,16 @@ package tconstruct.tools.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ChestSlot extends Slot { + /* * A Slot, used for adjacent Chest Inventories, that can be disabled. */ @@ -24,7 +26,7 @@ public class ChestSlot extends Slot { @SideOnly(Side.CLIENT) @Override - public boolean func_111238_b /*isEnabled*/() { + public boolean func_111238_b /* isEnabled */() { return enabled; } diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index e0191a52..d98a79cc 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -1,12 +1,9 @@ package tconstruct.tools.gui; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; import java.awt.Rectangle; import java.util.Collections; import java.util.List; + import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -17,18 +14,25 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.logic.CraftingStationLogic; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { + /* - * Slider/slots related. Taken & adapted from Tinkers Construct 1.12 under the MIT License + * Slider/slots related. Taken & adapted from Tinkers Construct 1.12 under the MIT License */ private static final ResourceLocation gui_inventory = new ResourceLocation("tinker", "textures/gui/generic.png"); @@ -43,8 +47,13 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { private static final GuiElementScalable sliderBackground = new GuiElementScalable(43, 8, 12, 30, 64, 64); private static final GuiElementScalable textBackground = new GuiElementScalable(7 + 18, 7, 18, 10, 64, 64); - private final GuiSliderWidget slider = - new GuiSliderWidget(sliderNormal, sliderHigh, sliderLow, sliderTop, sliderBottom, sliderBackground); + private final GuiSliderWidget slider = new GuiSliderWidget( + sliderNormal, + sliderHigh, + sliderLow, + sliderTop, + sliderBottom, + sliderBackground); private final GuiBorderWidget border = new GuiBorderWidget(); private int firstSlotId; @@ -119,15 +128,14 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { if (logic.chest != null) { if (logic.chest.get() instanceof TileEntity) { TileEntity te = (TileEntity) logic.chest.get(); - if (te == null - || te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null - && te.getWorldObj().isRemote) { + if (te == null || te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null + && te.getWorldObj().isRemote) { mc.thePlayer.closeScreen(); return; } } - this.fontRendererObj.drawString( - StatCollector.translateToLocal(logic.chest.get().getInventoryName()), 8, 6, 0x202020); + this.fontRendererObj + .drawString(StatCollector.translateToLocal(logic.chest.get().getInventoryName()), 8, 6, 0x202020); } this.fontRendererObj.drawString( @@ -135,22 +143,22 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { craftingTextLeft + 8, 6, 0x202020); - this.fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, 72, 0x202020); + this.fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, 72, 0x202020); if (logic.tinkerTable) { if (logic.isStackInSlot(0)) // output slot = modified item - drawToolStats(logic.getStackInSlot(0)); + drawToolStats(logic.getStackInSlot(0)); else if (logic.isStackInSlot(5)) { // center slot if no output item // other slots empty? - if (!logic.isStackInSlot(1) - && !logic.isStackInSlot(2) + if (!logic.isStackInSlot(1) && !logic.isStackInSlot(2) && !logic.isStackInSlot(3) && !logic.isStackInSlot(4) && !logic.isStackInSlot(6) && !logic.isStackInSlot(7) && !logic.isStackInSlot(8) - && !logic.isStackInSlot(9)) drawToolStats(logic.getStackInSlot(5)); + && !logic.isStackInSlot(9)) + drawToolStats(logic.getStackInSlot(5)); else drawToolInformation(); } else drawToolInformation(); } @@ -206,21 +214,18 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { 16777215); int attack = materialEnum.attack(); - String heart = attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, - baseX, - baseY + 60, - 0xffffff); - else - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, - baseX, - baseY + 60, - 0xffffff); + if (attack % 2 == 0) this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + baseX, + baseY + 60, + 0xffffff); + else this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + baseX, + baseY + 60, + 0xffffff); } @Override @@ -333,8 +338,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { final int xMod = (slider.isEnabled() ? slider.width : 0) + border.w; final int yMod = (shouldDrawName() ? textBackground.y : 0) + (border.h * 2); - return mouseX >= (this.chestLeft - xMod) - && mouseX < (chestLeft + chestWidth + xMod) + return mouseX >= (this.chestLeft - xMod) && mouseX < (chestLeft + chestWidth + xMod) && mouseY >= (this.chestTop - yMod) && mouseY < (chestTop + chestHeight + yMod); } @@ -349,14 +353,13 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { } protected boolean shouldDrawName() { - return this.logic.chest != null - && this.logic.chest.get().getInventoryName() != null + return this.logic.chest != null && this.logic.chest.get().getInventoryName() != null && !this.logic.chest.get().getInventoryName().isEmpty(); } @Override - public void func_146977_a /*drawSlot*/(Slot slot) { - if (!slot.func_111238_b /*isEnabled*/()) return; + public void func_146977_a /* drawSlot */(Slot slot) { + if (!slot.func_111238_b /* isEnabled */()) return; super.func_146977_a(slot); } @@ -406,8 +409,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { slider.disable(); } - chestWidth = logic.invColumns * CraftingStationGui.slotElement.w - + 2 * border.w + chestWidth = logic.invColumns * CraftingStationGui.slotElement.w + 2 * border.w + (slider.isEnabled() ? slider.width : 0); chestLeft = guiLeft - chestWidth; @@ -415,8 +417,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { // Leaving out the xSize increase by chestSize and adjusting where it's used, because otherwise it shifts both // the bookmarks and item panel - // way too far out. If anything (mouseClick, for example) relies on xSize, you'll need to hack it like below. - // xSize += guiLeft - chestLeft; + // way too far out. If anything (mouseClick, for example) relies on xSize, you'll need to hack it like below. + // xSize += guiLeft - chestLeft; guiLeft = chestLeft; border.setPosition(chestLeft, chestTop); diff --git a/src/main/java/tconstruct/tools/gui/FrypanGui.java b/src/main/java/tconstruct/tools/gui/FrypanGui.java index 7273768e..0faa6cad 100644 --- a/src/main/java/tconstruct/tools/gui/FrypanGui.java +++ b/src/main/java/tconstruct/tools/gui/FrypanGui.java @@ -4,10 +4,13 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.*; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.tools.logic.FrypanLogic; public class FrypanGui extends GuiContainer { + public FrypanLogic logic; public FrypanGui(InventoryPlayer inventoryplayer, FrypanLogic frypan, World world, int x, int y, int z) { @@ -18,8 +21,8 @@ public class FrypanGui extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); - fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index c32bc921..5df957b9 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -1,18 +1,21 @@ package tconstruct.tools.gui; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import tconstruct.tools.inventory.FurnaceContainer; import tconstruct.tools.logic.FurnaceLogic; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class FurnaceGui extends GuiContainer { - private static final ResourceLocation furnaceGuiTextures = - new ResourceLocation("textures/gui/container/furnace.png"); + + private static final ResourceLocation furnaceGuiTextures = new ResourceLocation( + "textures/gui/container/furnace.png"); private final FurnaceLogic logic; public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) { @@ -21,8 +24,7 @@ public class FurnaceGui extends GuiContainer { } /** - * Draw the foreground layer for the GuiContainer (everything in front of - * the items) + * Draw the foreground layer for the GuiContainer (everything in front of the items) */ @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { @@ -32,8 +34,7 @@ public class FurnaceGui extends GuiContainer { } /** - * Draw the background layer for the GuiContainer (everything behind the - * items) + * Draw the background layer for the GuiContainer (everything behind the items) */ @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { diff --git a/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java b/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java index 0d555477..bdffaf49 100644 --- a/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java +++ b/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java @@ -1,22 +1,21 @@ package tconstruct.tools.gui; /* -* Taken from Tinker's Construct 1.12 under the MIT License -* -* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ + * Taken from Tinker's Construct 1.12 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights + * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ public class GuiBorderWidget { + // all elements based on generic gui public GuiElementDuex cornerTopLeft = new GuiElementDuex(0, 0, 7, 7, 64, 64); public GuiElementDuex cornerTopRight = new GuiElementDuex(64 - 7, 0, 7, 7, 64, 64); diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java index 5a9df1b5..88c26ff2 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java @@ -3,13 +3,15 @@ package tconstruct.tools.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import tconstruct.library.client.StencilGuiElement; public class GuiButtonStencil extends GuiButton { + /** - * True for pointing right (next page), false for pointing left (previous - * page). + * True for pointing right (next page), false for pointing left (previous page). */ int textureX; @@ -18,8 +20,8 @@ public class GuiButtonStencil extends GuiButton { public StencilGuiElement element; private static ResourceLocation background; - public GuiButtonStencil( - int id, int posX, int posY, int texX, int texY, String domain, String tex, StencilGuiElement e) { + public GuiButtonStencil(int id, int posX, int posY, int texX, int texY, String domain, String tex, + StencilGuiElement e) { super(id, posX, posY, 18, 18, ""); textureX = texX; textureY = texY; @@ -34,15 +36,13 @@ public class GuiButtonStencil extends GuiButton { @Override public void drawButton(Minecraft mc, int mouseX, int mouseY) { if (this.visible) { - boolean var4 = mouseX >= this.xPosition - && mouseY >= this.yPosition + boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(background); - this.field_146123_n = mouseX >= this.xPosition - && mouseY >= this.yPosition + this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_146123_n); diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index eb89affa..d679f242 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -1,17 +1,19 @@ package tconstruct.tools.gui; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import tconstruct.library.client.ToolGuiElement; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class GuiButtonTool extends GuiButton { + /** - * True for pointing right (next page), false for pointing left (previous - * page). + * True for pointing right (next page), false for pointing left (previous page). */ int textureX; @@ -37,15 +39,13 @@ public class GuiButtonTool extends GuiButton { @Override public void drawButton(Minecraft mc, int mouseX, int mouseY) { if (this.visible) { - boolean var4 = mouseX >= this.xPosition - && mouseY >= this.yPosition + boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(background); - this.field_146123_n = mouseX >= this.xPosition - && mouseY >= this.yPosition + this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_146123_n); diff --git a/src/main/java/tconstruct/tools/gui/GuiElementDuex.java b/src/main/java/tconstruct/tools/gui/GuiElementDuex.java index 0ebcea81..c3bbb364 100644 --- a/src/main/java/tconstruct/tools/gui/GuiElementDuex.java +++ b/src/main/java/tconstruct/tools/gui/GuiElementDuex.java @@ -1,24 +1,23 @@ package tconstruct.tools.gui; +import net.minecraft.client.gui.GuiScreen; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.gui.GuiScreen; /* -* Taken from Mantle 1.12-1.3.3.49 under the MIT License -* -* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ + * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights + * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ @SideOnly(Side.CLIENT) public class GuiElementDuex { diff --git a/src/main/java/tconstruct/tools/gui/GuiElementScalable.java b/src/main/java/tconstruct/tools/gui/GuiElementScalable.java index 7ed79940..25fdcb51 100644 --- a/src/main/java/tconstruct/tools/gui/GuiElementScalable.java +++ b/src/main/java/tconstruct/tools/gui/GuiElementScalable.java @@ -1,24 +1,23 @@ package tconstruct.tools.gui; +import net.minecraft.client.gui.GuiScreen; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.gui.GuiScreen; /* -* Taken from Mantle 1.12-1.3.3.49 under the MIT License -* -* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ + * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights + * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ @SideOnly(Side.CLIENT) public class GuiElementScalable extends GuiElementDuex { diff --git a/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java b/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java index d9a8a029..24579f0f 100644 --- a/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java +++ b/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java @@ -1,28 +1,28 @@ package tconstruct.tools.gui; +import org.lwjgl.input.Mouse; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import org.lwjgl.input.Mouse; /* -* Taken from Mantle 1.12-1.3.3.49 under the MIT License -* -* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ + * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights + * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ // a vertical slider! @SideOnly(Side.CLIENT) public class GuiSliderWidget { + // gui info public final GuiElementDuex slider; public final GuiElementDuex sliderHighlighted; @@ -51,13 +51,8 @@ public class GuiSliderWidget { private int clickY; private boolean clickedBar; // if the bar has already been clicked and not released - public GuiSliderWidget( - GuiElementDuex slider, - GuiElementDuex sliderHighlighted, - GuiElementDuex sliderDisabled, - GuiElementDuex slideBarTop, - GuiElementDuex slideBarBottom, - GuiElementScalable slideBar) { + public GuiSliderWidget(GuiElementDuex slider, GuiElementDuex sliderHighlighted, GuiElementDuex sliderDisabled, + GuiElementDuex slideBarTop, GuiElementDuex slideBarBottom, GuiElementScalable slideBar) { this.slider = slider; this.sliderHighlighted = sliderHighlighted; this.sliderDisabled = sliderDisabled; diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 757e07e1..12287d80 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -1,27 +1,31 @@ package tconstruct.tools.gui; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; import java.util.Collections; import java.util.List; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.inventory.PartCrafterChestContainer; import tconstruct.tools.logic.PartBuilderLogic; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { + PartBuilderLogic logic; String title, otherTitle = ""; boolean drawChestPart; @@ -49,8 +53,8 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { private int chestLeft = 0; private int chestTop = 0; - public PartCrafterGui( - InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, int z) { + public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, + int z) { super(partlogic.getGuiContainer(inventoryplayer, world, x, y, z)); logic = partlogic; drawChestPart = inventorySlots instanceof PartCrafterChestContainer; @@ -92,8 +96,8 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { this.fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 14, 17, 4210752); } - this.fontRendererObj.drawString( - StatCollector.translateToLocal("crafters.PartBuilder"), craftingTextLeft + 6, 6, 4210752); + this.fontRendererObj + .drawString(StatCollector.translateToLocal("crafters.PartBuilder"), craftingTextLeft + 6, 6, 4210752); this.fontRendererObj.drawString( StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, @@ -107,7 +111,11 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { title = "\u00A7n" + StatCollector.translateToLocal("gui.partcrafter2"); this.drawCenteredString(fontRendererObj, title, descTextLeft + DESC_WIDTH / 2, 8, 16777215); fontRendererObj.drawSplitString( - StatCollector.translateToLocal("gui.partcrafter3"), descTextLeft + 8, 24, 115, 16777215); + StatCollector.translateToLocal("gui.partcrafter3"), + descTextLeft + 8, + 24, + 115, + 16777215); } void drawMaterialInformation() { @@ -165,21 +173,18 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { 16777215); int attack = topEnum.attack(); - String heart = attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, - descTextLeft + 8, - offset + 60, - 0xffffff); - else - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, - descTextLeft + 8, - offset + 60, - 0xffffff); + if (attack % 2 == 0) this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); + else this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); } offset = 90; @@ -207,29 +212,27 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { offset + 49, 16777215); int attack = bottomEnum.attack(); - String heart = attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, - descTextLeft + 8, - offset + 60, - 0xffffff); - else - this.fontRendererObj.drawString( - StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, - descTextLeft + 8, - offset + 60, - 0xffffff); + if (attack % 2 == 0) this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); + else this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); } if (!hasTop && !hasBottom) drawDefaultInformation(); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/toolparts.png"); - private static final ResourceLocation minichest = - new ResourceLocation("tinker", "textures/gui/patternchestmini.png"); + private static final ResourceLocation minichest = new ResourceLocation( + "tinker", + "textures/gui/patternchestmini.png"); private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); @Override diff --git a/src/main/java/tconstruct/tools/gui/PatternChestGui.java b/src/main/java/tconstruct/tools/gui/PatternChestGui.java index fb190fc5..5bb34186 100644 --- a/src/main/java/tconstruct/tools/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/tools/gui/PatternChestGui.java @@ -4,14 +4,17 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.*; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.tools.logic.PatternChestLogic; public class PatternChestGui extends GuiContainer { + public PatternChestLogic logic; - public PatternChestGui( - InventoryPlayer inventoryplayer, PatternChestLogic holder, World world, int x, int y, int z) { + public PatternChestGui(InventoryPlayer inventoryplayer, PatternChestLogic holder, World world, int x, int y, + int z) { super(holder.getGuiContainer(inventoryplayer, world, x, y, z)); logic = holder; xSize = 194; @@ -21,8 +24,8 @@ public class PatternChestGui extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); - fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index 23f2ba3e..9fdbf287 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -1,34 +1,38 @@ package tconstruct.tools.gui; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; import java.util.Collections; import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; import tconstruct.library.client.*; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; import tconstruct.util.network.PatternTablePacket; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class StencilTableGui extends GuiContainer implements INEIGuiHandler { - int[] buttonsLeftRect = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE}; - int[] buttonsRightRect = new int[] {Integer.MIN_VALUE, Integer.MIN_VALUE}; + + int[] buttonsLeftRect = new int[] { Integer.MAX_VALUE, Integer.MIN_VALUE }; + int[] buttonsRightRect = new int[] { Integer.MIN_VALUE, Integer.MIN_VALUE }; StencilTableLogic logic; int activeButton; - public StencilTableGui( - InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, int z) { + public StencilTableGui(InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, + int z) { super(new PatternShaperContainer(inventoryplayer, shaper)); logic = shaper; activeButton = 0; @@ -42,8 +46,8 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); @@ -69,8 +73,8 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler { int cornerY = this.guiTop + 2; this.buttonList.clear(); - this.buttonsLeftRect = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE}; - this.buttonsRightRect = new int[] {Integer.MIN_VALUE, Integer.MIN_VALUE}; + this.buttonsLeftRect = new int[] { Integer.MAX_VALUE, Integer.MIN_VALUE }; + this.buttonsRightRect = new int[] { Integer.MIN_VALUE, Integer.MIN_VALUE }; int id = 0; for (int iter = 0; iter < TConstructClientRegistry.stencilButtons.size(); iter++) { @@ -115,8 +119,8 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler { if (logic.getStackInSlot(1) != null) { activeButton = StencilBuilder.getId(logic.getStackInSlot(1)); setActiveButton(activeButton); - stack = StencilBuilder.getStencil( - ((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex); + stack = StencilBuilder + .getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex); } else stack = null; logic.setSelectedPattern(stack); @@ -175,16 +179,14 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler { public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w, int h) { // is it in the horizontal column of the right buttons? - if (x > this.guiLeft + this.xSize - && x < this.buttonsRightRect[0] + if (x > this.guiLeft + this.xSize && x < this.buttonsRightRect[0] && y + h > this.guiTop && y < this.buttonsRightRect[1]) { return true; } // is it in the horizontal column of the left buttons? - return x + w > this.buttonsLeftRect[0] - && x < this.guiLeft + return x + w > this.buttonsLeftRect[0] && x < this.guiLeft && y + h > this.guiTop && y < this.buttonsLeftRect[1]; } diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index f9c734d3..5ca2ccfd 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -1,19 +1,21 @@ package tconstruct.tools.gui; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.client.*; import tconstruct.tools.logic.ToolForgeLogic; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class ToolForgeGui extends ToolStationGui { + int selectedButton; - public ToolForgeGui( - InventoryPlayer inventoryplayer, ToolForgeLogic stationlogic, World world, int x, int y, int z) { + public ToolForgeGui(InventoryPlayer inventoryplayer, ToolForgeLogic stationlogic, World world, int x, int y, + int z) { super(inventoryplayer, stationlogic, world, x, y, z); } @@ -92,8 +94,8 @@ public class ToolForgeGui extends ToolStationGui { this.text.setText(""); selectedButton = 0; setSlotType(0); - iconX = new int[] {0, 1, 2, 13}; - iconY = new int[] {13, 13, 13, 13}; + iconX = new int[] { 0, 1, 2, 13 }; + iconY = new int[] { 13, 13, 13, 13 }; title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1"); body = StatCollector.translateToLocal("gui.toolforge2"); } @@ -102,44 +104,44 @@ public class ToolForgeGui extends ToolStationGui { void setSlotType(int type) { switch (type) { case 0: - slotX = new int[] {56, 38, 38, 14}; // Repair - slotY = new int[] {37, 28, 46, 37}; + slotX = new int[] { 56, 38, 38, 14 }; // Repair + slotY = new int[] { 37, 28, 46, 37 }; break; case 1: - slotX = new int[] {56, 56, 56, 14}; // Three parts - slotY = new int[] {19, 55, 37, 37}; + slotX = new int[] { 56, 56, 56, 14 }; // Three parts + slotY = new int[] { 19, 55, 37, 37 }; break; case 2: - slotX = new int[] {56, 56, 14, 14}; // Two parts - slotY = new int[] {28, 46, 28, 46}; + slotX = new int[] { 56, 56, 14, 14 }; // Two parts + slotY = new int[] { 28, 46, 28, 46 }; break; case 3: - slotX = new int[] {38, 47, 56, 14}; // Double head - slotY = new int[] {28, 46, 28, 37}; + slotX = new int[] { 38, 47, 56, 14 }; // Double head + slotY = new int[] { 28, 46, 28, 37 }; break; case 4: - slotX = new int[] {47, 38, 56, 47}; // Four parts - slotY = new int[] {19, 37, 37, 55}; + slotX = new int[] { 47, 38, 56, 47 }; // Four parts + slotY = new int[] { 19, 37, 37, 55 }; break; case 5: - slotX = new int[] {38, 47, 56, 47}; // Four parts, double head - slotY = new int[] {19, 55, 19, 37}; + slotX = new int[] { 38, 47, 56, 47 }; // Four parts, double head + slotY = new int[] { 19, 55, 19, 37 }; break; case 6: - slotX = new int[] {38, 38, 20, 56}; // Double head - slotY = new int[] {28, 46, 28, 28}; + slotX = new int[] { 38, 38, 20, 56 }; // Double head + slotY = new int[] { 28, 46, 28, 28 }; break; case 7: - slotX = new int[] {56, 56, 56, 14}; // Three parts reverse - slotY = new int[] {19, 37, 55, 37}; + slotX = new int[] { 56, 56, 56, 14 }; // Three parts reverse + slotY = new int[] { 19, 37, 55, 37 }; break; case 8: - slotX = new int[] {20, 38, 56, 38}; // Double head middle - slotY = new int[] {28, 46, 28, 28}; + slotX = new int[] { 20, 38, 56, 38 }; // Double head middle + slotY = new int[] { 28, 46, 28, 28 }; break; case 9: - slotX = new int[] {38, 56, 47, 47}; // Four parts, crossbow. - slotY = new int[] {37, 37, 55, 19}; + slotX = new int[] { 38, 56, 47, 47 }; // Four parts, crossbow. + slotY = new int[] { 37, 37, 55, 19 }; break; } toolSlots.resetSlots(slotX, slotY); diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 8737133b..012042c9 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -1,13 +1,8 @@ package tconstruct.tools.gui; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Collections; import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; @@ -16,18 +11,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.client.ToolGuiElement; import tconstruct.tools.inventory.ToolStationContainer; import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.network.ToolStationPacket; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class ToolStationGui extends GuiContainer implements INEIGuiHandler { + public ToolStationLogic logic; public ToolStationContainer toolSlots; public GuiTextField text; @@ -37,8 +41,8 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { public boolean active; public String title, body = ""; - public ToolStationGui( - InventoryPlayer inventoryplayer, ToolStationLogic stationlogic, World world, int x, int y, int z) { + public ToolStationGui(InventoryPlayer inventoryplayer, ToolStationLogic stationlogic, World world, int x, int y, + int z) { super(stationlogic.getGuiContainer(inventoryplayer, world, x, y, z)); this.logic = stationlogic; toolSlots = (ToolStationContainer) inventorySlots; @@ -70,8 +74,8 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { this.text.setText(""); guiType = 0; setSlotType(0); - iconX = new int[] {0, 1, 2}; - iconY = new int[] {13, 13, 13}; + iconX = new int[] { 0, 1, 2 }; + iconY = new int[] { 13, 13, 13 }; title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1"); body = StatCollector.translateToLocal("gui.toolforge2"); } @@ -136,24 +140,24 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { void setSlotType(int type) { switch (type) { case 0: - slotX = new int[] {56, 38, 38}; // Repair - slotY = new int[] {37, 28, 46}; + slotX = new int[] { 56, 38, 38 }; // Repair + slotY = new int[] { 37, 28, 46 }; break; case 1: - slotX = new int[] {56, 56, 56}; // Three parts - slotY = new int[] {19, 55, 37}; + slotX = new int[] { 56, 56, 56 }; // Three parts + slotY = new int[] { 19, 55, 37 }; break; case 2: - slotX = new int[] {56, 56, 14}; // Two parts - slotY = new int[] {28, 46, 37}; + slotX = new int[] { 56, 56, 14 }; // Two parts + slotY = new int[] { 28, 46, 37 }; break; case 3: - slotX = new int[] {38, 47, 56}; // Double head - slotY = new int[] {28, 46, 28}; + slotX = new int[] { 38, 47, 56 }; // Double head + slotY = new int[] { 28, 46, 28 }; break; case 7: - slotX = new int[] {56, 56, 56}; // Three parts reverse - slotY = new int[] {19, 37, 55}; + slotX = new int[] { 56, 56, 56 }; // Three parts reverse + slotY = new int[] { 19, 37, 55 }; break; } toolSlots.resetSlots(slotX, slotY); @@ -166,14 +170,13 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { } /** - * Draw the foreground layer for the GuiContainer (everything in front of - * the items) + * Draw the foreground layer for the GuiContainer (everything in front of the items) */ @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.getInvName()), 116, 8, 0x000000); - this.fontRendererObj.drawString( - StatCollector.translateToLocal("container.inventory"), 118, this.ySize - 96 + 2, 0x000000); + this.fontRendererObj + .drawString(StatCollector.translateToLocal("container.inventory"), 118, this.ySize - 96 + 2, 0x000000); this.fontRendererObj.drawString(toolName + "_", 180, 8, 0xffffff); if (logic.isStackInSlot(0)) ToolStationGuiHelper.drawToolStats(logic.getStackInSlot(0), 294, 0); @@ -190,8 +193,7 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); /** - * Draw the background layer for the GuiContainer (everything behind the - * items) + * Draw the background layer for the GuiContainer (everything behind the items) */ @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { @@ -213,7 +215,12 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { this.drawTexturedModalRect(cornerX + slotX[i], this.guiTop + slotY[i], 144, 216, 18, 18); if (!logic.isStackInSlot(i + 1)) { this.drawTexturedModalRect( - cornerX + slotX[i], this.guiTop + slotY[i], 18 * iconX[i], 18 * iconY[i], 18, 18); + cornerX + slotX[i], + this.guiTop + slotY[i], + 18 * iconX[i], + 18 * iconY[i], + 18, + 18); } } @@ -240,19 +247,12 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { void updateServer(String name) { /* - * ByteArrayOutputStream bos = new ByteArrayOutputStream(8); - * DataOutputStream outputStream = new DataOutputStream(bos); try { - * outputStream.writeByte(1); - * outputStream.writeInt(logic.getWorld().provider.dimensionId); - * outputStream.writeInt(logic.xCoord); - * outputStream.writeInt(logic.yCoord); - * outputStream.writeInt(logic.zCoord); outputStream.writeUTF(name); } - * catch (Exception ex) { ex.printStackTrace(); } - * - * Packet250CustomPayload packet = new Packet250CustomPayload(); - * packet.channel = "TConstruct"; packet.data = bos.toByteArray(); - * packet.length = bos.size(); - * + * ByteArrayOutputStream bos = new ByteArrayOutputStream(8); DataOutputStream outputStream = new + * DataOutputStream(bos); try { outputStream.writeByte(1); + * outputStream.writeInt(logic.getWorld().provider.dimensionId); outputStream.writeInt(logic.xCoord); + * outputStream.writeInt(logic.yCoord); outputStream.writeInt(logic.zCoord); outputStream.writeUTF(name); } + * catch (Exception ex) { ex.printStackTrace(); } Packet250CustomPayload packet = new Packet250CustomPayload(); + * packet.channel = "TConstruct"; packet.data = bos.toByteArray(); packet.length = bos.size(); * PacketDispatcher.sendPacketToServer(packet); */ @@ -260,9 +260,8 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { } /* - * protected void mouseClicked(int par1, int par2, int par3) { - * super.mouseClicked(par1, par2, par3); text.mouseClicked(par1, par2, - * par3); } + * protected void mouseClicked(int par1, int par2, int par3) { super.mouseClicked(par1, par2, par3); + * text.mouseClicked(par1, par2, par3); } */ @Override diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index 51a7e284..97d8d99a 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -4,6 +4,7 @@ import java.text.DecimalFormat; import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; @@ -11,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; + import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.armor.ArmorCore; import tconstruct.library.modifier.IModifyable; @@ -22,6 +24,7 @@ import tconstruct.library.weaponry.IAmmo; import tconstruct.library.weaponry.ProjectileWeapon; public final class ToolStationGuiHelper { + // non-instantiable private ToolStationGuiHelper() {} @@ -40,8 +43,7 @@ public final class ToolStationGuiHelper { } public static void drawToolStats(ItemStack stack, int x, int y) { - String name = stack.getItem() instanceof ToolCore - ? ((ToolCore) stack.getItem()).getLocalizedToolName() + String name = stack.getItem() instanceof ToolCore ? ((ToolCore) stack.getItem()).getLocalizedToolName() : stack.getDisplayName(); Item item = stack.getItem(); NBTTagCompound tags = stack.getTagCompound(); @@ -147,8 +149,7 @@ public final class ToolStationGuiHelper { EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); // re-add the X/Y - if (bracket > 0) - tipName += " " + tags.getString(tooltip + tipNum).substring(bracket); + if (bracket > 0) tipName += " " + tags.getString(tooltip + tipNum).substring(bracket); } write("- " + tipName); tipNum++; @@ -162,13 +163,13 @@ public final class ToolStationGuiHelper { write(StatCollector.translateToLocal("gui.toolstation14") + df.format(mineSpeed)); if (stoneboundSpeed != 0) { - String bloss = stoneboundSpeed > 0 - ? StatCollector.translateToLocal("gui.toolstation4") + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundSpeed)); } - write(StatCollector.translateToLocal("gui.toolstation15") - + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel"))); + write( + StatCollector.translateToLocal("gui.toolstation15") + + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel"))); } private static void drawDualHarvestStats(ToolCore tool, NBTTagCompound tags) { @@ -179,15 +180,16 @@ public final class ToolStationGuiHelper { write(StatCollector.translateToLocal("gui.toolstation12")); write("- " + df.format(mineSpeed) + ", " + df.format(mineSpeed2)); if (stoneboundSpeed != 0) { - String bloss = stoneboundSpeed > 0 - ? StatCollector.translateToLocal("gui.toolstation4") + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundSpeed)); } write(StatCollector.translateToLocal("gui.toolstation13")); - write("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " - + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2"))); + write( + "- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + + ", " + + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2"))); } private static void drawWeaponStats(ToolCore tool, NBTTagCompound tags) { @@ -201,18 +203,15 @@ public final class ToolStationGuiHelper { if (attack < 1) attack = 1; - String heart = attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) write(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart); else write(StatCollector.translateToLocal("gui.toolstation3") + df.format(attack / 2f) + heart); if (stoneboundDamage != 0) { - heart = stoneboundDamage == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - String bloss = stoneboundDamage > 0 - ? StatCollector.translateToLocal("gui.toolstation4") + String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundDamage / 2f) + heart); } @@ -227,8 +226,7 @@ public final class ToolStationGuiHelper { int attack = (int) attackf; - String heart = attack == 2 - ? StatCollector.translateToLocal("gui.partcrafter8") + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) write(StatCollector.translateToLocal("gui.toolstation23") + attack / 2 + heart); else write(StatCollector.translateToLocal("gui.toolstation23") + df.format(attack / 2f) + heart); @@ -269,8 +267,10 @@ public final class ToolStationGuiHelper { double protection = armor.getProtection(stack); double maxProtection = tags.getDouble("MaxDefense"); - write(StatCollector.translateToLocal("gui.toolstation20") + df.format(protection) + "/" - + df.format(maxProtection)); + write( + StatCollector.translateToLocal("gui.toolstation20") + df.format(protection) + + "/" + + df.format(maxProtection)); } private static void drawAccessoryStats(AccessoryCore core, NBTTagCompound tags) { @@ -282,12 +282,14 @@ public final class ToolStationGuiHelper { } /** - * Renders the specified text to the screen, center-aligned. - * Copied out of GUI + * Renders the specified text to the screen, center-aligned. Copied out of GUI */ - public static void drawCenteredString( - FontRenderer p_73732_1_, String p_73732_2_, int p_73732_3_, int p_73732_4_, int p_73732_5_) { + public static void drawCenteredString(FontRenderer p_73732_1_, String p_73732_2_, int p_73732_3_, int p_73732_4_, + int p_73732_5_) { p_73732_1_.drawStringWithShadow( - p_73732_2_, p_73732_3_ - p_73732_1_.getStringWidth(p_73732_2_) / 2, p_73732_4_, p_73732_5_); + p_73732_2_, + p_73732_3_ - p_73732_1_.getStringWidth(p_73732_2_) / 2, + p_73732_4_, + p_73732_5_); } } diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index daedc927..2526931f 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -1,7 +1,9 @@ package tconstruct.tools.inventory; import java.lang.ref.WeakReference; + import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -14,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; + import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.TinkerTools; @@ -21,6 +24,7 @@ import tconstruct.tools.gui.ChestSlot; import tconstruct.tools.logic.CraftingStationLogic; public class CraftingStationContainer extends Container { + private final World worldObj; private final int posX; private final int posY; @@ -62,8 +66,14 @@ public class CraftingStationContainer extends Container { final int inventoryOffsetX = 8 + bothOffset; // 0 - crafting slot - this.addSlotToContainer(new SlotCraftingStation( - inventoryplayer.player, this.craftMatrix, this.craftResult, 0, craftingOffsetX + 94, 35)); + this.addSlotToContainer( + new SlotCraftingStation( + inventoryplayer.player, + this.craftMatrix, + this.craftResult, + 0, + craftingOffsetX + 94, + 35)); // 1 - 9 - Crafting Matrix for (row = 0; row < 3; ++row) { @@ -156,7 +166,11 @@ public class CraftingStationContainer extends Container { // Crafting Result if (ret.getItem() instanceof IModifyable) { nothingDone &= !this.mergeCraftedStack( - itemstack, logic.getSizeInventory(), this.inventorySlots.size(), true, entityPlayer); + itemstack, + logic.getSizeInventory(), + this.inventorySlots.size(), + true, + entityPlayer); } else { // First refill the attached chests nothingDone &= this.refillChest(itemstack); @@ -229,7 +243,7 @@ public class CraftingStationContainer extends Container { return !this.mergeItemStack(itemstack, 1, 10, true); } - public boolean func_94530_a /*canMergeSlot*/(ItemStack par1ItemStack, Slot par2Slot) { + public boolean func_94530_a /* canMergeSlot */(ItemStack par1ItemStack, Slot par2Slot) { return par2Slot.inventory != this.craftResult && super.func_94530_a(par1ItemStack, par2Slot); } @@ -251,9 +265,9 @@ public class CraftingStationContainer extends Container { public void onCraftMatrixChanged(IInventory par1IInventory) { ItemStack tool = modifyItem(); if (tool != null) this.craftResult.setInventorySlotContents(0, tool); - else - this.craftResult.setInventorySlotContents( - 0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); + else this.craftResult.setInventorySlotContents( + 0, + CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); } @Override @@ -268,8 +282,8 @@ public class CraftingStationContainer extends Container { <= 64.0D; } - protected boolean mergeCraftedStack( - ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { + protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, + EntityPlayer player) { boolean failedToMerge = false; int slotIndex = slotsStart; @@ -314,8 +328,8 @@ public class CraftingStationContainer extends Container { } // only refills items that are already present - protected boolean mergeItemStackRefill( - @Nonnull ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) { + protected boolean mergeItemStackRefill(@Nonnull ItemStack stack, int startIndex, int endIndex, + boolean useEndIndex) { if (stack.stackSize <= 0) { return false; } @@ -331,11 +345,10 @@ public class CraftingStationContainer extends Container { slot = (Slot) this.inventorySlots.get(k); itemstack1 = slot.getStack(); - if (itemstack1 != null - && itemstack1.getItem() == stack.getItem() + if (itemstack1 != null && itemstack1.getItem() == stack.getItem() && (!stack.getHasSubtypes() || stack.getItemDamage() == itemstack1.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, itemstack1) - && this.func_94530_a /*canMergeSlot*/(stack, slot)) { + && this.func_94530_a /* canMergeSlot */(stack, slot)) { int l = itemstack1.stackSize + stack.stackSize; int limit = Math.min(stack.getMaxStackSize(), slot.getSlotStackLimit()); @@ -353,7 +366,7 @@ public class CraftingStationContainer extends Container { } if (useEndIndex) --k; - else ++k; + else++k; } } @@ -373,9 +386,8 @@ public class CraftingStationContainer extends Container { final Slot slot = (Slot) this.inventorySlots.get(k); ItemStack itemstack1 = slot.getStack(); - if ((itemstack1 == null || itemstack1.stackSize == 0) - && slot.isItemValid(stack) - && this.func_94530_a /*canMergeSlot*/(stack, slot)) { + if ((itemstack1 == null || itemstack1.stackSize == 0) && slot.isItemValid(stack) + && this.func_94530_a /* canMergeSlot */(stack, slot)) { // Forge: Make sure to respect isItemValid in the slot. int limit = slot.getSlotStackLimit(); ItemStack stack2 = stack.copy(); @@ -395,7 +407,7 @@ public class CraftingStationContainer extends Container { } if (useEndIndex) --k; - else ++k; + else++k; } return didSomething; diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index a02282a7..6e60b241 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -4,10 +4,12 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.FrypanLogic; public class FrypanContainer extends Container { + public FrypanLogic logic; public int progress = 0; public int fuel = 0; @@ -17,9 +19,8 @@ public class FrypanContainer extends Container { InventoryPlayer inventoryplayer = player.inventory; logic = frypan; this.addSlotToContainer(new Slot(frypan, 1, 26, 45)); - for (int y = 0; y < 2; y++) - for (int x = 0; x < 4; x++) - this.addSlotToContainer(new SlotFrypan(frypan, 2 + x + y * 4, 70 + x * 18, 27 + y * 18, player)); + for (int y = 0; y < 2; y++) for (int x = 0; x < 4; x++) + this.addSlotToContainer(new SlotFrypan(frypan, 2 + x + y * 4, 70 + x * 18, 27 + y * 18, player)); /* Player inventory */ for (int column = 0; column < 3; column++) { diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index c4357493..7d42bbdd 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -1,14 +1,16 @@ package tconstruct.tools.inventory; -import cpw.mods.fml.relauncher.*; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; + import tconstruct.tools.logic.FurnaceLogic; +import cpw.mods.fml.relauncher.*; public class FurnaceContainer extends Container { + private final FurnaceLogic furnace; private int lastCookTime; private int lastBurnTime; @@ -90,8 +92,7 @@ public class FurnaceContainer extends Container { } /** - * Called when a player shift-clicks on a slot. You must override this or - * you will crash when someone does that. + * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that. */ @Override public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 9914c74e..6e1c7c68 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -1,17 +1,18 @@ package tconstruct.tools.inventory; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class InventoryCraftingStation extends InventoryCrafting { + /** the width of the crafting inventory */ private final int inventoryWidth; /** - * Class containing the callbacks for the events on_GUIClosed and - * on_CraftMaxtrixChanged. + * Class containing the callbacks for the events on_GUIClosed and on_CraftMaxtrixChanged. */ private final Container eventHandler; @@ -62,8 +63,8 @@ public class InventoryCraftingStation extends InventoryCrafting { } /** - * Removes from an inventory slot (first arg) up to a specified number - * (second arg) of items and returns them in a new stack. + * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a + * new stack. */ @Override public ItemStack decrStackSize(int slotID, int par2) { @@ -84,8 +85,7 @@ public class InventoryCraftingStation extends InventoryCrafting { } /** - * Sets the given item stack to the specified slot in the inventory (can be - * crafting or armor sections). + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ @Override public void setInventorySlotContents(int slot, ItemStack itemstack) { @@ -94,8 +94,8 @@ public class InventoryCraftingStation extends InventoryCrafting { } /** - * Returns the maximum stack size for a inventory slot. Seems to always be - * 64, possibly will be extended. *Isn't this more of a set than a get?* + * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't + * this more of a set than a get?* */ @Override public int getInventoryStackLimit() { @@ -109,8 +109,7 @@ public class InventoryCraftingStation extends InventoryCrafting { public void markDirty() {} /** - * Do not make give this method the name canInteractWith because it clashes - * with Container + * Do not make give this method the name canInteractWith because it clashes with Container */ @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { @@ -122,8 +121,7 @@ public class InventoryCraftingStation extends InventoryCrafting { public void closeChest() {} /** - * Returns true if automation is allowed to insert the given stack (ignoring - * stack size) into the given slot. + * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. */ public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) { return true; diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java index aa9fffcf..2ef2458a 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java @@ -3,9 +3,11 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.item.ItemStack; + import tconstruct.tools.logic.CraftingStationLogic; public class InventoryCraftingStationResult extends InventoryCraftResult { + CraftingStationLogic logic; public InventoryCraftingStationResult(CraftingStationLogic logic) { @@ -36,17 +38,16 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { } /** - * If this returns false, the inventory name will be used as an unlocalized - * name, and translated into the player's language. Otherwise it will be - * used directly. + * If this returns false, the inventory name will be used as an unlocalized name, and translated into the player's + * language. Otherwise it will be used directly. */ public boolean isInvNameLocalized() { return false; } /** - * Removes from an inventory slot (first arg) up to a specified number - * (second arg) of items and returns them in a new stack. + * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a + * new stack. */ @Override public ItemStack decrStackSize(int par1, int par2) { @@ -60,9 +61,8 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { } /** - * When some containers are closed they call this on each slot, then drop - * whatever it returns as an EntityItem - like when you close a workbench - * GUI. + * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - + * like when you close a workbench GUI. */ @Override public ItemStack getStackInSlotOnClosing(int par1) { @@ -70,8 +70,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { } /** - * Sets the given item stack to the specified slot in the inventory (can be - * crafting or armor sections). + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ @Override public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { @@ -79,8 +78,8 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { } /** - * Returns the maximum stack size for a inventory slot. Seems to always be - * 64, possibly will be extended. *Isn't this more of a set than a get?* + * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't + * this more of a set than a get?* */ @Override public int getInventoryStackLimit() { @@ -94,8 +93,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { public void markDirty() {} /** - * Do not make give this method the name canInteractWith because it clashes - * with Container + * Do not make give this method the name canInteractWith because it clashes with Container */ @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { @@ -107,8 +105,7 @@ public class InventoryCraftingStationResult extends InventoryCraftResult { public void closeChest() {} /** - * Returns true if automation is allowed to insert the given stack (ignoring - * stack size) into the given slot. + * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. */ public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) { return true; diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java index 430477bf..df7b1b06 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.library.util.IPattern; import tconstruct.smeltery.inventory.ActiveContainer; @@ -13,6 +14,7 @@ import tconstruct.tools.logic.PartBuilderLogic; import tconstruct.tools.logic.PatternChestLogic; public class PartCrafterChestContainer extends ActiveContainer { + protected PatternChestLogic patternLogic; protected InventoryPlayer invPlayer; protected PartBuilderLogic logic; @@ -20,22 +22,16 @@ public class PartCrafterChestContainer extends ActiveContainer { protected Slot[] inventory; public boolean largeInventory; - public PartCrafterChestContainer( - InventoryPlayer inventoryplayer, PartBuilderLogic partLogic, PatternChestLogic pLogic) { + public PartCrafterChestContainer(InventoryPlayer inventoryplayer, PartBuilderLogic partLogic, + PatternChestLogic pLogic) { logic = partLogic; patternLogic = pLogic; largeInventory = true; - inventory = new Slot[] { - new SlotPattern(partLogic, 0, 156, 27), - new SlotPattern(partLogic, 1, 156, 45), - new Slot(partLogic, 2, 174, 27), - new Slot(partLogic, 3, 174, 45), - new SlotOnlyTake(partLogic, 4, 218, 27), - new SlotOnlyTake(partLogic, 5, 236, 27), - new SlotOnlyTake(partLogic, 6, 218, 45), - new SlotOnlyTake(partLogic, 7, 236, 45) - }; + inventory = new Slot[] { new SlotPattern(partLogic, 0, 156, 27), new SlotPattern(partLogic, 1, 156, 45), + new Slot(partLogic, 2, 174, 27), new Slot(partLogic, 3, 174, 45), + new SlotOnlyTake(partLogic, 4, 218, 27), new SlotOnlyTake(partLogic, 5, 236, 27), + new SlotOnlyTake(partLogic, 6, 218, 45), new SlotOnlyTake(partLogic, 7, 236, 45) }; for (Slot slot : inventory) { this.addSlotToContainer(slot); } diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index f63609fb..051fd720 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.library.util.IPattern; import tconstruct.smeltery.inventory.ActiveContainer; @@ -11,6 +12,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.PartBuilderLogic; public class PartCrafterContainer extends ActiveContainer { + protected InventoryPlayer invPlayer; protected PartBuilderLogic logic; protected Slot[] input; @@ -22,16 +24,10 @@ public class PartCrafterContainer extends ActiveContainer { logic = partLogic; largeInventory = false; - inventory = new Slot[] { - new SlotPattern(partLogic, 0, 40, 27), - new SlotPattern(partLogic, 1, 40, 45), - new Slot(partLogic, 2, 58, 27), - new Slot(partLogic, 3, 58, 45), - new SlotOnlyTake(partLogic, 4, 102, 27), - new SlotOnlyTake(partLogic, 5, 120, 27), - new SlotOnlyTake(partLogic, 6, 102, 45), - new SlotOnlyTake(partLogic, 7, 120, 45) - }; + inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), + new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), new SlotOnlyTake(partLogic, 4, 102, 27), + new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), + new SlotOnlyTake(partLogic, 7, 120, 45) }; for (Slot slot : inventory) { this.addSlotToContainer(slot); } diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 01d5a13b..495c125b 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -1,16 +1,18 @@ package tconstruct.tools.inventory; -import invtweaks.api.container.ChestContainer; import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.library.util.IPattern; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.PatternChestLogic; +import invtweaks.api.container.ChestContainer; @ChestContainer public class PatternChestContainer extends Container { + public PatternChestLogic logic; public int progress = 0; public int fuel = 0; diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index ebae404c..16afea7e 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -4,24 +4,23 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.StencilTableLogic; public class PatternShaperContainer extends Container { + public StencilTableLogic logic; public PatternShaperContainer(InventoryPlayer inventoryplayer, StencilTableLogic shaper) { logic = shaper; this.addSlotToContainer(new Slot(shaper, 0, 48, 35)); this.addSlotToContainer(new SlotOnlyTake(shaper, 1, 106, 35)); - /*for (int i = 0; i < 3; i++) - { - for (int l = 0; l < 3; l++) - { - this.addSlotToContainer(new Slot(craftMatrix, l + i * 3, 30 + l * 18, 17 + i * 18)); - } - }*/ + /* + * for (int i = 0; i < 3; i++) { for (int l = 0; l < 3; l++) { this.addSlotToContainer(new Slot(craftMatrix, l + + * i * 3, 30 + l * 18, 17 + i * 18)); } } + */ /* Player inventory */ for (int column = 0; column < 3; column++) { @@ -36,25 +35,16 @@ public class PatternShaperContainer extends Container { } } - /*public void onCraftMatrixChanged(IInventory iinventory) - { - craftResult.setInventorySloTRepos(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj)); - }*/ + /* + * public void onCraftMatrixChanged(IInventory iinventory) { craftResult.setInventorySloTRepos(0, + * CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj)); } + */ - /*@Override - public void onContainerClosed(EntityPlayer entityplayer) - { - super.onContainerClosed(entityplayer); - if (logic.worldObj.isRemote) - { - return; - } - ItemStack itemstack = logic.getStackInSlot(0); - if (itemstack != null) - { - entityplayer.dropPlayerItem(itemstack); - } - }*/ + /* + * @Override public void onContainerClosed(EntityPlayer entityplayer) { super.onContainerClosed(entityplayer); if + * (logic.worldObj.isRemote) { return; } ItemStack itemstack = logic.getStackInSlot(0); if (itemstack != null) { + * entityplayer.dropPlayerItem(itemstack); } } + */ @Override public boolean canInteractWith(EntityPlayer entityplayer) { @@ -66,36 +56,13 @@ public class PatternShaperContainer extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { return null; - /*ItemStack stack = null; - Slot slot = (Slot)this.inventorySlots.get(slotID); - - if (slot != null && slot.getHasStack()) - { - ItemStack slotStack = slot.getStack(); - stack = slotStack.copy(); - - if (slotID < logic.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { - return null; - } - } - else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory()-1, false)) - { - return null; - } - - if (slotStack.stackSize == 0) - { - slot.putStack((ItemStack)null); - } - else - { - slot.onSlotChanged(); - } - } - - return stack;*/ + /* + * ItemStack stack = null; Slot slot = (Slot)this.inventorySlots.get(slotID); if (slot != null && + * slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); if (slotID < + * logic.getSizeInventory()) { if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), + * this.inventorySlots.size(), true)) { return null; } } else if (!this.mergeItemStack(slotStack, 0, + * logic.getSizeInventory()-1, false)) { return null; } if (slotStack.stackSize == 0) { + * slot.putStack((ItemStack)null); } else { slot.onSlotChanged(); } } return stack; + */ } } diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index 59c0135a..2f644381 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -3,20 +3,17 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.AbilityHelper; public class SlotCraftingStation extends SlotCrafting { + private final IInventory matrix; private final EntityPlayer player; - public SlotCraftingStation( - EntityPlayer par1EntityPlayer, - IInventory par2IInventory, - IInventory par3iInventory, - int par4, - int par5, - int par6) { + public SlotCraftingStation(EntityPlayer par1EntityPlayer, IInventory par2IInventory, IInventory par3iInventory, + int par4, int par5, int par6) { super(par1EntityPlayer, par2IInventory, par3iInventory, par4, par5, par6); this.matrix = par2IInventory; this.player = par1EntityPlayer; diff --git a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java index 93616278..84b4ba26 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.achievements.TAchievements; public class SlotFrypan extends Slot { @@ -18,8 +19,7 @@ public class SlotFrypan extends Slot { @Override public void putStack(ItemStack par1ItemStack) { super.putStack(par1ItemStack); - if (par1ItemStack != null - && par1ItemStack.getItem() != null + if (par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound()) { NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound(); diff --git a/src/main/java/tconstruct/tools/inventory/SlotPattern.java b/src/main/java/tconstruct/tools/inventory/SlotPattern.java index 066b8a82..509f22d6 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPattern.java @@ -2,9 +2,11 @@ package tconstruct.tools.inventory; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; + import tconstruct.library.util.IPattern; public class SlotPattern extends Slot { + public SlotPattern(IInventory builder, int par3, int par4, int par5) { super(builder, par3, par4, par5); } diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java index 7ce50ae8..a719f789 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -1,16 +1,19 @@ package tconstruct.tools.inventory; import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; public class SlotTool extends Slot { + /** The player that is using the GUI where this slot resides. */ public EntityPlayer player; @@ -49,21 +52,20 @@ public class SlotTool extends Slot { */ protected void onCrafting(ItemStack stack) { if (stack.getItem() instanceof IModifyable) { - NBTTagCompound tags = - stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + NBTTagCompound tags = stack.getTagCompound() + .getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null); for (int i = 2; i <= 3; i++) inventory.decrStackSize(i, 1); ItemStack compare = inventory.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; inventory.decrStackSize(1, amount); - if (!player.worldObj.isRemote && full) - player.worldObj.playSoundEffect( - player.posX, - player.posY, - player.posZ, - "tinker:little_saw", - 1.0F, - (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + if (!player.worldObj.isRemote && full) player.worldObj.playSoundEffect( + player.posX, + player.posY, + player.posZ, + "tinker:little_saw", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } else // Simply naming items @@ -72,8 +74,7 @@ public class SlotTool extends Slot { inventory.decrStackSize(1, amount); for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (inventory.getStackInSlot(i) != null - && inventory.getStackInSlot(i).getItem() == Items.name_tag) { + if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getItem() == Items.name_tag) { inventory.decrStackSize(i, 1); break; } diff --git a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java index 69e9e817..41c69967 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java @@ -1,16 +1,19 @@ package tconstruct.tools.inventory; import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; public class SlotToolForge extends SlotTool { + /** The player that is using the GUI where this slot resides. */ Random random = new Random(); @@ -20,10 +23,9 @@ public class SlotToolForge extends SlotTool { protected void onCrafting(ItemStack stack) { if (stack.getItem() instanceof IModifyable) { - NBTTagCompound tags = - stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - boolean full = (inventory.getStackInSlot(2) != null - || inventory.getStackInSlot(3) != null + NBTTagCompound tags = stack.getTagCompound() + .getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null || inventory.getStackInSlot(4) != null); for (int i = 2; i <= 4; i++) inventory.decrStackSize(i, 1); ItemStack compare = inventory.getStackInSlot(1); @@ -39,8 +41,7 @@ public class SlotToolForge extends SlotTool { inventory.decrStackSize(1, amount); for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (inventory.getStackInSlot(i) != null - && inventory.getStackInSlot(i).getItem() == Items.name_tag) { + if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getItem() == Items.name_tag) { inventory.decrStackSize(i, 1); break; } diff --git a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index 37df96b6..e6fc8829 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -7,6 +7,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.TinkerTools; @@ -25,12 +26,8 @@ public class ToolForgeContainer extends ToolStationContainer { toolSlot = new SlotToolForge(inventoryplayer.player, logic, 0, 225, 38); this.addSlotToContainer(toolSlot); - slots = new Slot[] { - new Slot(logic, 1, 167, 29), - new Slot(logic, 2, 169, 29), - new Slot(logic, 3, 167, 47), - new Slot(logic, 4, 149, 47) - }; + slots = new Slot[] { new Slot(logic, 1, 167, 29), new Slot(logic, 2, 169, 29), new Slot(logic, 3, 167, 47), + new Slot(logic, 4, 149, 47) }; for (int iter = 0; iter < 4; iter++) this.addSlotToContainer(slots[iter]); @@ -73,10 +70,9 @@ public class ToolForgeContainer extends ToolStationContainer { @Override protected void craftTool(ItemStack stack) { if (stack.getItem() instanceof IModifyable) { - NBTTagCompound tags = - stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - boolean full = (logic.getStackInSlot(2) != null - || logic.getStackInSlot(3) != null + NBTTagCompound tags = stack.getTagCompound() + .getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null || logic.getStackInSlot(4) != null); for (int i = 2; i <= 4; i++) logic.decrStackSize(i, 1); ItemStack compare = logic.getStackInSlot(1); @@ -95,8 +91,7 @@ public class ToolForgeContainer extends ToolStationContainer { if (!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { for (int i = 0; i < logic.getSizeInventory(); i++) { - if (logic.getStackInSlot(i) != null - && logic.getStackInSlot(i).getItem() == Items.name_tag) { + if (logic.getStackInSlot(i) != null && logic.getStackInSlot(i).getItem() == Items.name_tag) { logic.decrStackSize(i, 1); break; } diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index 19d64c2b..d423f038 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -1,6 +1,7 @@ package tconstruct.tools.inventory; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.entity.player.*; import net.minecraft.init.Items; @@ -8,6 +9,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; + import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; import tconstruct.smeltery.inventory.ActiveContainer; @@ -15,6 +17,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.ToolStationLogic; public class ToolStationContainer extends ActiveContainer { + public InventoryPlayer invPlayer; public ToolStationLogic logic; public Slot[] slots; @@ -31,9 +34,8 @@ public class ToolStationContainer extends ActiveContainer { toolSlot = new SlotTool(inventoryplayer.player, builderlogic, 0, 225, 38); this.addSlotToContainer(toolSlot); - slots = new Slot[] { - new Slot(builderlogic, 1, 167, 29), new Slot(builderlogic, 2, 149, 38), new Slot(builderlogic, 3, 167, 47) - }; + slots = new Slot[] { new Slot(builderlogic, 1, 167, 29), new Slot(builderlogic, 2, 149, 38), + new Slot(builderlogic, 3, 167, 47) }; for (int iter = 0; iter < 3; iter++) this.addSlotToContainer(slots[iter]); @@ -92,13 +94,17 @@ public class ToolStationContainer extends ActiveContainer { if (slotID < logic.getSizeInventory()) { if (slotID == 0) { if (!this.mergeCraftedStack( - slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true, player)) { + slotStack, + logic.getSizeInventory(), + this.inventorySlots.size(), + true, + player)) { + return null; + } + } else + if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } else if (!this.mergeItemStack( - slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { - return null; - } } else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory(), false)) { return null; } @@ -115,22 +121,21 @@ public class ToolStationContainer extends ActiveContainer { protected void craftTool(ItemStack stack) { if (stack.getItem() instanceof IModifyable) { - NBTTagCompound tags = - stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + NBTTagCompound tags = stack.getTagCompound() + .getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null); for (int i = 2; i <= 3; i++) logic.decrStackSize(i, 1); ItemStack compare = logic.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; logic.decrStackSize(1, amount); EntityPlayer player = invPlayer.player; - if (!player.worldObj.isRemote && full) - player.worldObj.playSoundEffect( - logic.xCoord, - logic.yCoord, - logic.zCoord, - "tinker:little_saw", - 1.0F, - (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + if (!player.worldObj.isRemote && full) player.worldObj.playSoundEffect( + logic.xCoord, + logic.yCoord, + logic.zCoord, + "tinker:little_saw", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.logic, player, stack)); } else // Simply naming items @@ -141,8 +146,7 @@ public class ToolStationContainer extends ActiveContainer { if (!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { for (int i = 0; i < logic.getSizeInventory(); i++) { - if (logic.getStackInSlot(i) != null - && logic.getStackInSlot(i).getItem() == Items.name_tag) { + if (logic.getStackInSlot(i) != null && logic.getStackInSlot(i).getItem() == Items.name_tag) { logic.decrStackSize(i, 1); break; } @@ -151,8 +155,8 @@ public class ToolStationContainer extends ActiveContainer { } } - protected boolean mergeCraftedStack( - ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { + protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, + EntityPlayer player) { boolean failedToMerge = false; int slotIndex = slotsStart; diff --git a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java index 5dd832a6..1ebef972 100644 --- a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java @@ -1,14 +1,15 @@ package tconstruct.tools.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; public class CraftingSlabItemBlock extends MultiItemBlock { - public static final String[] blockTypes = { - "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" - }; + + public static final String[] blockTypes = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", + "PatternChest", "tile.ToolForge" }; public CraftingSlabItemBlock(Block b) { super(b, "ToolStation", blockTypes); diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 4900fe85..cb5ab132 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -1,32 +1,20 @@ package tconstruct.tools.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; + public class MultiBrickFancyItem extends MultiItemBlock { - static String[] blockTypes = { - "obsidian", - "sandstone", - "netherrack", - "stone.refined", - "iron", - "gold", - "lapis", - "diamond", - "redstone", - "bone", - "slime", - "blueslime", - "endstone", - "obsidian.ingot", - "stone", - "stone.road" - }; + + static String[] blockTypes = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", + "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone", "stone.road" }; public MultiBrickFancyItem(Block b) { super(b, "block.fancybrick", blockTypes); diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 7cc49413..4add2640 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -1,32 +1,21 @@ package tconstruct.tools.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; + public class MultiBrickItem extends MultiItemBlock { - static String[] blockTypes = { - "obsidian", - "sandstone", - "netherrack", - "stone.refined", - "iron", - "gold", - "lapis", - "diamond", - "redstone", - "bone", - "slime", - "blueslime", - "endstone", - "obsidian.ingot", - "stone.road", - "stone.refined.road" - }; + + static String[] blockTypes = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", + "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone.road", + "stone.refined.road" }; public MultiBrickItem(Block b) { super(b, "block.brick", blockTypes); diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java index 1580fbbd..2fd0c52a 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java @@ -1,19 +1,13 @@ package tconstruct.tools.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class MultiBrickMetalItem extends MultiItemBlock { - static String[] blockTypes = { - "brick.alumite", - "brick.ardite", - "brick.cobalt", - "brick.manyullyn", - "fancybrick.alumite", - "fancybrick.ardite", - "fancybrick.cobalt", - "fancybrick.manyullyn" - }; + + static String[] blockTypes = { "brick.alumite", "brick.ardite", "brick.cobalt", "brick.manyullyn", + "fancybrick.alumite", "fancybrick.ardite", "fancybrick.cobalt", "fancybrick.manyullyn" }; public MultiBrickMetalItem(Block b) { super(b, "block", blockTypes); diff --git a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java index a80a458e..1ec73d97 100644 --- a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java @@ -1,26 +1,14 @@ package tconstruct.tools.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class ToolStationItemBlock extends MultiItemBlock { - public static final String[] blockTypes = { - "Crafter", - "Parts", - "Parts", - "Parts", - "Parts", - "PatternChest", - "PatternChest", - "PatternChest", - "PatternChest", - "PatternChest", - "PatternShaper", - "PatternShaper", - "PatternShaper", - "PatternShaper", - "CastingTable" - }; + + public static final String[] blockTypes = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", + "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternShaper", "PatternShaper", + "PatternShaper", "PatternShaper", "CastingTable" }; public ToolStationItemBlock(Block b) { super(b, "ToolStation", blockTypes); diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index d5bf36fd..c11403ed 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -1,15 +1,19 @@ package tconstruct.tools.items; -import cpw.mods.fml.common.Loader; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; + import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.common.Loader; public class Bowstring extends CraftingItem implements IToolPart { + public Bowstring() { super(toolMaterialNames, buildTextureNames("_bowstring"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); @@ -25,9 +29,9 @@ public class Bowstring extends CraftingItem implements IToolPart { return names; } - public static final String[] toolMaterialNames = new String[] {"string", "enchantedfabric", "flamestring"}; + public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric", "flamestring" }; - public static final String[] toolTextureNames = new String[] {"string", "magicfabric", "flamestring"}; + public static final String[] toolTextureNames = new String[] { "string", "magicfabric", "flamestring" }; @Override public int getMaterialID(ItemStack stack) { diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index 618eda36..3a373b2a 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -1,16 +1,18 @@ package tconstruct.tools.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.relauncher.*; public class CreativeModifier extends Item { diff --git a/src/main/java/tconstruct/tools/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java index c17b47b4..407a24d1 100644 --- a/src/main/java/tconstruct/tools/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -1,11 +1,14 @@ package tconstruct.tools.items; import mantle.items.abstracts.CraftingItem; + import net.minecraft.item.ItemStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; public class Fletching extends CraftingItem implements IToolPart { + public Fletching() { super(toolMaterialNames, buildTextureNames("_fletching"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); @@ -21,10 +24,11 @@ public class Fletching extends CraftingItem implements IToolPart { return names; } - public static final String[] toolMaterialNames = - new String[] {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; + public static final String[] toolMaterialNames = new String[] { "feather", "leaf", "slime", "blueslime", + "slimeleaf" }; - public static final String[] toolTextureNames = new String[] {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; + public static final String[] toolTextureNames = new String[] { "feather", "leaf", "slime", "blueslime", + "slimeleaf" }; @Override public int getMaterialID(ItemStack stack) { diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index 51e64061..3d18d24b 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -1,25 +1,28 @@ package tconstruct.tools.items; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.books.BookData; import mantle.client.gui.GuiManual; import mantle.items.abstracts.CraftingItem; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.*; public class Manual extends CraftingItem { - static String[] name = new String[] {"beginner", "toolstation", "smeltery", "diary", "weaponry"}; - static String[] textureName = new String[] { - "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue", "tinkerbook_green" - }; + + static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary", "weaponry" }; + static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", + "tinkerbook_blue", "tinkerbook_green" }; public Manual() { super(name, textureName, "", "tinker", TConstructRegistry.materialTab); diff --git a/src/main/java/tconstruct/tools/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java index 09c9ef9a..ec64885d 100644 --- a/src/main/java/tconstruct/tools/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -1,15 +1,18 @@ package tconstruct.tools.items; +import mantle.books.*; + +import net.minecraft.util.*; + +import org.w3c.dom.Document; + +import tconstruct.client.TProxyClient; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import mantle.books.*; -import net.minecraft.util.*; -import org.w3c.dom.Document; -import tconstruct.client.TProxyClient; public class ManualInfo { - // static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" }; - // static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", + // static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" }; + // static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", // "tinkerbook_smeltery", "tinkerbook_blue" }; BookData beginner = new BookData(); @@ -18,10 +21,12 @@ public class ManualInfo { BookData diary = new BookData(); BookData weaponry = new BookData(); - /* diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory); - volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory); - volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory); - smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory);*/ + /* + * diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory); volume1 = + * readManual("/assets/tinker/manuals/firstday.xml", dbFactory); volume2 = + * readManual("/assets/tinker/manuals/materials.xml", dbFactory); smelter = + * readManual("/assets/tinker/manuals/smeltery.xml", dbFactory); + */ public ManualInfo() { Side side = FMLCommonHandler.instance().getEffectiveSide(); diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index 8ba1a2e0..675dc08c 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -18,95 +18,21 @@ public class MaterialItem extends CraftingItem { return names; } - 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", - "EssenceCrystal", - "AluBrassNugget", - "SilkyCloth", - "SilkyJewel", - "ObsidianNugget", - "CobaltNugget", - "ArditeNugget", - "ManyullynNugget", - "BronzeNugget", - "AlumiteNugget", - "SteelNugget", - "PigIronIngot", - "PigIronNugget", - "GlueBall", - "SearedBrick", - "ArditeDust", - "CobaltDust", - "AluminumDust", - "ManyullynDust", - "AluBrassDust" - }; + 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", + "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", + "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", "SteelNugget", "PigIronIngot", + "PigIronNugget", "GlueBall", "SearedBrick", "ArditeDust", "CobaltDust", "AluminumDust", "ManyullynDust", + "AluBrassDust" }; - 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_alubrass", - "silkycloth", - "silkyjewel", - "nugget_obsidian", - "nugget_cobalt", - "nugget_ardite", - "nugget_manyullyn", - "nugget_bronze", - "nugget_alumite", - "nugget_steel", - "pigironingot", - "nugget_pigiron", - "glueball", - "searedbrick_nether", - "ardite_dust", - "cobalt_dust", - "aluminum_dust", - "manyullyn_dust", - "alubrass_dust" - }; + 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_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", + "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", + "glueball", "searedbrick_nether", "ardite_dust", "cobalt_dust", "aluminum_dust", "manyullyn_dust", + "alubrass_dust" }; } diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index f70007a3..de4458b5 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -1,19 +1,23 @@ package tconstruct.tools.items; -import cpw.mods.fml.relauncher.*; import java.util.HashMap; import java.util.List; import java.util.Map; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; +import cpw.mods.fml.relauncher.*; public class Pattern extends CraftingItem implements IPattern { + public Pattern(String patternType, String folder) { this(patternName, getPatternNames(patternType), folder); } @@ -32,34 +36,10 @@ public class Pattern extends CraftingItem implements IPattern { 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", - "bowstring", - "fletching", - "arrowhead" - }; + 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" }; private static final Map patternCosts = buildPatternCostMap(); diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index 533fcb2a..d7243111 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -1,8 +1,7 @@ package tconstruct.tools.items; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -12,19 +11,23 @@ import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.client.TProxyClient; import tconstruct.library.tools.ToolCore; import tconstruct.world.entity.BlueSlime; import tconstruct.world.entity.KingBlueSlime; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; // spawn egg. public class TitleIcon extends Item { - int[] primaryColor = {0x66BBE8, 0x66BBE8}; - int[] secondaryColor = {0x1567BF, 0xFFEC6E}; - String[] mobNames = {"TConstruct.EdibleSlime", "TConstruct.KingSlime"}; - String[] achievementIconNames = - new String[] {"tinkerer", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience"}; + int[] primaryColor = { 0x66BBE8, 0x66BBE8 }; + int[] secondaryColor = { 0x1567BF, 0xFFEC6E }; + String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" }; + + String[] achievementIconNames = new String[] { "tinkerer", "preparedFight", "proTinkerer", "enemySlayer", + "dualConvenience" }; IIcon[] achievementIcons = new IIcon[achievementIconNames.length]; public TitleIcon() { @@ -100,17 +103,8 @@ public class TitleIcon extends Item { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int posX, - int posY, - int posZ, - int par7, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int posX, int posY, int posZ, int par7, + float par8, float par9, float par10) { if (!world.isRemote) { Block b = world.getBlock(posX, posY, posZ); posX += Facing.offsetsXForSide[par7]; @@ -138,8 +132,8 @@ public class TitleIcon extends Item { return true; } - public static EntityLiving activateSpawnEgg( - ItemStack stack, World world, double posX, double posY, double posZ, int par7) { + public static EntityLiving activateSpawnEgg(ItemStack stack, World world, double posX, double posY, double posZ, + int par7) { Block b = world.getBlock((int) posX, (int) posY, (int) posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; @@ -183,8 +177,8 @@ public class TitleIcon extends Item { } } - public static void spawnBossSlime( - double x, double y, double z, KingBlueSlime entity, World world, EntityPlayer player) { + public static void spawnBossSlime(double x, double y, double z, KingBlueSlime entity, World world, + EntityPlayer player) { if (!world.isRemote) { entity.setPosition(x, y, z); entity.setSlimeSize(8); diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 3db1b976..b005fa73 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -1,16 +1,20 @@ package tconstruct.tools.items; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; @Deprecated public class ToolPart extends CraftingItem implements IToolPart { + public String partName; public ToolPart(String textureType, String name) { @@ -47,75 +51,13 @@ public class ToolPart extends CraftingItem implements IToolPart { return names; } - 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", - "Pig Iron", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "Thaumium" - }; + 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", "Pig Iron", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; - public static final String[] toolTextureNames = new String[] { - "wood", - "stone", - "iron", - "flint", - "cactus", - "bone", - "obsidian", - "netherrack", - "slime", - "paper", - "cobalt", - "ardite", - "manyullyn", - "copper", - "bronze", - "alumite", - "steel", - "blueslime", - "pigiron", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "thaumium" - }; + public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", + "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", + "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; @Override public void getSubItems(Item b, CreativeTabs tab, List list) { diff --git a/src/main/java/tconstruct/tools/items/ToolPartHidden.java b/src/main/java/tconstruct/tools/items/ToolPartHidden.java index d2dd8684..61e87785 100644 --- a/src/main/java/tconstruct/tools/items/ToolPartHidden.java +++ b/src/main/java/tconstruct/tools/items/ToolPartHidden.java @@ -1,6 +1,7 @@ package tconstruct.tools.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/tools/items/ToolShard.java b/src/main/java/tconstruct/tools/items/ToolShard.java index e02fe83f..7cf2e0ae 100644 --- a/src/main/java/tconstruct/tools/items/ToolShard.java +++ b/src/main/java/tconstruct/tools/items/ToolShard.java @@ -1,9 +1,11 @@ package tconstruct.tools.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.DynamicToolPart; diff --git a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java index 8e8060d5..9126f448 100644 --- a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java +++ b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java @@ -7,11 +7,12 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; -/* Slots - * 0: Battlesign item +/* + * Slots 0: Battlesign item */ public class BattlesignLogic extends EquipLogic { + protected String[] text; public BattlesignLogic() { diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index f422f7e3..c4ab2440 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -1,7 +1,9 @@ package tconstruct.tools.logic; import java.lang.ref.WeakReference; + import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -13,10 +15,12 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.tools.inventory.CraftingStationContainer; import tconstruct.util.config.PHConstruct; public class CraftingStationLogic extends InventoryLogic implements ISidedInventory { + public ForgeDirection chestDirection = ForgeDirection.UNKNOWN; public int chestSize; public WeakReference chest; @@ -65,9 +69,9 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { final int xPos = x + dir.offsetX, yPos = y + dir.offsetY, zPos = z + dir.offsetZ; final TileEntity tile = world.getTileEntity(xPos, yPos, zPos); - if (!(tile instanceof IInventory) - || (tile instanceof CraftingStationLogic) - || isBlacklisted(tile.getClass())) continue; + if (!(tile instanceof IInventory) || (tile instanceof CraftingStationLogic) + || isBlacklisted(tile.getClass())) + continue; final IInventory inv = (IInventory) tile; @@ -83,20 +87,15 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent } if (tile instanceof ISidedInventory - && ((ISidedInventory) tile) - .getAccessibleSlotsFromSide( - dir.getOpposite().ordinal()) - .length - == 0) continue; + && ((ISidedInventory) tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length == 0) + continue; if (chest == null && inv.isUseableByPlayer(inventoryplayer.player)) { chest = new WeakReference<>(inv); chestDirection = dir; invColumns = 6; chestSize = tile instanceof ISidedInventory - ? ((ISidedInventory) tile) - .getAccessibleSlotsFromSide(dir.getOpposite().ordinal()) - .length + ? ((ISidedInventory) tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length : inv.getSizeInventory(); if (tile instanceof TileEntityChest) { @@ -157,7 +156,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent return true; } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public static boolean isUseableByPlayer(EntityPlayer player, WeakReference[] inventories) { for (WeakReference ref : inventories) { if (ref != null) { @@ -171,7 +170,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent @SuppressWarnings("rawtypes") public WeakReference[] getInventories() { - return new WeakReference[] {this.chest, this.doubleChest, this.patternChest, this.furnace}; + return new WeakReference[] { this.chest, this.doubleChest, this.patternChest, this.furnace }; } @Override diff --git a/src/main/java/tconstruct/tools/logic/EquipLogic.java b/src/main/java/tconstruct/tools/logic/EquipLogic.java index 2fb048e0..9d24aaef 100644 --- a/src/main/java/tconstruct/tools/logic/EquipLogic.java +++ b/src/main/java/tconstruct/tools/logic/EquipLogic.java @@ -1,15 +1,14 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -/* Slots - * 0: Frying pan item - * 1: Fuel - * 2-9: Food +/* + * Slots 0: Frying pan item 1: Fuel 2-9: Food */ public abstract class EquipLogic extends InventoryLogic { diff --git a/src/main/java/tconstruct/tools/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java index fca40074..14109fb3 100644 --- a/src/main/java/tconstruct/tools/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -1,8 +1,8 @@ package tconstruct.tools.logic; -import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.iface.IActiveLogic; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; @@ -12,15 +12,16 @@ import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.tools.inventory.FrypanContainer; -/* Slots - * 0: Frying pan item - * 1: Fuel - * 2-9: Food +import tconstruct.tools.inventory.FrypanContainer; +import cpw.mods.fml.common.registry.GameRegistry; + +/* + * Slots 0: Frying pan item 1: Fuel 2-9: Food */ public class FrypanLogic extends EquipLogic implements IActiveLogic { + boolean active; public int fuel; public int fuelGague; @@ -116,8 +117,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic { boolean placed = false; while (ids < 10 && !placed) // Try to merge stacks first { - if (inventory[ids] != null - && inventory[ids].isItemEqual(result) + if (inventory[ids] != null && inventory[ids].isItemEqual(result) && inventory[ids].stackSize < inventory[ids].getMaxStackSize()) { if (inventory[ids].stackSize + result.stackSize <= inventory[ids].getMaxStackSize()) { inventory[ids].stackSize += result.stackSize; @@ -150,11 +150,11 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic { public boolean canCook() { for (int id = 2; id < 10; id++) { if (inventory[id] == null) // Nothing here! - continue; + continue; ItemStack result = getResultFor(inventory[id]); if (result == null) // Doesn't cook into anything - continue; + continue; for (int slotid = 2; slotid < 10; slotid++) { if (inventory[slotid] == null) return true; @@ -174,7 +174,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic { if (stack != null) { ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); if (result != null && result.getItem() instanceof ItemFood) // Only valid for food - return result.copy(); + return result.copy(); } return null; } @@ -200,12 +200,9 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic { return 300; } } - if (item instanceof ItemTool - && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword - && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemHoe - && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; if (item == Items.stick) return 100; if (item == Items.coal) return 800; if (item == Items.lava_bucket) return 20000; diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index e2a6d73c..5ac68a48 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -1,9 +1,9 @@ package tconstruct.tools.logic; -import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.InventoryLogic; import mantle.blocks.iface.*; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -18,25 +18,25 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.tools.inventory.FurnaceContainer; -/* Slots - * 0: Input - * 1: Fuel - * 2: Output - * 3-16: Chest +import tconstruct.tools.inventory.FurnaceContainer; +import cpw.mods.fml.common.registry.GameRegistry; + +/* + * Slots 0: Input 1: Fuel 2: Output 3-16: Chest */ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, ISidedInventory { + boolean active = false; public int fuel; public int fuelGague; public int progress; public int fuelScale = 200; byte direction; - private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {2, 1}; - private static final int[] slots_sides = new int[] {1}; + private static final int[] slots_top = new int[] { 0 }; + private static final int[] slots_bottom = new int[] { 2, 1 }; + private static final int[] slots_sides = new int[] { 1 }; public FurnaceLogic() { super(3); @@ -135,7 +135,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public boolean canSmelt() { if (inventory[0] == null) // Nothing here! - return false; + return false; else { ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); if (itemstack == null) return false; @@ -153,7 +153,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public ItemStack getResultFor(ItemStack stack) { ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); if (result != null) // Only valid for food - return result.copy(); + return result.copy(); return null; } @@ -184,12 +184,9 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin } } - if (item instanceof ItemTool - && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword - && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemHoe - && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; if (item == Items.stick) return 100; if (item == Items.coal) return 1600; if (item == Items.lava_bucket) return 20000; diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index 16997fde..ea5cc2a9 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -1,17 +1,20 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.*; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { + boolean craftedTop; boolean craftedBottom; diff --git a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java index 903b9a0f..34c8b56c 100644 --- a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java @@ -1,14 +1,17 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.PatternChestContainer; public class PatternChestLogic extends InventoryLogic { + public PatternChestLogic() { super(30); } diff --git a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java index 6a930cfd..f969e100 100644 --- a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -1,16 +1,19 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; public class StencilTableLogic extends InventoryLogic implements ISidedInventory { + private ItemStack selectedStack; public StencilTableLogic() { @@ -32,13 +35,10 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory return new PatternShaperContainer(inventoryplayer, this); } - /*@Override - public void onInventoryChanged() - { - if (inventory[0] == null) - inventory[1] = null; - super.onInventoryChanged(); - }*/ + /* + * @Override public void onInventoryChanged() { if (inventory[0] == null) inventory[1] = null; + * super.onInventoryChanged(); } + */ public void setSelectedPattern(ItemStack stack) { selectedStack = stack; diff --git a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index fb1642bb..0f137f83 100644 --- a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -4,14 +4,17 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.crafting.*; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolForgeContainer; -/* Simple class for storing items in the block +/* + * Simple class for storing items in the block */ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory { + ItemStack previousTool; String toolName; @@ -38,15 +41,15 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory { if (inventory[2] == null && inventory[3] == null && inventory[4] == null) output = inventory[1].copy(); else { - output = ModifyBuilder.instance.modifyItem( - inventory[1], new ItemStack[] {inventory[2], inventory[3], inventory[4]}); + output = ModifyBuilder.instance + .modifyItem(inventory[1], new ItemStack[] { inventory[2], inventory[3], inventory[4] }); } } else // Build new item { toolName = name; - ItemStack tool = - ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); + ItemStack tool = ToolBuilder.instance + .buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); if (inventory[0] == null) output = tool; else if (tool != null) { // NBTTagCompound tags = tool.getTagCompound(); @@ -57,23 +60,14 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory } } if (!name.equals("")) // Name item - output = tryRenameTool(output, name); + output = tryRenameTool(output, name); } inventory[0] = output; } - /*public void buildTool (String name) - { - toolName = name; - ItemStack tool = ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); - if (inventory[0] == null) - inventory[0] = tool; - else - { - NBTTagCompound tags = inventory[0].getTagCompound(); - if (!tags.getCompoundTag("InfiTool").hasKey("Built")) - { - inventory[0] = tool; - } - } - }*/ + /* + * public void buildTool (String name) { toolName = name; ItemStack tool = + * ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); if (inventory[0] == + * null) inventory[0] = tool; else { NBTTagCompound tags = inventory[0].getTagCompound(); if + * (!tags.getCompoundTag("InfiTool").hasKey("Built")) { inventory[0] = tool; } } } + */ } diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index b15339d2..7ba06be2 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -1,6 +1,7 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Container; @@ -8,15 +9,18 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolStationContainer; -/* Simple class for storing items in the block +/* + * Simple class for storing items in the block */ public class ToolStationLogic extends InventoryLogic implements ISidedInventory { + public ItemStack previousTool; public String toolName; @@ -66,8 +70,8 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory { if (inventory[2] == null && inventory[3] == null) output = inventory[1].copy(); else { - output = ModifyBuilder.instance.modifyItem( - inventory[1], new ItemStack[] {inventory[2], inventory[3]}); + output = ModifyBuilder.instance + .modifyItem(inventory[1], new ItemStack[] { inventory[2], inventory[3] }); } } else // Build new item @@ -77,14 +81,13 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory if (inventory[0] == null) output = tool; else if (tool != null) { NBTTagCompound tags = tool.getTagCompound(); - if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()) - .hasKey("Built")) { + if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()).hasKey("Built")) { output = tool; } } } if (!name.equals("")) // Name item - output = tryRenameTool(output, name); + output = tryRenameTool(output, name); } inventory[0] = output; } diff --git a/src/main/java/tconstruct/tools/model/BattlesignRender.java b/src/main/java/tconstruct/tools/model/BattlesignRender.java index 3ebf465d..89bc50fb 100644 --- a/src/main/java/tconstruct/tools/model/BattlesignRender.java +++ b/src/main/java/tconstruct/tools/model/BattlesignRender.java @@ -1,11 +1,13 @@ package tconstruct.tools.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.*; + public class BattlesignRender implements ISimpleBlockRenderingHandler { + public static int battlesignModelID = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -14,8 +16,8 @@ public class BattlesignRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { renderer.setRenderBounds(0.45F, 0.0F, 0.45F, 0.55F, 1.125F, 0.55F); renderer.renderStandardBlock(block, x, y, z); renderFace(world, x, y, z, block, renderer); diff --git a/src/main/java/tconstruct/tools/model/BattlesignTesr.java b/src/main/java/tconstruct/tools/model/BattlesignTesr.java index d08c6cd5..19775674 100644 --- a/src/main/java/tconstruct/tools/model/BattlesignTesr.java +++ b/src/main/java/tconstruct/tools/model/BattlesignTesr.java @@ -5,7 +5,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; + import org.lwjgl.opengl.GL11; + import tconstruct.tools.logic.BattlesignLogic; public class BattlesignTesr extends TileEntitySpecialRenderer { @@ -42,16 +44,14 @@ public class BattlesignTesr extends TileEntitySpecialRenderer { String[] strings = te.getText(); if (strings != null && strings.length > 0) { - float lum = calcLuminance(te.getWorldObj() - .getBlock(te.xCoord, te.yCoord, te.zCoord) - .colorMultiplier(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord)); + float lum = calcLuminance( + te.getWorldObj().getBlock(te.xCoord, te.yCoord, te.zCoord) + .colorMultiplier(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord)); for (int i = 0; i < strings.length; i++) { fr.drawString( - (lum >= 35F - ? EnumChatFormatting.BLACK - : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) - + strings[i], + (lum >= 35F ? EnumChatFormatting.BLACK + : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + strings[i], -fr.getStringWidth(strings[i]) / 2 + 40, 10 * i, 0); diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index 2f2beaa3..e16d3e21 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -1,7 +1,7 @@ package tconstruct.tools.model; -import cpw.mods.fml.relauncher.*; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -13,12 +13,16 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraftforge.client.ForgeHooksClient; + import org.lwjgl.opengl.*; +import cpw.mods.fml.relauncher.*; + @SideOnly(Side.CLIENT) public class FancyItemRender extends Render { - private static final ResourceLocation field_110798_h = - new ResourceLocation("textures/misc/enchanted_item_glint.png"); + + private static final ResourceLocation field_110798_h = new ResourceLocation( + "textures/misc/enchanted_item_glint.png"); private final RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ @@ -64,91 +68,106 @@ public class FancyItemRender extends Render { Block block = Block.getBlockFromItem(itemstack.getItem()); if (ForgeHooksClient.renderEntityItem( - par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1)) { - } else if (itemstack.getItemSpriteNumber() == 0 - && block != null - && RenderBlocks.renderItemIn3d( - Block.getBlockFromItem(itemstack.getItem()).getRenderType())) { - GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); + par1EntityItem, + itemstack, + f2, + f3, + random, + renderManager.renderEngine, + field_147909_c, + 1)) {} else + if (itemstack.getItemSpriteNumber() == 0 && block != null + && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemstack.getItem()).getRenderType())) { + GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - if (renderInFrame) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(0.0F, 0.05F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - } + if (renderInFrame) { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glTranslatef(0.0F, 0.05F, 0.0F); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + } - float f7 = 0.25F; - int j = block.getRenderType(); + float f7 = 0.25F; + int j = block.getRenderType(); - if (j == 1 || j == 19 || j == 12 || j == 2) { - f7 = 0.5F; - } + if (j == 1 || j == 19 || j == 12 || j == 2) { + f7 = 0.5F; + } - GL11.glScalef(f7, f7, f7); + GL11.glScalef(f7, f7, f7); - for (i = 0; i < b0; ++i) { - GL11.glPushMatrix(); + for (i = 0; i < b0; ++i) { + GL11.glPushMatrix(); - if (i > 0) { - f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - GL11.glTranslatef(f5, f4, f6); - } + if (i > 0) { + f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + GL11.glTranslatef(f5, f4, f6); + } - f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); - GL11.glPopMatrix(); - } - } else { - float f8; - - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) { - if (renderInFrame) { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } else { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { - this.random.setSeed(187L); - IIcon icon = itemstack.getItem().getIcon(itemstack, k); - f8 = 1.0F; - - if (this.renderWithColor) { - i = itemstack.getItem().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(par1EntityItem, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); + f5 = 1.0F; + this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); + GL11.glPopMatrix(); + } } else { - this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); + float f8; + + if (itemstack.getItemSpriteNumber() == 1 + && itemstack.getItem().requiresMultipleRenderPasses()) { + if (renderInFrame) { + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + } else { + GL11.glScalef(0.5F, 0.5F, 0.5F); + } + + for (int k = 0; k + < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { + this.random.setSeed(187L); + IIcon icon = itemstack.getItem().getIcon(itemstack, k); + f8 = 1.0F; + + if (this.renderWithColor) { + i = itemstack.getItem().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( + par1EntityItem, + icon, + b0, + par9, + f5 * f8, + f4 * f8, + f6 * f8, + k); + } else { + this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); + } + } + } else { + if (renderInFrame) { + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + } else { + GL11.glScalef(0.5F, 0.5F, 0.5F); + } + + IIcon icon1 = itemstack.getIconIndex(); + + if (this.renderWithColor) { + int l = itemstack.getItem().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(par1EntityItem, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); + } else { + this.renderDroppedItem(par1EntityItem, icon1, b0, par9, 1.0F, 1.0F, 1.0F); + } + } } - } - } else { - if (renderInFrame) { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } else { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - IIcon icon1 = itemstack.getIconIndex(); - - if (this.renderWithColor) { - int l = itemstack.getItem().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(par1EntityItem, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } else { - this.renderDroppedItem(par1EntityItem, icon1, b0, par9, 1.0F, 1.0F, 1.0F); - } - } - } GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); @@ -156,33 +175,26 @@ public class FancyItemRender extends Render { } protected ResourceLocation func_110796_a(EntityItem par1EntityItem) { - return this.renderManager.renderEngine.getResourceLocation( - par1EntityItem.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine + .getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); } /** * Renders a dropped item */ - private void renderDroppedItem( - EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) { + private void renderDroppedItem(EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, + float par6, float par7) { renderDroppedItem(par1EntityItem, par2Icon, par3, par4, par5, par6, par7, 0); } - private void renderDroppedItem( - EntityItem par1EntityItem, - IIcon par2Icon, - int par3, - float par4, - float par5, - float par6, - float par7, - int pass) { + private void renderDroppedItem(EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, + float par6, float par7, int pass) { Tessellator tessellator = Tessellator.instance; if (par2Icon == null) { TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ResourceLocation resourcelocation = texturemanager.getResourceLocation( - par1EntityItem.getEntityItem().getItemSpriteNumber()); + ResourceLocation resourcelocation = texturemanager + .getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } @@ -235,7 +247,14 @@ public class FancyItemRender extends Render { GL11.glColor4f(par5, par6, par7, 1.0F); ItemRenderer.renderItemIn2D( - tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12); + tessellator, + f5, + f6, + f4, + f7, + par2Icon.getIconWidth(), + par2Icon.getIconHeight(), + f12); if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); @@ -274,22 +293,13 @@ public class FancyItemRender extends Render { /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); } - public void renderItemIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5, - boolean renderEffect) { + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) { Item k = par3ItemStack.getItem(); int l = par3ItemStack.getItemDamage(); IIcon object = par3ItemStack.getIconIndex(); @@ -299,8 +309,7 @@ public class FancyItemRender extends Render { float f2; Block block = Block.getBlockFromItem(k); // (k < Block.blocksList.length ? Block.blocksList[k] : null); - if (par3ItemStack.getItemSpriteNumber() == 0 - && block != null + if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); @@ -329,8 +338,7 @@ public class FancyItemRender extends Render { for (int j1 = 0; j1 < k.getRenderPasses(l); ++j1) { par2TextureManager.bindTexture( - par3ItemStack.getItemSpriteNumber() == 0 - ? TextureMap.locationBlocksTexture + par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); IIcon icon = k.getIcon(par3ItemStack, j1); int k1 = k.getColorFromItemStack(par3ItemStack, j1); @@ -352,13 +360,12 @@ public class FancyItemRender extends Render { GL11.glEnable(GL11.GL_LIGHTING); } else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = - par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + ResourceLocation resourcelocation = par2TextureManager + .getResourceLocation(par3ItemStack.getItemSpriteNumber()); par2TextureManager.bindTexture(resourcelocation); if (object == null) { - object = ((TextureMap) - Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)) + object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)) .getAtlasSprite("missingno"); } @@ -402,38 +409,29 @@ public class FancyItemRender extends Render { /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { if (par3ItemStack != null) { if (!ForgeHooksClient.renderInventoryItem( - field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) - par5)) { + field_147909_c, + par2TextureManager, + par3ItemStack, + renderWithColor, + zLevel, + (float) par4, + (float) par5)) { this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); } - /* Modders must handle this themselves if they use custom renderers! - if (par3ItemStack.hasEffect()) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - par2TextureManager.bindTexture(field_110798_h); - 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); - } - */ + /* + * Modders must handle this themselves if they use custom renderers! if (par3ItemStack.hasEffect()) { + * GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); + * par2TextureManager.bindTexture(field_110798_h); 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); } + */ } } @@ -449,8 +447,7 @@ public class FancyItemRender extends Render { float f = 0.00390625F; float f1 = 0.00390625F; - float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) - / (3000.0F + (float) (j1 * 1873)) + float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; float f3 = 0.0F; Tessellator tessellator = Tessellator.instance; @@ -462,7 +459,11 @@ public class FancyItemRender extends Render { tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - par2 + 0, par3 + par5, this.zLevel, (f2 + (float) par5 * f4) * f, (f3 + (float) par5) * f1); + par2 + 0, + par3 + par5, + this.zLevel, + (f2 + (float) par5 * f4) * f, + (f3 + (float) par5) * f1); tessellator.addVertexWithUV( par2 + par4, par3 + par5, @@ -479,41 +480,33 @@ public class FancyItemRender extends Render { * 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, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5) { + public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + ItemStack par3ItemStack, int par4, int par5) { this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, null); } - public void renderItemOverlayIntoGUI( - FontRenderer par1FontRenderer, - TextureManager par2TextureManager, - ItemStack par3ItemStack, - int par4, - int par5, - String par6Str) { + public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, + 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); + 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 + 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 + 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); @@ -533,7 +526,7 @@ public class FancyItemRender extends Render { } /** - * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: + * 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) { @@ -574,6 +567,7 @@ public class FancyItemRender extends Render { /** * Items should spread out when rendered in 3d? + * * @return */ public boolean shouldSpreadItems() { @@ -582,6 +576,7 @@ public class FancyItemRender extends Render { /** * Items should have a bob effect + * * @return */ public boolean shouldBob() { @@ -598,8 +593,8 @@ public class FancyItemRender extends Render { } /** - * Allows for a subclass to override how many rendered items appear in a - * "mini item 3d stack" + * Allows for a subclass to override how many rendered items appear in a "mini item 3d stack" + * * @param stack * @return */ diff --git a/src/main/java/tconstruct/tools/model/FrypanRender.java b/src/main/java/tconstruct/tools/model/FrypanRender.java index c71b0024..6f00b3a6 100644 --- a/src/main/java/tconstruct/tools/model/FrypanRender.java +++ b/src/main/java/tconstruct/tools/model/FrypanRender.java @@ -1,11 +1,13 @@ package tconstruct.tools.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.*; + public class FrypanRender implements ISimpleBlockRenderingHandler { + public static int frypanModelID = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -14,8 +16,8 @@ public class FrypanRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index 398aa569..efa6284e 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -1,13 +1,16 @@ package tconstruct.tools.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import tconstruct.tools.TinkerTools; +import cpw.mods.fml.client.registry.*; public class TableRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -35,8 +38,8 @@ public class TableRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); // until we get the new model.. finally... diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java index 598bebf0..59b6ba7a 100644 --- a/src/main/java/tconstruct/util/CraftingRecipeHelper.java +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -1,11 +1,13 @@ package tconstruct.util; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraft.item.crafting.*; public class CraftingRecipeHelper { + public static void removeShapedRecipes(List removelist) { for (ItemStack stack : removelist) removeShapedRecipe(stack); } diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index eb432888..aaf33026 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -1,17 +1,16 @@ package tconstruct.util; +import mantle.crash.CallableSuppConfig; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; -import mantle.crash.CallableSuppConfig; public class EnvironmentChecks { private EnvironmentChecks() {} // Singleton /** - * Checks for conflicting stuff in environment; adds callable to any crash - * logs if so. Note: This code adds additional data to crashlogs. It does - * not trigger any crashes. + * Checks for conflicting stuff in environment; adds callable to any crash logs if so. Note: This code adds + * additional data to crashlogs. It does not trigger any crashes. */ // private static List incompatibilities = new ArrayList<>(); // private static EnvironmentChecks instance = new EnvironmentChecks(); diff --git a/src/main/java/tconstruct/util/IMCHandler.java b/src/main/java/tconstruct/util/IMCHandler.java index 731a6a75..0e73cc50 100644 --- a/src/main/java/tconstruct/util/IMCHandler.java +++ b/src/main/java/tconstruct/util/IMCHandler.java @@ -1,17 +1,15 @@ package tconstruct.util; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.event.FMLInterModComms; import java.util.LinkedList; import java.util.List; import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; @@ -24,8 +22,13 @@ import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.IPattern; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.event.FMLInterModComms; public final class IMCHandler { + private IMCHandler() {} public static void processIMC(List messages) { @@ -69,9 +72,8 @@ public final class IMCHandler { // add additional render mapping so resource packs or the mods themselves can have custom // textures // for the tools - if (FMLCommonHandler.instance().getSide().isClient()) - TConstructClientRegistry.addMaterialRenderMapping( - id, "tinker", mat.name().toLowerCase(), true); + if (FMLCommonHandler.instance().getSide().isClient()) TConstructClientRegistry + .addMaterialRenderMapping(id, "tinker", mat.name().toLowerCase(), true); } break; } @@ -105,7 +107,12 @@ public final class IMCHandler { // register the material PatternBuilder.instance.registerFullMaterial( - item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID); + item, + value, + TConstructRegistry.getMaterial(matID).materialName, + shard, + rod, + matID); List addItems = new LinkedList<>(); List addMetas = new LinkedList<>(); @@ -136,8 +143,9 @@ public final class IMCHandler { for (int i = 0; i < addItems.size(); i++) TConstructRegistry.addPartMapping(addItems.get(i), addMetas.get(i), matID, addOUtputs.get(i)); - TConstruct.logger.debug("PartBuilder IMC: Added Part builder mapping for " - + TConstructRegistry.getMaterial(matID).materialName); + TConstruct.logger.debug( + "PartBuilder IMC: Added Part builder mapping for " + + TConstructRegistry.getMaterial(matID).materialName); break; } case "addPartCastingMaterial": { @@ -169,13 +177,12 @@ public final class IMCHandler { // we add the toolpart to all smeltery recipies that use iron and create a toolpart List newRecipies = new LinkedList<>(); - for (CastingRecipe recipe : - TConstructRegistry.getTableCasting().getCastingRecipes()) { + for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) { if (recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) continue; if (recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) continue; - if (!(recipe.getResult().getItem() - instanceof DynamicToolPart)) // has to be dynamic toolpart to support automatic addition - continue; + if (!(recipe.getResult().getItem() instanceof DynamicToolPart)) // has to be dynamic toolpart to + // support automatic addition + continue; newRecipies.add(recipe); } @@ -200,8 +207,8 @@ public final class IMCHandler { Smeltery.addMelting(ft, output, 0, liquid2.amount); } - TConstruct.logger.debug( - "Casting IMC: Added fluid " + tag.getString("FluidName") + " to part casting"); + TConstruct.logger + .debug("Casting IMC: Added fluid " + tag.getString("FluidName") + " to part casting"); break; } case "addMaterialItem": { @@ -240,7 +247,12 @@ public final class IMCHandler { // register the material PatternBuilder.instance.registerFullMaterial( - stack, value, TConstructRegistry.getMaterial(id).materialName, shard, rod, id); + stack, + value, + TConstructRegistry.getMaterial(id).materialName, + shard, + rod, + id); } break; } @@ -267,19 +279,23 @@ public final class IMCHandler { ItemStack block = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Block")); int temperature = tag.getInteger("Temperature"); - if (FluidType.getFluidType(liquid.getFluid()) == null) - FluidType.registerFluidType( - liquid.getFluid().getName(), - Block.getBlockFromItem(block.getItem()), - block.getItemDamage(), - temperature, - liquid.getFluid(), - false); + if (FluidType.getFluidType(liquid.getFluid()) == null) FluidType.registerFluidType( + liquid.getFluid().getName(), + Block.getBlockFromItem(block.getItem()), + block.getItemDamage(), + temperature, + liquid.getFluid(), + false); Smeltery.addMelting( - item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid); - TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " - + liquid.amount + "mb " + liquid.getLocalizedName()); + item, + Block.getBlockFromItem(block.getItem()), + block.getItemDamage(), + temperature, + liquid); + TConstruct.logger.debug( + "Smeltery IMC: Added melting: " + item + .getDisplayName() + " to " + liquid.amount + "mb " + liquid.getLocalizedName()); break; } case "addSmelteryFuel": { @@ -302,8 +318,9 @@ public final class IMCHandler { Smeltery.addSmelteryFuel(liquid.getFluid(), temperature, duration); - TConstruct.logger.debug("Smeltery IMC: Added fuel: " + liquid.getLocalizedName() + " (" - + temperature + ", " + duration + ")"); + TConstruct.logger.debug( + "Smeltery IMC: Added fuel: " + liquid + .getLocalizedName() + " (" + temperature + ", " + duration + ")"); break; } case "addFluxBattery": @@ -328,11 +345,10 @@ public final class IMCHandler { private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, String... tags) { boolean ok = true; - for (String t : tags) - if (!tag.hasKey(t)) { - FMLLog.bigWarning(String.format("%s IMC: Missing required NBT Tag %s", prefix, t)); - ok = false; // don't abort, report all missing tags - } + for (String t : tags) if (!tag.hasKey(t)) { + FMLLog.bigWarning(String.format("%s IMC: Missing required NBT Tag %s", prefix, t)); + ok = false; // don't abort, report all missing tags + } return ok; } @@ -342,8 +358,12 @@ public final class IMCHandler { } private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) { - FMLLog.bigWarning(String.format( - "Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type)); + FMLLog.bigWarning( + String.format( + "Received invalid IMC '%s' from %s. Not a %s Message.", + message.key, + message.getSender(), + type)); } private static ToolMaterial scanMaterial(NBTTagCompound tag) { @@ -379,19 +399,18 @@ public final class IMCHandler { if (tag.hasKey("Jagged")) shoddy = -tag.getFloat("Jagged"); - if (tag.hasKey("localizationString")) - return new ToolMaterial( - name, - tag.getString("localizationString"), - hlvl, - durability, - speed, - attack, - handle, - reinforced, - shoddy, - style, - color); + if (tag.hasKey("localizationString")) return new ToolMaterial( + name, + tag.getString("localizationString"), + hlvl, + durability, + speed, + attack, + handle, + reinforced, + shoddy, + style, + color); else return new ToolMaterial(name, hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color); } diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index fd444716..0add9df5 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -1,6 +1,7 @@ package tconstruct.util; import java.lang.reflect.Field; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; @@ -9,10 +10,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraftforge.event.entity.living.LivingDropsEvent; + import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; public class ItemHelper { + public static Object getStaticItem(String name, String classPackage) { try { Class clazz = Class.forName(classPackage); @@ -46,8 +50,8 @@ public class ItemHelper { tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos( - block, 0.0D, 0.0D, 0.0D, ItemHelper.getIconSafe(block.getIcon(1, meta))); // block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, ItemHelper.getIconSafe(block.getIcon(1, meta))); // block.getIcon(1, + // meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); diff --git a/src/main/java/tconstruct/util/Reference.java b/src/main/java/tconstruct/util/Reference.java index 7e630861..883b5a15 100644 --- a/src/main/java/tconstruct/util/Reference.java +++ b/src/main/java/tconstruct/util/Reference.java @@ -3,6 +3,7 @@ package tconstruct.util; import tconstruct.TConstruct; public final class Reference { + private Reference() {} public static final String MOD_ID = TConstruct.modID; diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index b4a0b212..2d6d6c40 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -1,12 +1,15 @@ package tconstruct.util.config; -import cpw.mods.fml.common.Loader; import java.io.File; import java.util.ArrayList; + import net.minecraftforge.common.config.Configuration; + import tconstruct.TConstruct; +import cpw.mods.fml.common.Loader; public class DimensionBlacklist { + public static ArrayList blacklistedDims = new ArrayList<>(); public static ArrayList noPoolDims = new ArrayList<>(); @@ -59,8 +62,7 @@ public class DimensionBlacklist { config.load(); - twilightForestDimensionID = - config.get("dimension", "dimensionID", -100).getInt(); + twilightForestDimensionID = config.get("dimension", "dimensionID", -100).getInt(); TConstruct.logger.trace("Twilight Forest Dim ID: " + twilightForestDimensionID); } else twilightForestDimensionID = -100; } @@ -73,8 +75,7 @@ public class DimensionBlacklist { config.load(); - promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200) - .getInt(); + promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt(); TConstruct.logger.trace("Promised Lands Dim ID: " + promisedLandDimensionID); } else promisedLandDimensionID = -100; } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 51d9685e..92936356 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -1,22 +1,24 @@ package tconstruct.util.config; -import com.google.common.collect.Sets; import java.io.File; import java.util.Set; + import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; +import com.google.common.collect.Sets; + public class PHConstruct { public static void initProps(File location) { - /* Here we will set up the config file for the mod - * First: Create a folder inside the config folder - * Make sure to read any old configs file if they exist - * Second: Create the actual config file + /* + * Here we will set up the config file for the mod First: Create a folder inside the config folder Make sure to + * read any old configs file if they exist Second: Create the actual config file */ File mainFile = new File(location + "/TinkersConstruct.cfg"); File legacyFile16 = new File(location + "/TinkersWorkshop.txt"); @@ -34,173 +36,124 @@ public class PHConstruct { Configuration config = new Configuration(mainFile); // config.load(); /* Load happens in the constructor */ - superfunWorld = - config.get("Superfun", "All the world is Superfun", false).getBoolean(false); + superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); - keepHunger = - config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); - keepLevels = - config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); - beginnerBook = - config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); - deathPenality = config.get("Difficulty Changes", "Tools lose 10% durability on death", true) - .getBoolean(true); - balancedFluxModifier = - config.get("Difficulty Changes", "Balanced Flux Modifier", true).getBoolean(true); + keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); + keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); + beginnerBook = config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); + deathPenality = config.get("Difficulty Changes", "Tools lose 10% durability on death", true).getBoolean(true); + balancedFluxModifier = config.get("Difficulty Changes", "Balanced Flux Modifier", true).getBoolean(true); - enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true) - .getBoolean(true); - enableTStone = - config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true); - enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true) - .getBoolean(true); - enableTBone = - config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true); - enableTFlint = - config.get("Difficulty Changes", "Enable mod flint tools", true).getBoolean(true); - enableTNetherrack = config.get("Difficulty Changes", "Enable mod netherrack tools", true) - .getBoolean(true); - enableTSlime = - config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true); - enableTPaper = - config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true); - enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true) - .getBoolean(true); + enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true); + enableTStone = config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true); + enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true).getBoolean(true); + enableTBone = config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true); + enableTFlint = config.get("Difficulty Changes", "Enable mod flint tools", true).getBoolean(true); + enableTNetherrack = config.get("Difficulty Changes", "Enable mod netherrack tools", true).getBoolean(true); + enableTSlime = config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true); + enableTPaper = config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true); + enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true).getBoolean(true); - craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false) - .getBoolean(false); - vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true) - .getBoolean(true); + craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false).getBoolean(false); + vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true); lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true) .getBoolean(true); - removeGoldCastRecipes = config.get("Difficulty Changes", "Remove Gold Cast Recipes", true) - .getBoolean(true); + removeGoldCastRecipes = config.get("Difficulty Changes", "Remove Gold Cast Recipes", true).getBoolean(true); removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false) .getBoolean(false); labotimizeVanillaTools = config.get("Difficulty Changes", "Remove Vanilla Tool Effectiveness", false) .getBoolean(false); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true) .getBoolean(true); - denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false) - .getBoolean(false); - craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true) - .getBoolean(true); + denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); + craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true).getBoolean(true); alternativeBoltRecipe = config.get( - "Difficulty Changes", - "Add alternative recipe for bolt parts: arrowhead + toolrod in a crafting grid", - false) - .getBoolean(false); + "Difficulty Changes", + "Add alternative recipe for bolt parts: arrowhead + toolrod in a crafting grid", + false).getBoolean(false); - naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable") - .getInt(1); + naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable").getInt(1); ingotsPerOre = config.get( - "Smeltery Output Modification", - "Ingots per ore", - 2, - "Number of ingots returned from smelting ores in the smeltery") - .getDouble(2); + "Smeltery Output Modification", + "Ingots per ore", + 2, + "Number of ingots returned from smelting ores in the smeltery").getDouble(2); ingotsBronzeAlloy = config.get( - "Smeltery Output Modification", - "Bronze ingot return", - 4, - "Number of ingots returned from smelting Bronze in the smeltery") - .getDouble(4); + "Smeltery Output Modification", + "Bronze ingot return", + 4, + "Number of ingots returned from smelting Bronze in the smeltery").getDouble(4); ingotsAluminumBrassAlloy = config.get( - "Smeltery Output Modification", - "Aluminum Brass ingot return", - 4, - "Number of ingots returned from smelting Aluminum Brass in the smeltery") - .getDouble(4); + "Smeltery Output Modification", + "Aluminum Brass ingot return", + 4, + "Number of ingots returned from smelting Aluminum Brass in the smeltery").getDouble(4); ingotsAlumiteAlloy = config.get( - "Smeltery Output Modification", - "Alumite ingot return", - 3, - "Number of ingots returned from smelting Alumite in the smeltery") - .getDouble(3); + "Smeltery Output Modification", + "Alumite ingot return", + 3, + "Number of ingots returned from smelting Alumite in the smeltery").getDouble(3); ingotsManyullynAlloy = config.get( - "Smeltery Output Modification", - "Manyullyn ingot return", - 1, - "Number of ingots returned from smelting Manyullyn in the smeltery") - .getDouble(1); + "Smeltery Output Modification", + "Manyullyn ingot return", + 1, + "Number of ingots returned from smelting Manyullyn in the smeltery").getDouble(1); ingotsPigironAlloy = config.get( - "Smeltery Output Modification", - "Pig Iron ingot return", - 1, - "Number of ingots returned from smelting Pig Iron in the smeltery") - .getDouble(1); + "Smeltery Output Modification", + "Pig Iron ingot return", + 1, + "Number of ingots returned from smelting Pig Iron in the smeltery").getDouble(1); capesEnabled = config.get("Superfun", "Enable-TCon-Capes", true).getBoolean(true); - achievementsEnabled = - config.get("Achievements", "Enable Achievements", true).getBoolean(true); + achievementsEnabled = config.get("Achievements", "Enable Achievements", true).getBoolean(true); boolean ic2 = true; boolean xycraft = true; try { Class c = Class.forName("ic2.core.IC2"); ic2 = false; - } catch (Exception ignored) { - } + } catch (Exception ignored) {} try { Class c = Class.forName("soaryn.xycraft.core.XyCraft"); xycraft = false; - } catch (Exception ignored) { - } + } catch (Exception ignored) {} generateCopper = config.get("Worldgen Disabler", "Generate Copper", ic2).getBoolean(ic2); generateTin = config.get("Worldgen Disabler", "Generate Tin", ic2).getBoolean(ic2); - generateAluminum = - config.get("Worldgen Disabler", "Generate Aluminum", xycraft).getBoolean(xycraft); + generateAluminum = config.get("Worldgen Disabler", "Generate Aluminum", xycraft).getBoolean(xycraft); if (config.hasKey("worldgen disabler", "Generate Cobalt and Ardite")) { - generateNetherOres = config.get("Worldgen Disabler", "Generate Cobalt and Ardite", true) - .getBoolean(true); + generateNetherOres = config.get("Worldgen Disabler", "Generate Cobalt and Ardite", true).getBoolean(true); generateCobalt = generateArdite = generateNetherOres; ConfigCategory cat = config.getCategory("worldgen disabler"); cat.remove("Generate Cobalt and Ardite"); } else { - generateCobalt = - config.get("Worldgen Disabler", "Generate Cobalt", true).getBoolean(true); - generateArdite = - config.get("Worldgen Disabler", "Generate Ardite", true).getBoolean(true); + generateCobalt = config.get("Worldgen Disabler", "Generate Cobalt", true).getBoolean(true); + generateArdite = config.get("Worldgen Disabler", "Generate Ardite", true).getBoolean(true); } - generateIronSurface = - config.get("Worldgen Disabler", "Generate Surface Iron", true).getBoolean(true); - generateGoldSurface = - config.get("Worldgen Disabler", "Generate Surface Gold", true).getBoolean(true); - generateCopperSurface = - config.get("Worldgen Disabler", "Generate Surface Copper", true).getBoolean(true); - generateTinSurface = - config.get("Worldgen Disabler", "Generate Surface Tin", true).getBoolean(true); - generateAluminumSurface = config.get("Worldgen Disabler", "Generate Surface Aluminum", true) - .getBoolean(true); + generateIronSurface = config.get("Worldgen Disabler", "Generate Surface Iron", true).getBoolean(true); + generateGoldSurface = config.get("Worldgen Disabler", "Generate Surface Gold", true).getBoolean(true); + generateCopperSurface = config.get("Worldgen Disabler", "Generate Surface Copper", true).getBoolean(true); + generateTinSurface = config.get("Worldgen Disabler", "Generate Surface Tin", true).getBoolean(true); + generateAluminumSurface = config.get("Worldgen Disabler", "Generate Surface Aluminum", true).getBoolean(true); - generateIronBush = - config.get("Worldgen Disabler", "Generate Iron Bushes", true).getBoolean(true); - generateGoldBush = - config.get("Worldgen Disabler", "Generate Gold Bushes", true).getBoolean(true); - 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); - generateEssenceBush = - config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true); - addToVillages = - config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true); - allowVillagerTrading = config.get( - "Worldgen Disabler", "Enable the Tinkers Villager to trade for oreberries", true) - .getBoolean(true); + generateIronBush = config.get("Worldgen Disabler", "Generate Iron Bushes", true).getBoolean(true); + generateGoldBush = config.get("Worldgen Disabler", "Generate Gold Bushes", true).getBoolean(true); + 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); + generateEssenceBush = config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true); + addToVillages = config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true); + allowVillagerTrading = config + .get("Worldgen Disabler", "Enable the Tinkers Villager to trade for oreberries", true).getBoolean(true); copperuDensity = config.get("Worldgen", "Copper Underground Density", 2, "Density: Chances per chunk") .getInt(2); tinuDensity = config.get("Worldgen", "Tin Underground Density", 2).getInt(2); - aluminumuDensity = - config.get("Worldgen", "Aluminum Underground Density", 3).getInt(3); + aluminumuDensity = config.get("Worldgen", "Aluminum Underground Density", 3).getInt(3); if (config.hasKey("worldgen", "Nether Ores Density")) { netherDensity = config.get("Worldgen", "Nether Ores Density", 8).getInt(8); cobaltDensity = arditeDensity = netherDensity; @@ -249,36 +202,29 @@ public class PHConstruct { seaLevel = config.get("general", "Sea level", 64).getInt(64); tconComesFirst = config.get( - "general", - "Always cast TConstruct ingots", - true, - "You will always get a TConstruct item from casting an ingot or block.") - .getBoolean(); + "general", + "Always cast TConstruct ingots", + true, + "You will always get a TConstruct item from casting an ingot or block.").getBoolean(); - enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true) - .getBoolean(true); + enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true).getBoolean(true); goldAppleRecipe = config.get( - "Ultra Hardcore Changes", - "Change Crafting Recipes", - false, - "Makes recipes for gold apples, carrots, and melon potions more expensive") - .getBoolean(false); - dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false) - .getBoolean(false); + "Ultra Hardcore Changes", + "Change Crafting Recipes", + false, + "Makes recipes for gold apples, carrots, and melon potions more expensive").getBoolean(false); + dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false).getBoolean(false); uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false) .getBoolean(false); - worldBorder = - config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); - worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000) - .getInt(1000); + worldBorder = config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); + worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); freePatterns = config.get( - "Ultra Hardcore Changes", - "Add Patterns to Pattern Chests", - false, - "Gives all tier 1 patterns when pattern chest is placed") - .getBoolean(false); - AbilityHelper.necroticUHS = config.get( - "Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false) + "Ultra Hardcore Changes", + "Add Patterns to Pattern Chests", + false, + "Gives all tier 1 patterns when pattern chest is placed").getBoolean(false); + AbilityHelper.necroticUHS = config + .get("Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false) .getBoolean(false); // Slime pools @@ -290,60 +236,59 @@ public class PHConstruct { connectedTexturesMode = conTexMode.getInt(2); // dimension blacklist - cfgForbiddenDim = config.get( + cfgForbiddenDim = config + .get( "DimBlackList", "ForbiddenDim", new int[] {}, "Disallow Traveller's Belt ability to swap inventories for certain dimension ID's") .getIntList(); cfgDimBlackList = config.get( - "DimBlackList", - "SlimeIslandDimBlacklist", - new int[] {}, - "Add dimension ID's to prevent slime islands from generating in them") - .getIntList(); + "DimBlackList", + "SlimeIslandDimBlacklist", + new int[] {}, + "Add dimension ID's to prevent slime islands from generating in them").getIntList(); slimeIslGenDim0Only = config.get( - "DimBlackList", - "GenerateSlimeIslandInDim0Only", - false, - "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages") + "DimBlackList", + "GenerateSlimeIslandInDim0Only", + false, + "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages") .getBoolean(false); slimeIslGenDim0 = config.get( - "DimBlackList", - "slimeIslGenDim0", - true, - "True: slime islands generate in overworld; False they do not generate") - .getBoolean(true); + "DimBlackList", + "slimeIslGenDim0", + true, + "True: slime islands generate in overworld; False they do not generate").getBoolean(true); genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds") .getBoolean(false); genOresFlat = config.get("DimBlacklist", "genOresFlat", false, "Generate ores in flat worlds") .getBoolean(false); // Experimental functionality - throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true) - .getBoolean(true); - meltableHorses = config.get("Experimental", "Allow horses to be melted down for glue", true) - .getBoolean(true); + throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); + meltableHorses = config.get("Experimental", "Allow horses to be melted down for glue", true).getBoolean(true); meltableVillagers = config.get("Experimental", "Allow villagers to be melted down for emeralds", true) .getBoolean(true); minimalTextures = config.get("Experimental", "Minimal Textures", false).getBoolean(false); extraBlockUpdates = config.get( - "Experimental", - "Send additional block updates when using AOE tools", - true, - "This fixes very fast tools sometimes resulting in ghost blocks, but causes a bit more network traffic. Should be fine in theory.") + "Experimental", + "Send additional block updates when using AOE tools", + true, + "This fixes very fast tools sometimes resulting in ghost blocks, but causes a bit more network traffic. Should be fine in theory.") .getBoolean(true); heartDropBlacklist = config.get( - "Experimental", - "YellowHeartDropBlacklist", - new String[] {"entitynpc", "entitycustomnpc"}, - "Entity classes listed here will not drop yellow hearts. The values are the actual class names in lowercase.") + "Experimental", + "YellowHeartDropBlacklist", + new String[] { "entitynpc", "entitycustomnpc" }, + "Entity classes listed here will not drop yellow hearts. The values are the actual class names in lowercase.") .getStringList(); - craftingStationBlacklist = Sets.newHashSet(config.get("CraftingStationBlacklist", "tileEntities", new String[] { - "wanion.avaritiaddons.block.chest.infinity.TileEntityInfinityChest" - }) - .getStringList()); + craftingStationBlacklist = Sets.newHashSet( + config.get( + "CraftingStationBlacklist", + "tileEntities", + new String[] { "wanion.avaritiaddons.block.chest.infinity.TileEntityInfinityChest" }) + .getStringList()); /* Save the configuration file only if it has changed */ if (config.hasChanged()) config.save(); @@ -353,8 +298,7 @@ public class PHConstruct { 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); + gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); } } diff --git a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java index 9e9b8654..493a7479 100644 --- a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java +++ b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java @@ -1,14 +1,16 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyCommon; import tconstruct.armor.TinkerArmor; import tconstruct.armor.player.TPlayerStats; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; public class AccessoryInventoryPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java index af305163..22597c74 100644 --- a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java +++ b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java @@ -1,13 +1,15 @@ package tconstruct.util.network; +import mantle.common.network.AbstractPacket; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; + +import tconstruct.armor.TinkerArmor; +import tconstruct.armor.player.TPlayerStats; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import tconstruct.armor.TinkerArmor; -import tconstruct.armor.player.TPlayerStats; /** * This Packet is for sending the players TPlayerStats from the server to the client. @@ -15,11 +17,14 @@ import tconstruct.armor.player.TPlayerStats; * @author covers1624 */ public class ArmourGuiSyncPacket extends AbstractPacket { + NBTTagCompound playerStats = new NBTTagCompound(); public ArmourGuiSyncPacket() {} + /** * For sending the players TPlayerStats to the client. + * * @param tag, The players TPlayerStats written to NBT. */ public ArmourGuiSyncPacket(NBTTagCompound tag) { diff --git a/src/main/java/tconstruct/util/network/BeltPacket.java b/src/main/java/tconstruct/util/network/BeltPacket.java index a69b8197..c4215897 100644 --- a/src/main/java/tconstruct/util/network/BeltPacket.java +++ b/src/main/java/tconstruct/util/network/BeltPacket.java @@ -1,13 +1,16 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; + import net.minecraft.entity.player.EntityPlayer; + import tconstruct.armor.PlayerAbilityHelper; import tconstruct.armor.player.TPlayerStats; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; public class BeltPacket extends AbstractPacket { + public BeltPacket() {} @Override diff --git a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java index 3484a467..2d5ac01d 100644 --- a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java +++ b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java @@ -1,9 +1,11 @@ package tconstruct.util.network; +import mantle.common.network.AbstractPacket; + +import net.minecraft.entity.player.EntityPlayer; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import net.minecraft.entity.player.EntityPlayer; public class DoubleJumpPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java index 743aadd4..55e944c5 100644 --- a/src/main/java/tconstruct/util/network/GogglePacket.java +++ b/src/main/java/tconstruct/util/network/GogglePacket.java @@ -1,12 +1,15 @@ package tconstruct.util.network; +import mantle.common.network.AbstractPacket; + +import net.minecraft.entity.player.EntityPlayer; + +import tconstruct.armor.PlayerAbilityHelper; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import net.minecraft.entity.player.EntityPlayer; -import tconstruct.armor.PlayerAbilityHelper; public class GogglePacket extends AbstractPacket { + boolean active; public GogglePacket() {} @@ -31,7 +34,8 @@ public class GogglePacket extends AbstractPacket { @Override public void handleServerSide(EntityPlayer player) { PlayerAbilityHelper.toggleGoggles(player, active); - /*TPlayerStats stats = TPlayerStats.get(player); - stats.activeGoggles = active;*/ + /* + * TPlayerStats stats = TPlayerStats.get(player); stats.activeGoggles = active; + */ } } diff --git a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java index 4dcd2180..ef882b24 100644 --- a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java @@ -1,13 +1,16 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; + import net.minecraft.entity.player.EntityPlayer; + import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.player.TPlayerStats; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; public class HealthUpdatePacket extends AbstractPacket { + private float health; public HealthUpdatePacket() {} diff --git a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java index 404cb13e..0b0c79e6 100644 --- a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java @@ -1,12 +1,15 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + public class MovementUpdatePacket extends AbstractPacket { + public int entityID; public double x; public double y; diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 7c8e7cfe..5a35dee5 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -1,5 +1,13 @@ package tconstruct.util.network; +import java.util.*; + +import mantle.common.network.*; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.*; +import net.minecraft.network.*; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.*; import cpw.mods.fml.common.network.internal.FMLProxyPacket; @@ -7,15 +15,9 @@ import cpw.mods.fml.relauncher.*; import io.netty.buffer.*; import io.netty.channel.*; import io.netty.handler.codec.MessageToMessageCodec; -import java.util.*; -import mantle.common.network.*; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.*; -import net.minecraft.network.*; /** - * Packet pipeline class. Directs all registered packet data to be handled by - * the packets themselves. + * Packet pipeline class. Directs all registered packet data to be handled by the packets themselves. * * @author sirgingalot some code from: cpw */ @@ -27,15 +29,12 @@ public class PacketPipeline extends MessageToMessageCodec clazz) { if (this.packets.size() > 256) { @@ -63,15 +62,15 @@ public class PacketPipeline extends MessageToMessageCodec clazz = msg.getClass(); if (!this.packets.contains(msg.getClass())) { - throw new NullPointerException( - "No Packet Registered for: " + msg.getClass().getCanonicalName()); + throw new NullPointerException("No Packet Registered for: " + msg.getClass().getCanonicalName()); } byte discriminator = (byte) this.packets.indexOf(clazz); buffer.writeByte(discriminator); msg.encodeInto(ctx, buffer); FMLProxyPacket proxyPacket = new FMLProxyPacket( - buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); + buffer.copy(), + ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); out.add(proxyPacket); } @@ -96,8 +95,7 @@ public class PacketPipeline extends MessageToMessageCodec - * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper + * Adapted from CPW's code in cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper * - * @param message - * The message to send + * @param message The message to send */ public void sendToAll(AbstractPacket message) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.ALL); this.channels.get(Side.SERVER).writeAndFlush(message); } @@ -172,87 +166,57 @@ public class PacketPipeline extends MessageToMessageCodec - * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper + * Adapted from CPW's code in cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper * - * @param message - * The message to send - * @param player - * The player to send it to + * @param message The message to send + * @param player The player to send it to */ public void sendTo(AbstractPacket message, EntityPlayerMP player) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(player); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); this.channels.get(Side.SERVER).writeAndFlush(message); } /** * Send this message to everyone within a certain range of a point. *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper + * Adapted from CPW's code in cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper * - * @param message - * The message to send - * @param point - * The - * {@link cpw.mods.fml.common.network.NetworkRegistry.TargetPoint} - * around which to send + * @param message The message to send + * @param point The {@link cpw.mods.fml.common.network.NetworkRegistry.TargetPoint} around which to send */ public void sendToAllAround(AbstractPacket message, NetworkRegistry.TargetPoint point) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(point); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point); this.channels.get(Side.SERVER).writeAndFlush(message); } /** * Send this message to everyone within the supplied dimension. *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper + * Adapted from CPW's code in cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper * - * @param message - * The message to send - * @param dimensionId - * The dimension id to target + * @param message The message to send + * @param dimensionId The dimension id to target */ public void sendToDimension(AbstractPacket message, int dimensionId) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.DIMENSION); - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(dimensionId); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(dimensionId); this.channels.get(Side.SERVER).writeAndFlush(message); } /** * Send this message to the server. *

- * Adapted from CPW's code in - * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper + * Adapted from CPW's code in cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper * - * @param message - * The message to send + * @param message The message to send */ public void sendToServer(AbstractPacket message) { - this.channels - .get(Side.CLIENT) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.TOSERVER); this.channels.get(Side.CLIENT).writeAndFlush(message); } diff --git a/src/main/java/tconstruct/util/network/PatternTablePacket.java b/src/main/java/tconstruct/util/network/PatternTablePacket.java index 6b72248d..6ed76d88 100644 --- a/src/main/java/tconstruct/util/network/PatternTablePacket.java +++ b/src/main/java/tconstruct/util/network/PatternTablePacket.java @@ -1,15 +1,17 @@ package tconstruct.util.network; -import cpw.mods.fml.common.network.ByteBufUtils; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import tconstruct.TConstruct; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; +import cpw.mods.fml.common.network.ByteBufUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; public class PatternTablePacket extends AbstractPacket { @@ -62,9 +64,9 @@ public class PatternTablePacket extends AbstractPacket { break; } } - if (warning) - TConstruct.logger.warn("Possible packet-cheating with PatternTable for player " - + player.getCommandSenderName()); + if (warning) TConstruct.logger.warn( + "Possible packet-cheating with PatternTable for player " + + player.getCommandSenderName()); else logic.setSelectedPattern(this.contents); } } diff --git a/src/main/java/tconstruct/util/network/SignDataPacket.java b/src/main/java/tconstruct/util/network/SignDataPacket.java index 9f9401d7..d6d97635 100644 --- a/src/main/java/tconstruct/util/network/SignDataPacket.java +++ b/src/main/java/tconstruct/util/network/SignDataPacket.java @@ -1,15 +1,18 @@ package tconstruct.util.network; +import mantle.common.network.AbstractPacket; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + +import tconstruct.TConstruct; +import tconstruct.tools.logic.BattlesignLogic; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import tconstruct.TConstruct; -import tconstruct.tools.logic.BattlesignLogic; public class SignDataPacket extends AbstractPacket { + private int dimension, x, y, z, length; private String[] text; diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java index 42d39cec..d4b0ef66 100644 --- a/src/main/java/tconstruct/util/network/SmelteryPacket.java +++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java @@ -1,15 +1,17 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; import mantle.common.network.PacketUpdateTE; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; + import tconstruct.TConstruct; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.smeltery.logic.SmelteryLogic; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; public class SmelteryPacket extends AbstractPacket { @@ -55,8 +57,7 @@ public class SmelteryPacket extends AbstractPacket { if (player.openContainer instanceof SmelteryContainer) { SmelteryContainer container = (SmelteryContainer) player.openContainer; SmelteryLogic logic = container.logic; - if (logic != null - && logic.hasWorldObj() + if (logic != null && logic.hasWorldObj() && logic.getWorldObj().provider.dimensionId == this.dimension && logic.xCoord == this.x && logic.yCoord == this.y @@ -75,8 +76,8 @@ public class SmelteryPacket extends AbstractPacket { NBTTagCompound data = new NBTTagCompound(); logic.writeToNBT(data); - TConstruct.packetPipeline.sendToDimension( - new PacketUpdateTE(this.x, this.y, this.z, data), this.dimension); + TConstruct.packetPipeline + .sendToDimension(new PacketUpdateTE(this.x, this.y, this.z, data), this.dimension); } } } diff --git a/src/main/java/tconstruct/util/network/ToolStationPacket.java b/src/main/java/tconstruct/util/network/ToolStationPacket.java index 17d747f6..8ac938f1 100644 --- a/src/main/java/tconstruct/util/network/ToolStationPacket.java +++ b/src/main/java/tconstruct/util/network/ToolStationPacket.java @@ -1,12 +1,14 @@ package tconstruct.util.network; +import mantle.common.network.AbstractPacket; + +import net.minecraft.entity.player.EntityPlayer; + +import tconstruct.tools.inventory.ToolStationContainer; +import tconstruct.tools.logic.ToolStationLogic; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import net.minecraft.entity.player.EntityPlayer; -import tconstruct.tools.inventory.ToolStationContainer; -import tconstruct.tools.logic.ToolStationLogic; public class ToolStationPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java b/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java index 915166ab..0287abf3 100644 --- a/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java +++ b/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java @@ -5,16 +5,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; + import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; import tconstruct.util.Reference; public class AlternateBoltRecipe implements IRecipe { + static { // register the recipe with the recipesorter - RecipeSorter.register( - Reference.MOD_ID + ":part", AlternateBoltRecipe.class, RecipeSorter.Category.SHAPELESS, ""); + RecipeSorter + .register(Reference.MOD_ID + ":part", AlternateBoltRecipe.class, RecipeSorter.Category.SHAPELESS, ""); } private ItemStack outputPart; diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index 789592f8..674c53aa 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -2,16 +2,12 @@ package tconstruct.weaponry; import static tconstruct.tools.TinkerTools.MaterialID; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Map; import java.util.Random; + import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; + import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IPosition; import net.minecraft.init.Blocks; @@ -23,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; @@ -55,6 +52,12 @@ import tconstruct.weaponry.items.WeaponryPattern; import tconstruct.weaponry.items.WeaponryPatternClay; import tconstruct.weaponry.weapons.*; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(TConstruct.modID) @Pulse( @@ -62,6 +65,7 @@ import tconstruct.world.TinkerWorld; description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", pulsesRequired = "Tinkers' Tools") public class TinkerWeaponry { + @SidedProxy( clientSide = "tconstruct.weaponry.WeaponryClientProxy", serverSide = "tconstruct.weaponry.WeaponryCommonProxy") @@ -124,14 +128,14 @@ public class TinkerWeaponry { ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); ModifyBuilder.registerModifier( - new ModWindup(2, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); + new ModWindup(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); ModifyBuilder.registerModifier(new ModAmmoRestock()); modAttack = new ModAttack( "Quartz", 11, - new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, - new int[] {1, 4}, + new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, + new int[] { 1, 4 }, true); ModifyBuilder.registerModifier(modAttack); @@ -149,8 +153,8 @@ public class TinkerWeaponry { // "vanilla" bolt: // iron-tipped wood-shaft with feather fletching - ItemStack headStack = DualMaterialToolPart.createDualMaterial( - boltAmmo.getHeadItem(), TinkerTools.MaterialID.Wood, TinkerTools.MaterialID.Iron); + ItemStack headStack = DualMaterialToolPart + .createDualMaterial(boltAmmo.getHeadItem(), TinkerTools.MaterialID.Wood, TinkerTools.MaterialID.Iron); ItemStack handleStack = new ItemStack(boltAmmo.getAccessoryItem(), 1, 0); // feather fletchling ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, null, null, ""); @@ -231,26 +235,22 @@ public class TinkerWeaponry { PatternBuilder.instance.addToolPattern(woodPattern); // todo: integrate into tcon - int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; - int[] liquidDamage = new int[] {2, 13, 10, 11, 12, 14, 15, 6, 16, 18}; - patternOutputs = new Item[] {partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb}; + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; + int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; + patternOutputs = new Item[] { partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb }; // register part crafting if (PHConstruct.craftMetalTools) { - for (int m = 0; m < patternOutputs.length; m++) - for (int i = 0; i < 18; i++) - TConstructRegistry.addPartMapping(woodPattern, m, i, new ItemStack(patternOutputs[m], 1, i)); + for (int m = 0; m < patternOutputs.length; m++) for (int i = 0; i < 18; i++) + TConstructRegistry.addPartMapping(woodPattern, m, i, new ItemStack(patternOutputs[m], 1, i)); } else { - for (int m = 0; m < patternOutputs.length; m++) - for (int nonMetal : nonMetals) - TConstructRegistry.addPartMapping( - woodPattern, m, nonMetal, new ItemStack(patternOutputs[m], 1, nonMetal)); + for (int m = 0; m < patternOutputs.length; m++) for (int nonMetal : nonMetals) TConstructRegistry + .addPartMapping(woodPattern, m, nonMetal, new ItemStack(patternOutputs[m], 1, nonMetal)); } // arrowhead is still integrated in tinkertools.. bla n stuff - for (int nonMetal : nonMetals) - TConstructRegistry.addPartMapping( - TinkerTools.woodPattern, 25, nonMetal, new ItemStack(arrowhead, 1, nonMetal)); + for (int nonMetal : nonMetals) TConstructRegistry + .addPartMapping(TinkerTools.woodPattern, 25, nonMetal, new ItemStack(arrowhead, 1, nonMetal)); // register part casting if (TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery")) { @@ -265,13 +265,12 @@ public class TinkerWeaponry { new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - cast, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), + false, + 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); @@ -304,18 +303,18 @@ public class TinkerWeaponry { new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe( - cast, - new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(arrowhead, 1, Short.MAX_VALUE), - false, - 50); + if (!PHConstruct.removeGoldCastRecipes) tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(arrowhead, 1, Short.MAX_VALUE), + false, + 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); - int fluidAmount = - ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + int fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) + * TConstruct.ingotLiquidValue + / 2; ItemStack metalCast = new ItemStack(arrowhead, 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); @@ -362,8 +361,8 @@ public class TinkerWeaponry { TConstructRegistry.addBowMaterial(MaterialID.Manyullyn, 50, 5.0f); // Manyullyn TConstructRegistry.addBowMaterial(MaterialID.Copper, 40, 4.9f); // Copper TConstructRegistry.addBowMaterial(MaterialID.Bronze, 45, 5.1f); // Bronze - TConstructRegistry.addBowMaterial( - MaterialID.Alumite, 45, 5.0f); // Alumite - a bit stone-ish since it has obsidian + TConstructRegistry.addBowMaterial(MaterialID.Alumite, 45, 5.0f); // Alumite - a bit stone-ish since it has + // obsidian // Stone doesn't bend. takes forever, has no pow. WHY WOULD YOU DO THAT TConstructRegistry.addBowMaterial(MaterialID.Stone, 90, 1.0f); // Stone TConstructRegistry.addBowMaterial(MaterialID.Flint, 90, 1.0f); // Flint @@ -392,25 +391,47 @@ public class TinkerWeaponry { TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.0F, 0.5F); // Pigiron // Arrow Shaft Materials: Material ID, crafting item, durability-medifier, mass, fragility - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 1, Items.bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 2, Items.reeds, 1.5f, 0.5f, 0.66f, 0xc7ff87)); // reed: light, but less durable - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 3, Items.blaze_rod, 1.2f, 0.9f, 0.08f, 0xfff32d)); // blaze: tad lighter, tad more durable, fieryyyy + TConstructRegistry + .addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: + // reference + // material, + // 10% + // break + // chance + TConstructRegistry + .addCustomMaterial(ArrowShaftMaterial.createMaterial(1, Items.bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: + // heavier, + // but + // durable + TConstructRegistry + .addCustomMaterial(ArrowShaftMaterial.createMaterial(2, Items.reeds, 1.5f, 0.5f, 0.66f, 0xc7ff87)); // reed: + // light, + // but + // less + // durable + TConstructRegistry + .addCustomMaterial(ArrowShaftMaterial.createMaterial(3, Items.blaze_rod, 1.2f, 0.9f, 0.08f, 0xfff32d)); // blaze: + // tad + // lighter, + // tad + // more + // durable, + // fieryyyy // also add the tool rod variants, same stats - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 0, - TinkerTools.toolRod, - MaterialID.Wood, - 1.0f, - 1.0f, - 0.15f, - 0x866526)); // wood: reference material, 10% break chance - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( - 1, TinkerTools.toolRod, MaterialID.Bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable + TConstructRegistry.addCustomMaterial( + ArrowShaftMaterial + .createMaterial(0, TinkerTools.toolRod, MaterialID.Wood, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: + // reference + // material, + // 10% + // break + // chance + TConstructRegistry.addCustomMaterial( + ArrowShaftMaterial + .createMaterial(1, TinkerTools.toolRod, MaterialID.Bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: + // heavier, + // but + // durable // Arrow Fletching Materials TConstructRegistry.addFletchingMaterial( @@ -422,14 +443,15 @@ public class TinkerWeaponry { 0.05F, 1.0f, 0xffffff); // Feather - TConstructRegistry.addCustomMaterial(new FletchlingLeafMaterial( - 1, - 2, - "treeLeaves", - new ItemStack(TinkerWeaponry.fletching, 1, 1), - 75F, - 0F, - 2.5f)); // all vanilla and oredicted leaves. and all leaves in general. + TConstructRegistry.addCustomMaterial( + new FletchlingLeafMaterial( + 1, + 2, + "treeLeaves", + new ItemStack(TinkerWeaponry.fletching, 1, 1), + 75F, + 0F, + 2.5f)); // all vanilla and oredicted leaves. and all leaves in general. TConstructRegistry.addFletchingMaterial( 2, 2, @@ -477,8 +499,8 @@ public class TinkerWeaponry { TConstructRegistry.addToolRecipe(shortbow, partBowLimb, bowstring, partBowLimb); TConstructRegistry.addToolRecipe(longbow, partBowLimb, bowstring, partBowLimb, TinkerTools.largePlate); - TConstructRegistry.addToolRecipe( - crossbow, partCrossbowLimb, partCrossbowBody, bowstring, TinkerTools.toughBinding); + TConstructRegistry + .addToolRecipe(crossbow, partCrossbowLimb, partCrossbowBody, bowstring, TinkerTools.toughBinding); TConstructRegistry.addToolRecipe(arrowAmmo, arrowhead, partArrowShaft, fletching); TConstructRegistry.addToolRecipe(boltAmmo, partBolt, partBolt, fletching); @@ -496,8 +518,7 @@ public class TinkerWeaponry { // get a casting recipe for it D: FluidStack liquid = new FluidStack(entry.getValue().fluid, TConstruct.ingotLiquidValue); - CastingRecipe recipe = - tb.getCastingRecipe(liquid, new ItemStack(TinkerSmeltery.metalPattern, 1, 2)); // pickaxe + CastingRecipe recipe = tb.getCastingRecipe(liquid, new ItemStack(TinkerSmeltery.metalPattern, 1, 2)); // pickaxe // no recipe found if (recipe == null) continue; @@ -510,7 +531,11 @@ public class TinkerWeaponry { if (((IToolPart) TinkerTools.toolRod).getMaterialID(rod) == -1) continue; tb.addCastingRecipe( - DualMaterialToolPart.createDualMaterial(partBolt, id, matID), liquid, rod, true, 150); + DualMaterialToolPart.createDualMaterial(partBolt, id, matID), + liquid, + rod, + true, + 150); } } } @@ -563,6 +588,7 @@ public class TinkerWeaponry { // arrows BlockDispenser.dispenseBehaviorRegistry.putObject(arrowAmmo, new BehaviorProjectileBaseDispense() { + @Override protected ProjectileBase getProjectileEntity(World world, IPosition position, ItemStack stack) { return new ArrowEntity(world, position.getX(), position.getY(), position.getZ()); @@ -571,6 +597,7 @@ public class TinkerWeaponry { // bolts BlockDispenser.dispenseBehaviorRegistry.putObject(boltAmmo, new BehaviorProjectileBaseDispense() { + @Override protected ProjectileBase getProjectileEntity(World world, IPosition position, ItemStack stack) { return new BoltEntity(world, position.getX(), position.getY(), position.getZ()); diff --git a/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java b/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java index ea3e7f35..5fd56588 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java +++ b/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java @@ -3,10 +3,12 @@ package tconstruct.weaponry; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import tconstruct.library.ActiveToolMod; import tconstruct.library.weaponry.IAmmo; public class WeaponryActiveToolMod extends ActiveToolMod { + @Override public boolean damageTool(ItemStack stack, int damage, EntityLivingBase entity) { // does not proc on tool 'healing' diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index 0a0b7173..13a8e7fc 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -2,12 +2,13 @@ package tconstruct.weaponry; import static tconstruct.weaponry.TinkerWeaponry.*; -import cpw.mods.fml.client.registry.RenderingRegistry; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; + import tconstruct.client.AmmoItemRenderer; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -23,8 +24,10 @@ import tconstruct.weaponry.client.entity.ProjectileBaseRenderer; import tconstruct.weaponry.client.entity.ShurikenEntityRenderer; import tconstruct.weaponry.client.item.*; import tconstruct.weaponry.entity.*; +import cpw.mods.fml.client.registry.RenderingRegistry; public class WeaponryClientProxy extends WeaponryCommonProxy { + public static AmmoItemRenderer renderer; @Override @@ -72,29 +75,33 @@ public class WeaponryClientProxy extends WeaponryCommonProxy { ToolCore arrow = TinkerWeaponry.arrowAmmo; String pre = Reference.resource(arrow.getDefaultFolder()) + "/"; - String[] shaft = {"wood", "bone", "reed", "blaze", null}; - String[] fletching = {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; + String[] shaft = { "wood", "bone", "reed", "blaze", null }; + String[] fletching = { "feather", "leaf", "slime", "blueslime", "slimeleaf" }; // we register different textures for the different parts per index for (int i = 0; i < 5; i++) { String handletex = pre + shaft[i] + arrow.getIconSuffix(2); String acctex = pre + fletching[i] + arrow.getIconSuffix(3); - arrow.registerAlternatePartPaths(i, new String[] {null, null, handletex, acctex}); - TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] {null, null, null, acctex}); + arrow.registerAlternatePartPaths(i, new String[] { null, null, handletex, acctex }); + TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] { null, null, null, acctex }); } // for bolts too pre = Reference.resource(TinkerWeaponry.boltAmmo.getDefaultFolder()) + "/"; for (int i = 0; i < 5; i++) { String acctex = pre + fletching[i] + TinkerWeaponry.boltAmmo.getIconSuffix(3); - TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] {null, null, null, acctex}); + TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] { null, null, null, acctex }); } // bowstring - String[] bowstringTypes = {"string", "magicfabric", "flamestring"}; + String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) { TConstructClientRegistry.addAlternateMaterialRenderMapping( - TinkerWeaponry.shortbow, bowIter, Reference.RESOURCE, bowstringTypes[bowIter], true); + TinkerWeaponry.shortbow, + bowIter, + Reference.RESOURCE, + bowstringTypes[bowIter], + true); } } @@ -117,23 +124,20 @@ public class WeaponryClientProxy extends WeaponryCommonProxy { // bolt // Tool Station - ToolCore[] tools = {shortbow, arrowAmmo, throwingknife, javelin}; - int[][] icons = { - new int[] {3, 9, 1}, // shortbow - new int[] {7, 10, 1}, // arrow - new int[] {2, 1, 5}, // throwingknife - new int[] {1, 2, 5} // javelin + ToolCore[] tools = { shortbow, arrowAmmo, throwingknife, javelin }; + int[][] icons = { new int[] { 3, 9, 1 }, // shortbow + new int[] { 7, 10, 1 }, // arrow + new int[] { 2, 1, 5 }, // throwingknife + new int[] { 1, 2, 5 } // javelin }; - int[][] coords = { - new int[] {3, 10, 3, 13}, new int[] {4, 3, 4, 13}, // shortbow - new int[] {11, 0, 12, 13}, new int[] {3, 3, 3, 13}, // arrow - new int[] {7, 0, 13, 13}, new int[] {2, 3, 13, 13}, // throwingknife - new int[] {11, 8, 8, 13}, new int[] {3, 3, 3, 13} // javelin + int[][] coords = { new int[] { 3, 10, 3, 13 }, new int[] { 4, 3, 4, 13 }, // shortbow + new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, // arrow + new int[] { 7, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // throwingknife + new int[] { 11, 8, 8, 13 }, new int[] { 3, 3, 3, 13 } // javelin }; for (int i = 0; i < tools.length; i++) { - String locString = String.format( - "gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); + String locString = String.format("gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); TConstructClientRegistry.addToolButton( icons[i][0], icons[i][1], @@ -147,23 +151,20 @@ public class WeaponryClientProxy extends WeaponryCommonProxy { } // Tool Forge - tools = new ToolCore[] {longbow, crossbow, boltAmmo, shuriken}; - icons = new int[][] { - new int[] {8, 11, 1}, // longbow - new int[] {9, 12, 1}, // crossbow - new int[] {2, 13, 1}, // bolt - new int[] {4, 0, 5} // shuriken + tools = new ToolCore[] { longbow, crossbow, boltAmmo, shuriken }; + icons = new int[][] { new int[] { 8, 11, 1 }, // longbow + new int[] { 9, 12, 1 }, // crossbow + new int[] { 2, 13, 1 }, // bolt + new int[] { 4, 0, 5 } // shuriken }; - coords = new int[][] { - new int[] {3, 10, 3, 9}, new int[] {4, 3, 4, 2}, // longbow - new int[] {1, 2, 10, 9}, new int[] {4, 4, 3, 3}, // crossbow - new int[] {4, 12, 13, 13}, new int[] {4, 3, 13, 13}, // bolt - new int[] {0, 0, 0, 0}, new int[] {4, 4, 4, 4} // shuriken + coords = new int[][] { new int[] { 3, 10, 3, 9 }, new int[] { 4, 3, 4, 2 }, // longbow + new int[] { 1, 2, 10, 9 }, new int[] { 4, 4, 3, 3 }, // crossbow + new int[] { 4, 12, 13, 13 }, new int[] { 4, 3, 13, 13 }, // bolt + new int[] { 0, 0, 0, 0 }, new int[] { 4, 4, 4, 4 } // shuriken }; for (int i = 0; i < tools.length; i++) { - String locString = String.format( - "gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); + String locString = String.format("gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); TConstructClientRegistry.addTierTwoButton( icons[i][0], icons[i][1], diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java index d943a324..c06a4a6c 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java @@ -1,14 +1,15 @@ package tconstruct.weaponry; -import cpw.mods.fml.common.registry.EntityRegistry; import tconstruct.TConstruct; import tconstruct.weaponry.entity.*; +import cpw.mods.fml.common.registry.EntityRegistry; public class WeaponryCommonProxy { + public void init() { EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 20, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity( - ThrowingKnifeEntity.class, "ThrowingKnife", 21, TConstruct.instance, 32, 5, true); + EntityRegistry + .registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 21, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 22, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 23, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 24, TConstruct.instance, 32, 5, true); diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index 100b1367..bb3a7c21 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -1,9 +1,5 @@ package tconstruct.weaponry; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,6 +9,7 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.EntityJoinWorldEvent; + import tconstruct.armor.player.TPlayerStats; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; @@ -35,8 +32,13 @@ import tconstruct.weaponry.ammo.BoltAmmo; import tconstruct.weaponry.weapons.Crossbow; import tconstruct.weaponry.weapons.LongBow; import tconstruct.weaponry.weapons.ShortBow; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; public class WeaponryHandler { + @SubscribeEvent public void onCrafting(PlayerEvent.ItemCraftedEvent event) { Item item = event.crafting.getItem(); @@ -79,15 +81,14 @@ public class WeaponryHandler { // the materials ToolMaterial head = TConstructRegistry.getMaterial(tags.getInteger("Head")); ArrowMaterial arrow = TConstructRegistry.getArrowMaterial(tags.getInteger("Head")); - ArrowShaftMaterial shaft = (ArrowShaftMaterial) - TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), ArrowShaftMaterial.class); - FletchingMaterial fletching = (FletchingMaterial) - TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); + ArrowShaftMaterial shaft = (ArrowShaftMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Handle"), ArrowShaftMaterial.class); + FletchingMaterial fletching = (FletchingMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); // todo: fix leaf fletching - if (fletching == null) - fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial( - tags.getInteger("Accessory"), FletchlingLeafMaterial.class); + if (fletching == null) fletching = (FletchingMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Accessory"), FletchlingLeafMaterial.class); // invalid materials if (arrow == null || shaft == null || fletching == null) { @@ -95,8 +96,8 @@ public class WeaponryHandler { return; } - int durability = - (int) ((float) head.durability() * shaft.durabilityModifier * fletching.durabilityModifier); + int durability = (int) ((float) head.durability() * shaft.durabilityModifier + * fletching.durabilityModifier); float weight = arrow.mass + shaft.weight; float accuracy = fletching.accuracy; float breakChance = shaft.fragility * arrow.breakChance + fletching.breakChance; @@ -119,13 +120,12 @@ public class WeaponryHandler { ToolMaterial coreMat = TConstructRegistry.getMaterial(tags.getInteger("Handle")); ArrowMaterial head = TConstructRegistry.getArrowMaterial(tags.getInteger("Head")); ArrowMaterial core = TConstructRegistry.getArrowMaterial(tags.getInteger("Handle")); - FletchingMaterial fletching = (FletchingMaterial) - TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); + FletchingMaterial fletching = (FletchingMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); // todo: fix leaf fletching - if (fletching == null) - fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial( - tags.getInteger("Accessory"), FletchlingLeafMaterial.class); + if (fletching == null) fletching = (FletchingMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Accessory"), FletchlingLeafMaterial.class); // invalid materials if (head == null || core == null || fletching == null) { @@ -133,8 +133,8 @@ public class WeaponryHandler { return; } - int durability = - (int) ((float) headMat.durability() * coreMat.handleDurability() * fletching.durabilityModifier); + int durability = (int) ((float) headMat.durability() * coreMat.handleDurability() + * fletching.durabilityModifier); float weight = head.mass + core.mass * 1.5f; float accuracy = (100f + fletching.accuracy) / 2f; float breakChance = (fletching.breakChance * 2 + 0.15f * core.breakChance) * head.breakChance / 2f; @@ -172,8 +172,8 @@ public class WeaponryHandler { if (event.tool instanceof BowBaseAmmo) { top = TConstructRegistry.getBowMaterial(tags.getInteger("Head")); bottom = TConstructRegistry.getBowMaterial(tags.getInteger("Accessory")); - string = (BowstringMaterial) - TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), BowstringMaterial.class); + string = (BowstringMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Handle"), BowstringMaterial.class); // some materials seem to be incompatible if (top == null || bottom == null || string == null) { @@ -198,8 +198,8 @@ public class WeaponryHandler { enchanted = tags.getInteger("Handle") == 1; } else if (event.tool instanceof Crossbow) { top = TConstructRegistry.getBowMaterial(tags.getInteger("Head")); - string = (BowstringMaterial) - TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), BowstringMaterial.class); + string = (BowstringMaterial) TConstructRegistry + .getCustomMaterial(tags.getInteger("Accessory"), BowstringMaterial.class); // some materials seem to be incompatible if (top == null || string == null) { @@ -245,7 +245,10 @@ public class WeaponryHandler { if (mat == null) return; Item extra = event.extraStack != null ? event.extraStack.getItem() : null; ToolCore tool = ToolBuilder.instance.getMatchingRecipe( - event.headStack.getItem(), mat.craftingItem.getItem(), event.accessoryStack.getItem(), extra); + event.headStack.getItem(), + mat.craftingItem.getItem(), + event.accessoryStack.getItem(), + extra); // it's an arrow! if (tool == TinkerWeaponry.arrowAmmo) event.handleStack = mat.craftingItem.copy(); @@ -259,10 +262,10 @@ public class WeaponryHandler { if (event.headStack.getItem() != TinkerWeaponry.partBolt) return; // is the bolt already split into 2 items? - if (event.accessoryStack != null - && event.headStack.getItem() == TinkerWeaponry.partBolt + if (event.accessoryStack != null && event.headStack.getItem() == TinkerWeaponry.partBolt && event.handleStack.getItem() == TinkerWeaponry.partBolt - && event.accessoryStack.getItem() == TinkerWeaponry.fletching) return; + && event.accessoryStack.getItem() == TinkerWeaponry.fletching) + return; // split the bolt into its two parts ItemStack bolt1 = event.headStack.copy(); @@ -279,14 +282,8 @@ public class WeaponryHandler { event.accessoryStack = fletching; } - private void setAmmoData( - NBTTagCompound tags, - int durability, - float weight, - float breakChance, - float accuracy, - float shoddy, - int reinforced) { + private void setAmmoData(NBTTagCompound tags, int durability, float weight, float breakChance, float accuracy, + float shoddy, int reinforced) { tags.setInteger("TotalDurability", durability); tags.setInteger("BaseDurability", durability); tags.setFloat("Mass", weight); @@ -348,27 +345,21 @@ public class WeaponryHandler { // high priority because we want to do these checks on unmodified stacks @SubscribeEvent(priority = EventPriority.HIGH) public void boneanaParts(ToolBuildEvent event) { - if (event.headStack == null - || event.handleStack == null + if (event.headStack == null || event.handleStack == null || event.accessoryStack != null - || event.extraStack != null) return; + || event.extraStack != null) + return; // golden carrot + bone if (event.headStack.getItem() == Items.golden_carrot && event.handleStack.getItem() == Items.bone) { // golden carrot must be named banana - if (!event.headStack.hasTagCompound() - || !event.headStack.getTagCompound().hasKey("display") - || !event.headStack - .getTagCompound() - .getCompoundTag("display") - .hasKey("Name") - || !event.headStack - .getTagCompound() - .getCompoundTag("display") - .getString("Name") - .equalsIgnoreCase("banana")) return; - event.name = - '\u2400' + "Bonæna"; // the \u2400 is a non-printable unicode character so you can't just type it + if (!event.headStack.hasTagCompound() || !event.headStack.getTagCompound().hasKey("display") + || !event.headStack.getTagCompound().getCompoundTag("display").hasKey("Name") + || !event.headStack.getTagCompound().getCompoundTag("display").getString("Name") + .equalsIgnoreCase("banana")) + return; + event.name = '\u2400' + "Bonæna"; // the \u2400 is a non-printable unicode character so you can't just type + // it event.headStack = new ItemStack(TinkerTools.swordBlade, 1, TinkerTools.MaterialID.Bone); event.handleStack = new ItemStack(TinkerTools.toolRod, 1, TinkerTools.MaterialID.Bone); event.accessoryStack = new ItemStack(TinkerTools.wideGuard, 1, TinkerTools.MaterialID.Bone); diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java index 680eaab6..65f9115f 100644 --- a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java @@ -1,10 +1,12 @@ package tconstruct.weaponry.ammo; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -16,6 +18,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; public class ArrowAmmo extends AmmoItem { + public static ItemStack vanillaArrow; public ArrowAmmo() { @@ -82,7 +85,7 @@ public class ArrowAmmo extends AmmoItem { @Override public String[] getTraits() { - return new String[] {"ammo", "projectile", "weapon"}; + return new String[] { "ammo", "projectile", "weapon" }; } @Override @@ -92,8 +95,8 @@ public class ArrowAmmo extends AmmoItem { ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // wooden shaft ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling - ItemStack tool = ToolBuilder.instance.buildTool( - new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, null, ""); + ItemStack tool = ToolBuilder.instance + .buildTool(new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, null, ""); if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); @@ -133,7 +136,7 @@ public class ArrowAmmo extends AmmoItem { // blaze shaft? if (part == 1 && type == 3) return "\u00a76" + StatCollector.translateToLocal("modifier.tool.blaze"); if (part >= 1) // only head has ability otherwise - return ""; + return ""; return super.getAbilityNameForType(type, part); } } diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java index 5e5abc66..59f727fd 100644 --- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java @@ -1,8 +1,10 @@ package tconstruct.weaponry.ammo; import java.util.List; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; @@ -14,6 +16,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; public class BoltAmmo extends AmmoItem { + public BoltAmmo() { super(0, "Bolts"); } @@ -72,7 +75,7 @@ public class BoltAmmo extends AmmoItem { @Override public String[] getTraits() { - return new String[] {"ammo", "projectile", "weapon"}; + return new String[] { "ammo", "projectile", "weapon" }; } @Override @@ -80,8 +83,8 @@ public class BoltAmmo extends AmmoItem { if (TConstructRegistry.getArrowMaterial(id) == null) return; // dual material head: we use wooden shafts - ItemStack headStack = DualMaterialToolPart.createDualMaterial( - getHeadItem(), id, TinkerTools.MaterialID.Iron); // material shaft + ItemStack headStack = DualMaterialToolPart.createDualMaterial(getHeadItem(), id, TinkerTools.MaterialID.Iron); // material + // shaft ItemStack handleStack = new ItemStack(getAccessoryItem(), 1, 0); // feather Fletchling // ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling @@ -107,7 +110,7 @@ public class BoltAmmo extends AmmoItem { @Override public String getAbilityNameForType(int type, int part) { if (part >= 2) // only head and handle have ability - return ""; + return ""; return super.getAbilityNameForType(type, part); } } diff --git a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java index 7545328c..aea409a0 100644 --- a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java +++ b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java @@ -1,14 +1,16 @@ package tconstruct.weaponry.client; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; + import tconstruct.library.weaponry.ProjectileWeapon; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class AmmoSlotHandler { + @SubscribeEvent public void onRenderOverlay(RenderGameOverlayEvent.Pre event) { if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return; @@ -26,11 +28,10 @@ public class AmmoSlotHandler { // check if it's in the inventory int slot = -1; - for (int i = 0; i < 9; i++) - if (player.inventory.mainInventory[i] == ammo) { - slot = i; - break; - } + for (int i = 0; i < 9; i++) if (player.inventory.mainInventory[i] == ammo) { + slot = i; + break; + } // not in the hotbar if (slot == -1) return; diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index 3908d5cc..7e450f6d 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -1,6 +1,5 @@ package tconstruct.weaponry.client; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.OpenGlHelper; @@ -8,21 +7,29 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; + import org.lwjgl.opengl.GL11; + import tconstruct.library.weaponry.IWindup; import tconstruct.util.Reference; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class CrosshairHandler { + private static final Minecraft mc = Minecraft.getMinecraft(); - private static final ResourceLocation crossHairSquare = - new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png"); - private static final ResourceLocation crossHairTip = - new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png"); - private static final ResourceLocation crossHairWeird = - new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png"); - private static final ResourceLocation crossHairSpike = - new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png"); + private static final ResourceLocation crossHairSquare = new ResourceLocation( + Reference.RESOURCE, + "textures/gui/Crosshair.png"); + private static final ResourceLocation crossHairTip = new ResourceLocation( + Reference.RESOURCE, + "textures/gui/Crosshair2.png"); + private static final ResourceLocation crossHairWeird = new ResourceLocation( + Reference.RESOURCE, + "textures/gui/Crosshair3.png"); + private static final ResourceLocation crossHairSpike = new ResourceLocation( + Reference.RESOURCE, + "textures/gui/Crosshair4.png"); @SubscribeEvent public void onRenderOverlay(RenderGameOverlayEvent.Pre event) { @@ -100,7 +107,7 @@ public class CrosshairHandler { double v1 = 0; switch (part) { - // top left + // top left case 0: w -= s; h -= s; diff --git a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java index 4d14db03..fb83a7a1 100644 --- a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java +++ b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java @@ -1,13 +1,15 @@ package tconstruct.weaponry.client; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.FOVUpdateEvent; import net.minecraftforge.client.event.RenderPlayerEvent; + import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.library.weaponry.IWindup; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class RenderEventHandler { + @SubscribeEvent public void onAimZoom(FOVUpdateEvent event) { if (!event.entity.isUsingItem()) return; @@ -17,9 +19,8 @@ public class RenderEventHandler { ItemStack weapon = event.entity.getItemInUse(); IWindup item = (IWindup) weapon.getItem(); - if (item.zoomOnWindup(weapon)) - event.newfov = event.fov - / (event.fov + (item.getZoom(weapon) - 1.0f) * item.getWindupProgress(weapon, event.entity)); + if (item.zoomOnWindup(weapon)) event.newfov = event.fov + / (event.fov + (item.getZoom(weapon) - 1.0f) * item.getWindupProgress(weapon, event.entity)); } @SubscribeEvent diff --git a/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java index 2bc7bfe3..a02b3f90 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java @@ -1,9 +1,11 @@ package tconstruct.weaponry.client.entity; import org.lwjgl.opengl.GL11; + import tconstruct.weaponry.entity.ArrowEntity; public class ArrowEntityRenderer extends ProjectileBaseRenderer { + private int count = 0; private final float size; diff --git a/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java index 1269cc48..1da1a96a 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java @@ -1,12 +1,14 @@ package tconstruct.weaponry.client.entity; import org.lwjgl.opengl.GL11; + import tconstruct.weaponry.entity.JavelinEntity; public class JavelinEntityRenderer extends ProjectileBaseRenderer { + @Override - public void customRendering( - JavelinEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + public void customRendering(JavelinEntity entity, double x, double y, double z, float p_76986_8_, + float p_76986_9_) { // rotate it into the direction we threw it GL11.glRotatef(entity.rotationYaw, 0f, 1f, 0f); diff --git a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java index 9012f92c..7eae6501 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java @@ -6,22 +6,20 @@ import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import tconstruct.client.FlexibleToolRenderer; import tconstruct.library.entity.ProjectileBase; public class ProjectileBaseRenderer extends Render { + protected static FlexibleToolRenderer toolCoreRenderer = new FlexibleToolRenderer(); @SuppressWarnings("unchecked") @Override - public void doRender( - Entity p_76986_1_, - double p_76986_2_, - double p_76986_4_, - double p_76986_6_, - float p_76986_8_, + public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { doRender((T) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } @@ -88,7 +86,7 @@ public class ProjectileBaseRenderer extends Render { } protected ResourceLocation func_110796_a(ProjectileBase par1ArrowEntity) { - return this.renderManager.renderEngine.getResourceLocation( - par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + return this.renderManager.renderEngine + .getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java index 82683edb..06862199 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java @@ -1,13 +1,14 @@ package tconstruct.weaponry.client.entity; import org.lwjgl.opengl.GL11; + import tconstruct.weaponry.entity.ShurikenEntity; public class ShurikenEntityRenderer extends ProjectileBaseRenderer { @Override - public void customRendering( - ShurikenEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + public void customRendering(ShurikenEntity entity, double x, double y, double z, float p_76986_8_, + float p_76986_9_) { // make it smaller GL11.glScalef(0.6F, 0.6F, 0.6F); diff --git a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java index 030700cc..4a8cdd9a 100644 --- a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java @@ -6,7 +6,9 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; + import tconstruct.client.FlexibleToolRenderer; import tconstruct.library.weaponry.IWindup; import tconstruct.library.weaponry.ProjectileWeapon; @@ -15,6 +17,7 @@ import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.entity.ArrowEntity; public class BowRenderer extends FlexibleToolRenderer { + private static final ArrowEntity dummy = new ArrowEntity(null); @Override @@ -48,8 +51,9 @@ public class BowRenderer extends FlexibleToolRenderer { GL11.glTranslatef(progress * -0.1f, progress * -0.125f, 0.0F); // we're crazy, so.. render the arrow =D - ItemStack ammo = ((ProjectileWeapon) item.getItem()) - .searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! + ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a + // projectile weapon, it's + // a bow! if (ammo != null) { if (ammo.getItem() == Items.arrow) dummy.returnStack = ArrowAmmo.vanillaArrow; else dummy.returnStack = ammo; @@ -74,8 +78,9 @@ public class BowRenderer extends FlexibleToolRenderer { } } else if (type == ItemRenderType.EQUIPPED && player.isUsingItem()) { // we're crazy, so.. render the arrow =D - ItemStack ammo = ((ProjectileWeapon) item.getItem()) - .searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! + ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a + // projectile weapon, it's + // a bow! if (ammo != null) { if (ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo)) dummy.returnStack = ArrowAmmo.vanillaArrow; diff --git a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java index 9f02832a..34884282 100644 --- a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java @@ -5,7 +5,9 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; + import tconstruct.client.FlexibleToolRenderer; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.BoltAmmo; @@ -13,6 +15,7 @@ import tconstruct.weaponry.entity.BoltEntity; import tconstruct.weaponry.weapons.Crossbow; public class CrossbowRenderer extends FlexibleToolRenderer { + private static final BoltEntity dummy = new BoltEntity(null); @Override diff --git a/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java b/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java index 7b3905e1..7f4e476c 100644 --- a/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java @@ -2,7 +2,9 @@ package tconstruct.weaponry.client.item; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; + import tconstruct.client.AmmoItemRenderer; import tconstruct.library.weaponry.IWindup; @@ -13,8 +15,10 @@ public class JavelinRenderer extends AmmoItemRenderer { GL11.glTranslatef(0.5f, 0.5f, 0); GL11.glScalef(0.5f, 0.5f, 0.5f); - float progress = ((IWindup) item.getItem()) - .getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding + float progress = ((IWindup) item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 + // while + // not + // winding if (type == ItemRenderType.EQUIPPED) GL11.glRotatef(90, 0, 0, 1); diff --git a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java index 0367221f..c8297257 100644 --- a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java @@ -5,12 +5,15 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import tconstruct.client.AmmoItemRenderer; import tconstruct.library.weaponry.IWindup; public class ThrowingKnifeRenderer extends AmmoItemRenderer { + private static final Minecraft mc = Minecraft.getMinecraft(); @Override diff --git a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java index 0eb8e9c8..2feaa70f 100644 --- a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java @@ -8,12 +8,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; + import tconstruct.TConstruct; import tconstruct.library.entity.ProjectileBase; import tconstruct.library.tools.ToolCore; import tconstruct.library.util.PiercingArrowDamage; public class ArrowEntity extends ProjectileBase { + public ArrowEntity(World world) { super(world); } @@ -80,7 +82,7 @@ public class ArrowEntity extends ProjectileBase { public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Entity entityHit) { boolean dealtDamage = false; - // Minecraft.getMinecraft().thePlayer.sendChatMessage("Damage/Weight: " + damage + " - " + + // Minecraft.getMinecraft().thePlayer.sendChatMessage("Damage/Weight: " + damage + " - " + // tags.getFloat("Mass")); // we take the weight, and shift the damage done towards armor piercing, the more weight the arrow/bolt has! diff --git a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java index d8223a79..6765ed4c 100644 --- a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class BoltEntity extends ArrowEntity { + public BoltEntity(World world) { super(world); this.setSize(0.3f, 0.3f); diff --git a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java index aa43fc92..25de0a3a 100644 --- a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java @@ -1,13 +1,15 @@ package tconstruct.weaponry.entity; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.weaponry.TinkerWeaponry; +import io.netty.buffer.ByteBuf; public class JavelinEntity extends ProjectileBase { + public int roll = 0; public JavelinEntity(World world) { diff --git a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java index 97c1d6d4..6c5904f0 100644 --- a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java @@ -1,13 +1,15 @@ package tconstruct.weaponry.entity; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.weaponry.TinkerWeaponry; +import io.netty.buffer.ByteBuf; public class ShurikenEntity extends ProjectileBase { + public int spin = 0; public int rollAngle = 0; @@ -48,8 +50,8 @@ public class ShurikenEntity extends ProjectileBase { @Override protected double getGravity() { - return (this.ticksExisted / 8) - * 0.018d; // integer division. so the first 20 ticks it will have no gravity at all. + return (this.ticksExisted / 8) * 0.018d; // integer division. so the first 20 ticks it will have no gravity at + // all. } @Override diff --git a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java index f37bc822..f02379a2 100644 --- a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java @@ -3,10 +3,12 @@ package tconstruct.weaponry.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.weaponry.TinkerWeaponry; public class ThrowingKnifeEntity extends ProjectileBase { + public ThrowingKnifeEntity(World world) { super(world); } diff --git a/src/main/java/tconstruct/weaponry/items/Boneana.java b/src/main/java/tconstruct/weaponry/items/Boneana.java index 8402c31e..fb8b7ea8 100644 --- a/src/main/java/tconstruct/weaponry/items/Boneana.java +++ b/src/main/java/tconstruct/weaponry/items/Boneana.java @@ -1,17 +1,20 @@ package tconstruct.weaponry.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import tconstruct.items.tools.Broadsword; import tconstruct.util.Reference; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Boneana extends Broadsword { + private IIcon brokenIcon; @Override diff --git a/src/main/java/tconstruct/weaponry/items/GlassArrows.java b/src/main/java/tconstruct/weaponry/items/GlassArrows.java index 0a78ff4b..0d34c011 100644 --- a/src/main/java/tconstruct/weaponry/items/GlassArrows.java +++ b/src/main/java/tconstruct/weaponry/items/GlassArrows.java @@ -1,6 +1,7 @@ package tconstruct.weaponry.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -8,11 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; + import tconstruct.library.crafting.ToolBuilder; import tconstruct.util.Reference; import tconstruct.weaponry.ammo.ArrowAmmo; public class GlassArrows extends ArrowAmmo { + public GlassArrows() { super(); this.setUnlocalizedName(Reference.prefix("glassArrows")); @@ -29,8 +32,8 @@ public class GlassArrows extends ArrowAmmo { ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // wooden shaft ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling - ItemStack tool = ToolBuilder.instance.buildTool( - headStack, handleStack, accessoryStack, null, this.getLocalizedToolName()); + ItemStack tool = ToolBuilder.instance + .buildTool(headStack, handleStack, accessoryStack, null, this.getLocalizedToolName()); if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); } else return; diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java index 9028ba81..b92f3977 100644 --- a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java +++ b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java @@ -1,14 +1,17 @@ package tconstruct.weaponry.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.tools.items.Pattern; import tconstruct.util.Reference; public class WeaponryPattern extends Pattern { - private static final String[] patternName = new String[] {"shuriken", "crossbowlimb", "crossbowbody", "bowlimb"}; + + private static final String[] patternName = new String[] { "shuriken", "crossbowlimb", "crossbowbody", "bowlimb" }; public WeaponryPattern(String patternType, String name) { super(patternName, getPatternNames(patternName, patternType), "patterns/"); diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java b/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java index 877542af..fa270b6e 100644 --- a/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java +++ b/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java @@ -1,14 +1,17 @@ package tconstruct.weaponry.items; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import tconstruct.tools.items.Pattern; import tconstruct.util.Reference; public class WeaponryPatternClay extends Pattern { - private static final String[] patternName = new String[] {"", "", "", "bowlimb"}; + + private static final String[] patternName = new String[] { "", "", "", "bowlimb" }; public WeaponryPatternClay(String patternType, String name) { super(patternName, getPatternNames(patternName, patternType), "patterns/"); diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 0028d3f1..d19e408f 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -1,8 +1,9 @@ package tconstruct.weaponry.weapons; -import cpw.mods.fml.common.Loader; import java.util.List; + import mods.battlegear2.api.core.InventoryPlayerBattle; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -11,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; @@ -22,16 +24,17 @@ import tconstruct.util.Reference; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.BoltAmmo; import tconstruct.weaponry.entity.BoltEntity; +import cpw.mods.fml.common.Loader; public class Crossbow extends ProjectileWeapon { + public Crossbow() { super(0, "Crossbow"); this.setMaxDamage(100); } public boolean isLoaded(ItemStack itemStack) { - if (itemStack.hasTagCompound()) - return isLoaded(itemStack.getTagCompound().getCompoundTag("InfiTool")); + if (itemStack.hasTagCompound()) return isLoaded(itemStack.getTagCompound().getCompoundTag("InfiTool")); return false; } @@ -116,10 +119,9 @@ public class Crossbow extends ProjectileWeapon { if (tags.getBoolean("Broken")) return; // has ammo? - if (searchForAmmo(player, stack) != null) - if (!tags.hasKey("Reloading")) - // start reloading - tags.setInteger("Reloading", getWindupTime(stack)); + if (searchForAmmo(player, stack) != null) if (!tags.hasKey("Reloading")) + // start reloading + tags.setInteger("Reloading", getWindupTime(stack)); } // called after the reloading is done. Does the actual loading @@ -223,8 +225,7 @@ public class Crossbow extends ProjectileWeapon { // arrow priority: hotbar > inventory, tinker arrows > regular arrows if (Loader.isModLoaded("battlegear2")) { ItemStack offhand = ((InventoryPlayerBattle) player.inventory).getCurrentOffhandWeapon(); - if (offhand != null - && (offhand.getItem() instanceof BoltAmmo) + if (offhand != null && (offhand.getItem() instanceof BoltAmmo) && ((IAmmo) offhand.getItem()).getAmmoCount(offhand) > 0) { return offhand; } @@ -247,8 +248,8 @@ public class Crossbow extends ProjectileWeapon { } @Override - protected Entity createProjectile( - ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile(ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, + float windup) { EntityArrow arrow; ItemStack reference = ammo.copy(); @@ -276,8 +277,8 @@ public class Crossbow extends ProjectileWeapon { } @Override - public void playFiringSound( - World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { + public void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, + float accuracy) { world.playSoundAtEntity(player, "random.bow", 1.0F, 0.5F); } @@ -386,7 +387,7 @@ public class Crossbow extends ProjectileWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "bow", "windup"}; + return new String[] { "weapon", "bow", "windup" }; } @Override diff --git a/src/main/java/tconstruct/weaponry/weapons/Javelin.java b/src/main/java/tconstruct/weaponry/weapons/Javelin.java index 2fea6317..d7d2238d 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Javelin.java +++ b/src/main/java/tconstruct/weaponry/weapons/Javelin.java @@ -1,21 +1,23 @@ package tconstruct.weaponry.weapons; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.tools.AbilityHelper; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.JavelinEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Javelin extends AmmoWeapon { + public Javelin() { super(3, "Javelin"); } @@ -158,7 +160,7 @@ public class Javelin extends AmmoWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "thrown", "ammo", "windup"}; + return new String[] { "weapon", "thrown", "ammo", "windup" }; } @Override diff --git a/src/main/java/tconstruct/weaponry/weapons/LongBow.java b/src/main/java/tconstruct/weaponry/weapons/LongBow.java index a1d38133..b8a41879 100644 --- a/src/main/java/tconstruct/weaponry/weapons/LongBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/LongBow.java @@ -6,12 +6,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.ArrowAmmo; public class LongBow extends BowBaseAmmo { + public LongBow() { super(0, "Longbow"); } @@ -32,8 +34,8 @@ public class LongBow extends BowBaseAmmo { } @Override - protected Entity createProjectile( - ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, + float windup) { if (arrows.getItem() instanceof ArrowAmmo) { // modify accuraccy of the arrow depending on its accuraccy and weight NBTTagCompound tags = arrows.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java index 2f097e36..922118d9 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java @@ -1,7 +1,5 @@ package tconstruct.weaponry.weapons; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,11 +7,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.ArrowAmmo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ShortBow extends BowBaseAmmo { + public ShortBow() { super(0, "Shortbow"); } @@ -29,8 +31,8 @@ public class ShortBow extends BowBaseAmmo { } @Override - protected Entity createProjectile( - ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, + float windup) { if (arrows.getItem() instanceof ArrowAmmo) { // modify accuraccy of the arrow depending on its accuraccy and weight NBTTagCompound tags = arrows.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java index 99268d2f..77d67b50 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java +++ b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java @@ -1,9 +1,8 @@ package tconstruct.weaponry.weapons; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Iterator; import java.util.Map; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -12,11 +11,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import tconstruct.client.IconFlipped; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.ShurikenEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Shuriken extends AmmoWeapon { diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java index f2e2d349..2ec0ff4d 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java +++ b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java @@ -1,20 +1,22 @@ package tconstruct.weaponry.weapons; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import tconstruct.library.entity.ProjectileBase; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.ThrowingKnifeEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ThrowingKnife extends AmmoWeapon { + public ThrowingKnife() { super(1, "throwingknife"); } diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index d8727e16..5e15a9f3 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -1,6 +1,7 @@ package tconstruct.world; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; @@ -11,6 +12,7 @@ import net.minecraft.util.*; import net.minecraft.world.*; public class MiningExplosion extends Explosion { + World world; private final Random random = new Random(); private final int field_77289_h = 16; @@ -35,8 +37,7 @@ public class MiningExplosion extends Explosion { for (i = 0; i < this.field_77289_h; ++i) { for (j = 0; j < this.field_77289_h; ++j) { for (k = 0; k < this.field_77289_h; ++k) { - if (i == 0 - || i == this.field_77289_h - 1 + if (i == 0 || i == this.field_77289_h - 1 || j == 0 || j == this.field_77289_h - 1 || k == 0 @@ -63,13 +64,19 @@ public class MiningExplosion extends Explosion { float f3 = this.exploder != null ? this.exploder.func_145772_a(this, this.world, l, i1, j1, k1) : k1.getExplosionResistance( - this.exploder, world, l, i1, j1, explosionX, explosionY, explosionZ); + this.exploder, + world, + l, + i1, + j1, + explosionX, + explosionY, + explosionZ); f1 -= (f3 + 0.8F) * f2 * 0.25f; } - if (f1 > 0.0F - && (this.exploder == null - || this.exploder.func_145774_a(this, this.world, l, i1, j1, k1, f1))) { + if (f1 > 0.0F && (this.exploder == null + || this.exploder.func_145774_a(this, this.world, l, i1, j1, k1, f1))) { hashset.add(new ChunkPosition(l, i1, j1)); } @@ -90,13 +97,13 @@ public class MiningExplosion extends Explosion { int l1 = MathHelper.floor_double(this.explosionY + (double) this.explosionSize + 1.0D); int i2 = MathHelper.floor_double(this.explosionZ - (double) this.explosionSize - 1.0D); int j2 = MathHelper.floor_double(this.explosionZ + (double) this.explosionSize + 1.0D); - List list = this.world.getEntitiesWithinAABBExcludingEntity( - this.exploder, AxisAlignedBB.getBoundingBox(i, k, i2, j, l1, j2)); + List list = this.world + .getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getBoundingBox(i, k, i2, j, l1, j2)); Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ); for (Entity entity : list) { - double d7 = - entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) / (double) this.explosionSize; + double d7 = entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) + / (double) this.explosionSize; if (d7 <= 1.0D) { d0 = entity.posX - this.explosionX; @@ -110,9 +117,9 @@ public class MiningExplosion extends Explosion { d2 /= d8; double d9 = this.world.getBlockDensity(vec3, entity.boundingBox); double d10 = (1.0D - d7) * d9; - if (!(entity instanceof EntityItem)) - entity.attackEntityFrom(DamageSource.setExplosionSource(this), (float) - ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D))); + if (!(entity instanceof EntityItem)) entity.attackEntityFrom( + DamageSource.setExplosionSource(this), + (float) ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D))); double d11 = EnchantmentProtection.func_92092_a(entity, d10); entity.motionX += d0 * d11; entity.motionY += d1 * d11; @@ -140,10 +147,16 @@ public class MiningExplosion extends Explosion { if (this.explosionSize >= 2.0F && this.isSmoking) { this.world.spawnParticle( - "hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + "hugeexplosion", + this.explosionX, + this.explosionY, + this.explosionZ, + 1.0D, + 0.0D, + 0.0D); } else { - this.world.spawnParticle( - "largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + this.world + .spawnParticle("largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); } Iterator iterator; diff --git a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java index 4329c334..0506492c 100644 --- a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java @@ -5,12 +5,13 @@ import net.minecraft.dispenser.*; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; + import tconstruct.tools.items.TitleIcon; public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { + /** - * Dispense the specified stack, play the dispense sound and spawn - * particles. + * Dispense the specified stack, play the dispense sound and spawn particles. */ @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index 64f615e9..ed893a8a 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -1,12 +1,8 @@ package tconstruct.world; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; + import net.minecraft.block.*; import net.minecraft.block.Block.SoundType; import net.minecraft.block.material.Material; @@ -20,6 +16,7 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.*; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.*; + import tconstruct.TConstruct; import tconstruct.armor.TinkerArmor; import tconstruct.blocks.SlabBase; @@ -41,10 +38,16 @@ import tconstruct.world.entity.*; import tconstruct.world.gen.*; import tconstruct.world.itemblocks.*; import tconstruct.world.items.*; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' World", description = "Ores, slime islands, essence berries, and the like.", forced = true) public class TinkerWorld { + @Instance("TinkerWorld") public static TinkerWorld instance; @@ -109,9 +112,7 @@ public class TinkerWorld { TinkerWorld.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce"); TinkerWorld.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); TinkerWorld.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); - TinkerWorld.slimeExplosive = new SlimeExplosive() - .setHardness(0.0F) - .setStepSound(Block.soundTypeGrass) + TinkerWorld.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass) .setBlockName("explosive.slime"); // Slime @@ -121,41 +122,28 @@ public class TinkerWorld { if (!FluidRegistry.registerFluid(TinkerWorld.blueSlimeFluid)) TinkerWorld.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); TinkerWorld.slimePool = new SlimeFluid(TinkerWorld.blueSlimeFluid, Material.water) - .setCreativeTab(TConstructRegistry.blockTab) - .setStepSound(TinkerWorld.slimeStep) + .setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep) .setBlockName("liquid.slime"); GameRegistry.registerBlock(TinkerWorld.slimePool, "liquid.slime"); TinkerWorld.blueSlimeFluid.setBlock(TinkerWorld.slimePool); // Slime Islands - TinkerWorld.slimeGel = new SlimeGel() - .setStepSound(TinkerWorld.slimeStep) - .setLightOpacity(0) + TinkerWorld.slimeGel = new SlimeGel().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0) .setBlockName("slime.gel"); TinkerWorld.slimeGel.setHarvestLevel("axe", 0, 1); - TinkerWorld.slimeGrass = new SlimeGrass() - .setStepSound(Block.soundTypeGrass) - .setLightOpacity(0) + TinkerWorld.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0) .setBlockName("slime.grass"); - TinkerWorld.slimeTallGrass = - new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); - TinkerWorld.slimeLeaves = (SlimeLeaves) new SlimeLeaves() - .setStepSound(TinkerWorld.slimeStep) - .setLightOpacity(0) + TinkerWorld.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass) + .setBlockName("slime.grass.tall"); + TinkerWorld.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0) .setBlockName("slime.leaves"); - TinkerWorld.slimeSapling = (SlimeSapling) - new SlimeSapling().setStepSound(TinkerWorld.slimeStep).setBlockName("slime.sapling"); - TinkerWorld.slimeChannel = new ConveyorBase(Material.water, "greencurrent") - .setHardness(0.3f) - .setStepSound(TinkerWorld.slimeStep) - .setBlockName("slime.channel"); - TinkerWorld.bloodChannel = new ConveyorBase(Material.water, "liquid_cow") - .setHardness(0.3f) - .setStepSound(TinkerWorld.slimeStep) - .setBlockName("blood.channel"); - TinkerWorld.slimePad = new SlimePad(Material.cloth) - .setStepSound(TinkerWorld.slimeStep) - .setHardness(0.3f) + TinkerWorld.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TinkerWorld.slimeStep) + .setBlockName("slime.sapling"); + TinkerWorld.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f) + .setStepSound(TinkerWorld.slimeStep).setBlockName("slime.channel"); + TinkerWorld.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f) + .setStepSound(TinkerWorld.slimeStep).setBlockName("blood.channel"); + TinkerWorld.slimePad = new SlimePad(Material.cloth).setStepSound(TinkerWorld.slimeStep).setHardness(0.3f) .setBlockName("slime.pad"); // Decoration @@ -166,29 +154,23 @@ public class TinkerWorld { TinkerTools.multiBrickMetal = new MultiBrickMetal().setBlockName("Decoration.BrickMetal"); // Ores - String[] berryOres = new String[] { - "berry_iron", - "berry_gold", - "berry_copper", - "berry_tin", - "berry_iron_ripe", - "berry_gold_ripe", - "berry_copper_ripe", - "berry_tin_ripe" - }; - TinkerWorld.oreBerry = (OreberryBush) - new OreberryBush(berryOres, 0, 4, new String[] {"oreIron", "oreGold", "oreCopper", "oreTin"}) - .setBlockName("ore.berries.one"); - String[] berryOresTwo = new String[] { - "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" - }; - TinkerWorld.oreBerrySecond = - (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] {"oreAluminum", "oreSilver"}) - .setBlockName("ore.berries.two"); + String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", + "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; + TinkerWorld.oreBerry = (OreberryBush) new OreberryBush( + berryOres, + 0, + 4, + new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one"); + String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", + "berry_essence_ripe", "", "" }; + TinkerWorld.oreBerrySecond = (OreberryBush) new OreberryBushEssence( + berryOresTwo, + 4, + 2, + new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two"); - String[] oreTypes = new String[] { - "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" - }; + String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", + "ore_aluminum", "ore_slag" }; TinkerWorld.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore"); TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 1); TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 2); @@ -204,10 +186,8 @@ public class TinkerWorld { TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 4); TinkerWorld.oreGravel.setHarvestLevel("shovel", 4, 5); // Rail - TinkerWorld.woodenRail = new WoodRail() - .setStepSound(Block.soundTypeWood) - .setCreativeTab(TConstructRegistry.blockTab) - .setBlockName("rail.wood"); + TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood) + .setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood"); GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock"); OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock)); @@ -243,10 +223,10 @@ public class TinkerWorld { GameRegistry.registerBlock(TinkerWorld.stoneTorch, "decoration.stonetorch"); GameRegistry.registerBlock(TinkerWorld.stoneLadder, "decoration.stoneladder"); GameRegistry.registerBlock(TinkerTools.multiBrick, MultiBrickItem.class, "decoration.multibrick"); - GameRegistry.registerBlock( - TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); - GameRegistry.registerBlock( - TinkerTools.multiBrickMetal, MultiBrickMetalItem.class, "decoration.multibrickmetal"); + GameRegistry + .registerBlock(TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + GameRegistry + .registerBlock(TinkerTools.multiBrickMetal, MultiBrickMetalItem.class, "decoration.multibrickmetal"); // Ores GameRegistry.registerBlock(TinkerWorld.oreBerry, OreberryBushItem.class, "ore.berries.one"); @@ -258,9 +238,7 @@ public class TinkerWorld { GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood"); // Items - goldHead = new GoldenHead(4, 1.2F, false) - .setAlwaysEdible() - .setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F) + goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F) .setUnlocalizedName("goldenhead"); GameRegistry.registerItem(goldHead, "goldHead"); @@ -268,11 +246,11 @@ public class TinkerWorld { TinkerWorld.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); GameRegistry.registerItem(TinkerWorld.strangeFood, "strangeFood"); GameRegistry.registerItem(TinkerWorld.oreBerries, "oreBerries"); - String[] oreberries = {"Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence"}; + String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; for (int i = 0; i < oreberries.length; i++) { - TConstructRegistry.addItemStackToDirectory( - "oreberry" + oreberries[i], new ItemStack(TinkerWorld.oreBerries, 1, i)); + TConstructRegistry + .addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TinkerWorld.oreBerries, 1, i)); } TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TinkerWorld.strangeFood, 1, 0)); @@ -378,8 +356,8 @@ public class TinkerWorld { } private void craftingTableRecipes() { - String[] patBlock = {"###", "###", "###"}; - String[] patSurround = {"###", "#m#", "###"}; + String[] patBlock = { "###", "###", "###" }; + String[] patSurround = { "###", "#m#", "###" }; // Metal conversion Recipes GameRegistry.addRecipe( @@ -492,8 +470,8 @@ public class TinkerWorld { 'm', new ItemStack(TinkerWorld.metalBlock, 1, 9)); // Steel - GameRegistry.addRecipe( - new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 19)); // Iron + GameRegistry + .addRecipe(new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 19)); // Iron GameRegistry.addRecipe( new ItemStack(TinkerTools.materials, 1, 9), patBlock, @@ -550,8 +528,7 @@ public class TinkerWorld { '#', new ItemStack(TinkerTools.materials, 1, 33)); // Steel - GameRegistry.addRecipe( - new ItemStack(TinkerTools.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron GameRegistry.addRecipe( new ItemStack(TinkerTools.materials, 9, 20), "m", @@ -610,34 +587,20 @@ public class TinkerWorld { 'm', new ItemStack(TinkerTools.materials, 1, 16)); // Steel - String[] dyeTypes = { - "dyeBlack", - "dyeRed", - "dyeGreen", - "dyeBrown", - "dyeBlue", - "dyePurple", - "dyeCyan", - "dyeLightGray", - "dyeGray", - "dyePink", - "dyeLime", - "dyeYellow", - "dyeLightBlue", - "dyeMagenta", - "dyeOrange", - "dyeWhite" - }; + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", + "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", + "dyeWhite" }; String color; for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Blocks.wool, 8, i), - patSurround, - 'm', - color, - '#', - new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Blocks.wool, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); } // Jack o'Latern Recipe - Stone Torch @@ -650,43 +613,72 @@ public class TinkerWorld { 's', new ItemStack(TinkerWorld.stoneTorch)); // Stone Torch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerWorld.stoneTorch, 4), - "p", - "w", - 'p', - new ItemStack(Items.coal, 1, Short.MAX_VALUE), - 'w', - "rodStone")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerWorld.stoneTorch, 4), + "p", + "w", + 'p', + new ItemStack(Items.coal, 1, Short.MAX_VALUE), + 'w', + "rodStone")); // Stone Ladder Recipe GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone")); // Wooden Rail Recipe - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(TinkerWorld.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(TinkerWorld.woodenRail, 4, 0), + "b b", + "bxb", + "b b", + 'b', + "plankWood", + 'x', + "stickWood")); // Stonesticks Recipes GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone)); - GameRegistry.addRecipe( - new ItemStack(TinkerTools.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); + GameRegistry + .addRecipe(new ItemStack(TinkerTools.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); // ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); // Clock Recipe - Vanilla alternative - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', "dustRedstone")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Items.clock), + " i ", + "iri", + " i ", + 'i', + aluBrass, + 'r', + "dustRedstone")); // Gold Pressure Plate - Vanilla alternative // todo: temporarily disabled due to light weighted pressure plate being smeltable to gold // GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate, 0, 1), "ii", 'i', aluBrass); // Ultra hardcore recipes - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(goldHead), patSurround, '#', "ingotGold", 'm', new ItemStack(Items.skull, 1, 3))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(goldHead), + patSurround, + '#', + "ingotGold", + 'm', + new ItemStack(Items.skull, 1, 3))); // Wool Slab Recipes for (int sc = 0; sc <= 7; sc++) { GameRegistry.addRecipe( - new ItemStack(TinkerWorld.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); + new ItemStack(TinkerWorld.woolSlab1, 6, sc), + "www", + 'w', + new ItemStack(Blocks.wool, 1, sc)); GameRegistry.addRecipe( - new ItemStack(TinkerWorld.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); + new ItemStack(TinkerWorld.woolSlab2, 6, sc), + "www", + 'w', + new ItemStack(Blocks.wool, 1, sc + 8)); GameRegistry.addShapelessRecipe( new ItemStack(Blocks.wool, 1, sc), @@ -700,50 +692,78 @@ public class TinkerWorld { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); // Trap Recipes GameRegistry.addRecipe( - new ItemStack(TinkerWorld.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); + new ItemStack(TinkerWorld.punji, 5, 0), + "b b", + " b ", + "b b", + 'b', + new ItemStack(Items.reeds)); GameRegistry.addRecipe( - new ItemStack(TinkerWorld.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); + new ItemStack(TinkerWorld.barricadeSpruce, 1, 0), + "b", + "b", + 'b', + new ItemStack(Blocks.log, 1, 1)); GameRegistry.addRecipe( - new ItemStack(TinkerWorld.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); + new ItemStack(TinkerWorld.barricadeBirch, 1, 0), + "b", + "b", + 'b', + new ItemStack(Blocks.log, 1, 2)); GameRegistry.addRecipe( - new ItemStack(TinkerWorld.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); + new ItemStack(TinkerWorld.barricadeJungle, 1, 0), + "b", + "b", + 'b', + new ItemStack(Blocks.log, 1, 3)); GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(TinkerWorld.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); // Slime Recipes GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 0), "##", "##", '#', TinkerWorld.strangeFood); GameRegistry.addRecipe( - new ItemStack(TinkerWorld.strangeFood, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 0)); + new ItemStack(TinkerWorld.strangeFood, 4, 0), + "#", + '#', + new ItemStack(TinkerWorld.slimeGel, 1, 0)); GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 1), "##", "##", '#', Items.slime_ball); - GameRegistry.addRecipe( - new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 1)); + GameRegistry + .addRecipe(new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 1)); // slimeExplosive GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), Items.slime_ball, Blocks.tnt); GameRegistry.addShapelessRecipe( - new ItemStack(TinkerWorld.slimeExplosive, 1, 2), TinkerWorld.strangeFood, Blocks.tnt); + new ItemStack(TinkerWorld.slimeExplosive, 1, 2), + TinkerWorld.strangeFood, + Blocks.tnt); GameRegistry.addRecipe( new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerWorld.slimeChannel, 1, 0), - new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), - "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerWorld.bloodChannel, 1, 0), - new ItemStack(TinkerWorld.strangeFood, 1, 1), - new ItemStack(TinkerWorld.strangeFood, 1, 1), - new ItemStack(TinkerWorld.strangeFood, 1, 1), - new ItemStack(TinkerWorld.strangeFood, 1, 1), - "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerWorld.slimeChannel, 1, 0), - "slimeball", - "slimeball", - "slimeball", - "slimeball", - "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimeChannel, 1, 0), + new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), + "dustRedstone")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerWorld.bloodChannel, 1, 0), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + "dustRedstone")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimeChannel, 1, 0), + "slimeball", + "slimeball", + "slimeball", + "slimeball", + "dustRedstone")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimePad, 1, 0), + TinkerWorld.slimeChannel, + "slimeball")); GameRegistry.addRecipe( new ItemStack(TinkerWorld.meatBlock), @@ -757,63 +777,65 @@ public class TinkerWorld { } private void addRecipesForFurnace() { - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.craftedSoil, 1, 3), - new ItemStack(TinkerTools.craftedSoil, 1, 4), - 0.2f); // Concecrated + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 3), + new ItemStack(TinkerTools.craftedSoil, 1, 4), + 0.2f); // Concecrated // Soil - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.craftedSoil, 1, 0), - new ItemStack(TinkerTools.materials, 1, 1), - 2f); // Slime - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.craftedSoil, 1, 1), - new ItemStack(TinkerTools.materials, 1, 2), - 2f); // Seared brick item - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.craftedSoil, 1, 2), - new ItemStack(TinkerTools.materials, 1, 17), - 2f); // Blue Slime - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.craftedSoil, 1, 6), - new ItemStack(TinkerTools.materials, 1, 37), - 2f); // Nether seared + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 0), + new ItemStack(TinkerTools.materials, 1, 1), + 2f); // Slime + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 1), + new ItemStack(TinkerTools.materials, 1, 2), + 2f); // Seared brick item + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 2), + new ItemStack(TinkerTools.materials, 1, 17), + 2f); // Blue Slime + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 6), + new ItemStack(TinkerTools.materials, 1, 37), + 2f); // Nether seared // brick // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, // 1, new ItemStack(TRepo.materials, 1, 3), 3f); // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, // 2, new ItemStack(TRepo.materials, 1, 4), 3f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreSlag, 1, 3), new ItemStack(TinkerTools.materials, 1, 9), 0.5f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreSlag, 1, 4), new ItemStack(TinkerTools.materials, 1, 10), 0.5f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreSlag, 1, 5), new ItemStack(TinkerTools.materials, 1, 11), 0.5f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 3), + new ItemStack(TinkerTools.materials, 1, 9), + 0.5f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 4), + new ItemStack(TinkerTools.materials, 1, 10), + 0.5f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 5), + new ItemStack(TinkerTools.materials, 1, 11), + 0.5f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreBerries, 1, 0), new ItemStack(TinkerTools.materials, 1, 19), 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 0), + new ItemStack(TinkerTools.materials, 1, 19), + 0.2f); FurnaceRecipes.smelting() .func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 1), new ItemStack(Items.gold_nugget), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreBerries, 1, 2), new ItemStack(TinkerTools.materials, 1, 20), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreBerries, 1, 3), new ItemStack(TinkerTools.materials, 1, 21), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreBerries, 1, 4), new ItemStack(TinkerTools.materials, 1, 22), 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 2), + new ItemStack(TinkerTools.materials, 1, 20), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 3), + new ItemStack(TinkerTools.materials, 1, 21), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 4), + new ItemStack(TinkerTools.materials, 1, 22), + 0.2f); // FurnaceRecipes.smelting().func_151394_a(new // ItemStack(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), // 0.2f); @@ -822,31 +844,39 @@ public class TinkerWorld { .func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 0), new ItemStack(Items.iron_ingot), 0.2f); FurnaceRecipes.smelting() .func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 1), new ItemStack(Items.gold_ingot), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreGravel, 1, 2), new ItemStack(TinkerTools.materials, 1, 9), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreGravel, 1, 3), new ItemStack(TinkerTools.materials, 1, 10), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerWorld.oreGravel, 1, 4), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 2), + new ItemStack(TinkerTools.materials, 1, 9), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 3), + new ItemStack(TinkerTools.materials, 1, 10), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 4), + new ItemStack(TinkerTools.materials, 1, 11), + 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.materials, 1, 38), new ItemStack(TinkerTools.materials, 1, 4), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.materials, 1, 39), new ItemStack(TinkerTools.materials, 1, 3), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.materials, 1, 40), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.materials, 1, 41), new ItemStack(TinkerTools.materials, 1, 5), 0.2f); - FurnaceRecipes.smelting() - .func_151394_a( - new ItemStack(TinkerTools.materials, 1, 42), new ItemStack(TinkerTools.materials, 1, 14), 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.materials, 1, 38), + new ItemStack(TinkerTools.materials, 1, 4), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.materials, 1, 39), + new ItemStack(TinkerTools.materials, 1, 3), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.materials, 1, 40), + new ItemStack(TinkerTools.materials, 1, 11), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.materials, 1, 41), + new ItemStack(TinkerTools.materials, 1, 5), + 0.2f); + FurnaceRecipes.smelting().func_151394_a( + new ItemStack(TinkerTools.materials, 1, 42), + new ItemStack(TinkerTools.materials, 1, 14), + 0.2f); } public void oreRegistry() { @@ -924,10 +954,18 @@ public class TinkerWorld { RecipeRemover.removeShapedRecipe(new ItemStack(Items.magma_cream)); RecipeRemover.removeShapedRecipe(new ItemStack(Items.lead)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.sticky_piston), "slimeball", Blocks.piston)); + GameRegistry + .addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); GameRegistry.addRecipe( - new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); + new ShapedOreRecipe( + new ItemStack(Items.lead, 2), + "ss ", + "sS ", + " s", + 's', + Items.string, + 'S', + "slimeball")); } public static void ensureOreIsRegistered(String oreName, ItemStack is) { @@ -947,28 +985,18 @@ public class TinkerWorld { .addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); TinkerWorld.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); - TinkerWorld.tinkerHouseChest.addItem( - new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); - int[] validTypes = {0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17}; - Item[] partTypes = { - TinkerTools.pickaxeHead, - TinkerTools.shovelHead, - TinkerTools.hatchetHead, - TinkerTools.binding, - TinkerTools.swordBlade, - TinkerTools.wideGuard, - TinkerTools.handGuard, - TinkerTools.crossbar, - TinkerTools.knifeBlade, - TinkerTools.frypanHead, - TinkerTools.signHead, - TinkerTools.chiselHead - }; + TinkerWorld.tinkerHouseChest + .addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); + int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; + Item[] partTypes = { TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, + TinkerTools.binding, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, + TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.frypanHead, TinkerTools.signHead, + TinkerTools.chiselHead }; for (Item partType : partTypes) { for (int validType : validTypes) { - TinkerWorld.tinkerHouseChest.addItem( - new WeightedRandomChestContent(new ItemStack(partType, 1, validType), 1, 1, 15)); + TinkerWorld.tinkerHouseChest + .addItem(new WeightedRandomChestContent(new ItemStack(partType, 1, validType), 1, 1, 15)); } } @@ -977,7 +1005,7 @@ public class TinkerWorld { TinkerWorld.tinkerHousePatterns.addItem( new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, i + 1), 1, 3, 20)); } - TinkerWorld.tinkerHousePatterns.addItem( - new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, 22), 1, 3, 40)); + TinkerWorld.tinkerHousePatterns + .addItem(new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, 22), 1, 3, 40)); } } diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index 9cb31c5b..175d7dda 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -1,6 +1,5 @@ package tconstruct.world; -import cpw.mods.fml.common.eventhandler.*; import net.minecraft.entity.*; import net.minecraft.entity.item.*; import net.minecraft.entity.monster.*; @@ -11,12 +10,15 @@ import net.minecraft.potion.*; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.BonemealEvent; + import tconstruct.TConstruct; import tconstruct.tools.TinkerTools; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.eventhandler.*; public class TinkerWorldEvents { + @SubscribeEvent public void onLivingSpawn(LivingSpawnEvent.SpecialSpawn event) { EntityLivingBase living = event.entityLiving; @@ -27,7 +29,11 @@ public class TinkerWorldEvents { else creeper.mountEntity(living); EntityXPOrb orb = new EntityXPOrb( - living.worldObj, living.posX, living.posY, living.posZ, TConstruct.random.nextInt(20) + 20); + living.worldObj, + living.posX, + living.posY, + living.posZ, + TConstruct.random.nextInt(20) + 20); orb.mountEntity(creeper); } } @@ -45,8 +51,8 @@ public class TinkerWorldEvents { public void bonemealEvent(BonemealEvent event) { if (!event.world.isRemote) { if (event.block == TinkerWorld.slimeSapling) { - if (TinkerWorld.slimeSapling.boneFertilize( - event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) + if (TinkerWorld.slimeSapling + .boneFertilize(event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) event.setResult(Event.Result.ALLOW); } } diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 80980675..03ee305c 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -1,8 +1,7 @@ package tconstruct.world; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; import mantle.lib.client.MantleClientRegistry; + import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelSlime; @@ -10,12 +9,16 @@ import net.minecraft.client.particle.*; import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import tconstruct.mechworks.model.CartRender; import tconstruct.tools.TinkerTools; import tconstruct.world.entity.*; import tconstruct.world.model.*; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { + @Override public void initialize() { registerRenderer(); @@ -78,21 +81,31 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { // Traps ItemStack reed = new ItemStack(Items.reeds); MantleClientRegistry.registerManualLargeRecipe( - "punji", new ItemStack(TinkerWorld.punji, 5), reed, null, reed, null, reed, null, reed, null, reed); - MantleClientRegistry.registerManualSmallRecipe( - "barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); + "punji", + new ItemStack(TinkerWorld.punji, 5), + reed, + null, + reed, + null, + reed, + null, + reed, + null, + reed); + MantleClientRegistry + .registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); } Minecraft mc = Minecraft.getMinecraft(); @Override - public void spawnParticle( - String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) { + public void spawnParticle(String particle, double xPos, double yPos, double zPos, double velX, double velY, + double velZ) { this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ); } - public EntityFX doSpawnParticle( - String par1Str, double par2, double par4, double par6, double par8, double par10, double par12) { + public EntityFX doSpawnParticle(String par1Str, double par2, double par4, double par6, double par8, double par10, + double par12) { if (this.mc == null) this.mc = Minecraft.getMinecraft(); if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null) { @@ -115,12 +128,26 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { case "largeexplode": this.mc.effectRenderer.addEffect( entityfx = new EntityLargeExplodeFX( - mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12)); + mc.renderEngine, + mc.theWorld, + par2, + par4, + par6, + par8, + par10, + par12)); break; case "fireworksSpark": this.mc.effectRenderer.addEffect( entityfx = new EntityFireworkSparkFX( - mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)); + mc.theWorld, + par2, + par4, + par6, + par8, + par10, + par12, + this.mc.effectRenderer)); break; } @@ -181,7 +208,13 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { break; case "enchantmenttable": entityfx = new EntityEnchantmentTableParticleFX( - mc.theWorld, par2, par4, par6, par8, par10, par12); + mc.theWorld, + par2, + par4, + par6, + par8, + par10, + par12); break; case "explode": entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); @@ -206,7 +239,13 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { break; case "reddust": entityfx = new EntityReddustFX( - mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12); + mc.theWorld, + par2, + par4, + par6, + (float) par8, + (float) par10, + (float) par12); break; case "snowballpoof": entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Items.snowball); diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java index 4b9dccaf..dac54bc6 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java @@ -2,8 +2,8 @@ package tconstruct.world; public class TinkerWorldProxyCommon { - public void spawnParticle( - String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) {} + public void spawnParticle(String particle, double xPos, double yPos, double zPos, double velX, double velY, + double velZ) {} public void initialize() {} } diff --git a/src/main/java/tconstruct/world/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java index e64eefe3..b77c6fbc 100644 --- a/src/main/java/tconstruct/world/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -1,7 +1,7 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; @@ -9,10 +9,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; import tconstruct.world.model.SlimeChannelRender; +import cpw.mods.fml.relauncher.*; public class ConveyorBase extends MantleBlock { + String texturename; public ConveyorBase(Material material, String name) { @@ -82,8 +85,7 @@ public class ConveyorBase extends MantleBlock { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) - + (entity.isSneaking() ? 4 : 0) - & 7; + + (entity.isSneaking() ? 4 : 0) & 7; int meta = world.getBlockMetadata(x, y, z) & 8; world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } @@ -119,7 +121,7 @@ public class ConveyorBase extends MantleBlock { @Override public void registerBlockIcons(IIconRegister iconRegister) { - String[] textureNames = new String[] {texturename, texturename + "_flow"}; + String[] textureNames = new String[] { texturename, texturename + "_flow" }; this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 73ac3134..631c54d4 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -1,7 +1,7 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,11 +9,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class GravelOre extends BlockSand { - public String[] textureNames = new String[] {"iron", "gold", "copper", "tin", "aluminum", "cobalt"}; + + public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; public IIcon[] icons; public GravelOre() { @@ -46,15 +49,17 @@ public class GravelOre extends BlockSand { @Override public int damageDropped(int meta) { - /*if (meta == 1) - return 0;*/ + /* + * if (meta == 1) return 0; + */ return meta; } @Override public Item getItemDropped(int par1, Random par2Random, int par3) { - /*if (par1 == 1) - return Item.goldNugget.itemID;*/ + /* + * if (par1 == 1) return Item.goldNugget.itemID; + */ return Item.getItemFromBlock(TinkerWorld.oreGravel); } diff --git a/src/main/java/tconstruct/world/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java index aa8d6221..76500acf 100644 --- a/src/main/java/tconstruct/world/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -1,18 +1,21 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class MeatBlock extends BlockWood { + public IIcon[] icons; - public String[] textureNames = new String[] {"ham_skin", "ham_bone"}; + public String[] textureNames = new String[] { "ham_skin", "ham_bone" }; public MeatBlock() { this.setHardness(1.0F); @@ -60,8 +63,7 @@ public class MeatBlock extends BlockWood { } /** - * ejects contained items into the world, and notifies neighbours of an - * update, as appropriate + * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) { byte b0 = 4; @@ -83,12 +85,11 @@ public class MeatBlock extends BlockWood { } /** - * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, - * side, hitX, hitY, hitZ, block metadata + * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced( - World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { + public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, + float par8, int par9) { int j1 = par9 & 3; byte b0 = 0; @@ -110,8 +111,7 @@ public class MeatBlock extends BlockWood { } /** - * Determines the damage on the item the block drops. Used in cloth and - * wood. + * Determines the damage on the item the block drops. Used in cloth and wood. */ @Override public int damageDropped(int par1) { @@ -135,9 +135,8 @@ public class MeatBlock extends BlockWood { } /* - * public void onBlockHarvested (World world, int x, int y, int z, int meta, - * EntityPlayer player) { if (meta % 4 == 1) { if (world.difficultySetting > - * 2) world.createExplosion(null, x, y, z, 1.75f, false); else + * public void onBlockHarvested (World world, int x, int y, int z, int meta, EntityPlayer player) { if (meta % 4 == + * 1) { if (world.difficultySetting > 2) world.createExplosion(null, x, y, z, 1.75f, false); else * world.createExplosion(null, x, y, z, 2f, false); } } */ diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index 375f4a06..d5269ad6 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -1,7 +1,7 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import java.util.*; + import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -15,12 +15,15 @@ import net.minecraft.util.*; import net.minecraft.world.*; import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.model.OreberryRender; +import cpw.mods.fml.relauncher.*; public class OreberryBush extends BlockLeavesBase implements IPlantable { + Random random; public IIcon[] fastIcons; public IIcon[] fancyIcons; @@ -104,7 +107,12 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable { (double) z + 0.875D); } else { return AxisAlignedBB.getBoundingBox( - x + 0.0625, y, z + 0.0625, (double) x + 0.9375D, (double) y + 0.9375D, (double) z + 0.9375D); + x + 0.0625, + y, + z + 0.0625, + (double) x + 0.9375D, + (double) y + 0.9375D, + (double) z + 0.9375D); } } @@ -167,8 +175,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable { /* Right-click harvests berries */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { return harvest(world, x, y, z, player); } @@ -179,7 +187,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable { world.setBlock(x, y, z, this, meta - 4, 3); AbilityHelper.spawnItemAtPlayer( - player, new ItemStack(TinkerWorld.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); + player, + new ItemStack(TinkerWorld.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); } return false; @@ -231,10 +240,9 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable { world.setBlock(x, y, z, this, meta + 4, 3); } } - /*else if (meta < 8) - { - world.setBlock(x, y, z, blockID, meta + 4, 3); - }*/ + /* + * else if (meta < 8) { world.setBlock(x, y, z, blockID, meta + 4, 3); } + */ } } diff --git a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java index 46ab0176..aa327927 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java @@ -1,10 +1,12 @@ package tconstruct.world.blocks; import java.util.Random; + import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; public class OreberryBushEssence extends OreberryBush implements IPlantable { + public OreberryBushEssence(String[] textureNames, int meta, int sub, String[] oreTypes) { super(textureNames, meta, sub, oreTypes); } @@ -27,8 +29,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable { } } /* - * else if (meta < 8) { world.setBlock(x, y, z, blockID, meta + 4, - * 3); } + * else if (meta < 8) { world.setBlock(x, y, z, blockID, meta + 4, 3); } */ } } @@ -37,8 +38,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable { 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; + * if (world.getFullBlockLightValue(x, y, z) < 13) return super.canPlaceBlockAt(world, x, y, z); return false; */ } } diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index 3e6f1a41..e8fbea1d 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -1,8 +1,9 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -13,8 +14,10 @@ import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.blocks.TConstructBlock; import tconstruct.mechworks.entity.item.ExplosivePrimed; +import cpw.mods.fml.relauncher.*; public class SlimeExplosive extends TConstructBlock { @@ -24,7 +27,7 @@ public class SlimeExplosive extends TConstructBlock { static String[] getTextureNames() { String[] names = new String[6]; - String[] types = new String[] {"green", "blue"}; + String[] types = new String[] { "green", "blue" }; for (int i = 0; i < 2; i++) { names[i * 3 + 0] = "sdx_bottom_" + types[i]; names[i * 3 + 1] = "sdx_side_" + types[i]; @@ -83,12 +86,16 @@ public class SlimeExplosive extends TConstructBlock { this.primeTnt(par1World, par2, par3, par4, par5, null); } - public void primeTnt( - World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) { + public void primeTnt(World par1World, int par2, int par3, int par4, int par5, + EntityLivingBase par6EntityLivingBase) { if (!par1World.isRemote) { if ((par5 % 2) == 1) { ExplosivePrimed entitytntprimed = new ExplosivePrimed( - par1World, (float) par2 + 0.5F, (float) par3 + 0.5F, (float) par4 + 0.5F, par6EntityLivingBase); + par1World, + (float) par2 + 0.5F, + (float) par3 + 0.5F, + (float) par4 + 0.5F, + par6EntityLivingBase); par1World.spawnEntityInWorld(entitytntprimed); par1World.playSoundAtEntity(entitytntprimed, "random.fuse", 1.0F, 1.0F); } @@ -96,16 +103,8 @@ public class SlimeExplosive extends TConstructBlock { } @Override - public boolean onBlockActivated( - World par1World, - int par2, - int par3, - int par4, - EntityPlayer par5EntityPlayer, - int par6, - float par7, - float par8, - float par9) { + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, + int par6, float par7, float par8, float par9) { if (par5EntityPlayer.getCurrentEquippedItem() != null && par5EntityPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel) { this.primeTnt(par1World, par2, par3, par4, 1, par5EntityPlayer); diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index 01ba3e61..1605b358 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -1,7 +1,7 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; @@ -9,9 +9,11 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.SlimePadRender; +import cpw.mods.fml.relauncher.*; public class SlimePad extends MantleBlock { @@ -88,8 +90,7 @@ public class SlimePad extends MantleBlock { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) - + (entity.isSneaking() ? 4 : 0) - & 7; + + (entity.isSneaking() ? 4 : 0) & 7; int meta = world.getBlockMetadata(x, y, z) & 8; world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } diff --git a/src/main/java/tconstruct/world/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java index 9eaae6b9..0c362a6a 100644 --- a/src/main/java/tconstruct/world/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -6,12 +6,13 @@ import net.minecraft.init.Blocks; import net.minecraft.potion.*; import net.minecraft.util.*; import net.minecraft.world.World; + import tconstruct.blocks.TConstructBlock; public class SoilBlock extends TConstructBlock { - static String[] soilTypes = new String[] { - "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" - }; + + static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", + "consecratedsoil", "slimedirt_blue", "nether_grout" }; public SoilBlock() { super(Material.ground, 3.0F, soilTypes); @@ -52,9 +53,8 @@ public class SoilBlock extends TConstructBlock { } /* - * public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, - * int z) { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if - * (world.getBlockMetadata(x, y, z) >= 3) { this.setBlockBounds(0.0F, 0.0F, - * 0.0F, 1.0F, 0.875F, 1.0F); } } + * public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { this.setBlockBounds(0.0F, 0.0F, + * 0.0F, 1.0F, 1.0F, 1.0F); if (world.getBlockMetadata(x, y, z) >= 3) { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, + * 0.875F, 1.0F); } } */ } diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index 935acc79..659762a0 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -1,7 +1,7 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,11 +9,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; + import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.*; public class SoilSlab extends SlabBase { + public SoilSlab() { super(Material.ground); this.setCreativeTab(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/world/blocks/StoneLadder.java b/src/main/java/tconstruct/world/blocks/StoneLadder.java index e28e8230..57641d26 100644 --- a/src/main/java/tconstruct/world/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/world/blocks/StoneLadder.java @@ -1,12 +1,13 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.*; + public class StoneLadder extends BlockLadder { // Override ladder material diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index c25e10c3..7f3b0ceb 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -2,9 +2,10 @@ package tconstruct.world.blocks; import static net.minecraftforge.common.util.ForgeDirection.*; -import cpw.mods.fml.relauncher.*; import java.util.Random; + import mantle.blocks.MantleBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +13,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class StoneTorch extends MantleBlock { + public StoneTorch() { super(Material.circuits); this.setCreativeTab(CreativeTabs.tabDecorations); @@ -20,8 +24,8 @@ public class StoneTorch extends MantleBlock { } /** - * Returns a bounding box from the pool of bounding boxes (this means this - * box can change after the pool has been cleared to be reused) + * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been + * cleared to be reused) */ @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { @@ -29,9 +33,8 @@ public class StoneTorch extends MantleBlock { } /** - * Is this block (a) opaque and (b) a full 1m cube? This determines whether - * or not to render the shared face of two adjacent blocks and also whether - * the player can attach torches, redstone wire, etc to this block. + * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ @Override public boolean isOpaqueCube() { @@ -39,8 +42,7 @@ public class StoneTorch extends MantleBlock { } /** - * If this block doesn't render as an ordinary block it will return False - * (examples: signs, buttons, stairs, etc) + * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) */ @Override public boolean renderAsNormalBlock() { @@ -68,8 +70,7 @@ public class StoneTorch extends MantleBlock { } /** - * Checks to see if its valid to put this block at the specified - * coordinates. Args: world, x, y, z + * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { @@ -81,12 +82,11 @@ public class StoneTorch extends MantleBlock { } /** - * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, - * side, hitX, hitY, hitZ, block metadata + * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced( - World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { + public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, + float par8, int par9) { int j1 = par9; if (par5 == 1 && this.canPlaceTorchOn(par1World, par2, par3 - 1, par4)) { @@ -146,9 +146,8 @@ public class StoneTorch extends MantleBlock { } /** - * Lets the block know when one of its neighbor changes. Doesn't know which - * neighbor changed (coordinates passed are their own) Args: x, y, z, - * neighbor blockID + * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are + * their own) Args: x, y, z, neighbor blockID */ @Override public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { @@ -193,9 +192,8 @@ public class StoneTorch extends MantleBlock { } /** - * Tests if the block can remain at its current location and will drop as an - * item if it is unable to stay. Returns True if it can stay and False if it - * drops. Args: world, x, y, z + * Tests if the block can remain at its current location and will drop as an item if it is unable to stay. Returns + * True if it can stay and False if it drops. Args: world, x, y, z */ protected boolean dropTorchIfCantStay(World par1World, int par2, int par3, int par4) { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { @@ -212,12 +210,12 @@ public class StoneTorch extends MantleBlock { } /** - * Ray traces through the blocks collision from start vector to end vector - * returning a ray trace hit. Args: world, x, y, z, startVec, endVec + * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world, + * x, y, z, startVec, endVec */ @Override - public MovingObjectPosition collisionRayTrace( - World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) { + public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, + Vec3 par6Vec3) { int l = par1World.getBlockMetadata(par2, par3, par4) & 7; float f = 0.15F; diff --git a/src/main/java/tconstruct/world/blocks/TMetalBlock.java b/src/main/java/tconstruct/world/blocks/TMetalBlock.java index 0d23dd3b..5fb7958a 100644 --- a/src/main/java/tconstruct/world/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/world/blocks/TMetalBlock.java @@ -3,23 +3,14 @@ package tconstruct.world.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; + import tconstruct.blocks.TConstructBlock; public class TMetalBlock extends TConstructBlock { - static String[] metalTypes = new String[] { - "compressed_cobalt", - "compressed_ardite", - "compressed_manyullyn", - "compressed_copper", - "compressed_bronze", - "compressed_tin", - "compressed_aluminum", - "compressed_alubrass", - "compressed_alumite", - "compressed_steel", - "compressed_ender" - }; + static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", + "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", "compressed_alubrass", + "compressed_alumite", "compressed_steel", "compressed_ender" }; public TMetalBlock(Material material, float hardness) { super(material, hardness, metalTypes); diff --git a/src/main/java/tconstruct/world/blocks/WoodRail.java b/src/main/java/tconstruct/world/blocks/WoodRail.java index eb9b7e7a..0fd6443a 100644 --- a/src/main/java/tconstruct/world/blocks/WoodRail.java +++ b/src/main/java/tconstruct/world/blocks/WoodRail.java @@ -1,6 +1,5 @@ package tconstruct.world.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; @@ -8,7 +7,10 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class WoodRail extends BlockRailBase { + @SideOnly(Side.CLIENT) private IIcon theIcon; @@ -37,8 +39,7 @@ public class WoodRail extends BlockRailBase { } protected void func_94358_a(World par1World, int par2, int par3, int par4, int par5, int par6, Block par7) { - if (par7 != Blocks.air - && par7.canProvidePower() + if (par7 != Blocks.air && par7.canProvidePower() && (new Rail(par1World, par2, par3, par4)).func_150650_a() == 3) { this.func_150052_a(par1World, par2, par3, par4, false); } diff --git a/src/main/java/tconstruct/world/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java index 73afd202..8edc9d3d 100644 --- a/src/main/java/tconstruct/world/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -2,9 +2,11 @@ package tconstruct.world.entity; import net.minecraft.item.Item; import net.minecraft.world.*; + import tconstruct.world.TinkerWorld; public class BlueSlime extends SlimeBase { + public BlueSlime(World world) { super(world); } diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index adbfb931..9129a81b 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -1,9 +1,7 @@ package tconstruct.world.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.*; -import io.netty.buffer.ByteBuf; import java.util.*; + import net.minecraft.block.*; import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; @@ -17,7 +15,12 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.*; +import io.netty.buffer.ByteBuf; + public class CartEntity extends Entity implements IInventory, IEntityAdditionalSpawnData { + /** Array of item stacks stored in minecart (for storage minecarts). */ protected ItemStack[] cargoItems; @@ -32,18 +35,10 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS protected boolean field_82345_h; /** Minecart rotational logic matrix */ - protected static final int[][][] matrix = new int[][][] { - {{0, 0, -1}, {0, 0, 1}}, - {{-1, 0, 0}, {1, 0, 0}}, - {{-1, -1, 0}, {1, 0, 0}}, - {{-1, 0, 0}, {1, -1, 0}}, - {{0, 0, -1}, {0, -1, 1}}, - {{0, -1, -1}, {0, 0, 1}}, - {{0, 0, 1}, {1, 0, 0}}, - {{0, 0, 1}, {-1, 0, 0}}, - {{0, 0, -1}, {-1, 0, 0}}, - {{0, 0, -1}, {1, 0, 0}} - }; + protected static final int[][][] matrix = new int[][][] { { { 0, 0, -1 }, { 0, 0, 1 } }, + { { -1, 0, 0 }, { 1, 0, 0 } }, { { -1, -1, 0 }, { 1, 0, 0 } }, { { -1, 0, 0 }, { 1, -1, 0 } }, + { { 0, 0, -1 }, { 0, -1, 1 } }, { { 0, -1, -1 }, { 0, 0, 1 } }, { { 0, 0, 1 }, { 1, 0, 0 } }, + { { 0, 0, 1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { 1, 0, 0 } } }; /** appears to be the progress of the turn */ protected int turnProgress; @@ -120,8 +115,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * returns if this entity triggers Block.onEntityWalking on the blocks they - * walk on. used for spiders and wolves to prevent them from trampling crops + * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to + * prevent them from trampling crops */ @Override protected boolean canTriggerWalking() { @@ -137,9 +132,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns a boundingBox used to collide the entity with other entities and - * blocks. This enables the entity to be pushable on contact, like boats or - * minecarts. + * Returns a boundingBox used to collide the entity with other entities and blocks. This enables the entity to be + * pushable on contact, like boats or minecarts. */ @Override public AxisAlignedBB getCollisionBox(Entity par1Entity) { @@ -155,8 +149,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns true if this entity should push and be pushed by other entities - * when colliding. + * Returns true if this entity should push and be pushed by other entities when colliding. */ @Override public boolean canBePushed() { @@ -164,8 +157,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns the Y offset from the entity's position for any entity riding - * this one. + * Returns the Y offset from the entity's position for any entity riding this one. */ @Override public double getMountedYOffset() { @@ -218,8 +210,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns true if other Entities should be prevented from moving through - * this Entity. + * Returns true if other Entities should be prevented from moving through this Entity. */ @Override public boolean canBeCollidedWith() { @@ -256,8 +247,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS new ItemStack(var2.getItem(), var6, var2.getItemDamage())); if (var2.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) - var2.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound) var2.getTagCompound().copy()); } float var8 = 0.05F; @@ -274,8 +264,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Teleports the entity to another dimension. Params: Dimension number to - * teleport to + * Teleports the entity to another dimension. Params: Dimension number to teleport to */ @Override public void travelToDimension(int par1) { @@ -300,8 +289,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS this.kill(); } - if (this.isMinecartPowered() - && this.rand.nextInt(4) == 0 + if (this.isMinecartPowered() && this.rand.nextInt(4) == 0 && pullcartType == 2 && getClass() == CartEntity.class) { this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D); @@ -315,26 +303,26 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS var2 = this.getMaxInPortalTime(); // if (this.inPortal) { - // if (var1.getAllowNether()) { - // /* - // * if (this.ridingEntity == null && this.timeInPortal++ >= - // * var2) { this.timeInPortal = var2; this.timeUntilPortal = - // * this.getPortalCooldown(); byte var3; - // * - // * if (this.worldObj.provider.dimensionId == -1) { var3 = 0; - // * } else { var3 = -1; } - // * - // * this.travelToDimension(var3); } - // * - // * this.inPortal = false; - // */ - // } + // if (var1.getAllowNether()) { + // /* + // * if (this.ridingEntity == null && this.timeInPortal++ >= + // * var2) { this.timeInPortal = var2; this.timeUntilPortal = + // * this.getPortalCooldown(); byte var3; + // * + // * if (this.worldObj.provider.dimensionId == -1) { var3 = 0; + // * } else { var3 = -1; } + // * + // * this.travelToDimension(var3); } + // * + // * this.inPortal = false; + // */ + // } // } else { - // /* - // * if (this.timeInPortal > 0) { this.timeInPortal -= 4; } - // * - // * if (this.timeInPortal < 0) { this.timeInPortal = 0; } - // */ + // /* + // * if (this.timeInPortal > 0) { this.timeInPortal -= 4; } + // * + // * if (this.timeInPortal < 0) { this.timeInPortal = 0; } + // */ // } if (this.timeUntilPortal > 0) { @@ -428,11 +416,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS void moveTowardsEntity(Entity entity) { // TConstruct.logger.info("Moving towards entity"); /* - * double distX = this.posX - entity.posX; double distZ = this.posZ - - * entity.posZ; //posY = posY + 0.1; - * - * if (entity.posY > this.posY) motionY += 0.1; if (distX > 0.5 && distZ - * > 0.5) { motionX = -distX; motionZ = -distZ; } + * double distX = this.posX - entity.posX; double distZ = this.posZ - entity.posZ; //posY = posY + 0.1; if + * (entity.posY > this.posY) motionY += 0.1; if (distX > 0.5 && distZ > 0.5) { motionX = -distX; motionZ = + * -distZ; } */ double var15 = entity.posX; @@ -482,12 +468,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS public double calculateDistance(double pos1, double pos2) { double distance = Math.abs(pos1 - pos2); // 0.0D; /* - * double absPos1 = Math.abs(pos1); double absPos2 = Math.abs(pos2); - * - * if ((pos1 <= 0.0D || pos2 <= 0.0D) && (pos1 >= 0.0D || pos2 >= 0.0D)) - * { distance = absPos1 + absPos2; } else if (absPos1 > absPos2) { - * distance = absPos1 - absPos2; } else if (absPos2 > absPos1) { - * distance = absPos2 - absPos1; } + * double absPos1 = Math.abs(pos1); double absPos2 = Math.abs(pos2); if ((pos1 <= 0.0D || pos2 <= 0.0D) && (pos1 + * >= 0.0D || pos2 >= 0.0D)) { distance = absPos1 + absPos2; } else if (absPos1 > absPos2) { distance = absPos1 + * - absPos2; } else if (absPos2 > absPos1) { distance = absPos2 - absPos1; } */ return distance; @@ -637,15 +620,13 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Applies a velocity to each of the entities pushing them away from each - * other. Args: entity + * Applies a velocity to each of the entities pushing them away from each other. Args: entity */ @Override public void applyEntityCollision(Entity par1Entity) { if (!this.worldObj.isRemote) { if (par1Entity != this.riddenByEntity) { - if (par1Entity instanceof EntityLiving - && !(par1Entity instanceof EntityIronGolem) + if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null @@ -681,10 +662,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS double var12 = par1Entity.posZ - this.posZ; Vec3 var14 = Vec3.createVectorHelper(var10, 0.0D, var12).normalize(); Vec3 var15 = Vec3.createVectorHelper( - MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), - 0.0D, - MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) - .normalize(); + MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), + 0.0D, + MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)).normalize(); double var16 = Math.abs(var14.dotProduct(var15)); if (var16 < 0.8D) { @@ -742,8 +722,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Removes from an inventory slot (first arg) up to a specified number - * (second arg) of items and returns them in a new stack. + * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a + * new stack. */ @Override public ItemStack decrStackSize(int par1, int par2) { @@ -765,9 +745,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * When some containers are closed they call this on each slot, then drop - * whatever it returns as an EntityItem - like when you close a workbench - * GUI. + * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - + * like when you close a workbench GUI. */ @Override public ItemStack getStackInSlotOnClosing(int par1) { @@ -781,8 +760,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Sets the given item stack to the specified slot in the inventory (can be - * crafting or armor sections). + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ @Override public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { @@ -801,8 +779,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns the maximum stack size for a inventory slot. Seems to always be - * 64, possibly will be extended. *Isn't this more of a set than a get?* + * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't + * this more of a set than a get?* */ @Override public int getInventoryStackLimit() { @@ -816,8 +794,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS public void markDirty() {} /** - * Called when a player interacts with a mob. e.g. gets milk from a cow, - * gets into the saddle on a pig. + * Called when a player interacts with a mob. e.g. gets milk from a cow, gets into the saddle on a pig. */ public boolean interact(EntityPlayer player) { if (player.isSneaking()) { @@ -833,8 +810,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS return true; } if (canBeRidden()) { - if (this.riddenByEntity != null - && this.riddenByEntity instanceof EntityPlayer + if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != player) { return true; } @@ -894,8 +870,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Do not make give this method the name canInteractWith because it clashes - * with Container + * Do not make give this method the name canInteractWith because it clashes with Container */ @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { @@ -925,16 +900,16 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS public void closeChest() {} /** - * Sets the current amount of damage the minecart has taken. Decreases over - * time. The cart breaks when this is over 40. + * Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over + * 40. */ public void setDamage(int par1) { this.dataWatcher.updateObject(19, Integer.valueOf(par1)); } /** - * Gets the current amount of damage the minecart has taken. Decreases over - * time. The cart breaks when this is over 40. + * Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over + * 40. */ public int getDamage() { return this.dataWatcher.getWatchableObjectInt(19); @@ -957,8 +932,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Drops the cart as a item. The exact item dropped is defined by - * getItemDropped(). + * Drops the cart as a item. The exact item dropped is defined by getItemDropped(). */ public void dropCartAsItem() { for (ItemStack item : getItemsDropped()) { @@ -967,29 +941,24 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Override this to define which items your cart drops when broken. This - * does not include items contained in the inventory, that is handled - * elsewhere. + * Override this to define which items your cart drops when broken. This does not include items contained in the + * inventory, that is handled elsewhere. * * @return A list of items dropped. */ public List getItemsDropped() { /* - * List items = new ArrayList(); items.add(new - * ItemStack(Item.minecartEmpty)); - * - * switch(cartType) { case 1: items.add(new ItemStack(Block.chest)); - * break; case 2: items.add(new ItemStack(Block.stoneOvenIdle)); break; - * } return items; + * List items = new ArrayList(); items.add(new ItemStack(Item.minecartEmpty)); + * switch(cartType) { case 1: items.add(new ItemStack(Block.chest)); break; case 2: items.add(new + * ItemStack(Block.stoneOvenIdle)); break; } return items; */ return new ArrayList<>(); } /** - * This function returns an ItemStack that represents this cart. This should - * be an ItemStack that can be used by the player to place the cart. This is - * the item that was registered with the cart via the registerMinecart - * function, but is not necessary the item the cart drops when destroyed. + * This function returns an ItemStack that represents this cart. This should be an ItemStack that can be used by the + * player to place the cart. This is the item that was registered with the cart via the registerMinecart function, + * but is not necessary the item the cart drops when destroyed. * * @return An ItemStack that can be used to place the cart. */ @@ -1008,9 +977,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns true if this cart is a storage cart Some carts may have - * inventories but not be storage carts and some carts without inventories - * may be storage carts. + * Returns true if this cart is a storage cart Some carts may have inventories but not be storage carts and some + * carts without inventories may be storage carts. * * @return True if this cart should be classified as a storage cart. */ @@ -1028,8 +996,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Returns true if this cart can currently use rails. This function is - * mainly used to gracefully detach a minecart from a rail. + * Returns true if this cart can currently use rails. This function is mainly used to gracefully detach a minecart + * from a rail. * * @return True if the minecart can use rails. */ @@ -1038,19 +1006,16 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Set whether the minecart can use rails. This function is mainly used to - * gracefully detach a minecart from a rail. + * Set whether the minecart can use rails. This function is mainly used to gracefully detach a minecart from a rail. * - * @param use - * Whether the minecart can currently use rails. + * @param use Whether the minecart can currently use rails. */ public void setCanUseRail(boolean use) { canUseRail = use; } /** - * Return false if this cart should not call IRail.onMinecartPass() and - * should ignore Powered Rails. + * Return false if this cart should not call IRail.onMinecartPass() and should ignore Powered Rails. * * @return True if this cart should call IRail.onMinecartPass(). */ @@ -1123,8 +1088,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } /** - * Moved to allow overrides. This code handles minecart movement and speed - * capping when not on a rail. + * Moved to allow overrides. This code handles minecart movement and speed capping when not on a rail. */ protected void moveMinecartOffRail(int i, int j, int k) { double d2 = getMaxSpeedGround(); @@ -1168,8 +1132,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS /** * Moved to allow overrides, This code handle slopes affecting velocity. * - * @param metadata - * The blocks position metadata + * @param metadata The blocks position metadata */ protected void adjustSlopeVelocities(int metadata) { double acceleration = 0.0078125D; @@ -1189,10 +1152,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS */ /** - * Returns the carts max speed. Carts going faster than 1.1 cause issues - * with chunk loading. Carts cant traverse slopes or corners at greater than - * 0.5 - 0.6. This value is compared with the rails max speed to determine - * the carts current max speed. A normal rails max speed is 0.4. + * Returns the carts max speed. Carts going faster than 1.1 cause issues with chunk loading. Carts cant traverse + * slopes or corners at greater than 0.5 - 0.6. This value is compared with the rails max speed to determine the + * carts current max speed. A normal rails max speed is 0.4. * * @return Carts max speed. */ diff --git a/src/main/java/tconstruct/world/entity/KingBlueSlime.java b/src/main/java/tconstruct/world/entity/KingBlueSlime.java index 6cc1c1e8..ef489687 100644 --- a/src/main/java/tconstruct/world/entity/KingBlueSlime.java +++ b/src/main/java/tconstruct/world/entity/KingBlueSlime.java @@ -5,12 +5,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.armor.TinkerArmor; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; public class KingBlueSlime extends SlimeBase implements IBossDisplayData { + public KingBlueSlime(World world) { super(world); @@ -59,7 +61,11 @@ public class KingBlueSlime extends SlimeBase implements IBossDisplayData { double x = Math.cos(r); double z = Math.sin(r); entityslime.setLocationAndAngles( - this.posX - 1d + x, this.posY + 0.5D, this.posZ - 1d + z, this.rand.nextFloat() * 360.0F, 0.0F); + this.posX - 1d + x, + this.posY + 0.5D, + this.posZ - 1d + z, + this.rand.nextFloat() * 360.0F, + 0.0F); entityslime.motionX = x; entityslime.motionY = -0.5d - rand.nextDouble(); entityslime.motionZ = z; @@ -78,12 +84,12 @@ public class KingBlueSlime extends SlimeBase implements IBossDisplayData { final ItemStack headStack = new ItemStack(tool.getHeadItem(), 1, 17); final ItemStack handleStack = new ItemStack(tool.getHandleItem(), 1, 17); - final ItemStack accessoryStack = - tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; + final ItemStack accessoryStack = tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) + : null; final ItemStack extraStack = tool.getExtraItem() != null ? new ItemStack(tool.getExtraItem(), 1, 17) : null; - String loc = "tool." + tool.getToolName().toLowerCase() - + ".kingslime"; // special localization the same way as materials + String loc = "tool." + tool.getToolName().toLowerCase() + ".kingslime"; // special localization the same way as + // materials String name; if (StatCollector.canTranslate(loc)) name = StatCollector.translateToLocal(loc); else name = StatCollector.translateToLocal("tool.kingslimeprefix") + " " + tool.getLocalizedToolName(); @@ -107,8 +113,9 @@ public class KingBlueSlime extends SlimeBase implements IBossDisplayData { ToolCore getValidTool() { ToolCore tool = TConstructRegistry.tools.get(rand.nextInt(TConstructRegistry.tools.size())); - /*if (tool.getExtraItem() != null) - tool = getValidTool();*/ + /* + * if (tool.getExtraItem() != null) tool = getValidTool(); + */ return tool; } } diff --git a/src/main/java/tconstruct/world/entity/MetalSlime.java b/src/main/java/tconstruct/world/entity/MetalSlime.java index b267d0ef..c5b1f5fb 100644 --- a/src/main/java/tconstruct/world/entity/MetalSlime.java +++ b/src/main/java/tconstruct/world/entity/MetalSlime.java @@ -35,14 +35,9 @@ public class MetalSlime extends BlueSlime { } /* - * protected void dropFewItems (boolean par1, int par2) { int j = - * this.getDropItemId(); - * - * if (j > 0) { int k = rand.nextInt(3) + rand.nextInt(this.getSlimeSize()); - * - * if (par2 > 0) { k += this.rand.nextInt(par2 + 1); } - * - * for (int l = 0; l < k; ++l) { this.dropItem(j, 1); } } } + * protected void dropFewItems (boolean par1, int par2) { int j = this.getDropItemId(); if (j > 0) { int k = + * rand.nextInt(3) + rand.nextInt(this.getSlimeSize()); if (par2 > 0) { k += this.rand.nextInt(par2 + 1); } for (int + * l = 0; l < k; ++l) { this.dropItem(j, 1); } } } */ @Override diff --git a/src/main/java/tconstruct/world/entity/SlimeBase.java b/src/main/java/tconstruct/world/entity/SlimeBase.java index 4fc17378..cc2aff60 100644 --- a/src/main/java/tconstruct/world/entity/SlimeBase.java +++ b/src/main/java/tconstruct/world/entity/SlimeBase.java @@ -15,9 +15,11 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; + import tconstruct.world.TinkerWorld; public abstract class SlimeBase extends EntityLiving implements IMob { + public float sizeOffset; public float sizeFactor; public float sizeHeight; @@ -78,16 +80,14 @@ public abstract class SlimeBase extends EntityLiving implements IMob { } /** - * Indicates weather the slime is able to damage the player (based upon the - * slime's size) + * Indicates weather the slime is able to damage the player (based upon the slime's size) */ protected boolean canDamagePlayer() { return this.getSlimeSize() > 1; } /** - * Gets the amount of damage dealt to the player when "attacked" by the - * slime. + * Gets the amount of damage dealt to the player when "attacked" by the slime. */ protected int getAttackStrength() { return this.getSlimeSize(); @@ -129,8 +129,7 @@ public abstract class SlimeBase extends EntityLiving implements IMob { this.motionZ += MathHelper.cos(f) * 0.2F; } - if (!(this instanceof IBossDisplayData) - && this.getBrightness(1.0F) > 0.9F + if (!(this instanceof IBossDisplayData) && this.getBrightness(1.0F) > 0.9F && rand.nextInt(5) == 0 && this.worldObj.canBlockSeeTheSky( MathHelper.floor_double(this.posX), @@ -150,8 +149,7 @@ public abstract class SlimeBase extends EntityLiving implements IMob { */ @Override public void onUpdate() { - if (!this.worldObj.isRemote - && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL + if (!this.worldObj.isRemote && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL && this.getSlimeSize() > 0) { this.isDead = true; } @@ -309,10 +307,9 @@ public abstract class SlimeBase extends EntityLiving implements IMob { public boolean getCanSpawnHere() { // needs free space if (!this.worldObj.checkNoEntityCollision(this.boundingBox) - || !this.worldObj - .getCollidingBoundingBoxes(this, this.boundingBox) - .isEmpty() - || this.worldObj.isAnyLiquid(this.boundingBox)) return false; + || !this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() + || this.worldObj.isAnyLiquid(this.boundingBox)) + return false; int x = MathHelper.floor_double(this.posX); int y = MathHelper.floor_double(this.boundingBox.minY); diff --git a/src/main/java/tconstruct/world/gen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java index 221af820..b416e0a7 100644 --- a/src/main/java/tconstruct/world/gen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -1,12 +1,14 @@ package tconstruct.world.gen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class OreberryBushGen extends WorldGenerator { + private Block blockB; private final int metadata; int chance; @@ -46,9 +48,8 @@ public class OreberryBushGen extends WorldGenerator { public void generateMediumNode(World world, Random random, int x, int y, int z) { for (int xPos = -1; xPos <= 1; xPos++) - for (int yPos = -1; yPos <= 1; yPos++) - for (int zPos = -1; zPos <= 1; zPos++) - if (random.nextInt(4) == 0) generateBerryBlock(world, x + xPos, y + yPos, z + zPos, random); + for (int yPos = -1; yPos <= 1; yPos++) for (int zPos = -1; zPos <= 1; zPos++) + if (random.nextInt(4) == 0) generateBerryBlock(world, x + xPos, y + yPos, z + zPos, random); generateSmallNode(world, random, x, y, z); } @@ -75,13 +76,12 @@ public class OreberryBushGen extends WorldGenerator { void generateBerryBlock(World world, int x, int y, int z, Random random) { /* - * if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)]) { - * setBlockAndMetadata(world, x, y, z, blockID, metadata); } + * if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)]) { setBlockAndMetadata(world, x, y, z, blockID, + * metadata); } */ Block block = world.getBlock(x, y, z); - if (block == null - || (block != Blocks.end_portal_frame && !world.getBlock(x, y, z).func_149730_j())) + if (block == null || (block != Blocks.end_portal_frame && !world.getBlock(x, y, z).func_149730_j())) world.setBlock(x, y, z, this.blockB, metadata, 2); else { for (Block replaceBlock : replaceBlocks) { diff --git a/src/main/java/tconstruct/world/gen/OverworldProvider.java b/src/main/java/tconstruct/world/gen/OverworldProvider.java index 86b2a845..cb949bc2 100644 --- a/src/main/java/tconstruct/world/gen/OverworldProvider.java +++ b/src/main/java/tconstruct/world/gen/OverworldProvider.java @@ -34,17 +34,9 @@ public class OverworldProvider extends WorldProvider { } /* - * public float calculateCelestialAngle(long worldtime, float par3) { int - * timeOfDay = (int)(worldtime % 43200L); float f1 = ((float)timeOfDay + - * par3) / 43200.0F - 0.25F; - * - * if (f1 < 0.0F) { ++f1; } - * - * if (f1 > 1.0F) { --f1; } - * - * float f2 = f1; f1 = 1.0F - (float)((Math.cos((double)f1 * Math.PI) + - * 1.0D) / 2.0D); f1 = f2 + (f1 - f2) / 3.0F; return f1; } - * - * public int getMoonPhase(long par1) { return (int)(par1 / 43200L) % 8; } + * public float calculateCelestialAngle(long worldtime, float par3) { int timeOfDay = (int)(worldtime % 43200L); + * float f1 = ((float)timeOfDay + par3) / 43200.0F - 0.25F; if (f1 < 0.0F) { ++f1; } if (f1 > 1.0F) { --f1; } float + * f2 = f1; f1 = 1.0F - (float)((Math.cos((double)f1 * Math.PI) + 1.0D) / 2.0D); f1 = f2 + (f1 - f2) / 3.0F; return + * f1; } public int getMoonPhase(long par1) { return (int)(par1 / 43200L) % 8; } */ } diff --git a/src/main/java/tconstruct/world/gen/PlantGen.java b/src/main/java/tconstruct/world/gen/PlantGen.java index 9a5b85f5..0ba8fab2 100644 --- a/src/main/java/tconstruct/world/gen/PlantGen.java +++ b/src/main/java/tconstruct/world/gen/PlantGen.java @@ -1,12 +1,14 @@ package tconstruct.world.gen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class PlantGen extends WorldGenerator { + /** The ID of the plant block used in this plant generator. */ public final Block plant; @@ -39,8 +41,7 @@ public class PlantGen extends WorldGenerator { int posY = clumped ? y + random.nextInt(ySize) - random.nextInt(ySize) : y + random.nextInt(ySize); int posZ = clumped ? z + random.nextInt(zSize) - random.nextInt(zSize) : z + random.nextInt(zSize); - if (world.getBlock(posX, posY, posZ) == Blocks.air - && (!world.provider.hasNoSky || posY < 127) + if (world.getBlock(posX, posY, posZ) == Blocks.air && (!world.provider.hasNoSky || posY < 127) && this.plant.canBlockStay(world, posX, posY, posZ)) { world.setBlock(posX, posY, posZ, this.plant, this.metadata, 2); } diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index ba1e77eb..a1dd905f 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -1,8 +1,8 @@ package tconstruct.world.gen; -import cpw.mods.fml.common.IWorldGenerator; import java.awt.geom.Ellipse2D; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -10,11 +10,14 @@ import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; + import tconstruct.tools.TinkerTools; import tconstruct.util.config.*; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.IWorldGenerator; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { + private final Block liquidBlock; private final int gelMeta; int randomness = 2; @@ -29,15 +32,10 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { } @Override - public void generate( - Random random, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) // IWorldGenerator - // version - { + // version + { // dim 0 only? if ((chunkGenerator instanceof ChunkProviderFlat || world.provider.terrainType == WorldType.FLAT) && !PHConstruct.genIslandsFlat) { @@ -81,8 +79,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base - && random.nextInt(100) > randomness) { - } else { + && random.nextInt(100) > randomness) {} else { world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 2); } } @@ -100,8 +97,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base - && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) { - } else { + && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) {} else { world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 2); } } @@ -145,14 +141,12 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { @Override public boolean generate(World world, Random rand, int x, int y, int z) // WorldGenerator - // version - { + // version + { x -= 8; z -= 8; /* - * for (z -= 8; y > 5 && world.isAirBlock(x, y, z); --y) { ; } - * - * if (y <= 4) { return false; } else { + * for (z -= 8; y > 5 && world.isAirBlock(x, y, z); --y) { ; } if (y <= 4) { return false; } else { */ y -= 4; boolean[] validLocations = new boolean[2048]; @@ -199,15 +193,13 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); if (var33) { - Material var12 = - world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial(); + Material var12 = world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial(); if (yPos >= 4 && var12.isLiquid()) { return false; } - if (yPos < 4 - && !var12.isSolid() + if (yPos < 4 && !var12.isSolid() && world.getBlock(x + xPos, y + yPos, z + zPos) != this.liquidBlock) { return false; } @@ -251,14 +243,9 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); - if (var33 - && (yPos < 4 || rand.nextInt(2) != 0) - && world.getBlock(x + xPos, y + yPos, z + zPos) - .getMaterial() - .isSolid() - && world.getBlock(x + xPos, y + yPos + 1, z + zPos) - .getMaterial() - != Material.water) { + if (var33 && (yPos < 4 || rand.nextInt(2) != 0) + && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() + && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) { world.setBlock(x + xPos, y + yPos, z + zPos, TinkerWorld.slimeGel, gelMeta, 2); } } diff --git a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java index dbce672a..17e347dd 100644 --- a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java @@ -1,15 +1,18 @@ package tconstruct.world.gen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; public class SlimeTreeGen extends WorldGenerator { + public final int minTreeHeight; public final int treeHeightRange; public final int metaWood; @@ -44,7 +47,7 @@ public class SlimeTreeGen extends WorldGenerator { if (isSoil) { // TODO Fix this for 1.7 // if (!checkClear(world, xPos, yPos, zPos, height)) - // return false; + // return false; soil.onPlantGrow(world, xPos, yPos - 1, zPos, xPos, yPos, zPos); placeCanopy(world, random, xPos, yPos, zPos, height); @@ -65,9 +68,9 @@ public class SlimeTreeGen extends WorldGenerator { for (int xPos = range; xPos <= range; xPos++) { for (int zPos = range; zPos <= range; zPos++) { Block blockID = world.getBlock(x + xPos, y + yPos, z + zPos); - if (blockID != null - && blockID != TinkerWorld.slimeSapling - && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) return false; + if (blockID != null && blockID != TinkerWorld.slimeSapling + && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) + return false; } } } @@ -109,26 +112,66 @@ public class SlimeTreeGen extends WorldGenerator { this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata( - world, xPos + 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos + 2, + yPos + height - 4, + zPos + 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos + 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos + 2, + yPos + height - 4, + zPos - 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos - 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos - 2, + yPos + height - 4, + zPos + 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos - 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos - 2, + yPos + height - 4, + zPos - 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata( - world, xPos + 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos + 2, + yPos + height - 5, + zPos + 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos + 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos + 2, + yPos + height - 5, + zPos - 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos - 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos - 2, + yPos + height - 5, + zPos + 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); this.setBlockAndMetadata( - world, xPos - 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + world, + xPos - 2, + yPos + height - 5, + zPos - 2, + TinkerWorld.slimeLeaves, + this.metaLeaves); } void placeDiamondLayer(World world, int xPos, int yPos, int zPos, int range) { diff --git a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java index 873b18fa..63b461e3 100644 --- a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -1,14 +1,17 @@ package tconstruct.world.gen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; + import tconstruct.util.config.PHConstruct; public class SurfaceOreGen extends WorldGenerator { + /** The block of the ore to be placed using this generator. */ private final Block minableBlock; @@ -88,10 +91,10 @@ public class SurfaceOreGen extends WorldGenerator { double d7 = d4 + (d5 - d4) * (double) l / (double) blockNumber; double d8 = d2 + (d3 - d2) * (double) l / (double) blockNumber; double d9 = random.nextDouble() * (double) blockNumber / 16.0D; - double d10 = - (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; - double d11 = - (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; + double d10 = (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + + 1.0D; + double d11 = (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + + 1.0D; int i1 = MathHelper.floor_double(d6 - d10 / 2.0D); int j1 = MathHelper.floor_double(d7 - d11 / 2.0D); int k1 = MathHelper.floor_double(d8 - d10 / 2.0D); @@ -112,8 +115,7 @@ public class SurfaceOreGen extends WorldGenerator { Block block = world.getBlock(k2, l2, i3); if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D) { - if (block == null - || !world.getBlock(k2, l2, i3).isOpaqueCube()) + if (block == null || !world.getBlock(k2, l2, i3).isOpaqueCube()) world.setBlock(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); else { for (Block replaceBlock : replaceBlocks) { diff --git a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index f413af46..95b0b990 100644 --- a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -1,17 +1,20 @@ package tconstruct.world.gen; -import cpw.mods.fml.common.IWorldGenerator; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; + import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.IWorldGenerator; public class TBaseWorldGenerator implements IWorldGenerator { + public TBaseWorldGenerator() { copper = new WorldGenMinable(TinkerWorld.oreSlag, 3, 8, Blocks.stone); tin = new WorldGenMinable(TinkerWorld.oreSlag, 4, 8, Blocks.stone); @@ -29,12 +32,7 @@ public class TBaseWorldGenerator implements IWorldGenerator { } @Override - public void generate( - Random random, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { if (world.provider.isHellWorld) { generateNether(random, chunkX * 16, chunkZ * 16, world); @@ -133,7 +131,12 @@ public class TBaseWorldGenerator implements IWorldGenerator { yPos = (PHConstruct.copperBushMaxY + PHConstruct.copperBushMinY) / 2; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation( - world, xPos, yPos, zPos, PHConstruct.copperBushMaxY, PHConstruct.copperBushMinY); + world, + xPos, + yPos, + zPos, + PHConstruct.copperBushMaxY, + PHConstruct.copperBushMinY); if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -171,7 +174,12 @@ public class TBaseWorldGenerator implements IWorldGenerator { yPos = (PHConstruct.aluminumBushMaxY + PHConstruct.aluminumBushMinY) / 2; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation( - world, xPos, yPos, zPos, PHConstruct.aluminumBushMaxY, PHConstruct.aluminumBushMinY); + world, + xPos, + yPos, + zPos, + PHConstruct.aluminumBushMaxY, + PHConstruct.aluminumBushMinY); if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -250,8 +258,8 @@ public class TBaseWorldGenerator implements IWorldGenerator { void superfunGenerate(Random random, int chunkX, int chunkZ, World world) { /* - * for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) - * world.setBlock(x+chunkX, 192, z+chunkZ, Block.glowStone); + * for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) world.setBlock(x+chunkX, 192, z+chunkZ, + * Block.glowStone); */ for (int x = 0; x < 16; x++) { @@ -277,8 +285,7 @@ public class TBaseWorldGenerator implements IWorldGenerator { void generateChunkBorder(Random random, int chunkX, int chunkZ, World world) { for (int x = 0; x < 16; x++) { for (int z = 0; z < 16; z++) { - if (x + chunkX == PHConstruct.worldBorderSize - || x + chunkX == -PHConstruct.worldBorderSize + if (x + chunkX == PHConstruct.worldBorderSize || x + chunkX == -PHConstruct.worldBorderSize || z + chunkZ == PHConstruct.worldBorderSize || z + chunkZ == -PHConstruct.worldBorderSize) { for (int y = 0; y < 256; y++) { diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index c2d52f01..aa3b914d 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -3,16 +3,20 @@ package tconstruct.world.gen; import static net.minecraft.world.biome.BiomeGenBase.*; import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; -import com.google.common.collect.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Random; + import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; + import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; +import com.google.common.collect.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class TerrainGenEventHandler { + private final SurfaceOreGen ironSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 0, 12, true); private final SurfaceOreGen goldSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 1, 20, true); private final SurfaceOreGen copperSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 2, 12, true); @@ -20,8 +24,8 @@ public class TerrainGenEventHandler { private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 4, 12, true); private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 5, 30, true); - private static final ImmutableCollection EXTRA_ORE_BIOMES = - ImmutableList.of(extremeHills, extremeHillsEdge); + private static final ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList + .of(extremeHills, extremeHillsEdge); @SubscribeEvent public void onDecorateEvent(Decorate e) { diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 5a91e92a..68524085 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -1,7 +1,7 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,7 +9,10 @@ import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class BarricadeItem extends ItemBlock { + private final Block b; public BarricadeItem(Block b) { @@ -24,49 +27,39 @@ public class BarricadeItem extends ItemBlock { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { Block b = world.getBlock(x, y, z); if (b == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; - } else if (b != Blocks.vine - && b != Blocks.tallgrass + } else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush && (b == null || !b.canPlaceBlockAt(world, x, y, z))) { - if (side == 0) { - --y; - } + if (side == 0) { + --y; + } - if (side == 1) { - ++y; - } + if (side == 1) { + ++y; + } - if (side == 2) { - --z; - } + if (side == 2) { + --z; + } - if (side == 3) { - ++z; - } + if (side == 3) { + ++z; + } - if (side == 4) { - --x; - } + if (side == 4) { + --x; + } - if (side == 5) { - ++x; - } - } + if (side == 5) { + ++x; + } + } if (stack.stackSize == 0) { return false; diff --git a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index 55d92332..b71ab97a 100644 --- a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -1,17 +1,20 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import cpw.mods.fml.relauncher.*; + public class CraftedSoilItemBlock extends MultiItemBlock { - public static final String[] blockTypes = { - "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" - }; + + public static final String[] blockTypes = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", + "blue", "dirt", "Grout" }; public CraftedSoilItemBlock(Block b) { super(b, "CraftedSoil", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java index 3978c462..4500c6a7 100644 --- a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java +++ b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java @@ -1,10 +1,12 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class GravelOreItem extends MultiItemBlock { - public static final String[] blockTypes = {"iron", "gold", "copper", "tin", "aluminum", "cobalt"}; + + public static final String[] blockTypes = { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; public GravelOreItem(Block b) { super(b, "block.ore.gravel", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java index 6cddeb7b..a559d84a 100644 --- a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java @@ -1,8 +1,7 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; @@ -10,7 +9,11 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.*; + public class HamboneItemBlock extends ItemBlock { + public HamboneItemBlock(Block b) { super(b); itemUseDuration = 32; @@ -43,14 +46,12 @@ public class HamboneItemBlock extends ItemBlock { private final boolean isWolfsFavoriteMeat; /** - * If this field is true, the food can be consumed even if the player don't - * need to eat. + * If this field is true, the food can be consumed even if the player don't need to eat. */ private boolean alwaysEdible; /** - * represents the potion effect that will occurr upon eating this food. Set - * by setPotionEffect + * represents the potion effect that will occurr upon eating this food. Set by setPotionEffect */ private int potionId; @@ -64,12 +65,9 @@ public class HamboneItemBlock extends ItemBlock { private float potionEffectProbability; /* - * public ItemFood(int par1, int par2, float par3, boolean par4) { - * super(par1); this.itemUseDuration = 32; this.healAmount = par2; - * this.isWolfsFavoriteMeat = par4; this.saturationModifier = par3; - * this.setCreativeTab(CreativeTabs.tabFood); } - * - * public ItemFood(int par1, int par2, boolean par3) { this(par1, par2, + * public ItemFood(int par1, int par2, float par3, boolean par4) { super(par1); this.itemUseDuration = 32; + * this.healAmount = par2; this.isWolfsFavoriteMeat = par4; this.saturationModifier = par3; + * this.setCreativeTab(CreativeTabs.tabFood); } public ItemFood(int par1, int par2, boolean par3) { this(par1, par2, * 0.6F, par3); } */ @@ -84,8 +82,8 @@ public class HamboneItemBlock extends ItemBlock { protected void onFoodEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (!par2World.isRemote && this.potionId > 0 && par2World.rand.nextFloat() < this.potionEffectProbability) { - par3EntityPlayer.addPotionEffect( - new PotionEffect(this.potionId, this.potionDuration * 20, this.potionAmplifier)); + par3EntityPlayer + .addPotionEffect(new PotionEffect(this.potionId, this.potionDuration * 20, this.potionAmplifier)); } } @@ -98,8 +96,7 @@ public class HamboneItemBlock extends ItemBlock { } /** - * returns the action that specifies what animation to play when the items - * is being used + * returns the action that specifies what animation to play when the items is being used */ @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { @@ -107,8 +104,7 @@ public class HamboneItemBlock extends ItemBlock { } /** - * Called whenever this item is equipped and the right mouse button is - * pressed. Args: itemStack, world, entityPlayer + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { diff --git a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java index cc5c2c63..9304e5ff 100644 --- a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java @@ -1,14 +1,17 @@ package tconstruct.world.itemblocks; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class MetalOreItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag"}; + + public static final String[] blockTypes = { "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" }; public MetalOreItemBlock(Block b) { super(b, "MetalOre", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index 690f8675..c348b811 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -1,23 +1,25 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class OreberryBushItem extends MultiItemBlock { + public Block blockB; - public static final String[] blockTypes = { - "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", - "gold", "copper", "tin" - }; + public static final String[] blockTypes = { "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", + "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin" }; public OreberryBushItem(Block b) { super(b, "block.oreberry", blockTypes); @@ -32,23 +34,13 @@ public class OreberryBushItem extends MultiItemBlock { /* 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 par8, float par9, float par10) { if (side != 1) return false; else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); - if (block != null - && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerry) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index 6703bcb1..b3985b3a 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -1,37 +1,25 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class OreberryBushSecondItem extends MultiItemBlock { + public Block blockB; - public static final String[] blockTypes = { - "aluminum", - "essence", - "", - "", - "aluminum", - "essence", - "", - "", - "aluminum", - "essence", - "", - "", - "aluminum", - "essence", - "", - "" - }; + public static final String[] blockTypes = { "aluminum", "essence", "", "", "aluminum", "essence", "", "", + "aluminum", "essence", "", "", "aluminum", "essence", "", "" }; public OreberryBushSecondItem(Block b) { super(b, "block.oreberry", blockTypes); @@ -46,17 +34,8 @@ public class OreberryBushSecondItem extends MultiItemBlock { /* 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 hitX, - float hitY, - float hitZ) { + 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(); @@ -64,8 +43,7 @@ public class OreberryBushSecondItem extends MultiItemBlock { else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); - if (block != null - && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerrySecond) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java index de18475d..a8305f5a 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java @@ -1,10 +1,12 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class SlimeGelItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"blue", "green", "purple", "magma", "yellow", "red", "metal"}; + + public static final String[] blockTypes = { "blue", "green", "purple", "magma", "yellow", "red", "metal" }; public SlimeGelItemBlock(Block b) { super(b, "block.slime.congealed", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java index efa427e1..0239aa65 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java @@ -1,10 +1,12 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class SlimeGrassItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"blue", "dirt"}; + + public static final String[] blockTypes = { "blue", "dirt" }; public SlimeGrassItemBlock(Block b) { super(b, "block.slime.grass", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java index 57563848..765cca8f 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java @@ -1,10 +1,12 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class SlimeLeavesItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"blue"}; + + public static final String[] blockTypes = { "blue" }; public SlimeLeavesItemBlock(Block b) { super(b, "block.slime.leaves", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java index 524b8149..24077118 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java @@ -1,10 +1,12 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class SlimeSaplingItemBlock extends MultiItemBlock { - public static final String[] blockTypes = {"bluegreen"}; + + public static final String[] blockTypes = { "bluegreen" }; public SlimeSaplingItemBlock(Block b) { super(b, "block.slime.sapling", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index 3b52a368..3d6b8817 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -1,13 +1,16 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.util.*; + import tconstruct.world.TinkerWorld; +import cpw.mods.fml.relauncher.*; public class SlimeTallGrassItem extends MultiItemBlock { - public static final String[] blockTypes = {"tallgrass", "tallgrass.fern"}; + + public static final String[] blockTypes = { "tallgrass", "tallgrass.fern" }; public SlimeTallGrassItem(Block b) { super(b, "block.slime", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index 45e57c59..df80c280 100644 --- a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -1,17 +1,20 @@ package tconstruct.world.itemblocks; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; + public class SoilSlabItem extends MultiItemBlock { - public static final String[] blockTypes = { - "grass", "dirt", "mycelium", "slime", "grout", "blueslime", "graveyardsoil", "consecratedsoil" - }; + + public static final String[] blockTypes = { "grass", "dirt", "mycelium", "slime", "grout", "blueslime", + "graveyardsoil", "consecratedsoil" }; public SoilSlabItem(Block b) { super(b, "block.soil.slab", blockTypes); diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index b0b1c1f8..c985e454 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -1,6 +1,7 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,6 +10,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class WoolSlab1Item extends MultiItemBlock { + Block block; public WoolSlab1Item(Block b) { @@ -26,17 +28,8 @@ public class WoolSlab1Item extends MultiItemBlock { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { Block b = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index 486c8ec4..ac1551f0 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -1,6 +1,7 @@ package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,6 +10,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class WoolSlab2Item extends MultiItemBlock { + Block block; public WoolSlab2Item(Block b) { @@ -31,17 +33,8 @@ public class WoolSlab2Item extends MultiItemBlock { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; diff --git a/src/main/java/tconstruct/world/items/GoldenHead.java b/src/main/java/tconstruct/world/items/GoldenHead.java index 78b3de19..b60186e7 100644 --- a/src/main/java/tconstruct/world/items/GoldenHead.java +++ b/src/main/java/tconstruct/world/items/GoldenHead.java @@ -1,7 +1,7 @@ package tconstruct.world.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +10,10 @@ import net.minecraft.potion.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class GoldenHead extends ItemFood { + public GoldenHead(int par2, float par3, boolean par4) { super(par2, par3, par4); this.setHasSubtypes(true); diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index 7d452d38..5de7bedc 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -1,21 +1,24 @@ package tconstruct.world.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import mantle.items.abstracts.CraftingItem; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.*; public class OreBerries extends CraftingItem { - 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" - }; + + 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() { super(names, tex, "oreberries/", "tinker", TConstructRegistry.materialTab); @@ -49,8 +52,12 @@ public class OreBerries extends CraftingItem { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 5) { - EntityXPOrb entity = - new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, itemRand.nextInt(14) + 6); + EntityXPOrb entity = new EntityXPOrb( + world, + player.posX, + player.posY + 1, + player.posZ, + itemRand.nextInt(14) + 6); spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player); if (!player.capabilities.isCreativeMode) stack.stackSize--; } diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java index 7f86e98a..aed28afa 100644 --- a/src/main/java/tconstruct/world/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -1,13 +1,16 @@ package tconstruct.world.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.*; +import cpw.mods.fml.relauncher.*; + public class SpecialFood extends ItemFood { + protected int[] hunger; protected float[] saturation; protected String[] unlocalizedNames; diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index 16f24bcc..a1439311 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -1,20 +1,23 @@ package tconstruct.world.items; -import cpw.mods.fml.relauncher.*; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; + public class StrangeFood extends SpecialFood { + public StrangeFood() { super( - new int[] {2, 2, 4}, - new float[] {1f, 1f, 0.6f}, - new String[] {"edibleslime", "edibleblood", "bacon"}, - new String[] {"food/edibleslime", "food/edibleblood", "food/bacon"}); + new int[] { 2, 2, 4 }, + new float[] { 1f, 1f, 0.6f }, + new String[] { "edibleslime", "edibleblood", "bacon" }, + new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" }); this.setHasSubtypes(true); } diff --git a/src/main/java/tconstruct/world/model/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java index 3b3d9111..9c3f7177 100644 --- a/src/main/java/tconstruct/world/model/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -1,12 +1,14 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class BarricadeRender implements ISimpleBlockRenderingHandler { + public static int model; public BarricadeRender() { @@ -14,8 +16,8 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block barricade, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block barricade, int modelId, + RenderBlocks renderer) { if (modelId == model) { int meta = world.getBlockMetadata(x, y, z); int type = meta % 4; diff --git a/src/main/java/tconstruct/world/model/CrystalModelSmall.java b/src/main/java/tconstruct/world/model/CrystalModelSmall.java index d188dcb8..fedd8ce4 100644 --- a/src/main/java/tconstruct/world/model/CrystalModelSmall.java +++ b/src/main/java/tconstruct/world/model/CrystalModelSmall.java @@ -4,30 +4,17 @@ import net.minecraft.client.model.ModelBase; public class CrystalModelSmall extends ModelBase { /* - * ModelRenderer body; ModelRendererTurbo top; ModelRendererTurbo bottom; - * - * public CrystalModelSmall() { textureWidth = 32; textureHeight = 32; - * - * body = new ModelRenderer(this, 0, 8); body.addBox(-2F, 0F, -2F, 4, 6, 4); - * body.setRotationPoint(0F, 0F, 0F); setRotation(body, 0, 0.7853982F, 0); - * top = new ModelRendererTurbo(this, 0, 0, 32, 32); top.addCone(0, 0, 0, - * 2.8F, 4, 4, 0, ModelRendererTurbo.MR_BOTTOM, 4, 8); - * top.setRotationPoint(0F, -4F, 0F); setRotation(top, 0F, 0F, 0F); bottom = - * new ModelRendererTurbo(this, 0, 18, 32, 32); top.addCone(0, 10, 0, 2.8F, - * 4, 4, 0, ModelRendererTurbo.MR_TOP, 4, 8); bottom.setRotationPoint(0F, - * 6F, 0F); //setRotation(bottom, 0F, 0F, 0F); } - * - * 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); - * top.render(f5); bottom.render(f5); } - * - * private void setRotation (ModelRenderer model, float x, float y, float z) - * { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; - * } - * - * public void setRotationAngles (float f, float f1, float f2, float f3, - * float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, - * f3, f4, f5, entity); } + * ModelRenderer body; ModelRendererTurbo top; ModelRendererTurbo bottom; public CrystalModelSmall() { textureWidth + * = 32; textureHeight = 32; body = new ModelRenderer(this, 0, 8); body.addBox(-2F, 0F, -2F, 4, 6, 4); + * body.setRotationPoint(0F, 0F, 0F); setRotation(body, 0, 0.7853982F, 0); top = new ModelRendererTurbo(this, 0, 0, + * 32, 32); top.addCone(0, 0, 0, 2.8F, 4, 4, 0, ModelRendererTurbo.MR_BOTTOM, 4, 8); top.setRotationPoint(0F, -4F, + * 0F); setRotation(top, 0F, 0F, 0F); bottom = new ModelRendererTurbo(this, 0, 18, 32, 32); top.addCone(0, 10, 0, + * 2.8F, 4, 4, 0, ModelRendererTurbo.MR_TOP, 4, 8); bottom.setRotationPoint(0F, 6F, 0F); //setRotation(bottom, 0F, + * 0F, 0F); } 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); + * top.render(f5); bottom.render(f5); } private void setRotation (ModelRenderer model, float x, float y, float z) { + * model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } public void setRotationAngles (float f, + * float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, + * entity); } */ } diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index b4a9c7ea..919d49be 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -1,14 +1,16 @@ package tconstruct.world.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.*; import net.minecraft.util.ResourceLocation; + import tconstruct.world.entity.Crystal; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class CrystalRender extends RenderLiving { + /** The creeper model. */ private final ModelBase creeperModel = new CrystalModelSmall(); @@ -29,17 +31,16 @@ public class CrystalRender extends RenderLiving { } /** - * Allows the render to do any OpenGL state modifications necessary before - * the model is rendered. Args: entityLiving, partialTickTime + * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args: + * entityLiving, partialTickTime */ /* - * protected void preRenderCallback(EntityLiving par1EntityLiving, float - * par2) { this.updateCreeperScale((Skyla)par1EntityLiving, par2); } + * protected void preRenderCallback(EntityLiving par1EntityLiving, float par2) { + * this.updateCreeperScale((Skyla)par1EntityLiving, par2); } */ /** - * Returns an ARGB int color back. Args: entityLiving, lightBrightness, - * partialTickTime + * Returns an ARGB int color back. Args: entityLiving, lightBrightness, partialTickTime */ protected int getColorMultiplier(EntityLiving par1EntityLiving, float par2, float par3) { return super.getColorMultiplier(par1EntityLiving, par2, par3); diff --git a/src/main/java/tconstruct/world/model/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java index 2e32dff0..34de6df2 100644 --- a/src/main/java/tconstruct/world/model/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -1,17 +1,19 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class OreberryRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == model) { int md = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/tconstruct/world/model/PunjiRender.java b/src/main/java/tconstruct/world/model/PunjiRender.java index 30c2436f..54e6690d 100644 --- a/src/main/java/tconstruct/world/model/PunjiRender.java +++ b/src/main/java/tconstruct/world/model/PunjiRender.java @@ -1,12 +1,15 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.*; + public class PunjiRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -18,8 +21,8 @@ public class PunjiRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); @@ -41,18 +44,14 @@ public class PunjiRender implements ISimpleBlockRenderingHandler { renderer.renderStandardBlock(block, x, y, z); } /* - * if (metadata == 5) { renderer.setRenderBounds(0.0F, 0.0, 0.0F, - * 1.0F, 0.875F, 1.0F); renderer.renderStandardBlock(block, x, y, - * z); } else { renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, - * 1.0F, 1.0F); renderer.renderStandardBlock(block, x, y, z); - * renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - * renderer.renderStandardBlock(block, x, y, z); - * renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - * renderer.renderStandardBlock(block, x, y, z); - * renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - * renderer.renderStandardBlock(block, x, y, z); - * renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - * renderer.renderStandardBlock(block, x, y, z); } + * if (metadata == 5) { renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + * renderer.renderStandardBlock(block, x, y, z); } else { renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, + * 1.0F, 1.0F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.0F, 0.0F, 0.0F, + * 0.25F, 0.75F, 0.25F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.75F, 0.0F, + * 0.0F, 1.0F, 0.75F, 0.25F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.0F, + * 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); renderer.renderStandardBlock(block, x, y, z); + * renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); renderer.renderStandardBlock(block, x, + * y, z); } */ return true; } diff --git a/src/main/java/tconstruct/world/model/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java index ace7c8ee..1cc597e8 100644 --- a/src/main/java/tconstruct/world/model/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -1,12 +1,14 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; + import tconstruct.mechworks.landmine.Helper; +import cpw.mods.fml.client.registry.*; /** * @@ -29,8 +31,8 @@ public class RenderLandmine implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == getRenderId()) { renderBasedOnSide(world, x, y, z, block, modelId, renderer); return true; @@ -40,8 +42,8 @@ public class RenderLandmine implements ISimpleBlockRenderingHandler { } @SuppressWarnings("incomplete-switch") - public void renderBasedOnSide( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public void renderBasedOnSide(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { int l = world.getBlockMetadata(x, y, z); int i1 = l & 7; boolean flag = (l & 8) > 0; diff --git a/src/main/java/tconstruct/world/model/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java index 349e7890..1f0a86be 100644 --- a/src/main/java/tconstruct/world/model/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -1,13 +1,15 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; + import tconstruct.util.ItemHelper; +import cpw.mods.fml.client.registry.*; public class SlimeChannelRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -18,8 +20,8 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { renderRotatedBlock(block, x, y, z, world, renderer); return true; @@ -74,13 +76,10 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler { tessellator.addVertexWithUV(x + 1, y + 0.5, z + 0, u3, v3); renderer.renderStandardBlock(block, x, y, z); /* - * int direction = world.getBlockMetadata(x, y, z) % 4; if (direction == - * 0) renderer.uvRotateTop = 2; if (direction == 1) renderer.uvRotateTop - * = 1; if (direction == 2) renderer.uvRotateTop = 0; if (direction == - * 3) renderer.uvRotateTop = 3; - * - * boolean flag = renderer.renderStandardBlock(block, x, y, z); - * renderer.uvRotateTop = 0; return flag; + * int direction = world.getBlockMetadata(x, y, z) % 4; if (direction == 0) renderer.uvRotateTop = 2; if + * (direction == 1) renderer.uvRotateTop = 1; if (direction == 2) renderer.uvRotateTop = 0; if (direction == 3) + * renderer.uvRotateTop = 3; boolean flag = renderer.renderStandardBlock(block, x, y, z); renderer.uvRotateTop = + * 0; return flag; */ return true; } diff --git a/src/main/java/tconstruct/world/model/SlimeModel.java b/src/main/java/tconstruct/world/model/SlimeModel.java index 30ceb100..c49f948f 100644 --- a/src/main/java/tconstruct/world/model/SlimeModel.java +++ b/src/main/java/tconstruct/world/model/SlimeModel.java @@ -1,11 +1,13 @@ package tconstruct.world.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.*; import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.*; + @SideOnly(Side.CLIENT) public class SlimeModel extends ModelBase { + /** The slime's bodies, both the inside box and the outside box */ ModelRenderer slimeBodies; diff --git a/src/main/java/tconstruct/world/model/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java index 5a40bcd0..8cd5703a 100644 --- a/src/main/java/tconstruct/world/model/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -1,15 +1,17 @@ package tconstruct.world.model; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import tconstruct.client.BlockSkinRenderHelper; import tconstruct.util.ItemHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SlimePad; +import cpw.mods.fml.client.registry.*; public class SlimePadRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -22,8 +24,8 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { renderer.setRenderBounds(0f, 0, 0f, 1f, 0.5f, 1f); int metadata = world.getBlockMetadata(x, y, z); @@ -58,23 +60,23 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler { // xMin, zMin, xMax, zMax switch (meta) { case 0: - return new float[] {0.375f, 0.6875f, 0.625f, 0.9375f}; + return new float[] { 0.375f, 0.6875f, 0.625f, 0.9375f }; case 1: - return new float[] {0.0625f, 0.6875f, 0.3125f, 0.9375f}; + return new float[] { 0.0625f, 0.6875f, 0.3125f, 0.9375f }; case 2: - return new float[] {0.0625f, 0.375f, 0.3125f, 0.625f}; + return new float[] { 0.0625f, 0.375f, 0.3125f, 0.625f }; case 3: - return new float[] {0.0625f, 0.0625f, 0.3125f, 0.3125f}; + return new float[] { 0.0625f, 0.0625f, 0.3125f, 0.3125f }; case 4: - return new float[] {0.375f, 0.0625f, 0.625f, 0.3125f}; + return new float[] { 0.375f, 0.0625f, 0.625f, 0.3125f }; case 5: - return new float[] {0.6875f, 0.0625f, 0.9375f, 0.3125f}; + return new float[] { 0.6875f, 0.0625f, 0.9375f, 0.3125f }; case 6: - return new float[] {0.6875f, 0.375f, 0.9375f, 0.625f}; + return new float[] { 0.6875f, 0.375f, 0.9375f, 0.625f }; case 7: - return new float[] {0.6875f, 0.6875f, 0.9375f, 0.9375f}; + return new float[] { 0.6875f, 0.6875f, 0.9375f, 0.9375f }; } - return new float[] {0.375f, 0.375f, 0.625f, 0.625f}; + return new float[] { 0.375f, 0.375f, 0.625f, 0.625f }; } @Override diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index 68e7d013..1f04ff2e 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -1,17 +1,20 @@ package tconstruct.world.model; -import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.*; import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; +import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class SlimeRender extends RenderLiving { + static final ResourceLocation texture = new ResourceLocation("tinker", "textures/mob/slimeedible.png"); private final ModelBase scaleAmount; @@ -60,8 +63,8 @@ public class SlimeRender extends RenderLiving { } /** - * Allows the render to do any OpenGL state modifications necessary before - * the model is rendered. Args: entityLiving, partialTickTime + * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args: + * entityLiving, partialTickTime */ @Override protected void preRenderCallback(EntityLivingBase par1EntityLiving, float par2) { diff --git a/src/main/java/tconstruct/world/village/ComponentSmeltery.java b/src/main/java/tconstruct/world/village/ComponentSmeltery.java index 73ec797f..c2730c94 100644 --- a/src/main/java/tconstruct/world/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/world/village/ComponentSmeltery.java @@ -1,38 +1,41 @@ package tconstruct.world.village; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.structure.*; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; + import tconstruct.smeltery.TinkerSmeltery; public class ComponentSmeltery extends StructureVillagePieces.House1 { + private int averageGroundLevel = -1; public ComponentSmeltery() {} - public ComponentSmeltery( - Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { + public ComponentSmeltery(Start villagePiece, int par2, Random par3Random, + StructureBoundingBox par4StructureBoundingBox, int par5) { super(); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentSmeltery buildComponent( - Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { - StructureBoundingBox structureboundingbox = - StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); + public static ComponentSmeltery buildComponent(Start villagePiece, List pieces, Random random, int p1, int p2, + int p3, int p4, int p5) { + StructureBoundingBox structureboundingbox = StructureBoundingBox + .getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); return canVillageGoDeeper(structureboundingbox) - && StructureComponent.findIntersecting(pieces, structureboundingbox) == null - ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) - : null; + && StructureComponent.findIntersecting(pieces, structureboundingbox) == null + ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) + : null; } /** - * second Part of Structure generating, this for example places Spiderwebs, - * Mob Spawners, it closes Mineshafts at the end, it adds Fences... + * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at + * the end, it adds Fences... */ @Override public boolean addComponentParts(World world, Random random, StructureBoundingBox sbb) { @@ -47,8 +50,8 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 { } /** - * arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int - * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) + * arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, + * int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ this.fillWithBlocks(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); // Base this.fillWithBlocks(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); @@ -56,7 +59,19 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 { this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false); this.fillWithMetaBlocks( - world, sbb, 2, 0, 1, 6, 2, 5, TinkerSmeltery.smeltery, 2, TinkerSmeltery.smeltery, 2, false); // Basin + world, + sbb, + 2, + 0, + 1, + 6, + 2, + 5, + TinkerSmeltery.smeltery, + 2, + TinkerSmeltery.smeltery, + 2, + false); // Basin this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false); this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 0, 1, 1, 2, sbb); @@ -80,25 +95,26 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 { return true; } - protected void fillWithMetaBlocks( - World par1World, - StructureBoundingBox par2StructureBoundingBox, - int minX, - int minY, - int minZ, - int maxX, - int maxY, - int maxZ, - Block placeBlockID, - int placeBlockMeta, - Block replaceBlockID, - int replaceBlockMeta, - boolean alwaysReplace) { + protected void fillWithMetaBlocks(World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, + int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID, int placeBlockMeta, + Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace) { Block i2 = this.func_151558_b(placeBlockID, placeBlockMeta); int j2 = this.func_151557_c(placeBlockID, placeBlockMeta); Block k2 = this.func_151558_b(replaceBlockID, replaceBlockMeta); int l2 = this.func_151557_c(replaceBlockID, replaceBlockMeta); super.fillWithMetadataBlocks( - par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace); + par1World, + par2StructureBoundingBox, + minX, + minY, + minZ, + maxX, + maxY, + maxZ, + i2, + j2, + k2, + l2, + alwaysReplace); } } diff --git a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java index 53dac147..6d6c0c34 100644 --- a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java @@ -1,40 +1,43 @@ package tconstruct.world.village; import java.util.*; + import net.minecraft.init.Blocks; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.gen.structure.*; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; + import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.*; import tconstruct.world.TinkerWorld; public class ComponentToolWorkshop extends StructureVillagePieces.House1 { + private int averageGroundLevel = -1; public ComponentToolWorkshop() {} - public ComponentToolWorkshop( - Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { + public ComponentToolWorkshop(Start villagePiece, int par2, Random par3Random, + StructureBoundingBox par4StructureBoundingBox, int par5) { super(); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentToolWorkshop buildComponent( - Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { - StructureBoundingBox structureboundingbox = - StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); + public static ComponentToolWorkshop buildComponent(Start villagePiece, List pieces, Random random, int p1, int p2, + int p3, int p4, int p5) { + StructureBoundingBox structureboundingbox = StructureBoundingBox + .getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); return canVillageGoDeeper(structureboundingbox) - && StructureComponent.findIntersecting(pieces, structureboundingbox) == null - ? new ComponentToolWorkshop(villagePiece, p5, random, structureboundingbox, p4) - : null; + && StructureComponent.findIntersecting(pieces, structureboundingbox) == null + ? new ComponentToolWorkshop(villagePiece, p5, random, structureboundingbox, p4) + : null; } /** - * second Part of Structure generating, this for example places Spiderwebs, - * Mob Spawners, it closes Mineshafts at the end, it adds Fences... + * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at + * the end, it adds Fences... */ @Override public boolean addComponentParts(World world, Random random, StructureBoundingBox sbb) { @@ -49,9 +52,8 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 { } /** - * arguments: (World worldObj, StructureBoundingBox structBB, int minX, - * int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, - * int replaceBlockId, boolean alwaysreplace) + * arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, + * int maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); // Base this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false); @@ -168,15 +170,9 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 { return true; } - protected boolean generateStructureCraftingStationContents( - World world, - StructureBoundingBox par2StructureBoundingBox, - Random random, - int x, - int y, - int z, - WeightedRandomChestContent[] content, - int par8) { + protected boolean generateStructureCraftingStationContents(World world, + StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, + WeightedRandomChestContent[] content, int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); @@ -196,15 +192,8 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 { } } - protected boolean generateStructurePatternChestContents( - World world, - StructureBoundingBox par2StructureBoundingBox, - Random random, - int x, - int y, - int z, - WeightedRandomChestContent[] content, - int par8) { + protected boolean generateStructurePatternChestContents(World world, StructureBoundingBox par2StructureBoundingBox, + Random random, int x, int y, int z, WeightedRandomChestContent[] content, int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); @@ -225,8 +214,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 { } /** - * Returns the villager type to spawn in this component, based on the number - * of villagers already spawned. + * Returns the villager type to spawn in this component, based on the number of villagers already spawned. */ @Override protected int getVillagerType(int par1) { diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index db7e720b..1ff76f1d 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -1,14 +1,16 @@ package tconstruct.world.village; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import java.util.*; + import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.village.*; + import tconstruct.mechworks.TinkerMechworks; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class TVillageTrades implements IVillageTradeHandler { diff --git a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java index 589c1573..4b33fc47 100644 --- a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java @@ -1,11 +1,14 @@ package tconstruct.world.village; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; import java.util.*; + import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; + public class VillageSmelteryHandler implements IVillageCreationHandler { + @Override public PieceWeight getVillagePieceWeight(Random random, int i) { return new PieceWeight(ComponentSmeltery.class, 9, 1); @@ -17,16 +20,8 @@ public class VillageSmelteryHandler implements IVillageCreationHandler { } @Override - public Object buildComponent( - PieceWeight villagePiece, - Start startPiece, - List pieces, - Random random, - int p1, - int p2, - int p3, - int p4, - int p5) { + public Object buildComponent(PieceWeight villagePiece, Start startPiece, List pieces, Random random, int p1, int p2, + int p3, int p4, int p5) { return ComponentSmeltery.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } } diff --git a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java index bb24ac25..563703e4 100644 --- a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java @@ -1,11 +1,14 @@ package tconstruct.world.village; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; import java.util.*; + import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; + public class VillageToolStationHandler implements IVillageCreationHandler { + @Override public PieceWeight getVillagePieceWeight(Random random, int i) { return new PieceWeight(ComponentToolWorkshop.class, 30, i + random.nextInt(4)); @@ -17,16 +20,8 @@ public class VillageToolStationHandler implements IVillageCreationHandler { } @Override - public Object buildComponent( - PieceWeight villagePiece, - Start startPiece, - List pieces, - Random random, - int p1, - int p2, - int p3, - int p4, - int p5) { + public Object buildComponent(PieceWeight villagePiece, Start startPiece, List pieces, Random random, int p1, int p2, + int p3, int p4, int p5) { return ComponentToolWorkshop.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } }