From 0e893e449f89d784c76a716614240a103351b96d Mon Sep 17 00:00:00 2001 From: brad-c Date: Mon, 12 Aug 2013 16:22:59 +0800 Subject: [PATCH] Initial code dump. --- .classpath | 9 + .gitignore | 3 + .project | 17 + README.md | 4 + build.xml | 170 +++++ .../api/blueprints/BlockSignature.java | 77 +++ .../api/blueprints/BlueprintManager.java | 35 + .../buildcraft/api/blueprints/BptBlock.java | 234 +++++++ .../api/blueprints/BptBlockUtils.java | 85 +++ .../api/blueprints/BptSlotInfo.java | 54 ++ .../api/blueprints/IBptContext.java | 48 ++ .../api/blueprints/ItemSignature.java | 48 ++ .../buildcraft/api/bptblocks/BptBlockBed.java | 86 +++ .../api/bptblocks/BptBlockCustomStack.java | 34 + .../api/bptblocks/BptBlockDelegate.java | 65 ++ .../api/bptblocks/BptBlockDirt.java | 42 ++ .../api/bptblocks/BptBlockDoor.java | 71 ++ .../api/bptblocks/BptBlockFluid.java | 61 ++ .../api/bptblocks/BptBlockIgnore.java | 45 ++ .../api/bptblocks/BptBlockIgnoreMeta.java | 34 + .../api/bptblocks/BptBlockInventory.java | 28 + .../api/bptblocks/BptBlockLever.java | 38 ++ .../api/bptblocks/BptBlockPiston.java | 29 + .../api/bptblocks/BptBlockPumpkin.java | 53 ++ .../bptblocks/BptBlockRedstoneRepeater.java | 50 ++ .../bptblocks/BptBlockRotateInventory.java | 27 + .../api/bptblocks/BptBlockRotateMeta.java | 84 +++ .../api/bptblocks/BptBlockSign.java | 64 ++ .../api/bptblocks/BptBlockStairs.java | 53 ++ .../api/bptblocks/BptBlockWallSide.java | 52 ++ common/buildcraft/api/core/BuildCraftAPI.java | 20 + common/buildcraft/api/core/IAreaProvider.java | 34 + common/buildcraft/api/core/IBox.java | 30 + common/buildcraft/api/core/IIconProvider.java | 24 + common/buildcraft/api/core/LaserKind.java | 14 + common/buildcraft/api/core/Position.java | 142 ++++ .../buildcraft/api/core/SafeTimeTracker.java | 46 ++ common/buildcraft/api/core/StackWrapper.java | 50 ++ .../buildcraft/api/filler/FillerManager.java | 7 + .../buildcraft/api/filler/IFillerPattern.java | 23 + .../api/filler/IFillerRegistry.java | 15 + .../api/fuels/IronEngineCoolant.java | 83 +++ .../buildcraft/api/fuels/IronEngineFuel.java | 50 ++ .../buildcraft/api/gates/ActionManager.java | 106 +++ common/buildcraft/api/gates/IAction.java | 27 + .../buildcraft/api/gates/IActionProvider.java | 23 + .../buildcraft/api/gates/IActionReceptor.java | 16 + .../api/gates/IOverrideDefaultTriggers.java | 21 + common/buildcraft/api/gates/ITrigger.java | 47 ++ .../api/gates/ITriggerParameter.java | 18 + .../api/gates/ITriggerProvider.java | 29 + .../api/gates/TriggerParameter.java | 79 +++ .../api/inventory/ISecuredInventory.java | 23 + .../api/inventory/ISelectiveInventory.java | 23 + .../api/inventory/ISpecialInventory.java | 36 + .../buildcraft/api/power/IPowerEmitter.java | 24 + .../buildcraft/api/power/IPowerReceptor.java | 47 ++ common/buildcraft/api/power/PowerHandler.java | 389 +++++++++++ .../api/recipes/AssemblyRecipe.java | 48 ++ .../api/recipes/RefineryRecipes.java | 126 ++++ common/buildcraft/api/tools/IToolPipette.java | 40 ++ common/buildcraft/api/tools/IToolWrench.java | 32 + .../api/transport/FacadeManager.java | 25 + .../api/transport/IExtractionHandler.java | 21 + common/buildcraft/api/transport/IPipe.java | 45 ++ .../api/transport/IPipeConnection.java | 29 + .../buildcraft/api/transport/IPipeTile.java | 39 ++ .../api/transport/ISolidSideTile.java | 7 + .../buildcraft/api/transport/PipeManager.java | 36 + common/crazypants/enderio/ClientProxy.java | 120 ++++ .../crazypants/enderio/ClientTickHandler.java | 60 ++ common/crazypants/enderio/CommonProxy.java | 38 ++ common/crazypants/enderio/Config.java | 19 + common/crazypants/enderio/EnderIO.java | 172 +++++ common/crazypants/enderio/EnderIOTab.java | 36 + common/crazypants/enderio/GuiHandler.java | 41 ++ common/crazypants/enderio/ModObject.java | 80 +++ common/crazypants/enderio/PacketHandler.java | 264 ++++++++ .../crazypants/enderio/ServerTickHandler.java | 81 +++ common/crazypants/enderio/TickListener.java | 13 + common/crazypants/enderio/Tst.java | 22 + .../enderio/conduit/AbstractConduit.java | 368 ++++++++++ .../conduit/AbstractConduitNetwork.java | 84 +++ .../enderio/conduit/AbstractItemConduit.java | 121 ++++ .../enderio/conduit/BlockConduitBundle.java | 601 +++++++++++++++++ .../enderio/conduit/ConduitRecipes.java | 41 ++ .../enderio/conduit/ConduitUtil.java | 196 ++++++ .../crazypants/enderio/conduit/IConduit.java | 103 +++ .../enderio/conduit/IConduitBundle.java | 68 ++ .../enderio/conduit/IConduitItem.java | 11 + .../enderio/conduit/ItemConduitSubtype.java | 18 + .../enderio/conduit/RaytraceResult.java | 38 ++ .../enderio/conduit/TileConduitBundle.java | 517 ++++++++++++++ .../conduit/facade/BlockConduitFacade.java | 100 +++ .../conduit/facade/FacadeRenderer.java | 93 +++ .../conduit/facade/ItemConduitFacade.java | 106 +++ .../enderio/conduit/geom/CollidableCache.java | 83 +++ .../conduit/geom/CollidableComponent.java | 28 + .../conduit/geom/ConduitConnectorType.java | 9 + .../conduit/geom/ConduitGeometryUtil.java | 131 ++++ .../enderio/conduit/geom/GeometryKey.java | 60 ++ .../enderio/conduit/geom/Offset.java | 31 + .../enderio/conduit/geom/Offsets.java | 84 +++ .../enderio/conduit/liquid/ConduitTank.java | 183 +++++ .../conduit/liquid/ILiquidConduit.java | 31 + .../conduit/liquid/ItemLiquidConduit.java | 36 + .../enderio/conduit/liquid/LiquidConduit.java | 548 +++++++++++++++ .../conduit/liquid/LiquidConduitNetwork.java | 285 ++++++++ .../conduit/liquid/LiquidConduitRenderer.java | 118 ++++ .../enderio/conduit/power/IPowerConduit.java | 23 + .../conduit/power/ItemPowerConduit.java | 53 ++ .../conduit/power/NetworkPowerManager.java | 251 +++++++ .../enderio/conduit/power/PowerConduit.java | 234 +++++++ .../conduit/power/PowerConduitNetwork.java | 136 ++++ .../conduit/redstone/IRedstoneConduit.java | 39 ++ .../conduit/redstone/ItemRedstoneConduit.java | 41 ++ .../conduit/redstone/RedstoneConduit.java | 221 ++++++ .../redstone/RedstoneConduitNetwork.java | 185 +++++ .../conduit/redstone/RedstoneSwitch.java | 145 ++++ .../redstone/RedstoneSwitchRenderer.java | 112 ++++ .../enderio/conduit/redstone/Signal.java | 62 ++ .../conduit/redstone/SignalSource.java | 85 +++ .../conduit/render/ConduitBundleRenderer.java | 212 ++++++ .../conduit/render/ConduitRenderer.java | 12 + .../render/DefaultConduitRenderer.java | 296 ++++++++ .../conduit/render/ItemConduitRenderer.java | 68 ++ .../render/RoundedSegmentRenderer.java | 186 +++++ .../enderio/enderface/BlockEnderIO.java | 113 ++++ .../enderio/enderface/ContainerWrapper.java | 114 ++++ .../enderio/enderface/EnderIoRenderer.java | 157 +++++ .../enderio/enderface/GuiEnderface.java | 507 ++++++++++++++ .../enderio/enderface/ItemEnderface.java | 122 ++++ .../enderio/enderface/TileEnderIO.java | 7 + .../enderio/machine/AbstractMachineBlock.java | 246 +++++++ .../machine/AbstractMachineEntity.java | 353 ++++++++++ .../machine/AbstractPoweredTaskEntity.java | 189 ++++++ .../enderio/machine/BlockElectricLight.java | 95 +++ .../enderio/machine/GuiMachineBase.java | 129 ++++ .../crazypants/enderio/machine/IMachine.java | 8 + .../enderio/machine/IMachineRecipe.java | 21 + .../machine/MachineRecipeRegistry.java | 62 ++ .../enderio/machine/MachineRecipes.java | 40 ++ .../enderio/machine/PoweredTask.java | 119 ++++ .../enderio/machine/RecipeInput.java | 30 + .../enderio/machine/RedstoneControlMode.java | 9 + .../machine/alloy/BasicAlloyRecipe.java | 104 +++ .../machine/alloy/BlockAlloySmelter.java | 66 ++ .../machine/alloy/ContainerAlloySmelter.java | 115 ++++ .../machine/alloy/GuiAlloySmelter.java | 46 ++ .../machine/alloy/TileAlloySmelter.java | 31 + .../generator/BlockStirlingGenerator.java | 45 ++ .../generator/GuiStirlingGenerator.java | 59 ++ .../generator/StirlingGeneratorContainer.java | 81 +++ .../TileEntityStirlingGenerator.java | 225 +++++++ .../machine/painter/BasicPainterTemplate.java | 119 ++++ .../machine/painter/BlockCustomFence.java | 190 ++++++ .../machine/painter/BlockCustomFenceGate.java | 164 +++++ .../painter/BlockCustomFenceGateRenderer.java | 221 ++++++ .../machine/painter/BlockCustomStair.java | 168 +++++ .../machine/painter/BlockCustomWall.java | 168 +++++ .../machine/painter/BlockItemCustomFence.java | 21 + .../painter/BlockItemCustomFenceGate.java | 17 + .../machine/painter/BlockItemCustomStair.java | 16 + .../machine/painter/BlockItemCustomWall.java | 16 + .../enderio/machine/painter/BlockPainter.java | 65 ++ .../enderio/machine/painter/GuiPainter.java | 48 ++ .../machine/painter/PaintedItemRenderer.java | 70 ++ .../machine/painter/PainterContainer.java | 110 +++ .../enderio/machine/painter/PainterUtil.java | 77 +++ .../painter/TileEntityCustomBlock.java | 67 ++ .../machine/painter/TileEntityPainter.java | 70 ++ .../machine/reservoir/BlockReservoir.java | 283 ++++++++ .../machine/reservoir/ReservoirRenderer.java | 169 +++++ .../machine/reservoir/ReservoirTank.java | 66 ++ .../machine/reservoir/TankNeighbour.java | 18 + .../machine/reservoir/TileReservoir.java | 630 +++++++++++++++++ .../machine/solor/BlockSolarPanel.java | 105 +++ .../machine/solor/TileEntitySolorPanel.java | 188 ++++++ common/crazypants/enderio/material/Alloy.java | 28 + .../enderio/material/BlockFusedQuartz.java | 146 ++++ .../material/FusedQuartzFrameRenderer.java | 67 ++ .../enderio/material/FusedQuartzRenderer.java | 268 ++++++++ .../enderio/material/ItemAlloy.java | 80 +++ .../enderio/material/ItemCapacitor.java | 43 ++ .../material/ItemFusedQuartzFrame.java | 91 +++ .../material/ItemIndustrialBinder.java | 37 + .../enderio/material/ItemYetaWrench.java | 72 ++ .../enderio/material/MaterialRecipes.java | 43 ++ .../enderio/power/BasicCapacitor.java | 94 +++ .../crazypants/enderio/power/ICapacitor.java | 16 + .../enderio/power/ICapacitorItem.java | 7 + .../enderio/power/IInternalPowerReceptor.java | 12 + .../enderio/power/PowerHandlerUtil.java | 98 +++ common/crazypants/render/BoundingBox.java | 149 +++++ common/crazypants/render/CubeRenderer.java | 183 +++++ common/crazypants/render/EmptySlot.java | 43 ++ .../crazypants/render/GuiContainerBase.java | 60 ++ common/crazypants/render/GuiToolTip.java | 74 ++ common/crazypants/render/IconButton.java | 107 +++ common/crazypants/render/IconUtil.java | 39 ++ common/crazypants/render/ItemButton.java | 84 +++ common/crazypants/render/RenderUtil.java | 124 ++++ common/crazypants/render/VertexRotation.java | 23 + common/crazypants/render/VertexTransform.java | 10 + common/crazypants/util/BlockCoord.java | 63 ++ .../util/ForgeDirectionOffsets.java | 37 + common/crazypants/util/MetadataUtil.java | 44 ++ common/crazypants/util/PacketUtil.java | 139 ++++ common/crazypants/util/Util.java | 49 ++ common/crazypants/vecmath/Camera.java | 146 ++++ common/crazypants/vecmath/Matrix4d.java | 525 +++++++++++++++ common/crazypants/vecmath/Quat4d.java | 48 ++ common/crazypants/vecmath/VecmathUtil.java | 633 ++++++++++++++++++ common/crazypants/vecmath/Vector2d.java | 82 +++ common/crazypants/vecmath/Vector3d.java | 101 +++ common/crazypants/vecmath/Vector3f.java | 94 +++ common/crazypants/vecmath/Vector4d.java | 92 +++ common/crazypants/vecmath/ViewFrustum.java | 172 +++++ lib/cglib-nodep-2.2.3.jar | Bin 0 -> 322553 bytes resources/CGLibLiscence.txt | 201 ++++++ .../textures/blocks/CutterFrontOff.pdn | Bin 0 -> 7273 bytes .../textures/blocks/CutterFrontOff.png | Bin 0 -> 415 bytes .../enderio/textures/blocks/CutterFrontOn.pdn | Bin 0 -> 7279 bytes .../enderio/textures/blocks/CutterFrontOn.png | Bin 0 -> 416 bytes .../textures/blocks/activatedIronNugget.png | Bin 0 -> 229 bytes .../textures/blocks/alloySmelterFront.pdn | Bin 0 -> 6994 bytes .../textures/blocks/alloySmelterFront.png | Bin 0 -> 517 bytes .../textures/blocks/alloySmelterFrontOn.png | Bin 0 -> 534 bytes .../blocks/blockElectricLightFace.png | Bin 0 -> 216 bytes .../enderio/textures/blocks/conduitBundle.png | Bin 0 -> 480 bytes .../textures/blocks/conduitConnector.png | Bin 0 -> 178 bytes .../enderio/textures/blocks/conduitFacade.png | Bin 0 -> 300 bytes .../enderio/textures/blocks/enderIO.pdn | Bin 0 -> 8504 bytes .../enderio/textures/blocks/enderIO.png | Bin 0 -> 434 bytes .../enderio/textures/blocks/enderIOFrame.pdn | Bin 0 -> 8716 bytes .../enderio/textures/blocks/enderIOFrame.png | Bin 0 -> 838 bytes .../textures/blocks/enderIronNugget.png | Bin 0 -> 232 bytes .../enderio/textures/blocks/fusedQuartz.pdn | Bin 0 -> 5083 bytes .../enderio/textures/blocks/fusedQuartz.png | Bin 0 -> 186 bytes .../textures/blocks/fusedQuartzItem.png | Bin 0 -> 220 bytes .../textures/blocks/iconRedstoneControls.pdn | Bin 0 -> 7098 bytes .../textures/blocks/iconRedstoneIgnore.png | Bin 0 -> 489 bytes .../textures/blocks/iconRedstoneOff.png | Bin 0 -> 253 bytes .../textures/blocks/iconRedstoneOn.png | Bin 0 -> 253 bytes .../enderio/textures/blocks/liquidConduit.pdn | Bin 0 -> 6764 bytes .../enderio/textures/blocks/liquidConduit.png | Bin 0 -> 257 bytes .../textures/blocks/liquidConduitCore.pdn | Bin 0 -> 5796 bytes .../textures/blocks/liquidConduitCore.png | Bin 0 -> 481 bytes .../textures/blocks/liquidConduitExtract.pdn | Bin 0 -> 6114 bytes .../textures/blocks/liquidConduitExtract.png | Bin 0 -> 331 bytes .../enderio/textures/blocks/machineSide.pdn | Bin 0 -> 5764 bytes .../enderio/textures/blocks/machineSide.png | Bin 0 -> 445 bytes .../enderio/textures/blocks/painterFront.pdn | Bin 0 -> 6299 bytes .../textures/blocks/painterFrontOff.png | Bin 0 -> 417 bytes .../textures/blocks/painterFrontOn.png | Bin 0 -> 433 bytes .../enderio/textures/blocks/powerConduit.png | Bin 0 -> 169 bytes .../textures/blocks/powerConduitCore.pdn | Bin 0 -> 8179 bytes .../textures/blocks/powerConduitCore.png | Bin 0 -> 396 bytes .../textures/blocks/powerConduitCoreEnder.png | Bin 0 -> 435 bytes .../blocks/powerConduitCoreEnhanced.png | Bin 0 -> 443 bytes .../textures/blocks/powerConduitEnder.png | Bin 0 -> 180 bytes .../textures/blocks/powerConduitEnhanced.png | Bin 0 -> 171 bytes .../blocks/powerConduitTransmission.png | Bin 0 -> 172 bytes .../textures/blocks/redstoneConduit.png | Bin 0 -> 158 bytes .../blocks/redstoneConduitCoreOff.pdn | Bin 0 -> 6313 bytes .../blocks/redstoneConduitCoreOff.png | Bin 0 -> 530 bytes .../textures/blocks/redstoneConduitCoreOn.pdn | Bin 0 -> 6317 bytes .../textures/blocks/redstoneConduitCoreOn.png | Bin 0 -> 533 bytes .../textures/blocks/redstoneConduitSwitch.pdn | Bin 0 -> 6227 bytes .../blocks/redstoneConduitSwitchOff.png | Bin 0 -> 489 bytes .../blocks/redstoneConduitSwitchOn.png | Bin 0 -> 486 bytes .../blocks/redstoneConduitTransmission.png | Bin 0 -> 241 bytes .../enderio/textures/blocks/reservoir.pdn | Bin 0 -> 9868 bytes .../enderio/textures/blocks/reservoir.png | Bin 0 -> 534 bytes .../textures/blocks/reservoirFront.pdn | Bin 0 -> 8749 bytes .../enderio/textures/blocks/reservoirMbB.png | Bin 0 -> 258 bytes .../enderio/textures/blocks/reservoirMbBl.png | Bin 0 -> 216 bytes .../enderio/textures/blocks/reservoirMbBr.png | Bin 0 -> 223 bytes .../enderio/textures/blocks/reservoirMbL.png | Bin 0 -> 271 bytes .../enderio/textures/blocks/reservoirMbR.png | Bin 0 -> 272 bytes .../enderio/textures/blocks/reservoirMbT.png | Bin 0 -> 270 bytes .../enderio/textures/blocks/reservoirMbTl.png | Bin 0 -> 229 bytes .../enderio/textures/blocks/reservoirMbTr.png | Bin 0 -> 228 bytes .../blocks/reservoirSideHorizontal.pdn | Bin 0 -> 7752 bytes .../textures/blocks/reservoirSideVertical.pdn | Bin 0 -> 7868 bytes .../textures/blocks/reservoirSwitch.png | Bin 0 -> 650 bytes .../textures/blocks/solarPanelSide.png | Bin 0 -> 169 bytes .../enderio/textures/blocks/solarPanelTop.png | Bin 0 -> 262 bytes .../textures/blocks/stirlingGenFront.pdn | Bin 0 -> 7023 bytes .../textures/blocks/stirlingGenFrontOff.png | Bin 0 -> 478 bytes .../textures/blocks/stirlingGenFrontOn.png | Bin 0 -> 496 bytes .../enderio/textures/gui/alloySmelter.png | Bin 0 -> 2434 bytes .../assets/enderio/textures/gui/painter.pdn | Bin 0 -> 16711 bytes .../assets/enderio/textures/gui/painter.png | Bin 0 -> 2383 bytes .../textures/gui/stirlingGenerator.pdn | Bin 0 -> 11414 bytes .../textures/gui/stirlingGenerator.png | Bin 0 -> 2144 bytes .../enderio/textures/items/ConduitFacade.png | Bin 0 -> 457 bytes .../textures/items/ItemLiquidConduit.png | Bin 0 -> 481 bytes .../textures/items/ItemPowerConduit.png | Bin 0 -> 396 bytes .../textures/items/ItemRedstoneConduit.png | Bin 0 -> 530 bytes .../enderio/textures/items/activatedGold.png | Bin 0 -> 302 bytes .../textures/items/activatedGoldNugget.png | Bin 0 -> 244 bytes .../enderio/textures/items/activatedIron.pdn | Bin 0 -> 7103 bytes .../enderio/textures/items/activatedIron.png | Bin 0 -> 303 bytes .../textures/items/activatedIronNugget.png | Bin 0 -> 248 bytes .../enderio/textures/items/basicCapacitor.pdn | Bin 0 -> 11726 bytes .../enderio/textures/items/basicCapacitor.png | Bin 0 -> 484 bytes .../enderio/textures/items/blueSteel.png | Bin 0 -> 305 bytes .../textures/items/blueSteelNugget.pdn | Bin 0 -> 5035 bytes .../textures/items/blueSteelNugget.png | Bin 0 -> 248 bytes .../enderio/textures/items/conduitFacade.pdn | Bin 0 -> 7686 bytes .../textures/items/conduitFacadeOverlay.png | Bin 0 -> 297 bytes .../enderio/textures/items/enderGold.png | Bin 0 -> 299 bytes .../textures/items/enderGoldNugget.png | Bin 0 -> 247 bytes .../enderio/textures/items/enderIron.png | Bin 0 -> 302 bytes .../textures/items/enderIronNugget.pdn | Bin 0 -> 5035 bytes .../textures/items/enderIronNugget.png | Bin 0 -> 248 bytes .../enderio/textures/items/enderface.pdn | Bin 0 -> 9205 bytes .../enderio/textures/items/enderface.png | Bin 0 -> 394 bytes .../textures/items/industrialBinder.pdn | Bin 0 -> 7561 bytes .../textures/items/industrialBinder.png | Bin 0 -> 478 bytes .../textures/items/itemPowerConduitEnder.png | Bin 0 -> 435 bytes .../items/itemPowerConduitEnhanced.png | Bin 0 -> 443 bytes .../textures/items/itemRedstoneSwitch.png | Bin 0 -> 489 bytes .../assets/enderio/textures/items/nugget.pdn | Bin 0 -> 5041 bytes .../enderio/textures/items/yetaWrench.png | Bin 0 -> 586 bytes resources/mcmod.info | 21 + 327 files changed, 21597 insertions(+) create mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .project create mode 100644 build.xml create mode 100644 common/buildcraft/api/blueprints/BlockSignature.java create mode 100644 common/buildcraft/api/blueprints/BlueprintManager.java create mode 100644 common/buildcraft/api/blueprints/BptBlock.java create mode 100644 common/buildcraft/api/blueprints/BptBlockUtils.java create mode 100644 common/buildcraft/api/blueprints/BptSlotInfo.java create mode 100644 common/buildcraft/api/blueprints/IBptContext.java create mode 100644 common/buildcraft/api/blueprints/ItemSignature.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockBed.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockCustomStack.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockDelegate.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockDirt.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockDoor.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockFluid.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockIgnore.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockInventory.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockLever.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockPiston.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockPumpkin.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockRotateInventory.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockRotateMeta.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockSign.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockStairs.java create mode 100644 common/buildcraft/api/bptblocks/BptBlockWallSide.java create mode 100644 common/buildcraft/api/core/BuildCraftAPI.java create mode 100644 common/buildcraft/api/core/IAreaProvider.java create mode 100644 common/buildcraft/api/core/IBox.java create mode 100644 common/buildcraft/api/core/IIconProvider.java create mode 100644 common/buildcraft/api/core/LaserKind.java create mode 100644 common/buildcraft/api/core/Position.java create mode 100644 common/buildcraft/api/core/SafeTimeTracker.java create mode 100644 common/buildcraft/api/core/StackWrapper.java create mode 100644 common/buildcraft/api/filler/FillerManager.java create mode 100644 common/buildcraft/api/filler/IFillerPattern.java create mode 100644 common/buildcraft/api/filler/IFillerRegistry.java create mode 100644 common/buildcraft/api/fuels/IronEngineCoolant.java create mode 100644 common/buildcraft/api/fuels/IronEngineFuel.java create mode 100644 common/buildcraft/api/gates/ActionManager.java create mode 100644 common/buildcraft/api/gates/IAction.java create mode 100644 common/buildcraft/api/gates/IActionProvider.java create mode 100644 common/buildcraft/api/gates/IActionReceptor.java create mode 100644 common/buildcraft/api/gates/IOverrideDefaultTriggers.java create mode 100644 common/buildcraft/api/gates/ITrigger.java create mode 100644 common/buildcraft/api/gates/ITriggerParameter.java create mode 100644 common/buildcraft/api/gates/ITriggerProvider.java create mode 100644 common/buildcraft/api/gates/TriggerParameter.java create mode 100644 common/buildcraft/api/inventory/ISecuredInventory.java create mode 100644 common/buildcraft/api/inventory/ISelectiveInventory.java create mode 100644 common/buildcraft/api/inventory/ISpecialInventory.java create mode 100644 common/buildcraft/api/power/IPowerEmitter.java create mode 100644 common/buildcraft/api/power/IPowerReceptor.java create mode 100644 common/buildcraft/api/power/PowerHandler.java create mode 100644 common/buildcraft/api/recipes/AssemblyRecipe.java create mode 100644 common/buildcraft/api/recipes/RefineryRecipes.java create mode 100644 common/buildcraft/api/tools/IToolPipette.java create mode 100644 common/buildcraft/api/tools/IToolWrench.java create mode 100644 common/buildcraft/api/transport/FacadeManager.java create mode 100644 common/buildcraft/api/transport/IExtractionHandler.java create mode 100644 common/buildcraft/api/transport/IPipe.java create mode 100644 common/buildcraft/api/transport/IPipeConnection.java create mode 100644 common/buildcraft/api/transport/IPipeTile.java create mode 100644 common/buildcraft/api/transport/ISolidSideTile.java create mode 100644 common/buildcraft/api/transport/PipeManager.java create mode 100644 common/crazypants/enderio/ClientProxy.java create mode 100644 common/crazypants/enderio/ClientTickHandler.java create mode 100644 common/crazypants/enderio/CommonProxy.java create mode 100644 common/crazypants/enderio/Config.java create mode 100644 common/crazypants/enderio/EnderIO.java create mode 100644 common/crazypants/enderio/EnderIOTab.java create mode 100644 common/crazypants/enderio/GuiHandler.java create mode 100644 common/crazypants/enderio/ModObject.java create mode 100644 common/crazypants/enderio/PacketHandler.java create mode 100644 common/crazypants/enderio/ServerTickHandler.java create mode 100644 common/crazypants/enderio/TickListener.java create mode 100644 common/crazypants/enderio/Tst.java create mode 100644 common/crazypants/enderio/conduit/AbstractConduit.java create mode 100644 common/crazypants/enderio/conduit/AbstractConduitNetwork.java create mode 100644 common/crazypants/enderio/conduit/AbstractItemConduit.java create mode 100644 common/crazypants/enderio/conduit/BlockConduitBundle.java create mode 100644 common/crazypants/enderio/conduit/ConduitRecipes.java create mode 100644 common/crazypants/enderio/conduit/ConduitUtil.java create mode 100644 common/crazypants/enderio/conduit/IConduit.java create mode 100644 common/crazypants/enderio/conduit/IConduitBundle.java create mode 100644 common/crazypants/enderio/conduit/IConduitItem.java create mode 100644 common/crazypants/enderio/conduit/ItemConduitSubtype.java create mode 100644 common/crazypants/enderio/conduit/RaytraceResult.java create mode 100644 common/crazypants/enderio/conduit/TileConduitBundle.java create mode 100644 common/crazypants/enderio/conduit/facade/BlockConduitFacade.java create mode 100644 common/crazypants/enderio/conduit/facade/FacadeRenderer.java create mode 100644 common/crazypants/enderio/conduit/facade/ItemConduitFacade.java create mode 100644 common/crazypants/enderio/conduit/geom/CollidableCache.java create mode 100644 common/crazypants/enderio/conduit/geom/CollidableComponent.java create mode 100644 common/crazypants/enderio/conduit/geom/ConduitConnectorType.java create mode 100644 common/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java create mode 100644 common/crazypants/enderio/conduit/geom/GeometryKey.java create mode 100644 common/crazypants/enderio/conduit/geom/Offset.java create mode 100644 common/crazypants/enderio/conduit/geom/Offsets.java create mode 100644 common/crazypants/enderio/conduit/liquid/ConduitTank.java create mode 100644 common/crazypants/enderio/conduit/liquid/ILiquidConduit.java create mode 100644 common/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java create mode 100644 common/crazypants/enderio/conduit/liquid/LiquidConduit.java create mode 100644 common/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java create mode 100644 common/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java create mode 100644 common/crazypants/enderio/conduit/power/IPowerConduit.java create mode 100644 common/crazypants/enderio/conduit/power/ItemPowerConduit.java create mode 100644 common/crazypants/enderio/conduit/power/NetworkPowerManager.java create mode 100644 common/crazypants/enderio/conduit/power/PowerConduit.java create mode 100644 common/crazypants/enderio/conduit/power/PowerConduitNetwork.java create mode 100644 common/crazypants/enderio/conduit/redstone/IRedstoneConduit.java create mode 100644 common/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java create mode 100644 common/crazypants/enderio/conduit/redstone/RedstoneConduit.java create mode 100644 common/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java create mode 100644 common/crazypants/enderio/conduit/redstone/RedstoneSwitch.java create mode 100644 common/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java create mode 100644 common/crazypants/enderio/conduit/redstone/Signal.java create mode 100644 common/crazypants/enderio/conduit/redstone/SignalSource.java create mode 100644 common/crazypants/enderio/conduit/render/ConduitBundleRenderer.java create mode 100644 common/crazypants/enderio/conduit/render/ConduitRenderer.java create mode 100644 common/crazypants/enderio/conduit/render/DefaultConduitRenderer.java create mode 100644 common/crazypants/enderio/conduit/render/ItemConduitRenderer.java create mode 100644 common/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java create mode 100644 common/crazypants/enderio/enderface/BlockEnderIO.java create mode 100644 common/crazypants/enderio/enderface/ContainerWrapper.java create mode 100644 common/crazypants/enderio/enderface/EnderIoRenderer.java create mode 100644 common/crazypants/enderio/enderface/GuiEnderface.java create mode 100644 common/crazypants/enderio/enderface/ItemEnderface.java create mode 100644 common/crazypants/enderio/enderface/TileEnderIO.java create mode 100644 common/crazypants/enderio/machine/AbstractMachineBlock.java create mode 100644 common/crazypants/enderio/machine/AbstractMachineEntity.java create mode 100644 common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java create mode 100644 common/crazypants/enderio/machine/BlockElectricLight.java create mode 100644 common/crazypants/enderio/machine/GuiMachineBase.java create mode 100644 common/crazypants/enderio/machine/IMachine.java create mode 100644 common/crazypants/enderio/machine/IMachineRecipe.java create mode 100644 common/crazypants/enderio/machine/MachineRecipeRegistry.java create mode 100644 common/crazypants/enderio/machine/MachineRecipes.java create mode 100644 common/crazypants/enderio/machine/PoweredTask.java create mode 100644 common/crazypants/enderio/machine/RecipeInput.java create mode 100644 common/crazypants/enderio/machine/RedstoneControlMode.java create mode 100644 common/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java create mode 100644 common/crazypants/enderio/machine/alloy/BlockAlloySmelter.java create mode 100644 common/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java create mode 100644 common/crazypants/enderio/machine/alloy/GuiAlloySmelter.java create mode 100644 common/crazypants/enderio/machine/alloy/TileAlloySmelter.java create mode 100644 common/crazypants/enderio/machine/generator/BlockStirlingGenerator.java create mode 100644 common/crazypants/enderio/machine/generator/GuiStirlingGenerator.java create mode 100644 common/crazypants/enderio/machine/generator/StirlingGeneratorContainer.java create mode 100644 common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java create mode 100644 common/crazypants/enderio/machine/painter/BasicPainterTemplate.java create mode 100644 common/crazypants/enderio/machine/painter/BlockCustomFence.java create mode 100644 common/crazypants/enderio/machine/painter/BlockCustomFenceGate.java create mode 100644 common/crazypants/enderio/machine/painter/BlockCustomFenceGateRenderer.java create mode 100644 common/crazypants/enderio/machine/painter/BlockCustomStair.java create mode 100644 common/crazypants/enderio/machine/painter/BlockCustomWall.java create mode 100644 common/crazypants/enderio/machine/painter/BlockItemCustomFence.java create mode 100644 common/crazypants/enderio/machine/painter/BlockItemCustomFenceGate.java create mode 100644 common/crazypants/enderio/machine/painter/BlockItemCustomStair.java create mode 100644 common/crazypants/enderio/machine/painter/BlockItemCustomWall.java create mode 100644 common/crazypants/enderio/machine/painter/BlockPainter.java create mode 100644 common/crazypants/enderio/machine/painter/GuiPainter.java create mode 100644 common/crazypants/enderio/machine/painter/PaintedItemRenderer.java create mode 100644 common/crazypants/enderio/machine/painter/PainterContainer.java create mode 100644 common/crazypants/enderio/machine/painter/PainterUtil.java create mode 100644 common/crazypants/enderio/machine/painter/TileEntityCustomBlock.java create mode 100644 common/crazypants/enderio/machine/painter/TileEntityPainter.java create mode 100644 common/crazypants/enderio/machine/reservoir/BlockReservoir.java create mode 100644 common/crazypants/enderio/machine/reservoir/ReservoirRenderer.java create mode 100644 common/crazypants/enderio/machine/reservoir/ReservoirTank.java create mode 100644 common/crazypants/enderio/machine/reservoir/TankNeighbour.java create mode 100644 common/crazypants/enderio/machine/reservoir/TileReservoir.java create mode 100644 common/crazypants/enderio/machine/solor/BlockSolarPanel.java create mode 100644 common/crazypants/enderio/machine/solor/TileEntitySolorPanel.java create mode 100644 common/crazypants/enderio/material/Alloy.java create mode 100644 common/crazypants/enderio/material/BlockFusedQuartz.java create mode 100644 common/crazypants/enderio/material/FusedQuartzFrameRenderer.java create mode 100644 common/crazypants/enderio/material/FusedQuartzRenderer.java create mode 100644 common/crazypants/enderio/material/ItemAlloy.java create mode 100644 common/crazypants/enderio/material/ItemCapacitor.java create mode 100644 common/crazypants/enderio/material/ItemFusedQuartzFrame.java create mode 100644 common/crazypants/enderio/material/ItemIndustrialBinder.java create mode 100644 common/crazypants/enderio/material/ItemYetaWrench.java create mode 100644 common/crazypants/enderio/material/MaterialRecipes.java create mode 100644 common/crazypants/enderio/power/BasicCapacitor.java create mode 100644 common/crazypants/enderio/power/ICapacitor.java create mode 100644 common/crazypants/enderio/power/ICapacitorItem.java create mode 100644 common/crazypants/enderio/power/IInternalPowerReceptor.java create mode 100644 common/crazypants/enderio/power/PowerHandlerUtil.java create mode 100644 common/crazypants/render/BoundingBox.java create mode 100644 common/crazypants/render/CubeRenderer.java create mode 100644 common/crazypants/render/EmptySlot.java create mode 100644 common/crazypants/render/GuiContainerBase.java create mode 100644 common/crazypants/render/GuiToolTip.java create mode 100644 common/crazypants/render/IconButton.java create mode 100644 common/crazypants/render/IconUtil.java create mode 100644 common/crazypants/render/ItemButton.java create mode 100644 common/crazypants/render/RenderUtil.java create mode 100644 common/crazypants/render/VertexRotation.java create mode 100644 common/crazypants/render/VertexTransform.java create mode 100644 common/crazypants/util/BlockCoord.java create mode 100644 common/crazypants/util/ForgeDirectionOffsets.java create mode 100644 common/crazypants/util/MetadataUtil.java create mode 100644 common/crazypants/util/PacketUtil.java create mode 100644 common/crazypants/util/Util.java create mode 100644 common/crazypants/vecmath/Camera.java create mode 100644 common/crazypants/vecmath/Matrix4d.java create mode 100644 common/crazypants/vecmath/Quat4d.java create mode 100644 common/crazypants/vecmath/VecmathUtil.java create mode 100644 common/crazypants/vecmath/Vector2d.java create mode 100644 common/crazypants/vecmath/Vector3d.java create mode 100644 common/crazypants/vecmath/Vector3f.java create mode 100644 common/crazypants/vecmath/Vector4d.java create mode 100644 common/crazypants/vecmath/ViewFrustum.java create mode 100644 lib/cglib-nodep-2.2.3.jar create mode 100644 resources/CGLibLiscence.txt create mode 100644 resources/assets/enderio/textures/blocks/CutterFrontOff.pdn create mode 100644 resources/assets/enderio/textures/blocks/CutterFrontOff.png create mode 100644 resources/assets/enderio/textures/blocks/CutterFrontOn.pdn create mode 100644 resources/assets/enderio/textures/blocks/CutterFrontOn.png create mode 100644 resources/assets/enderio/textures/blocks/activatedIronNugget.png create mode 100644 resources/assets/enderio/textures/blocks/alloySmelterFront.pdn create mode 100644 resources/assets/enderio/textures/blocks/alloySmelterFront.png create mode 100644 resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png create mode 100644 resources/assets/enderio/textures/blocks/blockElectricLightFace.png create mode 100644 resources/assets/enderio/textures/blocks/conduitBundle.png create mode 100644 resources/assets/enderio/textures/blocks/conduitConnector.png create mode 100644 resources/assets/enderio/textures/blocks/conduitFacade.png create mode 100644 resources/assets/enderio/textures/blocks/enderIO.pdn create mode 100644 resources/assets/enderio/textures/blocks/enderIO.png create mode 100644 resources/assets/enderio/textures/blocks/enderIOFrame.pdn create mode 100644 resources/assets/enderio/textures/blocks/enderIOFrame.png create mode 100644 resources/assets/enderio/textures/blocks/enderIronNugget.png create mode 100644 resources/assets/enderio/textures/blocks/fusedQuartz.pdn create mode 100644 resources/assets/enderio/textures/blocks/fusedQuartz.png create mode 100644 resources/assets/enderio/textures/blocks/fusedQuartzItem.png create mode 100644 resources/assets/enderio/textures/blocks/iconRedstoneControls.pdn create mode 100644 resources/assets/enderio/textures/blocks/iconRedstoneIgnore.png create mode 100644 resources/assets/enderio/textures/blocks/iconRedstoneOff.png create mode 100644 resources/assets/enderio/textures/blocks/iconRedstoneOn.png create mode 100644 resources/assets/enderio/textures/blocks/liquidConduit.pdn create mode 100644 resources/assets/enderio/textures/blocks/liquidConduit.png create mode 100644 resources/assets/enderio/textures/blocks/liquidConduitCore.pdn create mode 100644 resources/assets/enderio/textures/blocks/liquidConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/liquidConduitExtract.pdn create mode 100644 resources/assets/enderio/textures/blocks/liquidConduitExtract.png create mode 100644 resources/assets/enderio/textures/blocks/machineSide.pdn create mode 100644 resources/assets/enderio/textures/blocks/machineSide.png create mode 100644 resources/assets/enderio/textures/blocks/painterFront.pdn create mode 100644 resources/assets/enderio/textures/blocks/painterFrontOff.png create mode 100644 resources/assets/enderio/textures/blocks/painterFrontOn.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduit.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCore.pdn create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitEnder.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitEnhanced.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitTransmission.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduit.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.pdn create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.pdn create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitSwitch.pdn create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png create mode 100644 resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png create mode 100644 resources/assets/enderio/textures/blocks/reservoir.pdn create mode 100644 resources/assets/enderio/textures/blocks/reservoir.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirFront.pdn create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbB.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbBl.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbBr.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbL.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbR.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbT.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbTl.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirMbTr.png create mode 100644 resources/assets/enderio/textures/blocks/reservoirSideHorizontal.pdn create mode 100644 resources/assets/enderio/textures/blocks/reservoirSideVertical.pdn create mode 100644 resources/assets/enderio/textures/blocks/reservoirSwitch.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelSide.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelTop.png create mode 100644 resources/assets/enderio/textures/blocks/stirlingGenFront.pdn create mode 100644 resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png create mode 100644 resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png create mode 100644 resources/assets/enderio/textures/gui/alloySmelter.png create mode 100644 resources/assets/enderio/textures/gui/painter.pdn create mode 100644 resources/assets/enderio/textures/gui/painter.png create mode 100644 resources/assets/enderio/textures/gui/stirlingGenerator.pdn create mode 100644 resources/assets/enderio/textures/gui/stirlingGenerator.png create mode 100644 resources/assets/enderio/textures/items/ConduitFacade.png create mode 100644 resources/assets/enderio/textures/items/ItemLiquidConduit.png create mode 100644 resources/assets/enderio/textures/items/ItemPowerConduit.png create mode 100644 resources/assets/enderio/textures/items/ItemRedstoneConduit.png create mode 100644 resources/assets/enderio/textures/items/activatedGold.png create mode 100644 resources/assets/enderio/textures/items/activatedGoldNugget.png create mode 100644 resources/assets/enderio/textures/items/activatedIron.pdn create mode 100644 resources/assets/enderio/textures/items/activatedIron.png create mode 100644 resources/assets/enderio/textures/items/activatedIronNugget.png create mode 100644 resources/assets/enderio/textures/items/basicCapacitor.pdn create mode 100644 resources/assets/enderio/textures/items/basicCapacitor.png create mode 100644 resources/assets/enderio/textures/items/blueSteel.png create mode 100644 resources/assets/enderio/textures/items/blueSteelNugget.pdn create mode 100644 resources/assets/enderio/textures/items/blueSteelNugget.png create mode 100644 resources/assets/enderio/textures/items/conduitFacade.pdn create mode 100644 resources/assets/enderio/textures/items/conduitFacadeOverlay.png create mode 100644 resources/assets/enderio/textures/items/enderGold.png create mode 100644 resources/assets/enderio/textures/items/enderGoldNugget.png create mode 100644 resources/assets/enderio/textures/items/enderIron.png create mode 100644 resources/assets/enderio/textures/items/enderIronNugget.pdn create mode 100644 resources/assets/enderio/textures/items/enderIronNugget.png create mode 100644 resources/assets/enderio/textures/items/enderface.pdn create mode 100644 resources/assets/enderio/textures/items/enderface.png create mode 100644 resources/assets/enderio/textures/items/industrialBinder.pdn create mode 100644 resources/assets/enderio/textures/items/industrialBinder.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitEnder.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png create mode 100644 resources/assets/enderio/textures/items/itemRedstoneSwitch.png create mode 100644 resources/assets/enderio/textures/items/nugget.pdn create mode 100644 resources/assets/enderio/textures/items/yetaWrench.png create mode 100644 resources/mcmod.info diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..4a9e7474 --- /dev/null +++ b/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ff007088 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/build +/download diff --git a/.project b/.project new file mode 100644 index 00000000..97fca3a4 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + EnderIO + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/README.md b/README.md index f554c7c6..658dabc9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ EnderIO ======= + +All code (excluding the build craft API, which is covered by the build craft liscence) is 'unliscenced' into the public domain. +Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to crazypants.mc at gmail.com. + diff --git a/build.xml b/build.xml new file mode 100644 index 00000000..e510b19c --- /dev/null +++ b/build.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/buildcraft/api/blueprints/BlockSignature.java b/common/buildcraft/api/blueprints/BlockSignature.java new file mode 100644 index 00000000..51db24d4 --- /dev/null +++ b/common/buildcraft/api/blueprints/BlockSignature.java @@ -0,0 +1,77 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +public class BlockSignature { + + public String blockClassName; + public String tileClassName; + public String blockName; + public String mod; + public String modVersion; + public String customField; + + public BlockSignature(String str) { + String[] values = str.split("/"); + + int i = 0; + + if (values[0].equals("#B")) { + i++; + } + + blockClassName = values[i]; + tileClassName = values[i + 1]; + blockName = values[i + 2]; + mod = values[i + 3]; + modVersion = values[i + 4]; + customField = values[i + 5]; + + replaceNullWithStar(); + + } + + public BlockSignature() { + replaceNullWithStar(); + } + + @Override + public String toString() { + replaceNullWithStar(); + + return "#B/" + blockClassName + "/" + tileClassName + "/" + blockName + "/" + mod + "/" + modVersion + "/" + customField; + } + + public void replaceNullWithStar() { + if (blockClassName == null) { + blockClassName = "*"; + } + + if (tileClassName == null) { + tileClassName = "*"; + } + + if (blockName == null) { + blockName = "*"; + } + + if (mod == null) { + mod = "*"; + } + + if (modVersion == null) { + modVersion = "*"; + } + + if (customField == null) { + customField = "*"; + } + } +} diff --git a/common/buildcraft/api/blueprints/BlueprintManager.java b/common/buildcraft/api/blueprints/BlueprintManager.java new file mode 100644 index 00000000..c71b710e --- /dev/null +++ b/common/buildcraft/api/blueprints/BlueprintManager.java @@ -0,0 +1,35 @@ +package buildcraft.api.blueprints; + +import buildcraft.api.core.BuildCraftAPI; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BlueprintManager { + + public static BptBlock[] blockBptProps = new BptBlock[Block.blocksList.length]; + + public static ItemSignature getItemSignature(Item item) { + ItemSignature sig = new ItemSignature(); + + if (item.itemID >= Block.blocksList.length + BuildCraftAPI.LAST_ORIGINAL_ITEM) { + sig.itemClassName = item.getClass().getSimpleName(); + } + + sig.itemName = item.getUnlocalizedName(new ItemStack(item)); + + return sig; + } + + public static BlockSignature getBlockSignature(Block block) { + return BlueprintManager.blockBptProps[0].getSignature(block); + } + + static { + // Initialize defaults for block properties. + for (int i = 0; i < BlueprintManager.blockBptProps.length; ++i) { + new BptBlock(i); + } + } +} diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java new file mode 100644 index 00000000..4f48d35e --- /dev/null +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -0,0 +1,234 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +import buildcraft.api.core.BuildCraftAPI; +import java.util.ArrayList; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +/** + * This class allow to specify specific behavior for blocks stored in blueprints: + * + * - what items needs to be used to create that block - how the block has to be built on the world - how to rotate the block - what extra data to store / load + * in the blueprint + * + * Default implementations of this can be seen in the package buildcraft.api.bptblocks. The class BptBlockUtils provide some additional utilities. + * + * Blueprints perform "id translation" in case the block ids between a blueprint and the world installation are different. In order to translate block ids, + * blocks needs to be uniquely identified. By default, this identification is done by: + * + * - the block simple class name - the tile simple class name (if any) - the block name + * + * In certain circumstances, the above is not enough (e.g. if several blocks share the same class and the same name, with no tile). In this case, additional + * data may be provided by children of this class: + * + * - mod name - custom signature + * + * At blueprint load time, BuildCraft will check that each block id of the blueprint corresponds to the block id in the installation. If not, it will perform a + * search through the block list, and upon matching signature, it will translate all blocks ids of the blueprint to the installation ones. If no such block id + * is found, BuildCraft will assume that the block is not installed and will not load the blueprint. + */ + +@Deprecated +public class BptBlock { + + public final int blockId; + + public BptBlock(int blockId) { + this.blockId = blockId; + + BlueprintManager.blockBptProps[blockId] = this; + } + + /** + * Returns the requirements needed to build this block. When the requirements are met, they will be removed all at once from the builder, before calling + * buildBlock. + */ + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + if (slot.blockId != 0) { + if (slot.storedRequirements.size() != 0) { + requirements.addAll(slot.storedRequirements); + } else { + requirements.add(new ItemStack(slot.blockId, 1, slot.meta)); + } + } + } + + /** + * This is called each time an item matches a reqquirement, that is: (req id == stack id) for damageable items (req id == stack id && req dmg == stack dmg) + * for other items by default, it will increase damage of damageable items by the amount of damage of the requirement, and remove the intended amount of non + * damageable item. + * + * Client may override this behavior for default items. Note that this subprogram may be called twice with the same parameters, once with a copy of + * requirements and stack to check if the entire requirements can be fullfilled, and once with the real inventory. Implementer is responsible for updating + * req (with the remaining requirements if any) and stack (after usage) + * + * returns: what was used (similer to req, but created from stack, so that any NBT based differences are drawn from the correct source) + */ + public ItemStack useItem(BptSlotInfo slot, IBptContext context, ItemStack req, ItemStack stack) { + ItemStack result = stack.copy(); + if (stack.isItemStackDamageable()) { + if (req.getItemDamage() + stack.getItemDamage() <= stack.getMaxDamage()) { + stack.setItemDamage(req.getItemDamage() + stack.getItemDamage()); + result.setItemDamage(req.getItemDamage()); + req.stackSize = 0; + } + + if (stack.getItemDamage() >= stack.getMaxDamage()) { + stack.stackSize = 0; + } + } else { + if (stack.stackSize >= req.stackSize) { + result.stackSize = req.stackSize; + stack.stackSize -= req.stackSize; + req.stackSize = 0; + } else { + req.stackSize -= stack.stackSize; + stack.stackSize = 0; + } + } + + if (stack.stackSize == 0 && stack.getItem().getContainerItem() != null) { + Item container = stack.getItem().getContainerItem(); + + stack.itemID = container.itemID; + stack.stackSize = 1; + stack.setItemDamage(0); + } + return result; + } + + /** + * Return true if the block on the world correspond to the block stored in the blueprint at the location given by the slot. By default, this subprogram is + * permissive and doesn't take into account metadata. + * + * Added metadata sensitivity //Krapht + */ + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z) && slot.meta == context.world().getBlockMetadata(slot.x, slot.y, slot.z); + } + + /** + * Perform a 90 degree rotation to the slot. + */ + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + + } + + /** + * Places the block in the world, at the location specified in the slot. + */ + public void buildBlock(BptSlotInfo slot, IBptContext context) { + // Meta needs to be specified twice, depending on the block behavior + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,3); + context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,3); + + if (Block.blocksList[slot.blockId] instanceof BlockContainer) { + TileEntity tile = context.world().getBlockTileEntity(slot.x, slot.y, slot.z); + + slot.cpt.setInteger("x", slot.x); + slot.cpt.setInteger("y", slot.y); + slot.cpt.setInteger("z", slot.z); + + if (tile != null) { + tile.readFromNBT(slot.cpt); + } + } + } + + /** + * Return true if the block should not be placed to the world. Requirements will not be asked on such a block, and building will not be called. + */ + public boolean ignoreBuilding(BptSlotInfo slot) { + return false; + } + + /** + * Initializes a slot from the blueprint according to an objet placed on {x, y, z} on the world. This typically means adding entries in slot.cpt. Note that + * "id" and "meta" will be set automatically, corresponding to the block id and meta. + * + * By default, if the block is a BlockContainer, tile information will be to save / load the block. + */ + public void initializeFromWorld(BptSlotInfo slot, IBptContext context, int x, int y, int z) { + if (Block.blocksList[slot.blockId] instanceof BlockContainer) { + TileEntity tile = context.world().getBlockTileEntity(x, y, z); + + if (tile != null) { + tile.writeToNBT(slot.cpt); + } + } + + if (Block.blocksList[slot.blockId] != null) { + ArrayList req = Block.blocksList[slot.blockId].getBlockDropped(context.world(), x, y, z, context.world().getBlockMetadata(x, y, z), 0); + + if (req != null) { + slot.storedRequirements.addAll(req); + } + } + } + + /** + * Called on a block when the blueprint has finished to place all the blocks. This may be useful to adjust variable depending on surrounding blocks that may + * not be there already at initial building. + */ + public void postProcessing(BptSlotInfo slot, IBptContext context) { + + } + + /** + * By default, block class name, block tile name and block name are used to define block signature. Overriding this subprogram may allow to replace some of + * these with stars, specify the mod that this block kind is coming from or add custom data to the signature. + */ + public BlockSignature getSignature(Block block) { + BlockSignature sig = new BlockSignature(); + + if (block.blockID > BuildCraftAPI.LAST_ORIGINAL_BLOCK) { + sig.blockClassName = block.getClass().getSimpleName(); + + if (block instanceof BlockContainer) { + // TODO: Try to see if we can get a world instance to call with instead of null + TileEntity tile = ((BlockContainer) block).createNewTileEntity(null); + + if (tile != null) { + sig.tileClassName = tile.getClass().getSimpleName(); + } + } + } + + sig.blockName = block.getUnlocalizedName(); + sig.replaceNullWithStar(); + + return sig; + } + + /** + * By default, block name, block and tile classes, mod name and custom signature are matched to verify if a blueprint block corresponds to the installation + * block - except for the default blocks which don't check for classes. For any value, * means match with anything. For compatibilty and evolution reasons, + * mods may want to write a different policy, allowing to migrate one format to the other. + */ + public boolean match(Block block, BlockSignature sig) { + if (block == null) + return false; + + BlockSignature inst = BlueprintManager.getBlockSignature(block); + + return starMatch(sig.blockName, inst.blockName) && starMatch(sig.blockClassName, inst.blockClassName) + && starMatch(sig.tileClassName, inst.tileClassName) && starMatch(sig.customField, inst.customField) && starMatch(sig.mod, inst.mod); + } + + private boolean starMatch(String s1, String s2) { + return s1.equals("*") || s2.equals("*") || s1.equals(s2); + } +} diff --git a/common/buildcraft/api/blueprints/BptBlockUtils.java b/common/buildcraft/api/blueprints/BptBlockUtils.java new file mode 100644 index 00000000..a46d9b12 --- /dev/null +++ b/common/buildcraft/api/blueprints/BptBlockUtils.java @@ -0,0 +1,85 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +import java.util.LinkedList; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +@Deprecated +public class BptBlockUtils { + + public static void requestInventoryContents(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + ItemStack[] stacks = getItemStacks(slot, context); + + for (ItemStack stack : stacks) { + if (stack != null) { + requirements.add(stack); + } + } + } + + public static void initializeInventoryContents(BptSlotInfo slot, IBptContext context, IInventory inventory) { + ItemStack[] stacks = new ItemStack[inventory.getSizeInventory()]; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + stacks[i] = inventory.getStackInSlot(i); + } + + setItemStacks(slot, context, stacks); + } + + public static void buildInventoryContents(BptSlotInfo slot, IBptContext context, IInventory inventory) { + ItemStack[] stacks = getItemStacks(slot, context); + + for (int i = 0; i < stacks.length; ++i) { + inventory.setInventorySlotContents(i, stacks[i]); + } + } + + public static ItemStack[] getItemStacks(BptSlotInfo slot, IBptContext context) { + NBTTagList list = (NBTTagList) slot.cpt.getTag("inv"); + + if (list == null) + return new ItemStack[0]; + + ItemStack stacks[] = new ItemStack[list.tagCount()]; + + for (int i = 0; i < list.tagCount(); ++i) { + ItemStack stack = ItemStack.loadItemStackFromNBT((NBTTagCompound) list.tagAt(i)); + + if (stack != null && stack.itemID != 0 && stack.stackSize > 0) { + stacks[i] = context.mapItemStack(stack); + } + } + + return stacks; + } + + public static void setItemStacks(BptSlotInfo slot, IBptContext context, ItemStack[] stacks) { + NBTTagList nbttaglist = new NBTTagList(); + + for (int i = 0; i < stacks.length; ++i) { + NBTTagCompound cpt = new NBTTagCompound(); + nbttaglist.appendTag(cpt); + ItemStack stack = stacks[i]; + + if (stack != null && stack.stackSize != 0) { + stack.writeToNBT(cpt); + context.storeId(stack.itemID); + } + } + + slot.cpt.setTag("inv", nbttaglist); + } + +} diff --git a/common/buildcraft/api/blueprints/BptSlotInfo.java b/common/buildcraft/api/blueprints/BptSlotInfo.java new file mode 100644 index 00000000..799a3b4f --- /dev/null +++ b/common/buildcraft/api/blueprints/BptSlotInfo.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +/** + * This class records a slot, either from a blueprint or from a block placed in the world. + */ + +@Deprecated +public class BptSlotInfo { + + public int blockId = 0; + public int meta = 0; + public int x; + public int y; + public int z; + + /** + * This field contains requirements for a given block when stored in the blueprint. Modders can either rely on this list or compute their own int BptBlock. + */ + public LinkedList storedRequirements = new LinkedList(); + + /** + * This tree contains additional data to be stored in the blueprint. By default, it will be initialized from BptBlock.initializeFromWorld with the standard + * readNBT function of the corresponding tile (if any) and will be loaded from BptBlock.buildBlock using the standard writeNBT function. + */ + public NBTTagCompound cpt = new NBTTagCompound(); + + @Override + public BptSlotInfo clone() { + BptSlotInfo obj = new BptSlotInfo(); + + obj.x = x; + obj.y = y; + obj.z = z; + obj.blockId = blockId; + obj.meta = meta; + obj.cpt = (NBTTagCompound) cpt.copy(); + + return obj; + } + +} diff --git a/common/buildcraft/api/blueprints/IBptContext.java b/common/buildcraft/api/blueprints/IBptContext.java new file mode 100644 index 00000000..8498bfd3 --- /dev/null +++ b/common/buildcraft/api/blueprints/IBptContext.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +import buildcraft.api.core.IBox; +import buildcraft.api.core.Position; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * This interface provide contextual information when building or initializing blueprint slots. + */ + +@Deprecated +public interface IBptContext { + + /** + * If bptItemStack is an ItemStack extracted from the blueprint containing this mapping, this will return an item stack with the id of the current world + */ + public ItemStack mapItemStack(ItemStack bptItemStack); + + /** + * Blueprints may be created in a world with a given id setting, and then ported to a world with different ids. Heuristics are used to retreive these new + * ids automatically. This interface provide services to map ids from a blueprints to current ids in the world, and should be used whenever storing block + * numbers or item stacks in blueprints.. + */ + public int mapWorldId(int bptWorldId); + + /** + * This asks the id mapping to store a mapping from this Id, which may be either an itemId or a blockId. In effect, the blueprint will record it and make it + * available upon blueprint load. Note that block present in the blueprint are automatically stored upon blueprint save, so this is really only needed when + * writing ids that are e.g. in inventory stacks. + */ + public void storeId(int worldId); + + public Position rotatePositionLeft(Position pos); + + public IBox surroundingBox(); + + public World world(); +} diff --git a/common/buildcraft/api/blueprints/ItemSignature.java b/common/buildcraft/api/blueprints/ItemSignature.java new file mode 100644 index 00000000..d6bd0310 --- /dev/null +++ b/common/buildcraft/api/blueprints/ItemSignature.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.blueprints; + +@Deprecated +public class ItemSignature { + + public String itemClassName; + public String itemName; + + public ItemSignature(String str) { + String[] values = str.split("/"); + + itemClassName = values[1]; + itemName = values[2]; + + replaceNullWithStar(); + + } + + public ItemSignature() { + replaceNullWithStar(); + } + + @Override + public String toString() { + replaceNullWithStar(); + + return "#I/" + itemClassName + "/" + itemName; + } + + public void replaceNullWithStar() { + if (itemClassName == null) { + itemClassName = "*"; + } + + if (itemName == null) { + itemName = "*"; + } + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockBed.java b/common/buildcraft/api/bptblocks/BptBlockBed.java new file mode 100644 index 00000000..e2dae05c --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockBed.java @@ -0,0 +1,86 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockBed extends BptBlock { + + public BptBlockBed(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + if ((slot.meta & 8) == 0) { + requirements.add(new ItemStack(Item.bed)); + } + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + int orientation = (slot.meta & 7); + int others = slot.meta - orientation; + + switch (orientation) { + case 0: + slot.meta = 1 + others; + break; + case 1: + slot.meta = 2 + others; + break; + case 2: + slot.meta = 3 + others; + break; + case 3: + slot.meta = 0 + others; + break; + } + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + if ((slot.meta & 8) != 0) + return; + + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + + int x2 = slot.x; + int z2 = slot.z; + + switch (slot.meta) { + case 0: + z2++; + break; + case 1: + x2--; + break; + case 2: + z2--; + break; + case 3: + x2++; + break; + } + + context.world().setBlock(x2, slot.y, z2, slot.blockId, slot.meta + 8,1); + } + + @Override + public boolean ignoreBuilding(BptSlotInfo slot) { + return (slot.meta & 8) != 0; + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockCustomStack.java b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java new file mode 100644 index 00000000..79aef15c --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java @@ -0,0 +1,34 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockCustomStack extends BptBlock { + + final ItemStack customStack; + + public BptBlockCustomStack(int blockId, ItemStack customStack) { + super(blockId); + + this.customStack = customStack; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(customStack.copy()); + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockDelegate.java b/common/buildcraft/api/bptblocks/BptBlockDelegate.java new file mode 100644 index 00000000..035dc556 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockDelegate.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BlueprintManager; +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockDelegate extends BptBlock { + + final int delegateTo; + + public BptBlockDelegate(int blockId, int delegateTo) { + super(blockId); + + this.delegateTo = delegateTo; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + BptSlotInfo newSlot = slot.clone(); + slot.blockId = delegateTo; + + if (BlueprintManager.blockBptProps[delegateTo] != null) { + BlueprintManager.blockBptProps[delegateTo].addRequirements(newSlot, context, requirements); + } else { + super.addRequirements(newSlot, context, requirements); + } + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + BptSlotInfo newSlot = slot.clone(); + slot.blockId = delegateTo; + + if (BlueprintManager.blockBptProps[delegateTo] != null) + return BlueprintManager.blockBptProps[delegateTo].isValid(newSlot, context); + else + return super.isValid(newSlot, context); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + BptSlotInfo newSlot = slot.clone(); + slot.blockId = delegateTo; + + if (BlueprintManager.blockBptProps[delegateTo] != null) { + BlueprintManager.blockBptProps[delegateTo].rotateLeft(newSlot, context); + } else { + super.rotateLeft(newSlot, context); + } + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockDirt.java b/common/buildcraft/api/bptblocks/BptBlockDirt.java new file mode 100644 index 00000000..365cbc45 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockDirt.java @@ -0,0 +1,42 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockDirt extends BptBlock { + + public BptBlockDirt(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(Block.dirt)); + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + context.world().setBlock(slot.x, slot.y, slot.z, Block.dirt.blockID, slot.meta,1); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + int id = context.world().getBlockId(slot.x, slot.y, slot.z); + + return id == Block.dirt.blockID || id == Block.grass.blockID || id == Block.tilledField.blockID; + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockDoor.java b/common/buildcraft/api/bptblocks/BptBlockDoor.java new file mode 100644 index 00000000..196e83b3 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockDoor.java @@ -0,0 +1,71 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockDoor extends BptBlock { + + final ItemStack stack; + + public BptBlockDoor(int blockId, ItemStack stack) { + super(blockId); + + this.stack = stack; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + if ((slot.meta & 8) == 0) { + requirements.add(stack.copy()); + } + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + int orientation = (slot.meta & 3); + int others = slot.meta - orientation; + + switch (orientation) { + case 0: + slot.meta = 1 + others; + break; + case 1: + slot.meta = 2 + others; + break; + case 2: + slot.meta = 3 + others; + break; + case 3: + slot.meta = 0 + others; + break; + } + } + + @Override + public boolean ignoreBuilding(BptSlotInfo slot) { + return (slot.meta & 8) != 0; + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y + 1, slot.z, slot.blockId, slot.meta + 8,1); + + context.world().setBlockMetadataWithNotify(slot.x, slot.y + 1, slot.z, slot.meta + 8,1); + context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,1); + + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockFluid.java b/common/buildcraft/api/bptblocks/BptBlockFluid.java new file mode 100644 index 00000000..1769c394 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockFluid.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockFluid extends BptBlock { + + private final ItemStack bucketStack; + + public BptBlockFluid(int blockId, ItemStack bucketStack) { + super(blockId); + + this.bucketStack = bucketStack; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + if (slot.meta == 0) { + requirements.add(bucketStack.copy()); + } + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + if (slot.meta == 0) + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z) && context.world().getBlockMetadata(slot.x, slot.y, slot.z) == 0; + else + return true; + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + + } + + @Override + public boolean ignoreBuilding(BptSlotInfo slot) { + return slot.meta != 0; + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + if (slot.meta == 0) { + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, 0,1); + } + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnore.java b/common/buildcraft/api/bptblocks/BptBlockIgnore.java new file mode 100644 index 00000000..12a058bc --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockIgnore.java @@ -0,0 +1,45 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockIgnore extends BptBlock { + + public BptBlockIgnore(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 0, 0)); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return true; + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + + } + + @Override + public boolean ignoreBuilding(BptSlotInfo slot) { + return true; + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java new file mode 100644 index 00000000..7f39f637 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java @@ -0,0 +1,34 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockIgnoreMeta extends BptBlock { + + public BptBlockIgnoreMeta(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z); + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockInventory.java b/common/buildcraft/api/bptblocks/BptBlockInventory.java new file mode 100644 index 00000000..0cebe58f --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockInventory.java @@ -0,0 +1,28 @@ +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import net.minecraft.inventory.IInventory; + +@Deprecated +public class BptBlockInventory extends BptBlock { + + public BptBlockInventory(int blockId) { + super(blockId); + + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + super.buildBlock(slot, context); + + IInventory inv = (IInventory) context.world().getBlockTileEntity(slot.x, slot.y, slot.z); + + for (int i = 0; i < inv.getSizeInventory(); ++i) { + inv.setInventorySlotContents(i, null); + } + + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockLever.java b/common/buildcraft/api/bptblocks/BptBlockLever.java new file mode 100644 index 00000000..b9a8e1c4 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockLever.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockLever extends BptBlockWallSide { + + public BptBlockLever(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + int status = slot.meta - (slot.meta & 7); + + slot.meta -= status; + super.rotateLeft(slot, context); + slot.meta += status; + + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockPiston.java b/common/buildcraft/api/bptblocks/BptBlockPiston.java new file mode 100644 index 00000000..b12693bd --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockPiston.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; + +@Deprecated +public class BptBlockPiston extends BptBlockRotateMeta { + + public BptBlockPiston(int blockId) { + super(blockId, new int[] { 2, 5, 3, 4 }, true); + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + int meta = slot.meta & 7; + + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, meta,1); + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockPumpkin.java b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java new file mode 100644 index 00000000..16049346 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockPumpkin extends BptBlock { + + public BptBlockPumpkin(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + switch (slot.meta) { + case 0: + slot.meta = 1; + break; + case 1: + slot.meta = 2; + break; + case 2: + slot.meta = 3; + break; + case 3: + slot.meta = 0; + break; + } + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java new file mode 100644 index 00000000..8ac4f023 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockRedstoneRepeater extends BptBlock { + + public BptBlockRedstoneRepeater(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(Item.redstoneRepeater)); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + int step = slot.meta - (slot.meta & 3); + + switch (slot.meta - step) { + case 0: + slot.meta = 1 + step; + break; + case 1: + slot.meta = 2 + step; + break; + case 2: + slot.meta = 3 + step; + break; + case 3: + slot.meta = 0 + step; + break; + } + } +} diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java new file mode 100644 index 00000000..6fcc30a8 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java @@ -0,0 +1,27 @@ +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import net.minecraft.inventory.IInventory; + +@Deprecated +public class BptBlockRotateInventory extends BptBlockRotateMeta { + + public BptBlockRotateInventory(int blockId, int[] rotations, boolean rotateForward) { + super(blockId, rotations, rotateForward); + + } + + @Override + public void buildBlock(BptSlotInfo slot, IBptContext context) { + super.buildBlock(slot, context); + + IInventory inv = (IInventory) context.world().getBlockTileEntity(slot.x, slot.y, slot.z); + + for (int i = 0; i < inv.getSizeInventory(); ++i) { + inv.setInventorySlotContents(i, null); + } + + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java new file mode 100644 index 00000000..4352b660 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockRotateMeta extends BptBlock { + + int[] rot; + boolean rotateForward; + + int infoMask = 0; + + public BptBlockRotateMeta(int blockId, int[] rotations, boolean rotateForward) { + super(blockId); + + rot = rotations; + + for (int i = 0; i < rot.length; ++i) { + if (rot[i] < 4) { + infoMask = (infoMask < 3 ? 3 : infoMask); + } else if (rot[i] < 8) { + infoMask = (infoMask < 7 ? 7 : infoMask); + } else if (rot[i] < 16) { + infoMask = (infoMask < 15 ? 15 : infoMask); + } + } + + this.rotateForward = rotateForward; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + int pos = slot.meta & infoMask; + int others = slot.meta - pos; + + if (rotateForward) { + if (pos == rot[0]) { + pos = rot[1]; + } else if (pos == rot[1]) { + pos = rot[2]; + } else if (pos == rot[2]) { + pos = rot[3]; + } else if (pos == rot[3]) { + pos = rot[0]; + } + } else { + if (pos == rot[0]) { + pos = rot[3]; + } else if (pos == rot[1]) { + pos = rot[2]; + } else if (pos == rot[2]) { + pos = rot[0]; + } else if (pos == rot[3]) { + pos = rot[1]; + } + } + + slot.meta = pos + others; + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockSign.java b/common/buildcraft/api/bptblocks/BptBlockSign.java new file mode 100644 index 00000000..f7bd1338 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockSign.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BlockSignature; +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockSign extends BptBlock { + + boolean isWall; + + public BptBlockSign(int blockId, boolean isWall) { + super(blockId); + + this.isWall = isWall; + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(Item.sign)); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + if (!isWall) { + double angle = ((slot.meta) * 360.0) / 16.0; + angle += 90.0; + if (angle >= 360) { + angle -= 360; + } + slot.meta = (int) (angle / 360.0 * 16.0); + } else { + // slot.meta = ForgeDirection.values()[slot.meta].rotateLeft().ordinal(); + } + } + + @Override + public BlockSignature getSignature(Block block) { + BlockSignature sig = super.getSignature(block); + + if (isWall) { + sig.customField = "wall"; + } else { + sig.customField = "floor"; + } + + return sig; + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockStairs.java b/common/buildcraft/api/bptblocks/BptBlockStairs.java new file mode 100644 index 00000000..4dc061a4 --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockStairs.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockStairs extends BptBlock { + + public BptBlockStairs(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public boolean isValid(BptSlotInfo slot, IBptContext context) { + return slot.blockId == context.world().getBlockId(slot.x, slot.y, slot.z); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + switch (slot.meta) { + case 0: + slot.meta = 2; + break; + case 1: + slot.meta = 3; + break; + case 2: + slot.meta = 1; + break; + case 3: + slot.meta = 0; + break; + } + } + +} diff --git a/common/buildcraft/api/bptblocks/BptBlockWallSide.java b/common/buildcraft/api/bptblocks/BptBlockWallSide.java new file mode 100644 index 00000000..74ff3f0f --- /dev/null +++ b/common/buildcraft/api/bptblocks/BptBlockWallSide.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.bptblocks; + +import buildcraft.api.blueprints.BptBlock; +import buildcraft.api.blueprints.BptSlotInfo; +import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +@Deprecated +public class BptBlockWallSide extends BptBlock { + + public BptBlockWallSide(int blockId) { + super(blockId); + } + + @Override + public void addRequirements(BptSlotInfo slot, IBptContext context, LinkedList requirements) { + requirements.add(new ItemStack(slot.blockId, 1, 0)); + } + + @Override + public void rotateLeft(BptSlotInfo slot, IBptContext context) { + final int XPos = 2; + final int XNeg = 1; + final int ZPos = 4; + final int ZNeg = 3; + + switch (slot.meta) { + case XPos: + slot.meta = ZPos; + break; + case ZNeg: + slot.meta = XPos; + break; + case XNeg: + slot.meta = ZNeg; + break; + case ZPos: + slot.meta = XNeg; + break; + } + } +} diff --git a/common/buildcraft/api/core/BuildCraftAPI.java b/common/buildcraft/api/core/BuildCraftAPI.java new file mode 100644 index 00000000..87c45fdf --- /dev/null +++ b/common/buildcraft/api/core/BuildCraftAPI.java @@ -0,0 +1,20 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.core; + +import net.minecraft.block.Block; + +public class BuildCraftAPI { + + public static final int LAST_ORIGINAL_BLOCK = 122; + public static final int LAST_ORIGINAL_ITEM = 126; + + public static final boolean[] softBlocks = new boolean[Block.blocksList.length]; +} diff --git a/common/buildcraft/api/core/IAreaProvider.java b/common/buildcraft/api/core/IAreaProvider.java new file mode 100644 index 00000000..fa905d2c --- /dev/null +++ b/common/buildcraft/api/core/IAreaProvider.java @@ -0,0 +1,34 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.core; + +/** + * To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. + */ +public interface IAreaProvider { + + public int xMin(); + + public int yMin(); + + public int zMin(); + + public int xMax(); + + public int yMax(); + + public int zMax(); + + /** + * Remove from the world all objects used to define the area. + */ + public void removeFromWorld(); + +} diff --git a/common/buildcraft/api/core/IBox.java b/common/buildcraft/api/core/IBox.java new file mode 100644 index 00000000..6337a96c --- /dev/null +++ b/common/buildcraft/api/core/IBox.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.core; + +import net.minecraft.world.World; + +public interface IBox { + + public void expand(int amount); + + public void contract(int amount); + + public boolean contains(int x, int y, int z); + + public Position pMin(); + + public Position pMax(); + + public void createLasers(World world, LaserKind kind); + + public void deleteLasers(); + +} diff --git a/common/buildcraft/api/core/IIconProvider.java b/common/buildcraft/api/core/IIconProvider.java new file mode 100644 index 00000000..666d32e3 --- /dev/null +++ b/common/buildcraft/api/core/IIconProvider.java @@ -0,0 +1,24 @@ +package buildcraft.api.core; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; + +public interface IIconProvider { + + /** + * @param iconIndex + * @return + */ + @SideOnly(Side.CLIENT) + public Icon getIcon(int iconIndex); + + /** + * A call for the provider to register its Icons. This may be called multiple times but should only be executed once per provider + * @param iconRegister + */ + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister); + +} diff --git a/common/buildcraft/api/core/LaserKind.java b/common/buildcraft/api/core/LaserKind.java new file mode 100644 index 00000000..24e66dba --- /dev/null +++ b/common/buildcraft/api/core/LaserKind.java @@ -0,0 +1,14 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.core; + +public enum LaserKind { + Red, Blue, Stripes +} diff --git a/common/buildcraft/api/core/Position.java b/common/buildcraft/api/core/Position.java new file mode 100644 index 00000000..5cdddbc8 --- /dev/null +++ b/common/buildcraft/api/core/Position.java @@ -0,0 +1,142 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.core; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; + +public class Position { + + public double x, y, z; + public ForgeDirection orientation; + + public Position(double ci, double cj, double ck) { + x = ci; + y = cj; + z = ck; + orientation = ForgeDirection.UNKNOWN; + } + + public Position(double ci, double cj, double ck, ForgeDirection corientation) { + x = ci; + y = cj; + z = ck; + orientation = corientation; + } + + public Position(Position p) { + x = p.x; + y = p.y; + z = p.z; + orientation = p.orientation; + } + + public Position(NBTTagCompound nbttagcompound) { + x = nbttagcompound.getDouble("i"); + y = nbttagcompound.getDouble("j"); + z = nbttagcompound.getDouble("k"); + + orientation = ForgeDirection.UNKNOWN; + } + + public Position(TileEntity tile) { + x = tile.xCoord; + y = tile.yCoord; + z = tile.zCoord; + } + + public void moveRight(double step) { + switch (orientation) { + case SOUTH: + x = x - step; + break; + case NORTH: + x = x + step; + break; + case EAST: + z = z + step; + break; + case WEST: + z = z - step; + break; + default: + } + } + + public void moveLeft(double step) { + moveRight(-step); + } + + public void moveForwards(double step) { + switch (orientation) { + case UP: + y = y + step; + break; + case DOWN: + y = y - step; + break; + case SOUTH: + z = z + step; + break; + case NORTH: + z = z - step; + break; + case EAST: + x = x + step; + break; + case WEST: + x = x - step; + break; + default: + } + } + + public void moveBackwards(double step) { + moveForwards(-step); + } + + public void moveUp(double step) { + switch (orientation) { + case SOUTH: + case NORTH: + case EAST: + case WEST: + y = y + step; + break; + default: + } + + } + + public void moveDown(double step) { + moveUp(-step); + } + + public void writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound.setDouble("i", x); + nbttagcompound.setDouble("j", y); + nbttagcompound.setDouble("k", z); + } + + @Override + public String toString() { + return "{" + x + ", " + y + ", " + z + "}"; + } + + public Position min(Position p) { + return new Position(p.x > x ? x : p.x, p.y > y ? y : p.y, p.z > z ? z : p.z); + } + + public Position max(Position p) { + return new Position(p.x < x ? x : p.x, p.y < y ? y : p.y, p.z < z ? z : p.z); + } + +} diff --git a/common/buildcraft/api/core/SafeTimeTracker.java b/common/buildcraft/api/core/SafeTimeTracker.java new file mode 100644 index 00000000..44e1531e --- /dev/null +++ b/common/buildcraft/api/core/SafeTimeTracker.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.core; + +import net.minecraft.world.World; + +public class SafeTimeTracker { + + private long lastMark = Long.MIN_VALUE; + private long duration = -1; + + /** + * Return true if a given delay has passed since last time marked was called + * successfully. + */ + public boolean markTimeIfDelay(World world, long delay) { + if (world == null) + return false; + + long currentTime = world.getTotalWorldTime(); + + if (currentTime < lastMark) { + lastMark = currentTime; + return false; + } else if (lastMark + delay <= currentTime) { + duration = currentTime - lastMark; + lastMark = currentTime; + return true; + } else + return false; + + } + + public long durationOfLastDelay() { + return duration > 0 ? duration : 0; + } + + public void markTime(World world) { + lastMark = world.getTotalWorldTime(); + } +} diff --git a/common/buildcraft/api/core/StackWrapper.java b/common/buildcraft/api/core/StackWrapper.java new file mode 100644 index 00000000..f46652c4 --- /dev/null +++ b/common/buildcraft/api/core/StackWrapper.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) SpaceToad, 2011-2012 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.core; + +import net.minecraft.item.ItemStack; + +/** + * + * @author CovertJaguar + */ +public class StackWrapper { + + public final ItemStack stack; + + public StackWrapper(ItemStack stack) { + this.stack = stack; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 67 * hash + stack.itemID; + hash = 67 * hash + stack.getItemDamage(); + if (stack.stackTagCompound != null) + hash = 67 * hash + stack.stackTagCompound.hashCode(); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final StackWrapper other = (StackWrapper) obj; + if (stack.itemID != other.stack.itemID) + return false; + if (stack.getHasSubtypes() && stack.getItemDamage() != other.stack.getItemDamage()) + return false; + if (stack.stackTagCompound != null && !stack.stackTagCompound.equals(other.stack.stackTagCompound)) + return false; + return true; + } +} diff --git a/common/buildcraft/api/filler/FillerManager.java b/common/buildcraft/api/filler/FillerManager.java new file mode 100644 index 00000000..ae104c59 --- /dev/null +++ b/common/buildcraft/api/filler/FillerManager.java @@ -0,0 +1,7 @@ +package buildcraft.api.filler; + +public class FillerManager { + + public static IFillerRegistry registry; + +} diff --git a/common/buildcraft/api/filler/IFillerPattern.java b/common/buildcraft/api/filler/IFillerPattern.java new file mode 100644 index 00000000..dd5862bb --- /dev/null +++ b/common/buildcraft/api/filler/IFillerPattern.java @@ -0,0 +1,23 @@ +package buildcraft.api.filler; + +import buildcraft.api.core.IBox; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; + +public interface IFillerPattern { + + public int getId(); + + public void setId(int id); + + public boolean iteratePattern(TileEntity tile, IBox box, ItemStack stackToPlace); + + @SideOnly(Side.CLIENT) + public Icon getTexture(); + + public String getName(); + +} diff --git a/common/buildcraft/api/filler/IFillerRegistry.java b/common/buildcraft/api/filler/IFillerRegistry.java new file mode 100644 index 00000000..12bf9799 --- /dev/null +++ b/common/buildcraft/api/filler/IFillerRegistry.java @@ -0,0 +1,15 @@ +package buildcraft.api.filler; + +import net.minecraft.inventory.IInventory; + +public interface IFillerRegistry { + + public void addRecipe(IFillerPattern pattern, Object aobj[]); + + public IFillerPattern findMatchingRecipe(IInventory inventorycrafting); + + public int getPatternNumber(IFillerPattern pattern); + + public IFillerPattern getPattern(int n); + +} diff --git a/common/buildcraft/api/fuels/IronEngineCoolant.java b/common/buildcraft/api/fuels/IronEngineCoolant.java new file mode 100644 index 00000000..347fabd7 --- /dev/null +++ b/common/buildcraft/api/fuels/IronEngineCoolant.java @@ -0,0 +1,83 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.fuels; + +import buildcraft.api.core.StackWrapper; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public final class IronEngineCoolant { + + public static Map liquidCoolants = new HashMap(); + public static Map solidCoolants = new HashMap(); + + public static FluidStack getFluidCoolant(ItemStack stack) { + return solidCoolants.get(new StackWrapper(stack)); + } + + public static Coolant getCoolant(ItemStack stack) { + return getCoolant(getFluidCoolant(stack)); + } + + public static Coolant getCoolant(FluidStack fluidStack) { + return fluidStack != null ? liquidCoolants.get(fluidStack.getFluid().getName()) : null; + } + + private IronEngineCoolant() { + } + + public static interface Coolant { + + float getDegreesCoolingPerMB(float currentHeat); + } + + public static void addCoolant(final Fluid fluid, final float degreesCoolingPerMB) { + if (fluid != null) { + liquidCoolants.put(fluid.getName(), new Coolant() { + @Override + public float getDegreesCoolingPerMB(float currentHeat) { + return degreesCoolingPerMB; + } + }); + } + } + + /** + * Adds a solid coolant like Ice Blocks. The FluidStack must contain a registered + * Coolant Fluid or nothing will happen. You do not need to call this for + * Fluid Containers. + * + * @param stack + * @param coolant + */ + public static void addCoolant(final ItemStack stack, final FluidStack coolant) { + if (stack != null && Item.itemsList[stack.itemID] != null && coolant != null) { + solidCoolants.put(new StackWrapper(stack), coolant); + } + } + + /** + * Adds a solid coolant like Ice Blocks. The FluidStack must contain a registered + * Coolant Fluid or nothing will happen. You do not need to call this for + * Fluid Containers. + * + * @param stack + * @param coolant + */ + public static void addCoolant(final int itemId, final int metadata, final FluidStack coolant) { + addCoolant(new ItemStack(itemId, 1, metadata), coolant); + } + + public static boolean isCoolant(Fluid fluid) { + return liquidCoolants.containsKey(fluid.getName()); + } +} diff --git a/common/buildcraft/api/fuels/IronEngineFuel.java b/common/buildcraft/api/fuels/IronEngineFuel.java new file mode 100644 index 00000000..3ab5ca2a --- /dev/null +++ b/common/buildcraft/api/fuels/IronEngineFuel.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.fuels; + +import java.util.HashMap; +import java.util.Map; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +public class IronEngineFuel { + + public static Map fuels = new HashMap(); + + public static Fuel getFuelForFluid(Fluid liquid) { + return liquid == null ? null : fuels.get(liquid.getName()); + } + + private IronEngineFuel() { + } + + public static class Fuel { + + public final Fluid liquid; + public final float powerPerCycle; + public final int totalBurningTime; + + private Fuel(String fluidName, float powerPerCycle, int totalBurningTime) { + this(FluidRegistry.getFluid(fluidName), powerPerCycle, totalBurningTime); + } + + private Fuel(Fluid liquid, float powerPerCycle, int totalBurningTime) { + this.liquid = liquid; + this.powerPerCycle = powerPerCycle; + this.totalBurningTime = totalBurningTime; + } + } + + public static void addFuel(Fluid fluid, float powerPerCycle, int totalBurningTime) { + fuels.put(fluid.getName(), new Fuel(fluid, powerPerCycle, totalBurningTime)); + } + + public static void addFuel(String fluidName, float powerPerCycle, int totalBurningTime) { + fuels.put(fluidName, new Fuel(fluidName, powerPerCycle, totalBurningTime)); + } +} diff --git a/common/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java new file mode 100644 index 00000000..26cfd2c7 --- /dev/null +++ b/common/buildcraft/api/gates/ActionManager.java @@ -0,0 +1,106 @@ +package buildcraft.api.gates; + +import buildcraft.api.transport.IPipe; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; + +public class ActionManager { + + public static Map triggers = new HashMap(); + public static Map actions = new HashMap(); + private static LinkedList triggerProviders = new LinkedList(); + private static LinkedList actionProviders = new LinkedList(); + + public static void registerTriggerProvider(ITriggerProvider provider) { + if (provider != null && !triggerProviders.contains(provider)) { + triggerProviders.add(provider); + } + } + + public static void registerTrigger(ITrigger trigger){ + triggers.put(trigger.getUniqueTag(), trigger); + } + + public static void registerAction(IAction action){ + actions.put(action.getUniqueTag(), action); + } + + public static LinkedList getNeighborTriggers(Block block, TileEntity entity) { + LinkedList triggers = new LinkedList(); + + for (ITriggerProvider provider : triggerProviders) { + LinkedList toAdd = provider.getNeighborTriggers(block, entity); + + if (toAdd != null) { + for (ITrigger t : toAdd) { + if (!triggers.contains(t)) { + triggers.add(t); + } + } + } + } + + return triggers; + } + + public static void registerActionProvider(IActionProvider provider) { + if (provider != null && !actionProviders.contains(provider)) { + actionProviders.add(provider); + } + } + + public static LinkedList getNeighborActions(Block block, TileEntity entity) { + LinkedList actions = new LinkedList(); + + for (IActionProvider provider : actionProviders) { + LinkedList toAdd = provider.getNeighborActions(block, entity); + + if (toAdd != null) { + for (IAction t : toAdd) { + if (!actions.contains(t)) { + actions.add(t); + } + } + } + } + + return actions; + } + + public static LinkedList getPipeTriggers(IPipe pipe) { + LinkedList triggers = new LinkedList(); + + for (ITriggerProvider provider : triggerProviders) { + LinkedList toAdd = provider.getPipeTriggers(pipe); + + if (toAdd != null) { + for (ITrigger t : toAdd) { + if (!triggers.contains(t)) { + triggers.add(t); + } + } + } + } + + return triggers; + } + + public static ITrigger getTriggerFromLegacyId(int legacyId){ + for(ITrigger trigger : triggers.values()){ + if(trigger.getLegacyId() == legacyId) + return trigger; + } + return null; + } + + public static IAction getActionFromLegacyId(int legacyId){ + for(IAction action : actions.values()){ + if(action.getLegacyId() == legacyId) + return action; + } + return null; + } +} diff --git a/common/buildcraft/api/gates/IAction.java b/common/buildcraft/api/gates/IAction.java new file mode 100644 index 00000000..90547d58 --- /dev/null +++ b/common/buildcraft/api/gates/IAction.java @@ -0,0 +1,27 @@ +package buildcraft.api.gates; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; + +public interface IAction { + + /** + * Return your ID from the old API here, this is only used to convert old + * saves to the new format. + */ + int getLegacyId(); + + String getUniqueTag(); + + @SideOnly(Side.CLIENT) + Icon getIcon(); + + @SideOnly(Side.CLIENT) + void registerIcons(IconRegister iconRegister); + + boolean hasParameter(); + + String getDescription(); +} diff --git a/common/buildcraft/api/gates/IActionProvider.java b/common/buildcraft/api/gates/IActionProvider.java new file mode 100644 index 00000000..6c64b57e --- /dev/null +++ b/common/buildcraft/api/gates/IActionProvider.java @@ -0,0 +1,23 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.gates; + +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; + +public interface IActionProvider { + + /** + * Returns the list of actions available to a gate next to the given block. + */ + public abstract LinkedList getNeighborActions(Block block, TileEntity tile); + +} diff --git a/common/buildcraft/api/gates/IActionReceptor.java b/common/buildcraft/api/gates/IActionReceptor.java new file mode 100644 index 00000000..c4637adc --- /dev/null +++ b/common/buildcraft/api/gates/IActionReceptor.java @@ -0,0 +1,16 @@ +/** + * Copyright (c) SpaceToad, 2012 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.gates; + +public interface IActionReceptor { + + public void actionActivated(IAction action); + +} diff --git a/common/buildcraft/api/gates/IOverrideDefaultTriggers.java b/common/buildcraft/api/gates/IOverrideDefaultTriggers.java new file mode 100644 index 00000000..8a2e47c6 --- /dev/null +++ b/common/buildcraft/api/gates/IOverrideDefaultTriggers.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.gates; + +import java.util.LinkedList; + +/** + * This interface has to be implemented by a TileEntity or a Pipe that wants to provide triggers different from the ones installed by default with BuildCraft. + */ +public interface IOverrideDefaultTriggers { + + LinkedList getTriggers(); + +} diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java new file mode 100644 index 00000000..ab59616b --- /dev/null +++ b/common/buildcraft/api/gates/ITrigger.java @@ -0,0 +1,47 @@ +package buildcraft.api.gates; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; + +public interface ITrigger { + + /** + * Return your ID from the old API here, this is only used to convert old + * saves to the new format. + */ + int getLegacyId(); + + String getUniqueTag(); + + @SideOnly(Side.CLIENT) + Icon getIcon(); + + @SideOnly(Side.CLIENT) + void registerIcons(IconRegister iconRegister); + + /** + * Return true if this trigger can accept parameters + */ + boolean hasParameter(); + + /** + * Return the trigger description in the UI + */ + String getDescription(); + + /** + * Return true if the tile given in parameter activates the trigger, given + * the parameters. + */ + boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter); + + /** + * Create parameters for the trigger. As for now, there is only one kind of + * trigger parameter available so this subprogram is final. + */ + ITriggerParameter createParameter(); +} diff --git a/common/buildcraft/api/gates/ITriggerParameter.java b/common/buildcraft/api/gates/ITriggerParameter.java new file mode 100644 index 00000000..cef436a6 --- /dev/null +++ b/common/buildcraft/api/gates/ITriggerParameter.java @@ -0,0 +1,18 @@ +package buildcraft.api.gates; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public interface ITriggerParameter { + + public abstract ItemStack getItemStack(); + + public abstract void set(ItemStack stack); + + public abstract void writeToNBT(NBTTagCompound compound); + + public abstract void readFromNBT(NBTTagCompound compound); + + public abstract ItemStack getItem(); + +} diff --git a/common/buildcraft/api/gates/ITriggerProvider.java b/common/buildcraft/api/gates/ITriggerProvider.java new file mode 100644 index 00000000..fe2271e0 --- /dev/null +++ b/common/buildcraft/api/gates/ITriggerProvider.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.gates; + +import buildcraft.api.transport.IPipe; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; + +public interface ITriggerProvider { + + /** + * Returns the list of triggers that are available from the pipe holding the gate. + */ + public abstract LinkedList getPipeTriggers(IPipe pipe); + + /** + * Returns the list of triggers available to a gate next to the given block. + */ + public abstract LinkedList getNeighborTriggers(Block block, TileEntity tile); + +} diff --git a/common/buildcraft/api/gates/TriggerParameter.java b/common/buildcraft/api/gates/TriggerParameter.java new file mode 100644 index 00000000..c76ce99a --- /dev/null +++ b/common/buildcraft/api/gates/TriggerParameter.java @@ -0,0 +1,79 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.gates; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class TriggerParameter implements ITriggerParameter { + + protected ItemStack stack; + + /* + * (non-Javadoc) + * + * @see net.minecraft.src.buildcraft.api.gates.ITriggerParameter#getItemStack() + */ + @Override + public ItemStack getItemStack() { + return stack; + } + + /* + * (non-Javadoc) + * + * @see net.minecraft.src.buildcraft.api.gates.ITriggerParameter#set(net.minecraft.src.ItemStack) + */ + @Override + public void set(ItemStack stack) { + if (stack != null) { + this.stack = stack.copy(); + this.stack.stackSize = 1; + } + } + + /* + * (non-Javadoc) + * + * @see net.minecraft.src.buildcraft.api.gates.ITriggerParameter#writeToNBT(net.minecraft.src.NBTTagCompound) + */ + @Override + public void writeToNBT(NBTTagCompound compound) { + if (stack != null) { + compound.setInteger("itemID", stack.itemID); + compound.setInteger("itemDMG", stack.getItemDamage()); + } + } + + /* + * (non-Javadoc) + * + * @see net.minecraft.src.buildcraft.api.gates.ITriggerParameter#readFromNBT(net.minecraft.src.NBTTagCompound) + */ + @Override + public void readFromNBT(NBTTagCompound compound) { + int itemID = compound.getInteger("itemID"); + + if (itemID != 0) { + stack = new ItemStack(itemID, 1, compound.getInteger("itemDMG")); + } + } + + /* + * (non-Javadoc) + * + * @see net.minecraft.src.buildcraft.api.gates.ITriggerParameter#getItem() + */ + @Override + public ItemStack getItem() { + return stack; + } + +} diff --git a/common/buildcraft/api/inventory/ISecuredInventory.java b/common/buildcraft/api/inventory/ISecuredInventory.java new file mode 100644 index 00000000..6ebb99b6 --- /dev/null +++ b/common/buildcraft/api/inventory/ISecuredInventory.java @@ -0,0 +1,23 @@ +package buildcraft.api.inventory; + +import net.minecraftforge.common.ForgeDirection; + +public interface ISecuredInventory { + + /** + * @param name + * @return true if the user/player with the given name has access permissions on this machine. + */ + boolean canAccess(String name); + + /** + * Informs the inventory with whose permissions the next item or liquid transaction will be performed. It is up to the inventory to determine the effect. + * + * @param orientation + * Orientation the transaction will be performed from. + * @param name + * Name of the user/player who owns the transaction. + */ + void prepareTransaction(ForgeDirection orientation, String name); + +} diff --git a/common/buildcraft/api/inventory/ISelectiveInventory.java b/common/buildcraft/api/inventory/ISelectiveInventory.java new file mode 100644 index 00000000..0e4d7045 --- /dev/null +++ b/common/buildcraft/api/inventory/ISelectiveInventory.java @@ -0,0 +1,23 @@ +package buildcraft.api.inventory; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; + +public interface ISelectiveInventory extends ISpecialInventory { + /** + * Requests specified items to be extracted from the inventory + * + * @param desired + * Array which can contain ItemStacks, Items, or classes describing the type of item accepted or excluded. + * @param exclusion + * If true desired items are not eligible for returning. + * @param doRemove + * If false no actual extraction may occur. + * @param from + * Orientation the ItemStack is requested from. + * @param maxItemCount + * Maximum amount of items to extract (spread over all returned item stacks) + * @return Array of item stacks extracted from the inventory + */ + ItemStack[] extractItem(Object[] desired, boolean exclusion, boolean doRemove, ForgeDirection from, int maxItemCount); +} diff --git a/common/buildcraft/api/inventory/ISpecialInventory.java b/common/buildcraft/api/inventory/ISpecialInventory.java new file mode 100644 index 00000000..27b735d4 --- /dev/null +++ b/common/buildcraft/api/inventory/ISpecialInventory.java @@ -0,0 +1,36 @@ +package buildcraft.api.inventory; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; + +public interface ISpecialInventory extends IInventory { + + /** + * Offers an ItemStack for addition to the inventory. + * + * @param stack + * ItemStack offered for addition. Do not manipulate this! + * @param doAdd + * If false no actual addition should take place. Implementors should simulate. + * @param from + * Orientation the ItemStack is offered from. + * @return Amount of items used from the passed stack. + */ + int addItem(ItemStack stack, boolean doAdd, ForgeDirection from); + + /** + * Requests items to be extracted from the inventory + * + * @param doRemove + * If false no actual extraction may occur. Implementors should simulate. + * Can be used to "peek" at what the result would be + * @param from + * Orientation the ItemStack is requested from. + * @param maxItemCount + * Maximum amount of items to extract (spread over all returned item stacks) + * @return Array of item stacks that were/would be extracted from the inventory + */ + ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount); + +} diff --git a/common/buildcraft/api/power/IPowerEmitter.java b/common/buildcraft/api/power/IPowerEmitter.java new file mode 100644 index 00000000..7ccf62b9 --- /dev/null +++ b/common/buildcraft/api/power/IPowerEmitter.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) SpaceToad, 2011-2012 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.power; + +import net.minecraftforge.common.ForgeDirection; + +/** + * Essentially only used for Wooden Power Pipe connection rules. + * + * This Tile Entity interface allows you to indicate that a block can emit power + * from a specific side. + * + * @author CovertJaguar + */ +public interface IPowerEmitter { + + public boolean canEmitPowerFrom(ForgeDirection side); +} diff --git a/common/buildcraft/api/power/IPowerReceptor.java b/common/buildcraft/api/power/IPowerReceptor.java new file mode 100644 index 00000000..a7f6c421 --- /dev/null +++ b/common/buildcraft/api/power/IPowerReceptor.java @@ -0,0 +1,47 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.power; + +import buildcraft.api.power.PowerHandler.PowerReceiver; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +/** + * This interface should be implemented by any Tile Entity that wishes to be + * able to receive power. + * + * @author CovertJaguar + */ +public interface IPowerReceptor { + + /** + * Get the PowerReceiver for this side of the block. You can return the same + * PowerReceiver for all sides or one for each side. + * + * You should NOT return null to this method unless you mean to NEVER + * receive power from that side. Returning null, after previous returning a + * PowerReceiver, will most likely cause pipe connections to derp out and + * engines to eventually explode. + * + * @param side + * @return + */ + public PowerReceiver getPowerReceiver(ForgeDirection side); + + /** + * Call back from the PowerHandler that is called when the stored power + * exceeds the activation power. + * + * It can be triggered by update() calls or power modification calls. + * + * @param workProvider + */ + public void doWork(PowerHandler workProvider); + + public World getWorld(); +} diff --git a/common/buildcraft/api/power/PowerHandler.java b/common/buildcraft/api/power/PowerHandler.java new file mode 100644 index 00000000..0751065b --- /dev/null +++ b/common/buildcraft/api/power/PowerHandler.java @@ -0,0 +1,389 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.power; + +import buildcraft.api.core.SafeTimeTracker; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; + +public final class PowerHandler { + + public static enum Type { + + ENGINE, GATE, MACHINE, PIPE, STORAGE; + + public boolean canReceiveFromPipes() { + switch (this) { + case MACHINE: + case STORAGE: + return true; + default: + return false; + } + } + + public boolean eatsEngineExcess() { + switch (this) { + case MACHINE: + case STORAGE: + return true; + default: + return false; + } + } + } + + public static class PerditionCalculator { + + public static final float DEFAULT_POWERLOSS = 1F; + public static final float MIN_POWERLOSS = 0.01F; + private final float powerLoss; + + public PerditionCalculator() { + powerLoss = DEFAULT_POWERLOSS; + } + + public PerditionCalculator(float powerLoss) { + if (powerLoss < MIN_POWERLOSS) { + powerLoss = MIN_POWERLOSS; + } + this.powerLoss = powerLoss; + } + + /** + * Apply the perdition algorithm to the current stored energy. This + * function can only be called once per tick, but it might not be called + * every tick. It is triggered by any manipulation of the stored energy. + * + * @param powerHandler the PowerHandler requesting the perdition update + * @param current the current stored energy + * @param ticksPassed ticks since the last time this function was called + * @return + */ + public float applyPerdition(PowerHandler powerHandler, float current, long ticksPassed) { + current -= powerLoss * ticksPassed; + if (current < 0) { + current = 0; + } + return current; + } + } + public static final PerditionCalculator DEFAULT_PERDITION = new PerditionCalculator(); + private float minEnergyReceived; + private float maxEnergyReceived; + private float maxEnergyStored; + private float activationEnergy; + private float energyStored = 0; + private final SafeTimeTracker doWorkTracker = new SafeTimeTracker(); + private final SafeTimeTracker sourcesTracker = new SafeTimeTracker(); + private final SafeTimeTracker perditionTracker = new SafeTimeTracker(); + public final int[] powerSources = new int[6]; + public final IPowerReceptor receptor; + private PerditionCalculator perdition; + private final PowerReceiver receiver; + private final Type type; + + public PowerHandler(IPowerReceptor receptor, Type type) { + this.receptor = receptor; + this.type = type; + this.receiver = new PowerReceiver(); + this.perdition = DEFAULT_PERDITION; + } + + public PowerReceiver getPowerReceiver() { + return receiver; + } + + public float getMinEnergyReceived() { + return minEnergyReceived; + } + + public float getMaxEnergyReceived() { + return maxEnergyReceived; + } + + public float getMaxEnergyStored() { + return maxEnergyStored; + } + + public float getActivationEnergy() { + return activationEnergy; + } + + public float getEnergyStored() { + return energyStored; + } + + /** + * Setup your PowerHandler's settings. + * + * @param minEnergyReceived This is the minimum about of power that will be + * accepted by the PowerHandler. This should generally be greater than the + * activationEnergy if you plan to use the doWork() callback. Anything + * greater than 1 will prevent Redstone Engines from powering this Provider. + * @param maxEnergyReceived The maximum amount of power accepted by the + * PowerHandler. This should generally be less than 500. Too low and larger + * engines will overheat while trying to power the machine. Too high, and + * the engines will never warm up. Greater values also place greater strain + * on the power net. + * @param activationEnergy If the stored energy is greater than this value, + * the doWork() callback is called (once per tick). + * @param maxStoredEnergy The maximum amount of power this PowerHandler can + * store. Values tend to range between 100 and 5000. With 1000 and 1500 + * being common. + */ + public void configure(float minEnergyReceived, float maxEnergyReceived, float activationEnergy, float maxStoredEnergy) { + if (minEnergyReceived > maxEnergyReceived) { + maxEnergyReceived = minEnergyReceived; + } + this.minEnergyReceived = minEnergyReceived; + this.maxEnergyReceived = maxEnergyReceived; + this.maxEnergyStored = maxStoredEnergy; + this.activationEnergy = activationEnergy; + } + + public void configurePowerPerdition(int powerLoss, int powerLossRegularity) { + if (powerLoss == 0 || powerLossRegularity == 0) { + perdition = new PerditionCalculator(0); + return; + } + perdition = new PerditionCalculator((float) powerLoss / (float) powerLossRegularity); + } + + /** + * Allows you to define a new PerditionCalculator class to handler perdition + * calculations. + * + * For example if you want exponentially increasing loss based on amount + * stored. + * + * @param perdition + */ + public void setPerdition(PerditionCalculator perdition) { + if (perdition == null) + perdition = DEFAULT_PERDITION; + this.perdition = perdition; + } + + public PerditionCalculator getPerdition() { + if (perdition == null) + return DEFAULT_PERDITION; + return perdition; + } + + /** + * Ticks the power handler. You should call this if you can, but its not + * required. + * + * If you don't call it, the possibility exists for some weirdness with the + * perdition algorithm and work callback as its possible they will not be + * called on every tick they otherwise would be. You should be able to + * design around this though if you are aware of the limitations. + */ + public void update() { + applyPerdition(); + applyWork(); + validateEnergy(); + } + + private void applyPerdition() { + if (perditionTracker.markTimeIfDelay(receptor.getWorld(), 1) && energyStored > 0) { + float newEnergy = getPerdition().applyPerdition(this, energyStored, perditionTracker.durationOfLastDelay()); + if (newEnergy == 0 || newEnergy < energyStored) + energyStored = newEnergy; + else + energyStored = DEFAULT_PERDITION.applyPerdition(this, energyStored, perditionTracker.durationOfLastDelay()); + validateEnergy(); + } + } + + private void applyWork() { + if (energyStored >= activationEnergy) { + if (doWorkTracker.markTimeIfDelay(receptor.getWorld(), 1)) { + receptor.doWork(this); + } + } + } + + private void updateSources(ForgeDirection source) { + if (sourcesTracker.markTimeIfDelay(receptor.getWorld(), 1)) { + for (int i = 0; i < 6; ++i) { + powerSources[i] -= sourcesTracker.durationOfLastDelay(); + if (powerSources[i] < 0) { + powerSources[i] = 0; + } + } + } + + if (source != null) + powerSources[source.ordinal()] = 10; + } + + /** + * Extract energy from the PowerHandler. You must call this even if doWork() + * triggers. + * + * @param min + * @param max + * @param doUse + * @return amount used + */ + public float useEnergy(float min, float max, boolean doUse) { + applyPerdition(); + + float result = 0; + + if (energyStored >= min) { + if (energyStored <= max) { + result = energyStored; + if (doUse) { + energyStored = 0; + } + } else { + result = max; + if (doUse) { + energyStored -= max; + } + } + } + + validateEnergy(); + + return result; + } + + public void readFromNBT(NBTTagCompound data) { + readFromNBT(data, "powerProvider"); + } + + public void readFromNBT(NBTTagCompound data, String tag) { + NBTTagCompound nbt = data.getCompoundTag(tag); + energyStored = nbt.getFloat("storedEnergy"); + } + + public void writeToNBT(NBTTagCompound data) { + writeToNBT(data, "powerProvider"); + } + + public void writeToNBT(NBTTagCompound data, String tag) { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setFloat("storedEnergy", energyStored); + data.setCompoundTag(tag, nbt); + } + + public final class PowerReceiver { + + private PowerReceiver() { + } + + public float getMinEnergyReceived() { + return minEnergyReceived; + } + + public float getMaxEnergyReceived() { + return maxEnergyReceived; + } + + public float getMaxEnergyStored() { + return maxEnergyStored; + } + + public float getActivationEnergy() { + return activationEnergy; + } + + public float getEnergyStored() { + return energyStored; + } + + public Type getType() { + return type; + } + + public void update() { + PowerHandler.this.update(); + } + + /** + * The amount of power that this PowerHandler currently needs. + * + * @return + */ + public float powerRequest() { + return Math.min(maxEnergyReceived, maxEnergyStored - energyStored); + } + + /** + * Add power to the PowerReceiver from an external source. + * + * @param quantity + * @param from + * @return the amount of power used + */ + public float receiveEnergy(Type source, final float quantity, ForgeDirection from) { + float used = quantity; + if (source == Type.ENGINE) { + if (used < minEnergyReceived) { + return 0; + } else if (used > maxEnergyReceived) { + used = maxEnergyReceived; + } + } + + updateSources(from); + + used = addEnergy(used); + + applyWork(); + + if (source == Type.ENGINE && type.eatsEngineExcess()) { + return Math.min(quantity, maxEnergyReceived); + } + + return used; + } + } + + /** + * + * @return the amount the power changed by + */ + public float addEnergy(float quantity) { + energyStored += quantity; + + if (energyStored > maxEnergyStored) { + quantity -= energyStored - maxEnergyStored; + energyStored = maxEnergyStored; + } else if (energyStored < 0) { + quantity -= energyStored; + energyStored = 0; + } + + applyPerdition(); + + return quantity; + } + + public void setEnergy(float quantity) { + this.energyStored = quantity; + validateEnergy(); + } + + public boolean isPowerSource(ForgeDirection from) { + return powerSources[from.ordinal()] != 0; + } + + private void validateEnergy() { + if (energyStored < 0) { + energyStored = 0; + } + if (energyStored > maxEnergyStored) { + energyStored = maxEnergyStored; + } + } +} diff --git a/common/buildcraft/api/recipes/AssemblyRecipe.java b/common/buildcraft/api/recipes/AssemblyRecipe.java new file mode 100644 index 00000000..573db282 --- /dev/null +++ b/common/buildcraft/api/recipes/AssemblyRecipe.java @@ -0,0 +1,48 @@ +package buildcraft.api.recipes; + +import java.util.LinkedList; +import net.minecraft.item.ItemStack; + +public class AssemblyRecipe { + + public static LinkedList assemblyRecipes = new LinkedList(); + + public final ItemStack[] input; + public final ItemStack output; + public final float energy; + + public AssemblyRecipe(ItemStack[] input, int energy, ItemStack output) { + this.input = input; + this.output = output; + this.energy = energy; + } + + public boolean canBeDone(ItemStack[] items) { + + for (ItemStack in : input) { + + if (in == null) { + continue; + } + + int found = 0; // Amount of ingredient found in inventory + + for (ItemStack item : items) { + if (item == null) { + continue; + } + + if (item.isItemEqual(in)) { + found += item.stackSize; // Adds quantity of stack to amount + // found + } + } + + if (found < in.stackSize) + return false; // Return false if the amount of ingredient found + // is not enough + } + + return true; + } +} diff --git a/common/buildcraft/api/recipes/RefineryRecipes.java b/common/buildcraft/api/recipes/RefineryRecipes.java new file mode 100644 index 00000000..64985bf7 --- /dev/null +++ b/common/buildcraft/api/recipes/RefineryRecipes.java @@ -0,0 +1,126 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.recipes; + +import com.google.common.base.Objects; +import java.util.Collections; +import java.util.SortedSet; +import java.util.TreeSet; +import net.minecraftforge.fluids.FluidStack; + +public final class RefineryRecipes { + + private static SortedSet recipes = new TreeSet(); + + public static void addRecipe(FluidStack ingredient, FluidStack result, int energy, int delay) { + addRecipe(ingredient, null, result, energy, delay); + } + + public static void addRecipe(FluidStack ingredient1, FluidStack ingredient2, FluidStack result, int energy, int delay) { + Recipe recipe = new Recipe(ingredient1, ingredient2, result, energy, delay); + recipes.add(recipe); + } + + public static SortedSet getRecipes() { + return Collections.unmodifiableSortedSet(recipes); + } + + public static Recipe findRefineryRecipe(FluidStack liquid1, FluidStack liquid2) { + for (Recipe recipe : recipes) { + if (recipe.matches(liquid1, liquid2)) + return recipe; + } + + return null; + } + + private RefineryRecipes() { + } + + public static final class Recipe implements Comparable { + + public final FluidStack ingredient1; + public final FluidStack ingredient2; + public final FluidStack result; + public final int energy; + public final int delay; + + private Recipe(FluidStack ingredient1, FluidStack ingredient2, FluidStack result, int energy, int delay) { + if (ingredient1 == null) + throw new IllegalArgumentException("First Ingredient cannot be null!"); + this.ingredient1 = ingredient1; + this.ingredient2 = ingredient2; + this.result = result; + this.energy = energy; + this.delay = delay; + } + + public boolean matches(FluidStack liquid1, FluidStack liquid2) { + + // No inputs, return. + if (liquid1 == null && liquid2 == null) + return false; + + // Return if two ingredients are required but only one was supplied. + if ((ingredient1 != null && ingredient2 != null) && (liquid1 == null || liquid2 == null)) + return false; + + if (liquid1 != null && liquid2 != null) { + if (liquid1.containsFluid(ingredient1) && liquid1.containsFluid(ingredient2)) + return true; + if (liquid1.containsFluid(ingredient2) && liquid1.containsFluid(ingredient1)) + return true; + } + + if (liquid1 != null) + return liquid1.containsFluid(ingredient1) || liquid1.containsFluid(ingredient2); + + if (liquid2 != null) + return liquid2.containsFluid(ingredient1) || liquid2.containsFluid(ingredient2); + + return false; + } + + // Compares to only the types of source materials. + // We consider non-null < null in order that one-ingredient recipe is checked after + // the failure of matching two-ingredient recipes which include that liquid. + @Override + public int compareTo(Recipe other) { + if (other == null) + return -1; + else if (ingredient1.getFluid() != other.ingredient1.getFluid()) + return ingredient1.getFluid().getName().compareTo(other.ingredient1.getFluid().getName()); + else if (ingredient1.amount != other.ingredient1.amount) + return other.ingredient1.amount - ingredient1.amount; + else if (ingredient2 == null) + return other.ingredient2 == null ? 0 : 1; + else if (other.ingredient2 == null) + return -1; + else if (ingredient2.getFluid() != other.ingredient2.getFluid()) + return ingredient2.getFluid().getName().compareTo(other.ingredient2.getFluid().getName()); + else if (ingredient2.amount != other.ingredient2.amount) + return other.ingredient2.amount - ingredient2.amount; + + return 0; + } + + // equals() should be consistent with compareTo(). + @Override + public boolean equals(Object obj) { + return obj instanceof Recipe + && Objects.equal(ingredient1, ((Recipe) obj).ingredient1) + && Objects.equal(ingredient2, ((Recipe) obj).ingredient2); + } + + // hashCode() should be overridden because equals() was overridden. + @Override + public int hashCode() { + return Objects.hashCode(ingredient1, ingredient2); + } + } +} diff --git a/common/buildcraft/api/tools/IToolPipette.java b/common/buildcraft/api/tools/IToolPipette.java new file mode 100644 index 00000000..d636523d --- /dev/null +++ b/common/buildcraft/api/tools/IToolPipette.java @@ -0,0 +1,40 @@ +package buildcraft.api.tools; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public interface IToolPipette { + + /** + * @param pipette + * ItemStack of the pipette. + * @return Capacity of the pipette. + */ + int getCapacity(ItemStack pipette); + + /** + * @param pipette + * @return true if the pipette can pipette. + */ + boolean canPipette(ItemStack pipette); + + /** + * Fills the pipette with the given liquid stack. + * + * @param pipette + * @param liquid + * @param doFill + * @return Amount of liquid used in filling the pipette. + */ + int fill(ItemStack pipette, FluidStack liquid, boolean doFill); + + /** + * Drains liquid from the pipette + * + * @param pipette + * @param maxDrain + * @param doDrain + * @return Fluid stack representing the liquid and amount drained from the pipette. + */ + FluidStack drain(ItemStack pipette, int maxDrain, boolean doDrain); +} diff --git a/common/buildcraft/api/tools/IToolWrench.java b/common/buildcraft/api/tools/IToolWrench.java new file mode 100644 index 00000000..bd0c3c59 --- /dev/null +++ b/common/buildcraft/api/tools/IToolWrench.java @@ -0,0 +1,32 @@ +package buildcraft.api.tools; + +import net.minecraft.entity.player.EntityPlayer; + +/*** + * Implement this interface on subclasses of Item to have that item work as a wrench for buildcraft + */ +public interface IToolWrench { + + /*** + * Called to ensure that the wrench can be used. To get the ItemStack that is used, check player.inventory.getCurrentItem() + * + * @param player + * - The player doing the wrenching + * @param x + * ,y,z - The coordinates for the block being wrenched + * + * @return true if wrenching is allowed, false if not + */ + public boolean canWrench(EntityPlayer player, int x, int y, int z); + + /*** + * Callback after the wrench has been used. This can be used to decrease durability or for other purposes. To get the ItemStack that was used, check + * player.inventory.getCurrentItem() + * + * @param player + * - The player doing the wrenching + * @param x + * ,y,z - The coordinates of the block being wrenched + */ + public void wrenchUsed(EntityPlayer player, int x, int y, int z); +} diff --git a/common/buildcraft/api/transport/FacadeManager.java b/common/buildcraft/api/transport/FacadeManager.java new file mode 100644 index 00000000..28cbdd1a --- /dev/null +++ b/common/buildcraft/api/transport/FacadeManager.java @@ -0,0 +1,25 @@ +package buildcraft.api.transport; + +import java.lang.reflect.Method; +import net.minecraft.item.ItemStack; + +/** + * You can use this if you wish, but FML InterModComms are recommended. + * + * SYNTAX: add-facade:id@meta + */ +public class FacadeManager { + private static Method addFacade; + + @SuppressWarnings({ "unchecked", "rawtypes" }) + public static void addFacade(ItemStack is) { + try { + if (addFacade == null) { + Class facade = Class.forName("buildcraft.transport.ItemFacade"); + addFacade = facade.getMethod("addFacade", ItemStack.class); + } + addFacade.invoke(null, is); + } catch (Exception ex) { + } + } +} diff --git a/common/buildcraft/api/transport/IExtractionHandler.java b/common/buildcraft/api/transport/IExtractionHandler.java new file mode 100644 index 00000000..e912f65b --- /dev/null +++ b/common/buildcraft/api/transport/IExtractionHandler.java @@ -0,0 +1,21 @@ +package buildcraft.api.transport; + +import net.minecraft.world.World; + +/** + * Implement and register with the PipeManager if you want to suppress connections from wooden pipes. + */ +public interface IExtractionHandler { + + /** + * Can this pipe extract items from the block located at these coordinates? + * param extractor can be null + */ + boolean canExtractItems(Object extractor, World world, int i, int j, int k); + + /** + * Can this pipe extract liquids from the block located at these coordinates? + * param extractor can be null + */ + boolean canExtractFluids(Object extractor, World world, int i, int j, int k); +} diff --git a/common/buildcraft/api/transport/IPipe.java b/common/buildcraft/api/transport/IPipe.java new file mode 100644 index 00000000..20096b76 --- /dev/null +++ b/common/buildcraft/api/transport/IPipe.java @@ -0,0 +1,45 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package buildcraft.api.transport; + +import net.minecraft.tileentity.TileEntity; + +public interface IPipe { + + enum DrawingState { + DrawingPipe, DrawingRedWire, DrawingBlueWire, DrawingGreenWire, DrawingYellowWire, DrawingGate + } + + enum WireColor { + Red, Blue, Green, Yellow; + + public WireColor reverse() { + switch (this) { + case Red: + return Yellow; + case Blue: + return Green; + case Green: + return Blue; + default: + return Red; + } + } + } + + public boolean isWired(WireColor color); + + public boolean hasGate(); + + public TileEntity getContainer(); + + public boolean isWireConnectedTo(TileEntity tile, WireColor color); + +} diff --git a/common/buildcraft/api/transport/IPipeConnection.java b/common/buildcraft/api/transport/IPipeConnection.java new file mode 100644 index 00000000..cbb1d003 --- /dev/null +++ b/common/buildcraft/api/transport/IPipeConnection.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.transport; + +import buildcraft.api.transport.IPipeTile.PipeType; +import net.minecraftforge.common.ForgeDirection; + +public interface IPipeConnection { + + enum ConnectOverride { + + CONNECT, DISCONNECT, DEFAULT + }; + + /** + * Allows you to override pipe connection logic. + * + * @param type + * @param with + * @return CONNECT to force a connection, DISCONNECT to force no connection, + * and DEFAULT to let the pipe decide. + */ + public ConnectOverride overridePipeConnection(PipeType type, ForgeDirection with); +} diff --git a/common/buildcraft/api/transport/IPipeTile.java b/common/buildcraft/api/transport/IPipeTile.java new file mode 100644 index 00000000..13aa8d76 --- /dev/null +++ b/common/buildcraft/api/transport/IPipeTile.java @@ -0,0 +1,39 @@ +/** + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.transport; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; + +public interface IPipeTile extends ISolidSideTile, IFluidHandler { + + public enum PipeType { + + ITEM, FLUID, POWER, STRUCTURE; + } + + @Deprecated + IPipe getPipe(); + + PipeType getPipeType(); + + /** + * Offers an ItemStack for addition to the pipe. Will be rejected if the + * pipe doesn't accept items from that side. + * + * @param stack ItemStack offered for addition. Do not manipulate this! + * @param doAdd If false no actual addition should take place. Implementors + * should simulate. + * @param from Orientation the ItemStack is offered from. + * @return Amount of items used from the passed stack. + */ + int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); + + boolean isPipeConnected(ForgeDirection with); +} diff --git a/common/buildcraft/api/transport/ISolidSideTile.java b/common/buildcraft/api/transport/ISolidSideTile.java new file mode 100644 index 00000000..627b0d88 --- /dev/null +++ b/common/buildcraft/api/transport/ISolidSideTile.java @@ -0,0 +1,7 @@ +package buildcraft.api.transport; + +import net.minecraftforge.common.ForgeDirection; + +public interface ISolidSideTile { + public boolean isSolidOnSide(ForgeDirection side); +} diff --git a/common/buildcraft/api/transport/PipeManager.java b/common/buildcraft/api/transport/PipeManager.java new file mode 100644 index 00000000..c78c86e2 --- /dev/null +++ b/common/buildcraft/api/transport/PipeManager.java @@ -0,0 +1,36 @@ +package buildcraft.api.transport; + +import java.util.ArrayList; +import java.util.List; +import net.minecraft.world.World; + +public abstract class PipeManager { + + public static List extractionHandlers = new ArrayList(); + + public static void registerExtractionHandler(IExtractionHandler handler) { + extractionHandlers.add(handler); + } + + /** + * param extractor can be null + */ + public static boolean canExtractItems(Object extractor, World world, int i, int j, int k) { + for (IExtractionHandler handler : extractionHandlers) + if (!handler.canExtractItems(extractor, world, i, j, k)) + return false; + + return true; + } + + /** + * param extractor can be null + */ + public static boolean canExtractFluids(Object extractor, World world, int i, int j, int k) { + for (IExtractionHandler handler : extractionHandlers) + if (!handler.canExtractFluids(extractor, world, i, j, k)) + return false; + + return true; + } +} diff --git a/common/crazypants/enderio/ClientProxy.java b/common/crazypants/enderio/ClientProxy.java new file mode 100644 index 00000000..f08a6a63 --- /dev/null +++ b/common/crazypants/enderio/ClientProxy.java @@ -0,0 +1,120 @@ +package crazypants.enderio; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import crazypants.enderio.conduit.BlockConduitBundle; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.TileConduitBundle; +import crazypants.enderio.conduit.facade.FacadeRenderer; +import crazypants.enderio.conduit.liquid.LiquidConduitRenderer; +import crazypants.enderio.conduit.redstone.RedstoneSwitchRenderer; +import crazypants.enderio.conduit.render.ConduitBundleRenderer; +import crazypants.enderio.conduit.render.ConduitRenderer; +import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import crazypants.enderio.conduit.render.ItemConduitRenderer; +import crazypants.enderio.enderface.EnderIoRenderer; +import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.machine.painter.BlockCustomFenceGate; +import crazypants.enderio.machine.painter.BlockCustomFenceGateRenderer; +import crazypants.enderio.machine.painter.PaintedItemRenderer; +import crazypants.enderio.machine.reservoir.ReservoirRenderer; +import crazypants.enderio.machine.reservoir.TileReservoir; +import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.FusedQuartzFrameRenderer; +import crazypants.enderio.material.FusedQuartzRenderer; + + +public class ClientProxy extends CommonProxy { + + //@formatter:off + public static int[][] sideAndFacingToSpriteOffset = new int[][] { + + { 3, 2, 0, 0, 0, 0 }, + { 2, 3, 1, 1, 1, 1 }, + { 1, 1, 3, 2, 5, 4 }, + { 0, 0, 2, 3, 4, 5 }, + { 4, 5, 4, 5, 3, 2 }, + { 5, 4, 5, 4, 2, 3 } }; +//@formatter:on + + + private List conduitRenderers = new ArrayList(); + + private DefaultConduitRenderer dcr = new DefaultConduitRenderer(); + + @Override + public World getClientWorld() { + return FMLClientHandler.instance().getClient().theWorld; + } + + @Override + public EntityPlayer getClientPlayer() { + return Minecraft.getMinecraft().thePlayer; + } + + @Override + public void load() { + super.load(); + + //Renderers + + ConduitBundleRenderer cbr = new ConduitBundleRenderer(); + BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(cbr); + + BlockCustomFenceGateRenderer bcfgr = new BlockCustomFenceGateRenderer(); + BlockCustomFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId();; + RenderingRegistry.registerBlockHandler(bcfgr); + + FusedQuartzRenderer fqr = new FusedQuartzRenderer(); + BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId();; + RenderingRegistry.registerBlockHandler(fqr); + + FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame.itemID, fqfr); + + ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit.itemID, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit.itemID, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit.itemID, itemConRenderer); + + + PaintedItemRenderer pir = new PaintedItemRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomFence.blockID, pir); + MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomFenceGate.blockID, pir); + MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomWall.blockID, pir); + MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomStair.blockID, pir); + + MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade.itemID, new FacadeRenderer()); + + ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr); + conduitRenderers.add(RedstoneSwitchRenderer.instance); + conduitRenderers.add(new LiquidConduitRenderer()); + + EnderIoRenderer eior = new EnderIoRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); + MinecraftForgeClient.registerItemRenderer(EnderIO.blockEnderIo.blockID, eior); + + ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); + + } + + @Override + public ConduitRenderer getRendererForConduit(IConduit conduit) { + for(ConduitRenderer renderer : conduitRenderers) { + if(renderer.isRendererForConduit(conduit)) { + return renderer; + } + } + return dcr; + } + +} diff --git a/common/crazypants/enderio/ClientTickHandler.java b/common/crazypants/enderio/ClientTickHandler.java new file mode 100644 index 00000000..91fc614c --- /dev/null +++ b/common/crazypants/enderio/ClientTickHandler.java @@ -0,0 +1,60 @@ +package crazypants.enderio; + +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.ITickHandler; +import cpw.mods.fml.common.TickType; +import crazypants.enderio.conduit.ConduitUtil; + +public class ClientTickHandler implements ITickHandler { + + private boolean hidingConduits = false; + private boolean first = true; + + @Override + public void tickStart(EnumSet type, Object... tickData) { + EntityPlayer player = (EntityPlayer) tickData[0]; + boolean curVal = ConduitUtil.isToolEquipped(player) || ConduitUtil.isConduitEquipped(player); + if(first) { + hidingConduits = curVal; + first = false; + } + if(curVal != hidingConduits) { + hidingConduits = curVal; + WorldClient world = FMLClientHandler.instance().getClient().theWorld; + + @SuppressWarnings("unchecked") + List checkList = world.loadedTileEntityList; + for(TileEntity o : checkList) { + if(o.blockType != null && o.blockType.blockID == EnderIO.blockConduitBundle.blockID) { + if(o.getDistanceFrom(player.posX, player.posY, player.posZ) < o.getMaxRenderDistanceSquared()) { + world.markBlockForRenderUpdate(o.xCoord, o.yCoord, o.zCoord); + } + } + } + } + + + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) { + } + + @Override + public EnumSet ticks() { + return EnumSet.of(TickType.PLAYER); + } + + @Override + public String getLabel() { + return "EnderIO Client Tick Handler"; + } + + +} diff --git a/common/crazypants/enderio/CommonProxy.java b/common/crazypants/enderio/CommonProxy.java new file mode 100644 index 00000000..a741a2b2 --- /dev/null +++ b/common/crazypants/enderio/CommonProxy.java @@ -0,0 +1,38 @@ +package crazypants.enderio; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.TickRegistry; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.render.ConduitRenderer; + +public class CommonProxy { + + private final ServerTickHandler serverTickHandler = new ServerTickHandler(); + + public World getClientWorld() { + return null; + } + + public EntityPlayer getClientPlayer() { + return null; + } + + public void load() { + TickRegistry.registerTickHandler(serverTickHandler, Side.SERVER); + } + + public ConduitRenderer getRendererForConduit(IConduit conduit) { + return null; + } + + public ServerTickHandler getServerTickHandler() { + return serverTickHandler; + } + + public void serverStopped() { + serverTickHandler.serverStopped(); + } + +} diff --git a/common/crazypants/enderio/Config.java b/common/crazypants/enderio/Config.java new file mode 100644 index 00000000..3d44f4b4 --- /dev/null +++ b/common/crazypants/enderio/Config.java @@ -0,0 +1,19 @@ +package crazypants.enderio; + +import net.minecraftforge.common.Configuration; + +public final class Config { + + static int BID = 700; + static int IID = 8524; + + public static void load(Configuration config) { + for (ModObject e : ModObject.values()) { + e.load(config); + } + } + + private Config() { + } + +} diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java new file mode 100644 index 00000000..e2ae2ca1 --- /dev/null +++ b/common/crazypants/enderio/EnderIO.java @@ -0,0 +1,172 @@ +package crazypants.enderio; + +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.Init; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.Mod.PostInit; +import cpw.mods.fml.common.Mod.PreInit; +import cpw.mods.fml.common.Mod.ServerStopped; +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.event.FMLServerStoppedEvent; +import cpw.mods.fml.common.network.NetworkMod; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.TickRegistry; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.conduit.BlockConduitBundle; +import crazypants.enderio.conduit.ConduitRecipes; +import crazypants.enderio.conduit.facade.BlockConduitFacade; +import crazypants.enderio.conduit.facade.ItemConduitFacade; +import crazypants.enderio.conduit.liquid.ItemLiquidConduit; +import crazypants.enderio.conduit.power.ItemPowerConduit; +import crazypants.enderio.conduit.redstone.ItemRedstoneConduit; +import crazypants.enderio.enderface.BlockEnderIO; +import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.machine.BlockElectricLight; +import crazypants.enderio.machine.MachineRecipes; +import crazypants.enderio.machine.alloy.BlockAlloySmelter; +import crazypants.enderio.machine.generator.BlockStirlingGenerator; +import crazypants.enderio.machine.painter.BlockCustomFence; +import crazypants.enderio.machine.painter.BlockCustomFenceGate; +import crazypants.enderio.machine.painter.BlockCustomStair; +import crazypants.enderio.machine.painter.BlockCustomWall; +import crazypants.enderio.machine.painter.BlockPainter; +import crazypants.enderio.machine.reservoir.BlockReservoir; +import crazypants.enderio.machine.solor.BlockSolarPanel; +import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.ItemAlloy; +import crazypants.enderio.material.ItemCapacitor; +import crazypants.enderio.material.ItemFusedQuartzFrame; +import crazypants.enderio.material.ItemIndustrialBinder; +import crazypants.enderio.material.ItemYetaWrench; +import crazypants.enderio.material.MaterialRecipes; + +@Mod(name = "EnderIO", modid = "EnderIO", version = "0.1.0", dependencies = "required-after:Forge@[7.1,);required-after:FML@[5.0.5,)") +@NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class) +public class EnderIO { + + @Instance("EnderIO") + public static EnderIO instance; + + @SidedProxy(clientSide = "crazypants.enderio.ClientProxy", serverSide = "crazypants.enderio.CommonProxy") + public static CommonProxy proxy; + + public static GuiHandler guiHandler = new GuiHandler(); + + //Materials + public static ItemIndustrialBinder itemIndustrialBinder; + public static ItemCapacitor itemBasicCapacitor; + public static ItemAlloy itemAlloy; + public static BlockFusedQuartz blockFusedQuartz; + public static ItemFusedQuartzFrame itemFusedQuartzFrame; + + // Enderface + public static BlockEnderIO blockEnderIo; + public static ItemEnderface itemEnderface; + + // Painter + public static BlockPainter blockPainter; + public static BlockCustomFence blockCustomFence; + public static BlockCustomFenceGate blockCustomFenceGate; + public static BlockCustomWall blockCustomWall; + public static BlockCustomStair blockCustomStair; + + // Conduits + public static BlockConduitBundle blockConduitBundle; + public static BlockConduitFacade blockConduitFacade; + public static ItemConduitFacade itemConduitFacade; + public static ItemRedstoneConduit itemRedstoneConduit; + public static ItemPowerConduit itemPowerConduit; + public static ItemLiquidConduit itemLiquidConduit; + + //Machines + public static BlockStirlingGenerator blockStirlingGenerator; + public static BlockSolarPanel blockSolarPanel; + public static BlockElectricLight blockElectricLight; + public static BlockReservoir blockReservoir; + public static BlockAlloySmelter blockAlloySmelter; + + public static ItemYetaWrench itemYetaWench; + + @PreInit + public void preInit(FMLPreInitializationEvent event) { + Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); + try { + cfg.load(); + Config.load(cfg); + } catch (Exception e) { + FMLLog.log(Level.SEVERE, e, "EnderIO has a problem loading it's configuration"); + } finally { + if (cfg.hasChanged()) { + cfg.save(); + } + } + + itemIndustrialBinder= ItemIndustrialBinder.create(); + itemBasicCapacitor = ItemCapacitor.create(); + itemAlloy = ItemAlloy.create(); + blockFusedQuartz = BlockFusedQuartz.create(); + itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); + + blockEnderIo = BlockEnderIO.create(); + itemEnderface = ItemEnderface.create(); + + blockPainter = BlockPainter.create(); + blockCustomFence = BlockCustomFence.create(); + blockCustomFenceGate = BlockCustomFenceGate.create(); + blockCustomWall = BlockCustomWall.create(); + blockCustomStair = BlockCustomStair.create(); + + blockStirlingGenerator = BlockStirlingGenerator.create(); + blockSolarPanel = BlockSolarPanel.create(); + blockReservoir = BlockReservoir.create(); + blockAlloySmelter = BlockAlloySmelter.create(); + + + blockConduitBundle = BlockConduitBundle.create(); + blockConduitFacade = BlockConduitFacade.create(); + itemConduitFacade = ItemConduitFacade.create(); + + itemRedstoneConduit = ItemRedstoneConduit.create(); + itemPowerConduit = ItemPowerConduit.create(); + itemLiquidConduit = ItemLiquidConduit.create(); + + //blockElectricLight = BlockElectricLight.create(); + + itemYetaWench = ItemYetaWrench.create(); + } + + + @Init + public void load(FMLInitializationEvent event) { + + instance = this; + + NetworkRegistry.instance().registerGuiHandler(this, guiHandler); + MinecraftForge.EVENT_BUS.register(this); + + MaterialRecipes.addRecipes(); + ConduitRecipes.addRecipes(); + MachineRecipes.addRecipes(); + + proxy.load(); + } + + @PostInit + public void postInit(FMLPostInitializationEvent event) { + TickRegistry.registerTickHandler(new ClientTickHandler(), Side.CLIENT); + } + + @ServerStopped + public void serverStopped(FMLServerStoppedEvent event) { + proxy.serverStopped(); + } + +} diff --git a/common/crazypants/enderio/EnderIOTab.java b/common/crazypants/enderio/EnderIOTab.java new file mode 100644 index 00000000..0640fb35 --- /dev/null +++ b/common/crazypants/enderio/EnderIOTab.java @@ -0,0 +1,36 @@ +package crazypants.enderio; + +import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EnderIOTab extends CreativeTabs { + + + public static final CreativeTabs tabEnderIO = new EnderIOTab(); + + public EnderIOTab() { + super("EnderIO"); + } + + /** + * the itemID for the item to be displayed on the tab + */ + @Override + public int getTabIconItemIndex() { + return EnderIO.itemEnderface.itemID; + } + + @Override + @SideOnly(Side.CLIENT) + public String getTabLabel() { + return "EnderIO"; + } + + @Override + @SideOnly(Side.CLIENT) + public String getTranslatedTabLabel() { + return "EnderIO"; + } + +} diff --git a/common/crazypants/enderio/GuiHandler.java b/common/crazypants/enderio/GuiHandler.java new file mode 100644 index 00000000..312b7e7b --- /dev/null +++ b/common/crazypants/enderio/GuiHandler.java @@ -0,0 +1,41 @@ +package crazypants.enderio; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + +public class GuiHandler implements IGuiHandler { + + public static final int GUI_ID_ENDERFACE = 1; + public static final int GUI_ID_PAINTER = 2; + public static final int GUI_ID_STIRLING_GEN = 3; + public static final int GUI_ID_ALLOY_SMELTER = 4; + + protected final Map guiHandlers = new HashMap(); + + public void registerGuiHandler(int id, IGuiHandler handler) { + guiHandlers.put(id, handler); + } + + @Override + public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + IGuiHandler handler = guiHandlers.get(id); + if(handler != null) { + return handler.getServerGuiElement(id, player, world, x, y, z); + } + return null; + } + + @Override + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + IGuiHandler handler = guiHandlers.get(id); + if(handler != null) { + return handler.getClientGuiElement(id, player, world, x, y, z); + } + return null; + } + +} diff --git a/common/crazypants/enderio/ModObject.java b/common/crazypants/enderio/ModObject.java new file mode 100644 index 00000000..997e84cb --- /dev/null +++ b/common/crazypants/enderio/ModObject.java @@ -0,0 +1,80 @@ +package crazypants.enderio; + +import static net.minecraftforge.common.Configuration.CATEGORY_BLOCK; +import static net.minecraftforge.common.Configuration.CATEGORY_ITEM; +import net.minecraftforge.common.Configuration; + +public enum ModObject { + // Enderface + blockEnderIo(++Config.BID, CATEGORY_BLOCK, "Ender IO"), + itemEnderface(++Config.IID, CATEGORY_ITEM, "Enderface"), + + // Conduits + blockConduitBundle(++Config.BID, CATEGORY_BLOCK, "Conduit Bundle"), + blockConduitFacade(++Config.BID, CATEGORY_BLOCK, "Conduit Facade"), + itemConduitFacade(++Config.IID, CATEGORY_ITEM, "Conduit Facade"), + itemRedstoneConduit(++Config.IID, CATEGORY_ITEM, "Redstone Conduit"), + + // Power + itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Power Conduit"), + + // Liquid + itemLiquidConduit(++Config.IID, CATEGORY_ITEM, "Liquid Conduit"), + + // Materials + itemIndustrialBinder(++Config.IID, CATEGORY_ITEM, "Industrial Binder"), + itemBasicCapacitor(++Config.IID, CATEGORY_ITEM, "Basic Capacitor"), + itemAlloy(++Config.IID, CATEGORY_ITEM, "Alloy"), + blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"), + + // Stirling Gen + blockStirlingGenerator(++Config.BID, CATEGORY_BLOCK, "Strirling Generator"), + blockReservoir(++Config.BID, CATEGORY_BLOCK, "Reservoir"), + blockAlloySmelter(++Config.BID, CATEGORY_BLOCK, "Alloy Smelter"), + + // Painter + blockPainter(++Config.BID, CATEGORY_BLOCK, "Painter"), + blockCustomFence(++Config.BID, CATEGORY_BLOCK, "Fence"), + blockCustomFenceGate(++Config.BID, CATEGORY_BLOCK, "Gate"), + blockCustomWall(++Config.BID, CATEGORY_BLOCK, "Wall"), + blockCustomStair(++Config.BID, CATEGORY_BLOCK, "Stair"), + itemFusedQuartzFrame(++Config.IID, CATEGORY_ITEM, "Fused Quartz Frame"), + + // Solar Panel + blockSolarPanel(++Config.BID, CATEGORY_BLOCK, "Photovoltaic Panel"), + + blockElectricLight(++Config.BID, CATEGORY_BLOCK, "Electric Light"), + + itemYetaWrench(++Config.IID, CATEGORY_ITEM, "Yeta Wrench"); + + public final String unlocalisedName; + public final String name; + public final int defaultId; + public final String category; + public int id; + public int actualId; + + private ModObject(int defaultId, String category, String name) { + this.unlocalisedName = "enderIO:" + toString(); + this.defaultId = defaultId; + this.name = name; + this.category = category; + id = -1; + actualId = -1; + } + + void load(Configuration config) { + if (CATEGORY_ITEM.equals(category)) { + id = config.getItem(unlocalisedName, defaultId).getInt(); + } else if (CATEGORY_BLOCK.equals(category)) { + id = config.getBlock(unlocalisedName, defaultId).getInt(); + } else { + throw new RuntimeException("Unknown category " + category); + } + actualId = id; + if (CATEGORY_ITEM.equals(category)) { + actualId += 256; + } + } + +} \ No newline at end of file diff --git a/common/crazypants/enderio/PacketHandler.java b/common/crazypants/enderio/PacketHandler.java new file mode 100644 index 00000000..3bf27911 --- /dev/null +++ b/common/crazypants/enderio/PacketHandler.java @@ -0,0 +1,264 @@ +package crazypants.enderio; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.ContainerBeacon; +import net.minecraft.inventory.ContainerRepair; +import net.minecraft.item.ItemInWorldManager; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet100OpenWindow; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityBeacon; +import net.minecraft.world.World; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IPacketHandler; +import cpw.mods.fml.common.network.Player; +import crazypants.enderio.enderface.ContainerWrapper; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.util.PacketUtil; + +public class PacketHandler implements IPacketHandler { + + public static int ID_ENDERFACE = 1; + private static final int ID_TILE_ENTITY = 4; + private static final int ID_MACHINE_REDSTONE_PACKET = 2; + + private static final String CHANNEL = "EnderIO"; + + + @Override + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) { + if (packet.data != null && packet.data.length <= 0) { + return; + } + + DataInputStream data = new DataInputStream(new ByteArrayInputStream(packet.data)); + try { + int id = data.readInt(); + if (id == ID_ENDERFACE) { + handleEnderfacePacket(data, manager, player); + } else if(id == ID_TILE_ENTITY) { + PacketUtil.handleTileEntityPacket(false, data); + } else if(id == ID_MACHINE_REDSTONE_PACKET) { + handleRedstoneControlPacket(data, manager, player); + } else { + System.out.println("PacketHandler.onPacketData: Recieved packet of unknown type: " + id); + } + } catch (IOException ex) { + FMLCommonHandler.instance().raiseException(ex, "PacketHandler.onPacketData", true); + } + } + + + + public static Packet getPacket(TileEntity te) { + return PacketUtil.createTileEntityPacket(CHANNEL, ID_TILE_ENTITY, te); + } + + // ---------------- Redstone Control -------------------------------------------------------- + + private void handleRedstoneControlPacket(DataInputStream data, INetworkManager manager, Player player) throws IOException { + int x = data.readInt(); + int y = data.readInt(); + int z = data.readInt(); + short ordinal = data.readShort(); + EntityPlayerMP p = (EntityPlayerMP) player; + TileEntity te = p.worldObj.getBlockTileEntity(x, y, z); + if(te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity)te; + me.setRedstoneControlMode(RedstoneControlMode.values()[ordinal]); + p.worldObj.markBlockForUpdate(x, y, z); + } + + } + + public static Packet getRedstoneControlPacket(AbstractMachineEntity te) { + ByteArrayOutputStream bos = new ByteArrayOutputStream(140); + DataOutputStream dos = new DataOutputStream(bos); + try { + dos.writeInt(ID_MACHINE_REDSTONE_PACKET); + dos.writeInt(te.xCoord); + dos.writeInt(te.yCoord); + dos.writeInt(te.zCoord); + dos.writeShort((short)te.getRedstoneControlMode().ordinal()); + } catch (IOException e) { + // never thrown + } + + Packet250CustomPayload pkt = new Packet250CustomPayload(); + pkt.channel = CHANNEL; + pkt.data = bos.toByteArray(); + pkt.length = bos.size(); + pkt.isChunkDataPacket = true; + return pkt; + + } + + + // ---------------- Enderface + // ------------------------------------------------------------ + + public static Packet250CustomPayload getPacketEnderface(int x, int y, int z) { + ByteArrayOutputStream bos = new ByteArrayOutputStream(16); + DataOutputStream dos = new DataOutputStream(bos); + try { + dos.writeInt(ID_ENDERFACE); + dos.writeInt(x); + dos.writeInt(y); + dos.writeInt(z); + } catch (IOException e) { + // never thrown + } + Packet250CustomPayload pkt = new Packet250CustomPayload(); + pkt.channel = CHANNEL; + pkt.data = bos.toByteArray(); + pkt.length = bos.size(); + pkt.isChunkDataPacket = true; + return pkt; + } + + private void handleEnderfacePacket(DataInputStream data, INetworkManager manager, Player p) throws IOException { + if (!(p instanceof EntityPlayerMP)) { + System.out.println("kitchenbench.PacketHandler.handleEnderfacePacket: Not an EntityPlayerMP"); + return; + } + int x = data.readInt(); + int y = data.readInt(); + int z = data.readInt(); + + EntityPlayerMP player = (EntityPlayerMP) p; + EntityPlayerMP proxy = createPlayerProxy(player); + player.theItemInWorldManager.activateBlockOrUseItem(proxy, player.worldObj, null, x, y, z, 0, 0, 0, 0); + player.theItemInWorldManager.thisPlayerMP = player; + + } + + public static T createPlayerProxy(EntityPlayerMP player) { + Enhancer e = new Enhancer(); + e.setCallback(new PlayerProxy(player)); + + e.setSuperclass(player.getClass()); + Class[] argTypes = new Class[] { MinecraftServer.class, World.class, String.class, ItemInWorldManager.class }; + Object[] args = new Object[] { player.mcServer, player.worldObj, player.username, player.theItemInWorldManager }; + + e.setInterceptDuringConstruction(false); + @SuppressWarnings("unchecked") + T proxifiedObj = (T) e.create(argTypes, args); + + return proxifiedObj; + } + + public static class PlayerProxy implements MethodInterceptor { + + private EntityPlayerMP realObj; + + private Set interceptNames = new HashSet(); + + private Set beaconNames = new HashSet(); + private Set anvilNames = new HashSet(); + + public PlayerProxy(EntityPlayerMP obj) { + // TODO: Move to config? + this.realObj = obj; + interceptNames.add("openGui"); + + interceptNames.add("displayGUIBrewingStand"); + interceptNames.add("func_71017_a"); + + interceptNames.add("displayGUIChest"); + interceptNames.add("func_71007_a"); + + interceptNames.add("displayGUIDispenser"); + interceptNames.add("func_71006_a"); + + interceptNames.add("displayGUIEnchantment"); + interceptNames.add("func_71002_c"); + + interceptNames.add("displayGUIFurnace"); + interceptNames.add("func_71042_a"); + + interceptNames.add("displayGUIWorkbench"); + interceptNames.add("func_71058_b"); + + interceptNames.add("displayGuiHopper"); // for when its added + interceptNames.add("func_94064_a"); // displayGuiHopper + + interceptNames.add("displayGUIHopper"); + + beaconNames.add("displayGUIBeacon"); + beaconNames.add("func_82240_a"); + + anvilNames.add("displayGUIAnvil"); + anvilNames.add("func_82244_d"); + + + } + + @Override + public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable { + if (interceptNames.contains(method.getName())) { + + Object res = method.invoke(realObj, objects); + if (realObj.openContainer != null) { + realObj.openContainer = new ContainerWrapper(realObj.openContainer); + } + return res; + + } else if (beaconNames.contains(method.getName())) { + + // Beacon needs to be done manually for some reason to work properly + TileEntityBeacon par1TileEntityBeacon = (TileEntityBeacon) objects[0]; + realObj.incrementWindowID(); + realObj.playerNetServerHandler.sendPacketToPlayer(new Packet100OpenWindow(realObj.currentWindowId, 7, par1TileEntityBeacon.getInvName(), + par1TileEntityBeacon.getSizeInventory(), par1TileEntityBeacon.isInvNameLocalized())); + realObj.openContainer = new ContainerBeacon(realObj.inventory, par1TileEntityBeacon) { + @Override + public boolean canInteractWith(EntityPlayer par1EntityPlayer) { + return true; + } + }; + realObj.openContainer.windowId = realObj.currentWindowId; + realObj.openContainer.addCraftingToCrafters(realObj); + return null; + + } else if (anvilNames.contains(method.getName())) { + + realObj.incrementWindowID(); + realObj.playerNetServerHandler.sendPacketToPlayer(new Packet100OpenWindow(realObj.currentWindowId, 8, "Repairing", 9, true)); + realObj.openContainer = new ContainerRepair(realObj.inventory, realObj.worldObj, ((Integer)objects[0]).intValue(), ((Integer)objects[1]).intValue(), ((Integer)objects[2]).intValue(), realObj) { + @Override + public boolean canInteractWith(EntityPlayer par1EntityPlayer) { + return true; + } + }; + realObj.openContainer.windowId = realObj.currentWindowId; + realObj.openContainer.addCraftingToCrafters(realObj); + return null; + + } else if(method.getName().equals("getDistanceSq")) { //for forestry + return 6; + } + method.setAccessible(true); + return method.invoke(realObj, objects); + } + + } + +} diff --git a/common/crazypants/enderio/ServerTickHandler.java b/common/crazypants/enderio/ServerTickHandler.java new file mode 100644 index 00000000..9494caff --- /dev/null +++ b/common/crazypants/enderio/ServerTickHandler.java @@ -0,0 +1,81 @@ +package crazypants.enderio; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +import cpw.mods.fml.common.ITickHandler; +import cpw.mods.fml.common.TickType; + +public class ServerTickHandler implements ITickHandler { + + private static final EnumSet TICKS = EnumSet.of(TickType.SERVER); + + private final List> listeners = new CopyOnWriteArrayList>(); + + public void addListener(TickListener listener) { + listeners.add(new WeakReference(listener)); + } + + public void removeListener(TickListener listener) { + WeakReference toRemove = null; + for(WeakReference ref : listeners) { + if(ref.get() == listener) { + toRemove = ref; + break; + } + } + if(toRemove != null) { + listeners.remove(toRemove); + } + } + + + @Override + public void tickStart(EnumSet type, Object... tickData) { + List lists = processListeners(); + for(TickListener listener : lists) { + listener.tickStart(type, tickData); + } + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) { + List lists = processListeners(); + for(TickListener listener : lists) { + listener.tickEnd(type, tickData); + } + } + + private List processListeners() { + List result = new ArrayList(listeners.size()); + List> toRemove = new ArrayList>(); + for(WeakReference ref : listeners) { + TickListener l = ref.get(); + if(l == null) { + toRemove.add(ref); + } else { + result.add(l); + } + } + return result; + } + + public void serverStopped() { + listeners.clear(); + } + + @Override + public EnumSet ticks() { + return TICKS; + } + + @Override + public String getLabel() { + return "EnderIO Server Tick Handler"; + } + + +} diff --git a/common/crazypants/enderio/TickListener.java b/common/crazypants/enderio/TickListener.java new file mode 100644 index 00000000..3f40b8c0 --- /dev/null +++ b/common/crazypants/enderio/TickListener.java @@ -0,0 +1,13 @@ +package crazypants.enderio; + +import java.util.EnumSet; + +import cpw.mods.fml.common.TickType; + +public interface TickListener { + + void tickStart(EnumSet type, Object... tickData); + + void tickEnd(EnumSet type, Object... tickData); + +} diff --git a/common/crazypants/enderio/Tst.java b/common/crazypants/enderio/Tst.java new file mode 100644 index 00000000..35b49ba6 --- /dev/null +++ b/common/crazypants/enderio/Tst.java @@ -0,0 +1,22 @@ +package crazypants.enderio; + +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector3d; + + +public class Tst { + + + /** + * @param args + */ + public static void main(String[] args) { + } + + + + + + +} diff --git a/common/crazypants/enderio/conduit/AbstractConduit.java b/common/crazypants/enderio/conduit/AbstractConduit.java new file mode 100644 index 00000000..974c2ef4 --- /dev/null +++ b/common/crazypants/enderio/conduit/AbstractConduit.java @@ -0,0 +1,368 @@ +package crazypants.enderio.conduit; + +import java.util.*; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.geom.*; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.util.BlockCoord; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +public abstract class AbstractConduit implements IConduit { + + protected final Set conduitConnections = new HashSet(); + + protected final Set externalConnections = new HashSet(); + + public static final float STUB_WIDTH = 0.2f; + + public static final float STUB_HEIGHT = 0.2f; + + public static final float TRANSMISSION_SCALE = 0.3f; + + // NB: This is a transient field controlled by the owning bundle. It is not + // written to the NBT etc + protected IConduitBundle bundle; + + protected boolean active; + + protected List collidables; + + protected boolean collidablesDirty = true; + + private boolean clientStateDirty = true; + + private boolean dodgyChangeSinceLastCallFlagForBundle = true; + + protected AbstractConduit() { + } + + private int lastNumConections = -1; + + @Override + public boolean haveCollidablesChangedSinceLastCall() { + if(dodgyChangeSinceLastCallFlagForBundle) { + dodgyChangeSinceLastCallFlagForBundle = false; + return true; + } + return false; + } + + @Override + public BlockCoord getLocation() { + if (bundle == null) { + return null; + } + TileEntity te = bundle.getEntity(); + if (te == null) { + return null; + } + return new BlockCoord(te.xCoord, te.yCoord, te.zCoord); + } + + @Override + public void setBundle(IConduitBundle tileConduitBundle) { + bundle = tileConduitBundle; + } + + @Override + public IConduitBundle getBundle() { + return bundle; + } + + // Connections + @Override + public Set getConduitConnections() { + return conduitConnections; + } + + @Override + public boolean containsConduitConnection(ForgeDirection dir) { + return conduitConnections.contains(dir); + } + + @Override + public void conduitConnectionAdded(ForgeDirection fromDirection) { + conduitConnections.add(fromDirection); + connectionsChanged(); + } + + @Override + public void conduitConnectionRemoved(ForgeDirection fromDirection) { + conduitConnections.remove(fromDirection); + connectionsChanged(); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction) { + return false; + } + + @Override + public Set getExternalConnections() { + return externalConnections; + } + + @Override + public boolean containsExternalConnection(ForgeDirection dir) { + return externalConnections.contains(dir); + } + + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + externalConnections.add(fromDirection); + connectionsChanged(); + } + + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + externalConnections.remove(fromDirection); + connectionsChanged(); + } + + @Override + public boolean isConnectedTo(ForgeDirection dir) { + return containsConduitConnection(dir) || containsExternalConnection(dir); + } + + @Override + public boolean isActive() { + return active; + } + + @Override + public void setActive(boolean active) { + if(active != this.active) { + clientStateDirty = true; + } + this.active = active; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + int[] dirs = new int[conduitConnections.size()]; + Iterator cons = conduitConnections.iterator(); + for (int i = 0; i < dirs.length; i++) { + dirs[i] = cons.next().ordinal(); + } + nbtRoot.setIntArray("connections", dirs); + + dirs = new int[externalConnections.size()]; + cons = externalConnections.iterator(); + for (int i = 0; i < dirs.length; i++) { + dirs[i] = cons.next().ordinal(); + } + nbtRoot.setIntArray("externalConnections", dirs); + nbtRoot.setBoolean("signalActive", active); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + conduitConnections.clear(); + int[] dirs = nbtRoot.getIntArray("connections"); + for (int i = 0; i < dirs.length; i++) { + conduitConnections.add(ForgeDirection.values()[dirs[i]]); + } + + externalConnections.clear(); + dirs = nbtRoot.getIntArray("externalConnections"); + for (int i = 0; i < dirs.length; i++) { + externalConnections.add(ForgeDirection.values()[dirs[i]]); + } + active = nbtRoot.getBoolean("signalActive"); + //collidablesDirty = true; + } + + @Override + public int getLightValue() { + return 0; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res) { + return false; + } + + @Override + public float getSelfIlluminationForState(CollidableComponent component) { + return isActive() ? 1 : 0; + } + + @Override + public float getTransmitionGeometryScale() { + return TRANSMISSION_SCALE; + } + + @Override + public void onChunkUnload(World worldObj) { + AbstractConduitNetwork network = getNetwork(); + if (network != null) { + System.out.println("AbstractConduit.onChunkUnload: Destroyed network on chunk unload."); + network.destroyNetwork(); + } + } + + @Override + public void updateEntity(World world) { + if (world.isRemote) { + return; + } + updateNetwork(world); + + if(clientStateDirty) { + getBundle().dirty(); + clientStateDirty = false; + } + } + + + protected void connectionsChanged() { + collidablesDirty = true; + clientStateDirty = true; + dodgyChangeSinceLastCallFlagForBundle = true; + } + + protected void updateNetwork(World world) { + if (getNetwork() == null) { + ConduitUtil.ensureValidNetwork(this); + } + getNetwork().onUpdateEntity(this); + } + + @Override + public void onAddedToBundle() { + + TileEntity te = bundle.getEntity(); + World world = te.worldObj; + + conduitConnections.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); + if (neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { + conduitConnections.add(dir); + neighbour.conduitConnectionAdded(dir.getOpposite()); + } + } + + externalConnections.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!containsConduitConnection(dir) && canConnectToExternal(dir)) { + externalConnectionAdded(dir); + } + } + + connectionsChanged(); + } + + @Override + public void onRemovedFromBundle() { + TileEntity te = bundle.getEntity(); + World world = te.worldObj; + + for (ForgeDirection dir : conduitConnections) { + IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); + if (neighbour != null) { + neighbour.conduitConnectionRemoved(dir.getOpposite()); + } + } + conduitConnections.clear(); + + if (!externalConnections.isEmpty()) { + world.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, EnderIO.blockConduitBundle.blockID); + } + externalConnections.clear(); + + AbstractConduitNetwork network = getNetwork(); + if (network != null) { + network.destroyNetwork(); + } + connectionsChanged(); + } + + @Override + public boolean onNeighborBlockChange(int blockId) { + // Check for changes to external connections, connections to conduits are + // handled by the bundle + + //NB: No need to check externals if the neighbour that changed was a conduit bundle as this + //can't effect external connections. + if(blockId == EnderIO.blockConduitBundle.blockID) { + return false; + } + + boolean externalConnectionsChanged = false; + List copy = new ArrayList(externalConnections); + // remove any no longer valid connections + for (ForgeDirection dir : copy) { + if (!canConnectToExternal(dir)) { + externalConnectionRemoved(dir); + externalConnectionsChanged = true; + } + } + + // then check for new ones + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!conduitConnections.contains(dir) && !externalConnections.contains(dir)) { + if (canConnectToExternal(dir)) { + externalConnectionAdded(dir); + externalConnectionsChanged = true; + } + } + } + if (externalConnectionsChanged) { + connectionsChanged(); + } + return externalConnectionsChanged; + } + + @Override + public Collection createCollidables(CacheKey key) { + return Collections.singletonList(new CollidableComponent(getBaseConduitType(),ConduitGeometryUtil.instance.getBoundingBox(getBaseConduitType(), key.dir, key.isStub, key.offset),key.dir,null)); + } + + @Override + public List getCollidableComponents() { + + if (collidables != null && !collidablesDirty) { + return collidables; + } + + List result = new ArrayList(); + CollidableCache cc = CollidableCache.instance; + + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + Collection col = getCollidables(dir); + if(col != null) { + result.addAll(col); + } + } + collidables = result; + + collidablesDirty = false; + + return result; + } + + + private Collection getCollidables(ForgeDirection dir) { + CollidableCache cc = CollidableCache.instance; + Class type = getBaseConduitType(); + + if (isConnectedTo(dir)) { + return cc.getCollidables(cc.createKey(type, getBundle().getOffset(type, dir), dir, false), this); + } + return null; + } + + +} diff --git a/common/crazypants/enderio/conduit/AbstractConduitNetwork.java b/common/crazypants/enderio/conduit/AbstractConduitNetwork.java new file mode 100644 index 00000000..2f3b89c3 --- /dev/null +++ b/common/crazypants/enderio/conduit/AbstractConduitNetwork.java @@ -0,0 +1,84 @@ +package crazypants.enderio.conduit; + +import java.util.*; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public abstract class AbstractConduitNetwork { + + protected final List conduits = new ArrayList(); + + protected AbstractConduitNetwork() { + } + + public void init(IConduitBundle tile, Collection connections, World world) { + + if (world.isRemote) { + throw new UnsupportedOperationException(); + } + + // Destroy all existing redstone networks around this block + for (T con : connections) { + AbstractConduitNetwork network = con.getNetwork(); + if (network != null) { + network.destroyNetwork(); + } + } + setNetwork(world, tile); + notifyNetworkOfUpdate(); + } + + public abstract Class getBaseConduitType(); + + protected void setNetwork(World world, IConduitBundle tile) { + + T conduit = tile.getConduit(getBaseConduitType()); + if (conduit.setNetwork(this)) { + addConduit(conduit); + TileEntity te = tile.getEntity(); + Collection connections = ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, getBaseConduitType()); + for (T con : connections) { + if (con.getNetwork() == null) { + setNetwork(world, con.getBundle()); + } + } + } + } + + public void addConduit(T con) { + conduits.add(con); + } + + public void destroyNetwork() { + for (T con : conduits) { + con.setNetwork(null); + } + conduits.clear(); + } + + public List getConduits() { + return conduits; + } + + public void notifyNetworkOfUpdate() { + for (T con : conduits) { + TileEntity te = con.getBundle().getEntity(); + te.worldObj.markBlockForUpdate(te.xCoord, te.yCoord, te.zCoord); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (IConduit con : conduits) { + sb.append(con.getLocation()); + sb.append(", "); + } + return "AbstractConduitNetwork [conduits=" + sb.toString() + "]"; + } + + public void onUpdateEntity(IConduit conduit) { + } + +} diff --git a/common/crazypants/enderio/conduit/AbstractItemConduit.java b/common/crazypants/enderio/conduit/AbstractItemConduit.java new file mode 100644 index 00000000..1e23d2fa --- /dev/null +++ b/common/crazypants/enderio/conduit/AbstractItemConduit.java @@ -0,0 +1,121 @@ +package crazypants.enderio.conduit; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.*; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.common.registry.*; +import crazypants.enderio.*; +import crazypants.enderio.material.Alloy; + +public abstract class AbstractItemConduit extends Item implements IConduitItem { + + protected ModObject modObj; + + protected ItemConduitSubtype[] subtypes; + + protected Icon[] icons; + + protected AbstractItemConduit(ModObject modObj) { + super(modObj.id); + this.modObj = modObj; + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(modObj.unlocalisedName); + setMaxStackSize(64); + setHasSubtypes(true); + } + + protected void init(ItemConduitSubtype[] subtypes) { + this.subtypes = subtypes; + icons = new Icon[subtypes.length]; + + LanguageRegistry.addName(this, modObj.name); + GameRegistry.registerItem(this, modObj.unlocalisedName); + for(ItemConduitSubtype subtype : subtypes) { + LanguageRegistry.instance().addStringLocalization(getUnlocalizedName() + "." + subtype.unlocalisedName + ".name", subtype.uiName); + } + + } + + @Override + public void registerIcons(IconRegister iconRegister) { + int index = 0; + for(ItemConduitSubtype subtype : subtypes) { + icons[index] = iconRegister.registerIcon(subtype.iconKey); + index++; + } + } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + + ForgeDirection dir = ForgeDirection.values()[side]; + int placeX = x + dir.offsetX; + int placeY = y + dir.offsetY; + int placeZ = z + dir.offsetZ; + + int blockID = world.getBlockId(placeX, placeY, placeZ); + if (blockID == 0) { + if(!world.isRemote) { + if(world.setBlock(placeX, placeY, placeZ, ModObject.blockConduitBundle.actualId,0,1)) { + IConduitBundle bundle = (IConduitBundle) world.getBlockTileEntity(placeX, placeY, placeZ); + bundle.addConduit(createConduit(stack)); + } + } + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; + } + return true; + } else if(blockID == ModObject.blockConduitBundle.actualId) { + + IConduitBundle bundle = (TileConduitBundle)world.getBlockTileEntity(placeX, placeY, placeZ); + if(bundle == null) { + System.out.println("AbstractItemConduit.onItemUse: Bunle null"); + return false; + } + IConduit con = createConduit(stack); + if(con == null) { + System.out.println("AbstractItemConduit.onItemUse: Conduit null."); + return false; + } + if(bundle.getConduit(con.getBaseConduitType()) == null) { + if(!world.isRemote) { + bundle.addConduit(con); + } + return true; + } + } + + return false; + } + + + @Override + public Icon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, subtypes.length); + return icons[damage]; + } + + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, subtypes.length); + return super.getUnlocalizedName() + "." + subtypes[i].unlocalisedName; + + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < subtypes.length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + +} diff --git a/common/crazypants/enderio/conduit/BlockConduitBundle.java b/common/crazypants/enderio/conduit/BlockConduitBundle.java new file mode 100644 index 00000000..94ebb740 --- /dev/null +++ b/common/crazypants/enderio/conduit/BlockConduitBundle.java @@ -0,0 +1,601 @@ +package crazypants.enderio.conduit; + +import static net.minecraftforge.common.ForgeDirection.getOrientation; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; +import crazypants.enderio.conduit.liquid.LiquidConduit; +import crazypants.enderio.conduit.power.PowerConduit; +import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.conduit.redstone.RedstoneConduit; +import crazypants.enderio.conduit.redstone.RedstoneSwitch; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.render.BoundingBox; + +public class BlockConduitBundle extends Block implements ITileEntityProvider { + + // private static final String KEY_BLOCK_ICON = "enderio:conduitBundle"; + + private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector"; + + public static BlockConduitBundle create() { + BlockConduitBundle result = new BlockConduitBundle(); + result.init(); + return result; + } + + public static int rendererId = -1; + + private Icon connectorIcon; + + private Icon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + protected BlockConduitBundle() { + super(ModObject.blockConduitBundle.id, Material.ground); + setHardness(0.5F); + setBlockBounds(0.334f, 0.334f, 0.334f, 0.667f, 0.667f, 0.667f); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockConduitBundle.unlocalisedName); + setCreativeTab(null); + + RedstoneConduit.initIcons(); + RedstoneSwitch.initIcons(); + PowerConduit.initIcons(); + LiquidConduit.initIcons(); + + } + + // public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, + // World par2World, int par3, int par4, int par5) + + @Override + public boolean addBlockHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + Icon tex = null; + + TileConduitBundle cb = (TileConduitBundle) world.getBlockTileEntity(target.blockX, target.blockY, target.blockZ); + if (ConduitUtil.renderFacade(cb, Minecraft.getMinecraft().thePlayer)) { + if (cb.getFacadeId() > 0) { + tex = Block.blocksList[cb.getFacadeId()].getIcon(target.sideHit, cb.getFacadeMetadata()); + } + } else if (target.hitInfo instanceof CollidableComponent) { + CollidableComponent cc = (CollidableComponent) target.hitInfo; + IConduit con = cb.getConduit(cc.conduitType); + if (con != null) { + tex = con.getTextureForState(cc); + } + } + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addBlockDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + Icon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = this.rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); + fx.func_110125_a(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; + + } + + @SideOnly(Side.CLIENT) + private void addBlockHitEffects(World world, EffectRenderer effectRenderer, int x, int y, int z, int side, Icon tex) { + float f = 0.1F; + double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); + double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); + double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.func_110125_a(tex); + effectRenderer.addEffect(digFX); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockConduitBundle.name); + GameRegistry.registerBlock(this, ModObject.blockConduitBundle.unlocalisedName); + GameRegistry.registerTileEntity(TileConduitBundle.class, ModObject.blockConduitBundle.unlocalisedName + "TileEntity"); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + if (target != null && target.hitInfo instanceof CollidableComponent) { + CollidableComponent cc = (CollidableComponent) target.hitInfo; + TileConduitBundle bundle = (TileConduitBundle) world.getBlockTileEntity(x, y, z); + IConduit conduit = bundle.getConduit(cc.conduitType); + if (conduit != null) { + return conduit.createItem(); + } else if(cc.conduitType == null && bundle.getFacadeId() > 0) { + //use the facde + ItemStack fac = new ItemStack(ModObject.itemConduitFacade.actualId, 1, 0); + PainterUtil.setSourceBlock(fac, bundle.getFacadeId(), bundle.getFacadeMetadata()); + return fac; + } + } + return null; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return 0; + } + IConduitBundle bun = (IConduitBundle) te; + return bun.getFacadeId() > 0 ? bun.getFacadeMetadata() : 0; + } + + + @Override + public int idDropped(int par1, Random par2Random, int par3) { + return 0; + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + public Icon getConnectorIcon() { + return connectorIcon; + } + + @Override + public void registerIcons(IconRegister iconRegister) { + connectorIcon = iconRegister.registerIcon(KEY_CONNECTOR_ICON); + blockIcon = connectorIcon; + } + + @Override + public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return false; + } + IConduitBundle con = (IConduitBundle) te; + if (con.getFacadeId() > 0) { + return true; + } + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return rendererId; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileConduitBundle(); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return super.getLightValue(world, x, y, z); + } + IConduitBundle con = (IConduitBundle) te; + if (con.getFacadeId() > 0) { + return 0; + } + Collection conduits = con.getConduits(); + int result = 0; + for (IConduit conduit : conduits) { + result += conduit.getLightValue(); + } + return result; + } + + @Override + public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int par5) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return 0; + } + IConduitBundle bundle = (IConduitBundle) te; + IRedstoneConduit con = bundle.getConduit(IRedstoneConduit.class); + if (con == null) { + return 0; + } + return con.isProvidingStrongPower(getOrientation(par5)); + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int par5) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return 0; + } + IConduitBundle bundle = (IConduitBundle) te; + IRedstoneConduit con = bundle.getConduit(IRedstoneConduit.class); + if (con == null) { + return 0; + } + return con.isProvidingWeakPower(getOrientation(par5)); + } + + @Override + public boolean canProvidePower() { + return true; + } + @Override + public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { + IConduitBundle te = (IConduitBundle) world.getBlockTileEntity(x, y, z); + if (te == null) { + return true; + } + + boolean breakBlock = true; + List drop = new ArrayList(); + if (ConduitUtil.renderFacade(te, player)) { + breakBlock = false; + ItemStack fac = new ItemStack(ModObject.itemConduitFacade.actualId, 1, 0); + PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata()); + drop.add(fac); + te.setFacadeId(-1); + te.setFacadeMetadata(0); + } + + if (breakBlock) { + RaytraceResult rt = doRayTrace(world, x, y, z, player); + if (rt != null && rt.component != null) { + Class type = rt.component.conduitType; + if (type == null) { + // broke a conector so drop any conduits with no connections as there + // is no other way to remove these + List cons = new ArrayList(te.getConduits()); + boolean droppedUnconected = false; + for (IConduit con : cons) { + if (con.getConduitConnections().isEmpty() && con.getExternalConnections().isEmpty()) { + te.removeConduit(con); + drop.add(con.createItem()); + droppedUnconected = true; + } + } + // If there isn't, then drop em all + if (!droppedUnconected) { + for (IConduit con : cons) { + te.removeConduit(con); + drop.add(con.createItem()); + } + } + } else { + IConduit con = te.getConduit(type); + te.removeConduit(con); + drop.add(con.createItem()); + + } + } + } + + breakBlock = te.getConduits().isEmpty() && !te.hasFacade(); + + if (!world.isRemote && !player.capabilities.isCreativeMode) { + for (ItemStack st : drop) { + ConduitUtil.dropItems(world, st, x, y, z); + } + } + + if (!breakBlock) { + world.markBlockForUpdate(x, y, z); + return false; + } + world.setBlockToAir(x, y, z); + return true; + } + + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + IConduitBundle te = (IConduitBundle) world.getBlockTileEntity(x, y, z); + if (te != null) { + te.onBlockRemoved(); + } + world.removeBlockTileEntity(x, y, z); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + + IConduitBundle bundle = (IConduitBundle) world.getBlockTileEntity(x, y, z); + if (bundle == null) { + return false; + } + + ItemStack stack = player.getCurrentEquippedItem(); + if (stack != null && stack.itemID == ModObject.itemConduitFacade.actualId && !bundle.hasFacade()) { + // Add facade + if (player.isSneaking()) { + return false; + } + + bundle.setFacadeId(PainterUtil.getSourceBlockId(player.getCurrentEquippedItem())); + bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(player.getCurrentEquippedItem())); + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; + } + world.markBlockForUpdate(x, y, z); + world.updateTileEntityChunkAndDoNothing(x, y, z, bundle.getEntity()); + return true; + + } else if (ConduitUtil.isConduitEquipped(player)) { + // Add conduit + if (player.isSneaking()) { + return false; + } + + IConduitItem equipped = (IConduitItem) stack.getItem(); + if (!bundle.hasType(equipped.getBaseConduitType())) { + bundle.addConduit(equipped.createConduit(stack)); + if (!player.capabilities.isCreativeMode) { + player.getCurrentEquippedItem().stackSize--; + } + return true; + } + + } + + // Break conduit with tool + if (ConduitUtil.isToolEquipped(player) && player.isSneaking()) { + if (!world.isRemote) { + removeBlockByPlayer(world, player, x, y, z); + if (player.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + ((IToolWrench) player.getCurrentEquippedItem().getItem()).wrenchUsed(player, x, y, z); + } + } + return true; + } + + // Check conduit defined actions + RaytraceResult res = doRayTrace(world, x, y, z, player); + + if(res != null && res.component != null && res.component.data instanceof ConduitConnectorType) { + //if its a connector pass the event on to all conduits + for(IConduit con : bundle.getConduits()) { + if(con.onBlockActivated(player, res)) { + world.updateTileEntityChunkAndDoNothing(x, y, z, bundle.getEntity()); + return true; + } + + } + return false; + } + + if (res == null || res.component == null || res.component.conduitType == null) { + // Nothing of interest hit + return false; + } + + // Conduit specific actions + if (bundle.getConduit(res.component.conduitType).onBlockActivated(player, res)) { + world.updateTileEntityChunkAndDoNothing(x, y, z, bundle.getEntity()); + return true; + } + return false; + + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int blockId) { + TileEntity tile = world.getBlockTileEntity(x, y, z); + if ((tile instanceof IConduitBundle)) { + ((IConduitBundle) tile).onNeighborBlockChange(blockId); + } + } + + @Override + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, @SuppressWarnings("rawtypes") List arraylist, + Entity par7Entity) { + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return; + } + IConduitBundle con = (IConduitBundle) te; + if (con.getFacadeId() > 0) { + setBlockBounds(0, 0, 0, 1, 1, 1); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } else { + + Collection bounds = con.getCollidableComponents(); + for (CollidableComponent bnd : bounds) { + setBlockBounds(bnd.bound.minX, bnd.bound.minY, bnd.bound.minZ, bnd.bound.maxX, bnd.bound.maxY, bnd.bound.maxZ); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } + + if (con.getConduits().isEmpty()) { // just in case + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } + } + + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + + } + + @Override + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + IConduitBundle con = (IConduitBundle) te; + + BoundingBox minBB = new BoundingBox(1, 1, 1, 0, 0, 0); + if (!ConduitUtil.renderFacade(con, EnderIO.proxy.getClientPlayer())) { + + Collection bounds = con.getCollidableComponents(); + for (CollidableComponent bnd : bounds) { + minBB = minBB.expandBy(bnd.bound); + } + + } else { + minBB = new BoundingBox(0, 0, 0, 1, 1, 1); + } + + if (!minBB.isValid()) { + minBB = new BoundingBox(0, 0, 0, 1, 1, 1); + } + + return AxisAlignedBB.getBoundingBox(x + minBB.minX, y + minBB.minY, + z + minBB.minZ, x + minBB.maxX, y + minBB.maxY, z + + minBB.maxZ); + } + + @Override + public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { + RaytraceResult raytraceResult = doRayTrace(world, x, y, z, origin, direction, null); + if (raytraceResult == null) { + return null; + } + + if (raytraceResult.movingObjectPosition != null) { + raytraceResult.movingObjectPosition.hitInfo = raytraceResult.component; + + } + return raytraceResult.movingObjectPosition; + } + + public RaytraceResult doRayTrace(World world, int x, int y, int z, EntityPlayer entityPlayer) { + double pitch = Math.toRadians(entityPlayer.rotationPitch); + double yaw = Math.toRadians(entityPlayer.rotationYaw); + + double dirX = -Math.sin(yaw) * Math.cos(pitch); + double dirY = -Math.sin(pitch); + double dirZ = Math.cos(yaw) * Math.cos(pitch); + + double reachDistance = 5; + + if (entityPlayer instanceof EntityPlayerMP) { + reachDistance = ((EntityPlayerMP) entityPlayer).theItemInWorldManager.getBlockReachDistance(); + } + + double posY = entityPlayer.posY + 1.62 - entityPlayer.yOffset; + if (!world.isRemote && entityPlayer.isSneaking()) { + posY -= 0.08; + } + Vec3 origin = Vec3.fakePool.getVecFromPool(entityPlayer.posX, posY, entityPlayer.posZ); + Vec3 direction = origin.addVector(dirX * reachDistance, dirY * reachDistance, dirZ * reachDistance); + RaytraceResult res = doRayTrace(world, x, y, z, origin, direction, entityPlayer); + return res; + } + + protected RaytraceResult doRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer player) { + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + IConduitBundle bundle = (IConduitBundle) te; + List hits = new ArrayList(); + + if (ConduitUtil.renderFacade(bundle, player)) { + setBlockBounds(0, 0, 0, 1, 1, 1); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult(new CollidableComponent(null, BoundingBox.UNIT_CUBE, ForgeDirection.UNKNOWN, null), hitPos)); + } + } else { + + Collection components = bundle.getCollidableComponents(); + for (CollidableComponent component : components) { + setBlockBounds(component.bound.minX, component.bound.minY, component.bound.minZ, component.bound.maxX, component.bound.maxY, component.bound.maxZ); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult(component, hitPos)); + } + } + + // safety to prevent unbreakable empty bundles in case of a bug + if (bundle.getConduits().isEmpty() && !ConduitUtil.isFacadeHidden(bundle, player)) { + setBlockBounds(0, 0, 0, 1, 1, 1); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult(null, hitPos)); + } + } + } + + setBlockBounds(0, 0, 0, 1, 1, 1); + + return RaytraceResult.getClosestHit(origin, hits); + } + +} diff --git a/common/crazypants/enderio/conduit/ConduitRecipes.java b/common/crazypants/enderio/conduit/ConduitRecipes.java new file mode 100644 index 00000000..166009a2 --- /dev/null +++ b/common/crazypants/enderio/conduit/ConduitRecipes.java @@ -0,0 +1,41 @@ +package crazypants.enderio.conduit; + +import static crazypants.enderio.ModObject.*; +import net.minecraft.block.Block; +import net.minecraft.item.*; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadePainterRecipe; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.material.Alloy; + +public class ConduitRecipes { + + public static void addRecipes() { + ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0); + //ItemStack glassPane = new ItemStack(Block.thinGlass, 1, 0); + ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); + + //Facade + GameRegistry.addShapedRecipe(new ItemStack(itemConduitFacade.actualId,1,0), "bbb", "b b", "bbb", 'b', industialBinder); + MachineRecipeRegistry.instance.registerRecipe(blockPainter.unlocalisedName, new FacadePainterRecipe()); + + //Liquids + GameRegistry.addShapedRecipe(new ItemStack(itemLiquidConduit.actualId,4,0), "bgb", "g g", "bgb", 'b', industialBinder, 'g', fusedQuartz); + + //Power + GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId,4,0), " b ", "bib", " b ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron)); + ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId,1,Alloy.ACTIVATED_IRON.ordinal()); + GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId,4,1), " b ", "bib", " b ", 'b', industialBinder, 'i', activatedIron); + GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId,4,2), " b ", "bib", " b ", 'b', industialBinder, 'i', new ItemStack(ModObject.itemAlloy.actualId,1,Alloy.ENDER_IRON.ordinal())); + + + //Redstone + ItemStack redstoneConduit = new ItemStack(itemRedstoneConduit.actualId,1,0); + GameRegistry.addShapedRecipe(redstoneConduit , " b ", "brb", " b ", 'b', industialBinder, 'r', new ItemStack(Item.redstone)); + GameRegistry.addShapedRecipe(new ItemStack(itemRedstoneConduit.actualId,1,1), " l ", "lcl", " l ", 'c', redstoneConduit, 'l', Block.lever); + + + } + +} diff --git a/common/crazypants/enderio/conduit/ConduitUtil.java b/common/crazypants/enderio/conduit/ConduitUtil.java new file mode 100644 index 00000000..b924b762 --- /dev/null +++ b/common/crazypants/enderio/conduit/ConduitUtil.java @@ -0,0 +1,196 @@ +package crazypants.enderio.conduit; + +import java.util.*; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.*; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.liquid.*; +import crazypants.enderio.conduit.power.*; +import crazypants.enderio.conduit.redstone.*; + +public class ConduitUtil { + + + public static final Random RANDOM = new Random(); + + + public static AbstractConduitNetwork createNetworkForType(Class type) { + if(IRedstoneConduit.class.isAssignableFrom(type)) { + return new RedstoneConduitNetwork(); + } else if(IPowerConduit.class.isAssignableFrom(type)) { + return new PowerConduitNetwork(); + } else if(ILiquidConduit.class.isAssignableFrom(type)) { + return new LiquidConduitNetwork(); + } + FMLCommonHandler.instance().raiseException(new Exception("Could not determine network type for class " + type), "ConduitUtil.createNetworkForType", false); + return null; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static void ensureValidNetwork(IConduit conduit) { + TileEntity te = conduit.getBundle().getEntity(); + World world = te.worldObj; + Collection connections = ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, conduit.getBaseConduitType()); + + if (reuseNetwork(conduit, connections, world)) { + return; + } + + AbstractConduitNetwork res = createNetworkForType(conduit.getBaseConduitType()); + res.init(conduit.getBundle(), connections, world); + return; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static boolean reuseNetwork(IConduit con, Collection connections, World world) { + AbstractConduitNetwork network = null; + for (IConduit conduit : connections) { + if (network == null) { + network = conduit.getNetwork(); + } else if (network != conduit.getNetwork()) { + return false; + } + } + if (network == null) { + return false; + } + con.setNetwork(network); + network.addConduit(con); + network.notifyNetworkOfUpdate(); + return true; + } + + public static void dropConduit(World world, IConduit conduit, int x, int y, int z) { + dropItems(world, conduit.createItem(), x, y, z); + } + + public static void dropItems(World world, ItemStack stack, int x, int y, int z) { + if (stack.stackSize <= 0) { + return; + } + + float f1 = 0.7F; + double d = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; + double d1 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; + double d2 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d, y + d1, z + d2, stack); + entityitem.delayBeforeCanPickup = 10; + + world.spawnEntityInWorld(entityitem); + } + + public static void dropItems(World world, IInventory inventory, int x, int y, int z) { + for (int l = 0; l < inventory.getSizeInventory(); ++l) { + ItemStack items = inventory.getStackInSlot(l); + + if (items != null && items.stackSize > 0) { + dropItems(world, inventory.getStackInSlot(l).copy(), x, y, z); + } + } + } + + public static boolean renderFacade(IConduitBundle bundle, EntityPlayer player) { + return bundle.getFacadeId() > 0 && !isFacadeHidden(bundle, player); + } + + public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { + return bundle.getFacadeId() > 0 && (isToolEquipped(player) || isConduitEquipped(player)); + } + + public static boolean isConduitEquipped(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() instanceof IConduitItem ; + } + + public static boolean isToolEquipped(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return /*equipped.itemID == Block.stone.blockID ||*/ equipped.getItem() instanceof IToolWrench; + } + + public static T getConduit(IBlockAccess world, int x, int y, int z, Class type) { + if(world == null) { + return null; + } + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof IConduitBundle) { + IConduitBundle con = (IConduitBundle) te; + return con.getConduit(type); + } + return null; + } + + public static T getConduit(IBlockAccess world, TileEntity te, ForgeDirection dir, Class type) { + return ConduitUtil.getConduit(world, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, type); + } + + public static Collection getConnectedConduits(IBlockAccess world, int x, int y, int z, Class type) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return Collections.emptyList(); + } + List result = new ArrayList(); + IConduitBundle root = (IConduitBundle) te; + for (ForgeDirection dir : root.getAllConnections()) { + T con = getConduit(world, root.getEntity(), dir, type); + if (con != null) { + result.add(con); + } + } + return result; + } + + public static void writeToNBT(IConduit conduit, NBTTagCompound conduitRoot) { + if (conduit == null) { + return; + } + + NBTTagCompound conduitBody = new NBTTagCompound(); + conduit.writeToNBT(conduitBody); + + conduitRoot.setString("conduitType", conduit.getClass().getCanonicalName()); + conduitRoot.setCompoundTag("conduit", conduitBody); + } + + public static IConduit readConduitFromNBT(NBTTagCompound conduitRoot) { + String typeName = conduitRoot.getString("conduitType"); + NBTTagCompound conduitBody = conduitRoot.getCompoundTag("conduit"); + if(typeName == null || conduitBody == null) { + return null; + } + IConduit result; + try { + result = (IConduit) Class.forName(typeName).newInstance(); + } catch (Exception e) { + throw new RuntimeException("Could not create an instance of the conduit with name: " + typeName, e); + } + result.readFromNBT(conduitBody); + return result; + + } + + + +} diff --git a/common/crazypants/enderio/conduit/IConduit.java b/common/crazypants/enderio/conduit/IConduit.java new file mode 100644 index 00000000..7163eeee --- /dev/null +++ b/common/crazypants/enderio/conduit/IConduit.java @@ -0,0 +1,103 @@ +package crazypants.enderio.conduit; + +import java.util.*; + +import crazypants.enderio.conduit.geom.*; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.util.BlockCoord; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +public interface IConduit { + + // Base functionality + Class getBaseConduitType(); + + ItemStack createItem(); + + int getLightValue(); + + boolean isActive(); + + void setActive(boolean active); + + void writeToNBT(NBTTagCompound conduitBody); + + void readFromNBT(NBTTagCompound conduitBody); + + // Container + + void setBundle(IConduitBundle tileConduitBundle); + + IConduitBundle getBundle(); + + void onAddedToBundle(); + + void onRemovedFromBundle(); + + BlockCoord getLocation(); + + // Conduit Connections + + boolean canConnectToConduit(ForgeDirection direction, IConduit conduit); + + Set getConduitConnections(); + + boolean containsConduitConnection(ForgeDirection dir); + + void conduitConnectionAdded(ForgeDirection fromDirection); + + void conduitConnectionRemoved(ForgeDirection fromDirection); + + AbstractConduitNetwork getNetwork(); + + boolean setNetwork(AbstractConduitNetwork network); + + // External Connections + + boolean canConnectToExternal(ForgeDirection direction); + + Set getExternalConnections(); + + boolean containsExternalConnection(ForgeDirection dir); + + void externalConnectionAdded(ForgeDirection fromDirection); + + void externalConnectionRemoved(ForgeDirection fromDirection); + + boolean isConnectedTo(ForgeDirection dir); + + // rendering, only needed us default rendering is used + + Icon getTextureForState(CollidableComponent component); + + Icon getTransmitionTextureForState(CollidableComponent component); + + float getTransmitionGeometryScale(); + + float getSelfIlluminationForState(CollidableComponent component); + + // geometry + + boolean haveCollidablesChangedSinceLastCall(); + + Collection getCollidableComponents(); + + Collection createCollidables(CacheKey key); + + // Actions + + boolean onBlockActivated(EntityPlayer player, RaytraceResult res); + + void onChunkUnload(World worldObj); + + void updateEntity(World worldObj); + + boolean onNeighborBlockChange(int blockId); + +} diff --git a/common/crazypants/enderio/conduit/IConduitBundle.java b/common/crazypants/enderio/conduit/IConduitBundle.java new file mode 100644 index 00000000..32f270ca --- /dev/null +++ b/common/crazypants/enderio/conduit/IConduitBundle.java @@ -0,0 +1,68 @@ +package crazypants.enderio.conduit; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.Offset; +import crazypants.enderio.power.IInternalPowerReceptor; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; +import buildcraft.api.power.IPowerReceptor; + +public interface IConduitBundle extends IInternalPowerReceptor, IFluidHandler { + + TileEntity getEntity(); + + //conduits + + boolean hasType(Class type); + + T getConduit(Class type); + + void addConduit(IConduit conduit); + + void removeConduit(IConduit conduit); + + Collection getConduits(); + + Offset getOffset(Class type, ForgeDirection dir); + + // connections + + Set getConnections(Class type); + + boolean containsConnection(Class type, ForgeDirection west); + + Set getAllConnections(); + + boolean containsConnection(ForgeDirection dir); + + // events + + void onNeighborBlockChange(int blockId); + + void onBlockRemoved(); + + // Facade + + boolean hasFacade(); + + void setFacadeId(int blockID); + + int getFacadeId(); + + void setFacadeMetadata(int meta); + + int getFacadeMetadata(); + + List getCollidableComponents(); + + List getConnectors(); + + void dirty(); + +} diff --git a/common/crazypants/enderio/conduit/IConduitItem.java b/common/crazypants/enderio/conduit/IConduitItem.java new file mode 100644 index 00000000..b36514da --- /dev/null +++ b/common/crazypants/enderio/conduit/IConduitItem.java @@ -0,0 +1,11 @@ +package crazypants.enderio.conduit; + +import net.minecraft.item.ItemStack; + +public interface IConduitItem { + + Class getBaseConduitType(); + + IConduit createConduit(ItemStack item); + +} diff --git a/common/crazypants/enderio/conduit/ItemConduitSubtype.java b/common/crazypants/enderio/conduit/ItemConduitSubtype.java new file mode 100644 index 00000000..6332c66e --- /dev/null +++ b/common/crazypants/enderio/conduit/ItemConduitSubtype.java @@ -0,0 +1,18 @@ +package crazypants.enderio.conduit; + +public class ItemConduitSubtype { + + public final String unlocalisedName; + + public final String uiName; + + public final String iconKey; + + public ItemConduitSubtype(String unlocalisedName, String uiName, String iconKey) { + super(); + this.unlocalisedName = unlocalisedName; + this.uiName = uiName; + this.iconKey = iconKey; + } + +} diff --git a/common/crazypants/enderio/conduit/RaytraceResult.java b/common/crazypants/enderio/conduit/RaytraceResult.java new file mode 100644 index 00000000..80c0a1e7 --- /dev/null +++ b/common/crazypants/enderio/conduit/RaytraceResult.java @@ -0,0 +1,38 @@ +package crazypants.enderio.conduit; + +import java.util.Collection; + +import crazypants.enderio.conduit.geom.CollidableComponent; + + +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; + +public class RaytraceResult { + + public static RaytraceResult getClosestHit(Vec3 origin, Collection candidates) { + double minLengthSquared = Double.POSITIVE_INFINITY; + RaytraceResult closest = null; + + for (RaytraceResult candidate : candidates) { + MovingObjectPosition hit = candidate.movingObjectPosition; + if (hit != null) { + double lengthSquared = hit.hitVec.squareDistanceTo(origin); + if (lengthSquared < minLengthSquared) { + minLengthSquared = lengthSquared; + closest = candidate; + } + } + } + return closest; + } + + public final CollidableComponent component; + public final MovingObjectPosition movingObjectPosition; + + public RaytraceResult(CollidableComponent component, MovingObjectPosition movingObjectPosition) { + this.component = component; + this.movingObjectPosition = movingObjectPosition; + } + +} diff --git a/common/crazypants/enderio/conduit/TileConduitBundle.java b/common/crazypants/enderio/conduit/TileConduitBundle.java new file mode 100644 index 00000000..c6528cb2 --- /dev/null +++ b/common/crazypants/enderio/conduit/TileConduitBundle.java @@ -0,0 +1,517 @@ +package crazypants.enderio.conduit; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.PacketHandler; +import crazypants.enderio.conduit.geom.CollidableCache; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.geom.Offset; +import crazypants.enderio.conduit.geom.Offsets; +import crazypants.enderio.conduit.liquid.ILiquidConduit; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.util.BlockCoord; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; + +public class TileConduitBundle extends TileEntity implements IConduitBundle { + + + private final List conduits = new ArrayList(); + + private int facadeId = -1; + private int facadeMeta = 0; + + private boolean facadeChanged; + + private final List cachedCollidables = new ArrayList(); + + private boolean conduitsDirty = true; + private boolean collidablesDirty = true; + + public TileConduitBundle() { + blockType = EnderIO.blockConduitBundle; + } + + @Override + public void dirty() { + conduitsDirty = true; + collidablesDirty = true; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + + NBTTagList conduitTags = new NBTTagList(); + for (IConduit conduit : conduits) { + NBTTagCompound conduitRoot = new NBTTagCompound(); + ConduitUtil.writeToNBT(conduit, conduitRoot); + conduitTags.appendTag(conduitRoot); + } + nbtRoot.setTag("conduits", conduitTags); + nbtRoot.setInteger("facadeId", facadeId); + nbtRoot.setInteger("facadeMeta", facadeMeta); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + + conduits.clear(); + NBTTagList conduitTags = nbtRoot.getTagList("conduits"); + for (int i = 0; i < conduitTags.tagCount(); i++) { + NBTTagCompound conduitTag = (NBTTagCompound) conduitTags.tagAt(i); + IConduit conduit = ConduitUtil.readConduitFromNBT(conduitTag); + if (conduit != null) { + conduit.setBundle(this); + conduits.add(conduit); + } + } + facadeId = nbtRoot.getInteger("facadeId"); + facadeMeta = nbtRoot.getInteger("facadeMeta"); + + } + + @Override + public boolean hasFacade() { + return facadeId > 0; + } + + @Override + public void setFacadeId(int blockID) { + this.facadeId = blockID; + facadeChanged = true; + } + + @Override + public int getFacadeId() { + return facadeId; + } + + @Override + public void setFacadeMetadata(int meta) { + facadeMeta = meta; + } + + @Override + public int getFacadeMetadata() { + return facadeMeta; + } + + @Override + public Packet getDescriptionPacket() { + return PacketHandler.getPacket(this); + } + + @Override + public void onChunkUnload() { + for (IConduit conduit : conduits) { + conduit.onChunkUnload(worldObj); + } + } + + @Override + public void updateEntity() { + for (IConduit conduit : conduits) { + conduit.updateEntity(worldObj); + } + + if(worldObj != null && !worldObj.isRemote && conduitsDirty) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + conduitsDirty = false; + } + + if(worldObj != null && facadeChanged) { + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + facadeChanged = false; + } + } + + public BlockCoord getLocation() { + return new BlockCoord(xCoord, yCoord, zCoord); + } + + @Override + public void onNeighborBlockChange(int blockId) { + boolean needsUpdate = false; + for (IConduit conduit : conduits) { + needsUpdate |= conduit.onNeighborBlockChange(blockId); + } + if (needsUpdate) { + dirty(); + } + } + + @Override + public TileConduitBundle getEntity() { + return this; + } + + @Override + public boolean hasType(Class type) { + return getConduit(type) != null; + } + + @SuppressWarnings("unchecked") + @Override + public T getConduit(Class type) { + if (type == null) { + return null; + } + for (IConduit conduit : conduits) { + if (type.isInstance(conduit)) { + return (T) conduit; + } + } + return null; + } + + @Override + public void addConduit(IConduit conduit) { + if (worldObj.isRemote) { + return; + } + conduits.add(conduit); + conduit.setBundle(this); + conduit.onAddedToBundle(); + dirty(); + } + + @Override + public void removeConduit(IConduit conduit) { + if(conduit != null) { + removeConduit(conduit, true); + } + } + + public void removeConduit(IConduit conduit, boolean notify) { + if (worldObj.isRemote) { + return; + } + conduit.onRemovedFromBundle(); + conduits.remove(conduit); + conduit.setBundle(null); + if (notify) { + dirty(); + } + } + + @Override + public void onBlockRemoved() { + if (worldObj.isRemote) { + return; + } + List copy = new ArrayList(conduits); + for (IConduit con : copy) { + removeConduit(con, false); + } + dirty(); + } + + @Override + public Collection getConduits() { + return conduits; + } + + @Override + public Set getConnections(Class type) { + IConduit con = getConduit(type); + if (con != null) { + return con.getConduitConnections(); + } + return null; + } + + @Override + public boolean containsConnection(Class type, ForgeDirection dir) { + IConduit con = getConduit(type); + if (con != null) { + return con.containsConduitConnection(dir); + } + return false; + } + + @Override + public boolean containsConnection(ForgeDirection dir) { + for (IConduit con : conduits) { + if (con.containsConduitConnection(dir)) { + return true; + } + } + return false; + } + + @Override + public Set getAllConnections() { + Set result = new HashSet(); + for (IConduit con : conduits) { + result.addAll(con.getConduitConnections()); + } + return result; + } + + // Geometry + + @Override + public Offset getOffset(Class type, ForgeDirection dir) { + + if (getConnectionCount(dir) < 2) { + return Offset.NONE; + } + + if (dir == ForgeDirection.UNKNOWN) { + if (containsOnlySingleVerticalConnections()) { + return Offsets.get(type, true, false); + } + if (containsOnlySingleHorizontalConnections()) { + return Offsets.get(type, false, true); + } + return Offsets.get(type, true, true); + } + + boolean isVertical = dir == ForgeDirection.UP || dir == ForgeDirection.DOWN; + if (isVertical) { + return Offsets.get(type, false, true); + } + return Offsets.get(type, true, false); + } + + @Override + public List getCollidableComponents() { + + for(IConduit con : conduits) { + collidablesDirty = collidablesDirty || con.haveCollidablesChangedSinceLastCall(); + } + if(!collidablesDirty && !cachedCollidables.isEmpty()) { + return cachedCollidables; + } + cachedCollidables.clear(); + for (IConduit conduit : conduits) { + cachedCollidables.addAll(conduit.getCollidableComponents()); + } + + addConnectors(cachedCollidables); + + collidablesDirty = false; + + return cachedCollidables; + } + + @Override + public List getConnectors() { + List result = new ArrayList(); + addConnectors(result); + return result; + } + + private void addConnectors(List result) { + if (conduits.isEmpty()) { + return; + } + CollidableCache cc = CollidableCache.instance; + if (conduits.size() == 1) { + + IConduit con = conduits.get(0); + result.addAll(cc.getCollidables(cc.createKey(con.getBaseConduitType(), Offset.NONE, ForgeDirection.UNKNOWN, false), con)); + + } else if (containsOnlySingleVerticalConnections()) { + + if (allDirectionsHaveSameConnectionCount()) { + for (IConduit con : conduits) { + Class type = con.getBaseConduitType(); + result.addAll(cc.getCollidables(cc.createKey(type, getOffset(type, ForgeDirection.UNKNOWN), ForgeDirection.UNKNOWN, false), con)); + } + } else { + // vertical box + result.add(new CollidableComponent(null, ConduitGeometryUtil.instance.getBoundingBox(ConduitConnectorType.VERTICAL), ForgeDirection.UNKNOWN, ConduitConnectorType.VERTICAL)); + } + + } else if (containsOnlySingleHorizontalConnections()) { + + if (allDirectionsHaveSameConnectionCount()) { + for (IConduit con : conduits) { + Class type = con.getBaseConduitType(); + result.addAll(cc.getCollidables(cc.createKey(type, getOffset(type, ForgeDirection.UNKNOWN), ForgeDirection.UNKNOWN, false), con)); + } + + } else { + // vertical box + result + .add(new CollidableComponent(null, ConduitGeometryUtil.instance.getBoundingBox(ConduitConnectorType.HORIZONTAL), ForgeDirection.UNKNOWN, ConduitConnectorType.HORIZONTAL)); + } + } else { + result.add(new CollidableComponent(null, ConduitGeometryUtil.instance.getBoundingBox(ConduitConnectorType.BOTH), ForgeDirection.UNKNOWN, ConduitConnectorType.BOTH)); + } + + } + + private boolean containsOnlySingleVerticalConnections() { + return getConnectionCount(ForgeDirection.UP) < 2 && getConnectionCount(ForgeDirection.DOWN) < 2; + } + + private boolean containsOnlySingleHorizontalConnections() { + return getConnectionCount(ForgeDirection.WEST) < 2 && getConnectionCount(ForgeDirection.EAST) < 2 && + getConnectionCount(ForgeDirection.NORTH) < 2 && getConnectionCount(ForgeDirection.SOUTH) < 2; + } + + private boolean allDirectionsHaveSameConnectionCount() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + boolean hasCon = conduits.get(0).isConnectedTo(dir); + for (int i = 1; i < conduits.size(); i++) { + if (hasCon != conduits.get(i).isConnectedTo(dir)) { + return false; + } + } + } + return true; + } + + private boolean containsOnlyHorizontalConnections() { + for (IConduit con : conduits) { + for (ForgeDirection dir : con.getConduitConnections()) { + if (dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) { + return false; + } + } + for (ForgeDirection dir : con.getExternalConnections()) { + if (dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) { + return false; + } + } + } + return true; + } + + private int getConnectionCount(ForgeDirection dir) { + if(dir == ForgeDirection.UNKNOWN) { + return conduits.size(); + } + int result = 0; + for (IConduit con : conduits) { + if (con.containsConduitConnection(dir) || con.containsExternalConnection(dir)) { + result++; + } + } + return result; + } + + // ------------ Power ----------------------------- + + @Override + public void doWork(PowerHandler workProvider) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + pc.doWork(workProvider); + } + } + + @Override + public PowerReceiver getPowerReceiver(ForgeDirection side) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getPowerReceiver(side); + } + return null; + } + + @Override + public PowerHandler getPowerHandler() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getPowerHandler(); + } + return null; + } + + @Override + public void applyPerdition() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + pc.applyPerdition(); + } + + } + + @Override + public World getWorld() { + return worldObj; + } + + + + //------- Liquids ----------------------------- + + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.fill(from, resource, doFill); + } + return 0; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.drain(from, resource, doDrain); + } + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.drain(from, maxDrain, doDrain); + } + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.canFill(from, fluid); + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.canDrain(from, fluid); + } + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.getTankInfo(from); + } + return null; + } + + +} diff --git a/common/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/common/crazypants/enderio/conduit/facade/BlockConduitFacade.java new file mode 100644 index 00000000..935dfcac --- /dev/null +++ b/common/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -0,0 +1,100 @@ +package crazypants.enderio.conduit.facade; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.IConduitBundle; + +public class BlockConduitFacade extends Block { + + public static BlockConduitFacade create() { + BlockConduitFacade result = new BlockConduitFacade(); + result.init(); + return result; + } + + private BlockConduitFacade() { + super(ModObject.blockConduitFacade.id, Material.rock); + setHardness(0.5F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockConduitFacade.unlocalisedName); + setCreativeTab(null); + } + + private void init() { + LanguageRegistry.addName(this, "Utility for Rendering DO NOT USE"); + GameRegistry.registerBlock(this, ModObject.blockConduitFacade.unlocalisedName); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:conduitFacade"); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getBlockTexture(IBlockAccess ba, int x, int y, int z, int side) { + TileEntity te = ba.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return blockIcon; + } + IConduitBundle cb = (IConduitBundle) te; + int id = cb.getFacadeId(); + int meta = cb.getFacadeMetadata(); + if (id <= 0 || id == blockID) { + return blockIcon; + } + return Block.blocksList[id].getIcon(side, meta); + } + + + @Override + public int getDamageValue(World par1World, int x, int y, int z) { + Mimic m = getMimic(par1World, x, y, z); + if (m != null) { + return m.meta; + } + return 0; + } + + private Mimic getMimic(IBlockAccess ba, int x, int y, int z) { + TileEntity te = ba.getBlockTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + // System.out.println("BlockConduitFacade.getMimic: Not a conduit bundle"); + return null; + } + IConduitBundle cb = (IConduitBundle) te; + int id = cb.getFacadeId(); + int meta = cb.getFacadeMetadata(); + + if(id <= 0) { + return null; + } + + return new Mimic(id, meta); + } + + class Mimic { + int id; + int meta; + Block block; + + private Mimic(int id, int meta) { + super(); + this.id = id; + this.meta = meta; + this.block = Block.blocksList[id]; + } + + } + +} diff --git a/common/crazypants/enderio/conduit/facade/FacadeRenderer.java b/common/crazypants/enderio/conduit/facade/FacadeRenderer.java new file mode 100644 index 00000000..de9333b0 --- /dev/null +++ b/common/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -0,0 +1,93 @@ +package crazypants.enderio.conduit.facade; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.render.RenderUtil; + + +public class FacadeRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (type == ItemRenderType.INVENTORY) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEquipped(item, (RenderBlocks) data[0]); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, (RenderBlocks) data[0]); + } else { + System.out.println("FacadeRenderer.renderItem: Unsupported render type"); + } + } + + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } + + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + + Block block = PainterUtil.getSourceBlock(item); + if (block != null ) { + //Render the facade block + + RenderUtil.bindBlockTexture(); + renderBlocks.renderBlockAsItem(block, PainterUtil.getSourceBlockMetadata(item), 1.0F); + + //then the 'overlay' that marks it as a facade + //GL11.glDepthFunc(GL11.GL_ALWAYS); + GL11.glDepthFunc(GL11.GL_LEQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + + RenderUtil.bindItemTexture(); + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getOverlayIcon()); + renderBlocks.renderBlockAsItem(block, item.getItemDamage(), 1.0F); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + renderBlocks.clearOverrideBlockTexture(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + + } else { + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(0)); + renderBlocks.renderBlockAsItem(Block.stone, 0, 1.0F); + renderBlocks.clearOverrideBlockTexture(); + } + + } + +} diff --git a/common/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/common/crazypants/enderio/conduit/facade/ItemConduitFacade.java new file mode 100644 index 00000000..e3721359 --- /dev/null +++ b/common/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -0,0 +1,106 @@ +package crazypants.enderio.conduit.facade; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.*; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.*; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.machine.painter.*; + +public class ItemConduitFacade extends Item { + + public static ItemConduitFacade create() { + ItemConduitFacade result = new ItemConduitFacade(); + result.init(); + return result; + } + + protected Icon overlayIcon; + + protected ItemConduitFacade() { + super(ModObject.itemConduitFacade.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemConduitFacade.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemConduitFacade.name); + GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:ConduitFacade"); + overlayIcon = iconRegister.registerIcon("enderio:conduitFacadeOverlay"); + } + + public Icon getOverlayIcon() { + return overlayIcon; + } + + @Override + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, + float par9, float par10) { + + if (world.isRemote) { + return true; + } + + ForgeDirection dir = ForgeDirection.values()[side]; + int placeX = x + dir.offsetX; + int placeY = y + dir.offsetY; + int placeZ = z + dir.offsetZ; + + if (player.canPlayerEdit(placeX, placeY, placeZ, side, itemStack) && world.isAirBlock(placeX, placeY, placeZ) + && PainterUtil.getSourceBlockId(itemStack) > 0) { + + world.setBlock(placeX, placeY, placeZ, EnderIO.blockConduitBundle.blockID); + IConduitBundle bundle = (IConduitBundle) world.getBlockTileEntity(placeX, placeY, placeZ); + bundle.setFacadeId(PainterUtil.getSourceBlockId(itemStack)); + bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + if (!player.capabilities.isCreativeMode) { + itemStack.stackSize--; + } + return true; + } + + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } + + @Override + public void onCreated(ItemStack itemStack, World world, EntityPlayer player) { + if (PainterUtil.getSourceBlock(itemStack) == null) { + PainterUtil.setSourceBlock(itemStack, ModObject.blockConduitFacade.id, 0); + } + } + + public ItemStack createItemStackForSourceBlock(int id, int itemDamage) { + if (id < 1) { + id = ModObject.blockConduitFacade.id; + } + ItemStack result = new ItemStack(itemID, 1, 0); + PainterUtil.setSourceBlock(result, id, itemDamage); + return result; + } + + public static final class FacadePainterRecipe extends BasicPainterTemplate { + + public FacadePainterRecipe() { + super(ModObject.itemConduitFacade.actualId); + } + + } + +} diff --git a/common/crazypants/enderio/conduit/geom/CollidableCache.java b/common/crazypants/enderio/conduit/geom/CollidableCache.java new file mode 100644 index 00000000..54fa6638 --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/CollidableCache.java @@ -0,0 +1,83 @@ +package crazypants.enderio.conduit.geom; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import crazypants.enderio.conduit.IConduit; + +import net.minecraftforge.common.ForgeDirection; + +public class CollidableCache { + + public static final CollidableCache instance = new CollidableCache(); + + private final Map> cache = new HashMap>(); + + public CacheKey createKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { + return new CacheKey(baseType, offset, dir, isStub); + } + + public Collection getCollidables(CacheKey key, IConduit conduit) { + Collection result = cache.get(key); + if(result == null) { + result = conduit.createCollidables(key); + cache.put(key, result); + } + return result; + } + + + public static class CacheKey { + + public final Class baseType; + public final String className; //used to generate reliable equals / hashcode + public final Offset offset; + public final ForgeDirection dir; + public final boolean isStub; + + public CacheKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { + this.baseType = baseType; + className = baseType.getCanonicalName(); + this.offset = offset; + this.dir = dir; + this.isStub = isStub; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((className == null) ? 0 : className.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + (isStub ? 1231 : 1237); + result = prime * result + ((offset == null) ? 0 : offset.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CacheKey other = (CacheKey) obj; + if (className == null) { + if (other.className != null) + return false; + } else if (!className.equals(other.className)) + return false; + if (dir != other.dir) + return false; + if (isStub != other.isStub) + return false; + if (offset != other.offset) + return false; + return true; + } + + } + +} diff --git a/common/crazypants/enderio/conduit/geom/CollidableComponent.java b/common/crazypants/enderio/conduit/geom/CollidableComponent.java new file mode 100644 index 00000000..a97ee06a --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/CollidableComponent.java @@ -0,0 +1,28 @@ +package crazypants.enderio.conduit.geom; + +import crazypants.enderio.conduit.IConduit; +import crazypants.render.BoundingBox; +import net.minecraftforge.common.ForgeDirection; + +public class CollidableComponent { + + public final Class conduitType; + public final BoundingBox bound; + public final ForgeDirection dir; + public final Object data; + + public CollidableComponent(Class conduitType, BoundingBox bound, ForgeDirection id,Object data) { + this.conduitType = conduitType; + this.bound = bound; + this.dir = id; + this.data = data; + } + + @Override + public String toString() { + return "CollidableComponent [conduitType=" + conduitType + ", bound=" + bound + ", id=" + dir + "]"; + } + + + +} diff --git a/common/crazypants/enderio/conduit/geom/ConduitConnectorType.java b/common/crazypants/enderio/conduit/geom/ConduitConnectorType.java new file mode 100644 index 00000000..002c5ed4 --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/ConduitConnectorType.java @@ -0,0 +1,9 @@ +package crazypants.enderio.conduit.geom; + +public enum ConduitConnectorType { + + VERTICAL, + HORIZONTAL, + BOTH + +} diff --git a/common/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/common/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java new file mode 100644 index 00000000..0bf49d8b --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -0,0 +1,131 @@ +package crazypants.enderio.conduit.geom; + +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + +import crazypants.enderio.conduit.IConduit; +import crazypants.render.BoundingBox; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector3d; + +import net.minecraftforge.common.ForgeDirection; + +public class ConduitGeometryUtil { + + public static final ConduitGeometryUtil instance = new ConduitGeometryUtil(); + + public static final float STUB_WIDTH = 0.2f; + public static final float STUB_HEIGHT = 0.2f; + + public static final float WIDTH = 0.075f; + public static final float HEIGHT = 0.075f; + + public static final float HWIDTH = WIDTH / 2; + public static final float HHEIGHT = HEIGHT / 2; + + // All values are for a single conduit core + public static final Vector3d CORE_MIN = new Vector3d(0.5f - HWIDTH, 0.5 - HHEIGHT, 0.5 - HWIDTH); + public static final Vector3d CORE_MAX = new Vector3d(CORE_MIN.x + WIDTH, CORE_MIN.y + HEIGHT, CORE_MIN.z + WIDTH); + public static final BoundingBox CORE_BOUNDS = new BoundingBox(CORE_MIN, CORE_MAX); + + private Map boundsCache = new HashMap(); + + private EnumMap connectorBounds = new EnumMap(ConduitConnectorType.class); + + private ConduitGeometryUtil() { + + } + + public BoundingBox getBoundingBox(ConduitConnectorType type) { + BoundingBox result = connectorBounds.get(type); + if (result == null) { + result = createConnector(type); + result = result.scale(1.2f, 1.2f, 1.2f); + connectorBounds.put(type, result); + } + return result; + } + + private BoundingBox createConnector(ConduitConnectorType type) { + float distance = WIDTH + HWIDTH; + switch (type) { + case VERTICAL: + return new BoundingBox(0.5 - HWIDTH, 0.5 - distance, 0.5 - HWIDTH, 0.5 + HWIDTH, 0.5 + distance, 0.5 + HWIDTH); + case HORIZONTAL: + return new BoundingBox(0.5 - distance, 0.5 - HWIDTH, 0.5 - HWIDTH, 0.5 + distance, 0.5 + HWIDTH, 0.5 + HWIDTH); + case BOTH: + return createConnector(ConduitConnectorType.VERTICAL).expandBy(createConnector(ConduitConnectorType.HORIZONTAL)); + default: + return CORE_BOUNDS; + } + + } + + public BoundingBox getBoundingBox(Class type, ForgeDirection dir, boolean isStub, Offset offset) { + GeometryKey key = new GeometryKey(dir, isStub, offset, type); + BoundingBox result = boundsCache.get(key); + if (result == null) { + result = createConduitBounds(type, key); + boundsCache.put(key, result); + } + return result; + } + + public Vector3d getTranslation(ForgeDirection dir, Offset offset) { + Vector3d result = new Vector3d(offset.xOffset, offset.yOffset,0); + result.scale(WIDTH); + return result; + } + + private BoundingBox createConduitBounds(Class type, GeometryKey key) { + return createConduitBounds(type, key.dir, key.isStub, key.offset); + } + + private BoundingBox createConduitBounds(Class type, ForgeDirection dir, boolean isStub, Offset offset) { + BoundingBox bb = CORE_BOUNDS; +// if(type == IRedstoneConduit.class) { +// bb = bb.scale(0.5f, 0.5f, 0.5f); +// } + Vector3d min = bb.getMin(); + Vector3d max = bb.getMax(); + + switch (dir) { + case WEST: + min.x = isStub ? Math.max(0, bb.minX - STUB_WIDTH) : 0; + max.x = bb.minX; + break; + case EAST: + min.x = bb.maxX; + max.x = isStub ? Math.min(1, bb.maxX + STUB_WIDTH) : 1; + break; + case DOWN: + min.y = isStub ? Math.max(0, bb.minY - STUB_HEIGHT) : 0; + max.y = bb.minY; + break; + case UP: + max.y = isStub ? Math.min(1, bb.maxY + STUB_HEIGHT) : 1; + min.y = bb.maxY; + break; + case NORTH: + min.z = isStub ? Math.max(0.0F, bb.minZ - STUB_WIDTH) : 0; + max.z = bb.minZ; + break; + case SOUTH: + max.z = isStub ? Math.min(1F, bb.maxZ + STUB_WIDTH) : 1; + min.z = bb.maxZ; + break; + default: + break; + } + + Vector3d trans = getTranslation(dir, offset); + min.add(trans); + max.add(trans); + bb = new BoundingBox(VecmathUtil.clamp(min,0,1), VecmathUtil.clamp(max,0,1)); + return bb; + } + + + +} diff --git a/common/crazypants/enderio/conduit/geom/GeometryKey.java b/common/crazypants/enderio/conduit/geom/GeometryKey.java new file mode 100644 index 00000000..b3aaa151 --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/GeometryKey.java @@ -0,0 +1,60 @@ +package crazypants.enderio.conduit.geom; + +import crazypants.enderio.conduit.IConduit; +import net.minecraftforge.common.ForgeDirection; + +public final class GeometryKey { + + public final ForgeDirection dir; + public final boolean isStub; + public final Offset offset; + public final String className; + + public GeometryKey(ForgeDirection dir, boolean isStub, Offset offset,Class type) { + this.dir = dir; + this.isStub = isStub; + this.offset = offset; + className = type != null ? type.getName() : null; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((className == null) ? 0 : className.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + (isStub ? 1231 : 1237); + result = prime * result + ((offset == null) ? 0 : offset.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + GeometryKey other = (GeometryKey) obj; + if (className == null) { + if (other.className != null) + return false; + } else if (!className.equals(other.className)) + return false; + if (dir != other.dir) + return false; + if (isStub != other.isStub) + return false; + if (offset != other.offset) + return false; + return true; + } + + + + + + + +} diff --git a/common/crazypants/enderio/conduit/geom/Offset.java b/common/crazypants/enderio/conduit/geom/Offset.java new file mode 100644 index 00000000..bc3e609c --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/Offset.java @@ -0,0 +1,31 @@ +package crazypants.enderio.conduit.geom; + + + +/** + * Offset vectors are based on Y up. + * @author brad + */ +public enum Offset { + + NONE(0,0), + TOP(0,1), + BOTTOM(0,-1), + LEFT(-1,0), + RIGHT(1,0), + TL(-1,1), + TR(1,1), + BL(-1,-1), + BR(1,-1); + + public final int xOffset; + public final int yOffset; + + private Offset(int xOffset, int yOffset) { + this.xOffset = xOffset; + this.yOffset = yOffset; + } + +} + + diff --git a/common/crazypants/enderio/conduit/geom/Offsets.java b/common/crazypants/enderio/conduit/geom/Offsets.java new file mode 100644 index 00000000..735dc6ab --- /dev/null +++ b/common/crazypants/enderio/conduit/geom/Offsets.java @@ -0,0 +1,84 @@ +package crazypants.enderio.conduit.geom; + +import java.util.*; + +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.liquid.ILiquidConduit; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.conduit.redstone.IRedstoneConduit; + + +public class Offsets { + + private static Map OFFSETS = new HashMap(); + + static { + OFFSETS.put(key(IRedstoneConduit.class, true, false), Offset.BOTTOM); + OFFSETS.put(key(IPowerConduit.class, true, false), Offset.TOP); + OFFSETS.put(key(ILiquidConduit.class, true, false), Offset.NONE); + + OFFSETS.put(key(IRedstoneConduit.class, false, true), Offset.LEFT); + OFFSETS.put(key(IPowerConduit.class, false, true), Offset.RIGHT); + OFFSETS.put(key(ILiquidConduit.class, false, true), Offset.NONE); + + OFFSETS.put(key(IRedstoneConduit.class, true, true), Offset.BL); + OFFSETS.put(key(IPowerConduit.class, true, true), Offset.TR); + OFFSETS.put(key(ILiquidConduit.class, true, true), Offset.NONE); + } + + public static Offset get(Class type, boolean horizontal, boolean vertical) { + return OFFSETS.get(key(type,horizontal,vertical)); + } + + public static OffsetKey key(Class type, boolean horizontal, boolean vertical) { + return new OffsetKey(type, horizontal, vertical); + } + + public static class OffsetKey { + + String typeName; + boolean horizontal; + boolean vertical; + + private OffsetKey(Class type, boolean horizontal, boolean vertical) { + this.typeName = type.getCanonicalName(); + this.horizontal = horizontal; + this.vertical = vertical; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (horizontal ? 1231 : 1237); + result = prime * result + ((typeName == null) ? 0 : typeName.hashCode()); + result = prime * result + (vertical ? 1231 : 1237); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OffsetKey other = (OffsetKey) obj; + if (horizontal != other.horizontal) + return false; + if (typeName == null) { + if (other.typeName != null) + return false; + } else if (!typeName.equals(other.typeName)) + return false; + if (vertical != other.vertical) + return false; + return true; + } + + } + + + +} diff --git a/common/crazypants/enderio/conduit/liquid/ConduitTank.java b/common/crazypants/enderio/conduit/liquid/ConduitTank.java new file mode 100644 index 00000000..613ef186 --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/ConduitTank.java @@ -0,0 +1,183 @@ +package crazypants.enderio.conduit.liquid; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; + +public class ConduitTank implements IFluidTank { + + private FluidStack fluid; + private int capacity; + private int tankPressure = 0; + + ConduitTank(int capacity) { + this.capacity = capacity; + } + + public int getFluidAmount() { + return fluid == null ? 0 : fluid.amount; + } + + public float getFilledRatio() { + if(getFluidAmount() <= 0) { + return 0; + } + if(getCapacity() <= 0) { + return -1; + } + return (float) getFluidAmount() / getCapacity(); + } + + public boolean isFull() { + return getFluidAmount() >= getCapacity(); + } + + public void setAmount(int amount) { + if(fluid != null) { + fluid.amount = amount; + } + } + + public int getAvailableSpace() { + return getCapacity() - getFluidAmount(); + } + + public void addAmount(int amount) { + setAmount(getFluidAmount() + amount); + } + + @Override + public FluidTankInfo getInfo() { + return new FluidTankInfo(this); + } + + + @Override + public FluidStack getFluid() { + return this.fluid; + } + + @Override + public int getCapacity() { + return this.capacity; + } + + public void setLiquid(FluidStack liquid) { + this.fluid = liquid; + } + + public void setCapacity(int capacity) { + this.capacity = capacity; + if (getFluidAmount() > capacity) { + setAmount(capacity); + } + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + if (resource == null || resource.fluidID <= 0) { + return 0; + } + + if (fluid == null || fluid.fluidID <= 0) { + if (resource.amount <= capacity) { + if (doFill) { + fluid = resource.copy(); + } + return resource.amount; + } else { + if (doFill) { + fluid = resource.copy(); + fluid.amount = capacity; + } + return capacity; + } + } + + if (!fluid.isFluidEqual(resource)) { + return 0; + } + + int space = capacity - fluid.amount; + if (resource.amount <= space) { + if (doFill) { + fluid.amount += resource.amount; + } + return resource.amount; + } else { + if (doFill) { + fluid.amount = capacity; + } + return space; + } + + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + if (fluid == null || fluid.fluidID <= 0) { + return null; + } + if (fluid.amount <= 0) { + return null; + } + + int used = maxDrain; + if (fluid.amount < used) { + used = fluid.amount; + } + + if (doDrain) { + fluid.amount -= used; + } + + FluidStack drained = new FluidStack(fluid.fluidID, used); + + if (fluid.amount < 0) { + fluid.amount = 0; + } + return drained; + } + + public void setTankPressure(int pressure) { + this.tankPressure = pressure; + } + + public String getLiquidName() { + return fluid != null ? FluidRegistry.getFluidName(fluid) : null; + } + + public boolean containsValidLiquid() { + return fluid != null && FluidRegistry.getFluidName(fluid) != null; + } + + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + if (containsValidLiquid()) { + fluid.writeToNBT(nbt); + } else { + nbt.setString("emptyTank", ""); + } + return nbt; + } + + public IFluidTank readFromNBT(NBTTagCompound nbt) { + if (!nbt.hasKey("emptyTank")) { + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbt); + if (liquid != null) { + setLiquid(liquid); + } + } + return this; + } + + public void remove(int amount) { + if(fluid == null) { + return; + } + fluid.amount -= amount; + fluid.amount = Math.max(0, fluid.amount); + } + +} diff --git a/common/crazypants/enderio/conduit/liquid/ILiquidConduit.java b/common/crazypants/enderio/conduit/liquid/ILiquidConduit.java new file mode 100644 index 00000000..edba3e0c --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/ILiquidConduit.java @@ -0,0 +1,31 @@ +package crazypants.enderio.conduit.liquid; + +import crazypants.enderio.conduit.IConduit; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; + +public interface ILiquidConduit extends IConduit, IFluidHandler { + + static final int VOLUME_PER_CONNECTION = FluidContainerRegistry.BUCKET_VOLUME/4; + + public static final String ICON_KEY ="enderio:liquidConduit"; + public static final String ICON_CORE_KEY ="enderio:liquidConduitCore"; + public static final String ICON_EXTRACT_KEY ="enderio:liquidConduitExtract"; + + void setFluidType(FluidStack fluidType); + + FluidStack getFluidType(); + + ConduitTank getTank(); + + IFluidHandler getExternalHandler(ForgeDirection direction); + + boolean canOutputToDir(ForgeDirection dir); + + boolean isExtractingFromDir(ForgeDirection dir); + + void setExtractingFromDir(ForgeDirection dir, boolean extracting); + +} diff --git a/common/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/common/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java new file mode 100644 index 00000000..4e4a0a30 --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -0,0 +1,36 @@ +package crazypants.enderio.conduit.liquid; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractItemConduit; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.ItemConduitSubtype; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemStack; + +public class ItemLiquidConduit extends AbstractItemConduit { + + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemLiquidConduit.unlocalisedName, ModObject.itemLiquidConduit.name, "enderio:ItemLiquidConduit"), + }; + + public static ItemLiquidConduit create() { + ItemLiquidConduit result = new ItemLiquidConduit(); + result.init(subtypes); + return result; + } + + protected ItemLiquidConduit() { + super(ModObject.itemLiquidConduit); + } + + @Override + public Class getBaseConduitType() { + return ILiquidConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack) { + return new LiquidConduit(); + } + +} diff --git a/common/crazypants/enderio/conduit/liquid/LiquidConduit.java b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java new file mode 100644 index 00000000..af10dedb --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -0,0 +1,548 @@ +package crazypants.enderio.conduit.liquid; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.machine.reservoir.TileReservoir; +import crazypants.render.IconUtil; +import crazypants.util.BlockCoord; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +public class LiquidConduit extends AbstractConduit implements ILiquidConduit { + + static final Map ICONS = new HashMap(); + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IconRegister register) { + ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); + ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); + ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + private LiquidConduitNetwork network; + + private ConduitTank tank = new ConduitTank(0); + + private float lastSyncRatio = -99; + + private boolean pushing = false; + + private final Set extractDirs = new HashSet(); + + // ----------------------------- + + private long lastEmptyTick = 0; + private int numEmptyEvents = 0; + + private boolean stateDirty = false; + + private int maxDrainPerTick = 50; + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res) { + if (player.getCurrentEquippedItem() == null) { + return false; + } + if (ConduitUtil.isToolEquipped(player)) { + + if (!getBundle().getEntity().worldObj.isRemote) { + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (res.component != null) { + ForgeDirection connDir = (ForgeDirection) res.component.dir; + + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + // Attempt to join networls + ILiquidConduit neighbour = getFluidConduit(faceHit); + if (neighbour != null && LiquidConduitNetwork.areFluidsCompatable(getFluidType(), neighbour.getFluidType())) { + // kill the networks so a new one is formed combining then + if (neighbour.getNetwork() != null) { + neighbour.getNetwork().destroyNetwork(); + } + if (getNetwork() != null) { + getNetwork().destroyNetwork(); + } + // and join'm'up + neighbour.conduitConnectionAdded(faceHit.getOpposite()); + conduitConnectionAdded(faceHit); + } + } else if (containsExternalConnection(connDir)) { + // Toggle extraction mode + setExtractingFromDir(connDir, !isExtractingFromDir(connDir)); + } + } + + } else { + String str = player.worldObj.isRemote ? "[Client]" : "[Server]"; + System.out.println(str + + " LiquidConduit.onBlockActivated: Tank volume is: " + + tank.getCapacity() + " tank contains: " + tank.getFluidAmount() + + " filled ratio is: " + tank.getFilledRatio()); + } + return true; + + } else if (player.getCurrentEquippedItem().itemID == Item.bucketEmpty.itemID) { + + if (!getBundle().getEntity().worldObj.isRemote) { + long curTick = getBundle().getEntity().worldObj.getWorldTime(); + if (curTick - lastEmptyTick < 20) { + numEmptyEvents++; + } else { + numEmptyEvents = 1; + } + lastEmptyTick = curTick; + + if (numEmptyEvents < 2) { + tank.setAmount(0); + } else if (network != null) { + network.setFluidType(null); + numEmptyEvents = 0; + } + } + + return true; + } else { + + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem()); + if (fluid != null) { + if (!getBundle().getEntity().worldObj.isRemote) { + if (network != null && (network.getFluidType() == null || network.getTotalVolume() < 500)) { + network.setFluidType(fluid); + ChatMessageComponent c = ChatMessageComponent.func_111066_d("Fluid type set to " + FluidRegistry.getFluidName(fluid)); + player.sendChatToPlayer(c); + } + } + return true; + } + } + + return false; + } + + @Override + public void updateEntity(World world) { + super.updateEntity(world); + if (world.isRemote) { + return; + } + doExtract(); + // Limit these updates to prevent spamming during flow + if (stateDirty || (lastSyncRatio != tank.getFilledRatio() && world.getTotalWorldTime() % 2 == 0)) { + lastSyncRatio = tank.getFilledRatio(); + setActive(lastSyncRatio > 0); + getBundle().dirty(); + stateDirty = false; + } + } + + private void doExtract() { + + BlockCoord loc = getLocation(); + if (!getBundle().getEntity().worldObj.isBlockIndirectlyGettingPowered(loc.x, loc.y, loc.z)) { + return; + } + + for (ForgeDirection dir : extractDirs) { + IFluidHandler extTank = getTankContainer(getLocation().getLocation(dir)); + + int maxPush = tank.getFluidAmount(); + int couldPush = pushLiquid(dir, maxPush, false); + int targetExtract = Math.min(maxDrainPerTick, tank.getAvailableSpace() + couldPush); + FluidStack couldDrain = extTank.drain(dir.getOpposite(), targetExtract, false); + if (couldDrain != null && network != null && network.canAcceptLiquid(couldDrain)) { + couldDrain = extTank.drain(dir.getOpposite(), targetExtract, true); + if (couldDrain != null) { + FluidStack drained = couldDrain.copy(); + + int totalVolume = tank.getFluidAmount() + drained.amount; + int pushed = pushLiquid(dir, Math.min(drained.amount, maxPush), true); + // System.out.println("LiquidConduit.doExtract: Drained: " + + // drained.amount + " pushed = " + pushed + " contains volume " + + // tank.getAmount()); + drained.amount = totalVolume - pushed; + tank.setLiquid(drained); + } + } + } + + } + + @Override + public boolean canOutputToDir(ForgeDirection dir) { + // TODO: In/Out control on externals + if (conduitConnections.contains(dir)) { + return true; + } + if (!externalConnections.contains(dir)) { + return false; + } + if (isExtractingFromDir(dir)) { + return false; + } + IFluidHandler ext = getExternalHandler(dir); + if (ext instanceof TileReservoir) { // dont push to an auto ejecting + // resevoir or we loop + TileReservoir tr = (TileReservoir) ext; + return !tr.isMultiblock() || !tr.isAutoEject(); + } + return true; + } + + @Override + public boolean isExtractingFromDir(ForgeDirection dir) { + return extractDirs.contains(dir); + } + + @Override + public void setExtractingFromDir(ForgeDirection dir, boolean extracting) { + if (isExtractingFromDir(dir) == extracting) { + return; + } + if (!extracting) { + extractDirs.remove(dir); + } else { + extractDirs.add(dir); + } + stateDirty = true; + } + + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + super.externalConnectionRemoved(fromDirection); + setExtractingFromDir(fromDirection, false); + } + + @Override + public void setFluidType(FluidStack liquidType) { + if (tank.getFluid() != null && tank.getFluid().isFluidEqual(liquidType)) { + return; + } + if (liquidType != null) { + liquidType = liquidType.copy(); + } + tank.setLiquid(liquidType); + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (network == null) { + return 0; + } + if (network.canAcceptLiquid(resource)) { + network.setFluidType(resource); + } else { + return 0; + } + int recieveAmount = resource == null ? 0 : resource.amount; + if (recieveAmount <= 0) { + return 0; + } + // int maxPush = Math.min(recieveAmount, tank.getFluidAmount()); + int maxPush = Math.max(0, recieveAmount + tank.getFluidAmount() - tank.getCapacity()); + + int pushedVolume = pushLiquid(from, maxPush, doFill); + if (doFill) { + tank.drain(pushedVolume, doFill); + return tank.fill(resource, doFill); + } else { + int amount = tank.getFluidAmount(); + tank.drain(pushedVolume, true); + int res = tank.fill(resource, false); + tank.setAmount(amount); + return res; + } + } + + private int pushLiquid(ForgeDirection from, int amount, boolean doPush) { + if (pushing || amount <= 0 || tank.getFluid() == null) { // avoid circular + // pushing + return 0; + } + + pushing = true; + int pushed = 0; + + try { + + Set cons = new HashSet(getConduitConnections()); + cons.addAll(getExternalConnections()); + cons.remove(from); + + if (cons.size() == 0) { + return pushed; + } + + int numToPushTo; + int amountPerCon; + List toRemove = new ArrayList(cons.size()); + FluidStack toPush = tank.getFluid().copy(); + do { + numToPushTo = cons.size(); + amountPerCon = amount / numToPushTo; + amountPerCon = Math.max(1, amountPerCon); + toPush.amount = amountPerCon; + for (ForgeDirection dir : cons) { + IFluidHandler con = getTankContainer(getLocation().getLocation(dir)); + // NB: Dont push liquid into a conduit that is fuller than yourself + ILiquidConduit conduitCon = getFluidConduit(dir); + if (con == null || !canOutputToDir(dir) || (conduitCon != null && conduitCon.getTank().getFilledRatio() > tank.getFilledRatio())) { + toRemove.add(dir); + } else { + int filled = con.fill(dir.getOpposite(), toPush, doPush); + if (filled < amountPerCon) { + toRemove.add(dir); + } + pushed += filled; + + } + toPush.amount = amountPerCon; + if (pushed >= amount) { + return amount; + } + } + for (ForgeDirection dir : toRemove) { + cons.remove(dir); + } + + } while (!cons.isEmpty() && pushed < amount); + + } finally { + pushing = false; + } + + return pushed; + } + + private ILiquidConduit getFluidConduit(ForgeDirection dir) { + TileEntity ent = getBundle().getEntity(); + return ConduitUtil.getConduit(ent.worldObj, ent, dir, ILiquidConduit.class); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tank.drain(maxDrain, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource != null && !resource.isFluidEqual(tank.getFluid())) { + return null; + } + return drain(from, resource.amount, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (tank.getFluid() == null) { + return true; + } + if (fluid != null && fluid.getID() == tank.getFluid().fluidID) { + return true; + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (tank.getFluid() == null || fluid == null) { + return false; + } + return tank.getFluid().getFluid().getID() == fluid.getID(); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] { tank.getInfo() }; + } + + // ----------------------------- + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + if (tank.containsValidLiquid()) { + nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); + } + + int[] dirs = new int[extractDirs.size()]; + Iterator cons = extractDirs.iterator(); + for (int i = 0; i < dirs.length; i++) { + dirs[i] = cons.next().ordinal(); + } + nbtRoot.setIntArray("extractDirs", dirs); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + updateTanksCapacity(); + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); + tank.setLiquid(liquid); + + extractDirs.clear(); + int[] dirs = nbtRoot.getIntArray("extractDirs"); + for (int i = 0; i < dirs.length; i++) { + extractDirs.add(ForgeDirection.values()[dirs[i]]); + } + } + + @Override + protected void connectionsChanged() { + super.connectionsChanged(); + updateTanksCapacity(); + } + + @Override + public ConduitTank getTank() { + return tank; + } + + @Override + public Class getBaseConduitType() { + return ILiquidConduit.class; + } + + @Override + public ItemStack createItem() { + return new ItemStack(ModObject.itemLiquidConduit.actualId, 1, 0); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + this.network = null; + return true; + } + + LiquidConduitNetwork n = (LiquidConduitNetwork) network; + if (tank.getFluid() == null) { + tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy()); + } else if (n.getFluidType() == null) { + n.setFluidType(tank.getFluid()); + } else if (!tank.getFluid().isFluidEqual(n.getFluidType())) { + return false; + } + this.network = (LiquidConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction) { + return getExternalHandler(direction) != null; + } + + @Override + public IFluidHandler getExternalHandler(ForgeDirection direction) { + IFluidHandler con = getTankContainer(getLocation().getLocation(direction)); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { + if (!(con instanceof ILiquidConduit)) { + return false; + } + if (getFluidType() != null && ((ILiquidConduit) con).getFluidType() == null) { + return false; + } + return LiquidConduitNetwork.areFluidsCompatable(getFluidType(), ((ILiquidConduit) con).getFluidType()); + } + + @Override + public net.minecraftforge.fluids.FluidStack getFluidType() { + FluidStack result = null; + if (network != null) { + result = network.getFluidType(); + } + if (result == null) { + result = tank.getFluid(); + } + return result; + } + + @Override + public Icon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY); + } + if (isExtractingFromDir((ForgeDirection) component.dir)) { + return ICONS.get(ICON_EXTRACT_KEY); + } + return ICONS.get(ICON_KEY); + } + + @Override + public Icon getTransmitionTextureForState(CollidableComponent component) { + if (active && tank.getFluid() != null) { + return tank.getFluid().getFluid().getStillIcon(); + } + return null; + } + + @Override + public float getTransmitionGeometryScale() { + return tank.getFilledRatio(); + } + + private IFluidHandler getTankContainer(BlockCoord bc) { + return getTankContainer(bc.x, bc.y, bc.z); + } + + private IFluidHandler getTankContainer(int x, int y, int z) { + TileEntity te = getBundle().getEntity().worldObj.getBlockTileEntity(x, y, z); + if (te instanceof IFluidHandler) { + return (IFluidHandler) te; + } + return null; + } + + private void updateTanksCapacity() { + int totalConnections = getConduitConnections().size() + getExternalConnections().size(); + tank.setCapacity(totalConnections * VOLUME_PER_CONNECTION); + } + +} diff --git a/common/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/common/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java new file mode 100644 index 00000000..31ab6d09 --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -0,0 +1,285 @@ +package crazypants.enderio.conduit.liquid; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.IConduit; +import crazypants.util.BlockCoord; + +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; + +public class LiquidConduitNetwork extends AbstractConduitNetwork { + + private FluidStack liquidType; + private long timeAtLastApply; + + private int maxFlowsPerTick = 10; + private int lastFlowIndex = 0; + + private boolean printFlowTiming = false; + + @Override + public Class getBaseConduitType() { + return ILiquidConduit.class; + } + + public FluidStack getFluidType() { + return liquidType; + } + + @Override + public void addConduit(ILiquidConduit con) { + super.addConduit(con); + con.setFluidType(liquidType); + } + + public void setFluidType(FluidStack newType) { + if (liquidType != null && liquidType.isFluidEqual(newType)) { + return; + } + if (newType != null) { + liquidType = newType.copy(); + liquidType.amount = 0; + } else { + liquidType = null; + } + for (ILiquidConduit conduit : conduits) { + conduit.setFluidType(liquidType); + } + } + + public boolean canAcceptLiquid(FluidStack acceptable) { + return areFluidsCompatable(liquidType, acceptable); + } + + public static boolean areFluidsCompatable(FluidStack a, FluidStack b) { + if (a == null || b == null) { + return true; + } + return a.isFluidEqual(b); + } + + public int getTotalVolume() { + int totalVolume = 0; + for (ILiquidConduit con : conduits) { + totalVolume += con.getTank().getFluidAmount(); + } + return totalVolume; + } + + @Override + public void onUpdateEntity(IConduit conduit) { + World world = conduit.getBundle().getEntity().worldObj; + if (world == null) { + return; + } + if (world.isRemote || liquidType == null) { + return; + } + + long curTime = world.getTotalWorldTime(); + if (curTime != timeAtLastApply) { + timeAtLastApply = curTime; + // 1000 water, 6000 lava + if (liquidType != null && liquidType.getFluid() != null) { + int visc = liquidType.getFluid().getViscosity(); + if (curTime % (visc / 500) == 0) { + long start = System.nanoTime(); + if (doFlow() && printFlowTiming) { + long took = System.nanoTime() - start; + double secs = took / 1000000000.0; + System.out.println("LiquidConduitNetwork.onUpdateEntity: took " + secs + " secs, " + (secs * 1000) + " millis"); + } + } + } + } + } + + private boolean doFlow() { + + // int preVol = 0; + // for (ILiquidConduit con : conduits) { + // preVol += con.getTank().getAmount(); + // } + + List actions = new ArrayList(); + for (int i = 0; i < Math.min(maxFlowsPerTick, conduits.size()); i++) { + + if (lastFlowIndex >= conduits.size()) { + lastFlowIndex = 0; + } + flowFrom(conduits.get(lastFlowIndex), actions); + ++lastFlowIndex; + + } + for (FlowAction action : actions) { + action.apply(); + } + + // int postVol = 0; + // for (ILiquidConduit con : conduits) { + // postVol += con.getTank().getAmount(); + // } + // if (preVol != postVol) { + // System.out.println("LiquidConduitNetwork.doFlow: net change of: " + + // (postVol - preVol)); + // } + + return !actions.isEmpty(); + } + + private void flowFrom(ILiquidConduit con, List actions) { + + ConduitTank tank = con.getTank(); + int totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + + int maxFlowVolume = 20; + + // First flow all we can down, then balance the rest + if (con.getConduitConnections().contains(ForgeDirection.DOWN)) { + BlockCoord loc = con.getLocation().getLocation(ForgeDirection.DOWN); + ILiquidConduit downCon = ConduitUtil.getConduit(con.getBundle().getEntity().worldObj, loc.x, loc.y, loc.z, ILiquidConduit.class); + int filled = downCon.fill(ForgeDirection.UP, tank.getFluid().copy(), false); + tank.addAmount(-filled); + downCon.getTank().addAmount(filled); + } + + totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + FluidStack available = tank.getFluid(); + int totalRequested = 0; + int numRequests = 0; + // Then to external connections + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.canOutputToDir(dir)) { + IFluidHandler extCon = con.getExternalHandler(dir); + if (extCon != null) { + int amount = extCon.fill(dir.getOpposite(), available.copy(), false); + if (amount > 0) { + totalRequested += amount; + numRequests++; + } + } + } + } + + if (numRequests > 0) { + int amountPerRequest = Math.min(totalAmount, totalRequested) / numRequests; + + // ----- + amountPerRequest = Math.min(maxFlowVolume, amountPerRequest); + // ---- + + FluidStack requestSource = available.copy(); + requestSource.amount = amountPerRequest; + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.canOutputToDir(dir)) { + IFluidHandler extCon = con.getExternalHandler(dir); + if (extCon != null) { + int amount = extCon.fill(dir.getOpposite(), requestSource.copy(), true); + if (amount > 0) { + tank.addAmount(-amount); + } + } + } + } + } + + // TODO: Liquid can currently flow upwards from a down connection + + totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + int totalCapacity = tank.getCapacity(); + + BlockCoord loc = con.getLocation(); + Collection connections = + ConduitUtil.getConnectedConduits(con.getBundle().getEntity().worldObj, + loc.x, loc.y, loc.z, ILiquidConduit.class); + int numTargets = 0; + for (ILiquidConduit neighbour : connections) { + if (canFlowTo(con, neighbour)) { // can only flow within same network + totalAmount += neighbour.getTank().getFluidAmount(); + totalCapacity += neighbour.getTank().getCapacity(); + numTargets++; + } + } + + float targetRatio = (float) totalAmount / totalCapacity; + int netChange = 0; + int flowVolume = Math.round((targetRatio - tank.getFilledRatio()) * tank.getCapacity()); + + // ----- + flowVolume = Math.min(maxFlowVolume, flowVolume); + // ---- + + if (Math.abs(flowVolume) < 2) { + return; // dont bother with transfers of less than a thousands of a bucket + } + + netChange += flowVolume; + actions.add(new FlowAction(con, flowVolume)); + for (ILiquidConduit neigbour : connections) { + if (canFlowTo(con, neigbour)) { // can only flow within same network + flowVolume = Math.round((targetRatio - neigbour.getTank().getFilledRatio()) * neigbour.getTank().getCapacity()); + if (flowVolume != 0) { + actions.add(new FlowAction(neigbour, flowVolume)); + netChange += flowVolume; + } + } + } + + if (netChange != 0) { + actions.add(new FlowAction(con, -netChange)); + } + } + + private boolean canFlowTo(ILiquidConduit con, ILiquidConduit neighbour) { + if (neighbour.getNetwork() != this) { + return false; + } + if (neighbour.getLocation().y > con.getLocation().y) { + return false; + } + float nr = neighbour.getTank().getFilledRatio(); + if (nr >= con.getTank().getFilledRatio()) { + return false; + } + return true; + } + + static class FlowAction { + ILiquidConduit con; + int amount; + + FlowAction(ILiquidConduit con, int amount) { + this.con = con; + this.amount = amount; + } + + void apply() { + if (amount != 0) { + // int preFlow = con.getTank().getAmount(); + con.getTank().addAmount(amount); + // System.out.println("LiquidConduitNetwork.FlowAction.apply: Con " + + // con.getLocation() + " went from " + preFlow + " to " + + // con.getTank().getAmount() + // + " with transfer amount " + amount); + } + } + + } + +} diff --git a/common/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/common/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java new file mode 100644 index 00000000..96641769 --- /dev/null +++ b/common/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -0,0 +1,118 @@ +package crazypants.enderio.conduit.liquid; + +import static crazypants.render.CubeRenderer.setupVertices; +import crazypants.enderio.conduit.*; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.render.*; +import crazypants.render.BoundingBox; +import crazypants.vecmath.Vector3d; + +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; + +public class LiquidConduitRenderer extends DefaultConduitRenderer { + + private float downRatio; + + private float flatRatio; + + private float upRatio; + + @Override + public boolean isRendererForConduit(IConduit conduit) { + if (conduit instanceof ILiquidConduit) { + return true; + } + return false; + } + + @Override + public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, + float worldLight) { + calculateRatios((ILiquidConduit) conduit); + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight); + } + + protected void renderConduit(Icon tex, CollidableComponent component) { + if (isNSEWUP(component.dir)) { + BoundingBox[] cubes = toCubes(component.bound); + for (BoundingBox cube : cubes) { + drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); + } + } else { + drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + } + } + + protected void renderTransmission(Icon tex, CollidableComponent component) { + BoundingBox[] cubes = toCubes(component.bound); + for (BoundingBox cube : cubes) { + drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + } + } + + @Override + protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection id) { + + float yScale = getRatioForConnection(id); + + float xs = ((ForgeDirection) id).offsetX == 0 ? 0.9f : 1; + float ys = ((ForgeDirection) id).offsetY == 0 ? Math.min(yScale, 0.9f) : yScale; + float zs = ((ForgeDirection) id).offsetZ == 0 ? 0.9f : 1; + + float sizeY = bound.sizeY(); + bound = bound.scale(xs, ys, zs); + float transY = (bound.sizeY() - sizeY) / 2; + + Vector3d translation = new Vector3d(0, transY, 0); + setupVertices(bound.translate(translation)); + } + + private void calculateRatios(ILiquidConduit conduit) { + ConduitTank tank = conduit.getTank(); + int totalAmount = tank.getFluidAmount(); + + int upCapacity = 0; + if (conduit.containsConduitConnection(ForgeDirection.UP) || conduit.containsExternalConnection(ForgeDirection.UP)) { + upCapacity = ILiquidConduit.VOLUME_PER_CONNECTION; + } + int downCapacity = 0; + if (conduit.containsConduitConnection(ForgeDirection.DOWN) || conduit.containsExternalConnection(ForgeDirection.DOWN)) { + downCapacity = ILiquidConduit.VOLUME_PER_CONNECTION; + } + + int flatCapacity = tank.getCapacity() - upCapacity - downCapacity; + + int usedCapacity = 0; + if (downCapacity > 0) { + int inDown = Math.min(totalAmount, downCapacity); + usedCapacity += inDown; + downRatio = (float) inDown / downCapacity; + } + if (flatCapacity > 0 && usedCapacity < totalAmount) { + int inFlat = Math.min(flatCapacity, totalAmount - usedCapacity); + usedCapacity += inFlat; + flatRatio = (float) inFlat / flatCapacity; + } else { + flatRatio = 0; + } + if (upCapacity > 0 && usedCapacity < totalAmount) { + int inUp = Math.min(upCapacity, totalAmount - usedCapacity); + upRatio = (float) inUp / upCapacity; + } else { + upRatio = 0; + } + + } + + private float getRatioForConnection(ForgeDirection id) { + if (id == ForgeDirection.UP) { + return upRatio; + } + if (id == ForgeDirection.DOWN) { + return downRatio; + } + return flatRatio; + } + +} diff --git a/common/crazypants/enderio/conduit/power/IPowerConduit.java b/common/crazypants/enderio/conduit/power/IPowerConduit.java new file mode 100644 index 00000000..7c65d48a --- /dev/null +++ b/common/crazypants/enderio/conduit/power/IPowerConduit.java @@ -0,0 +1,23 @@ +package crazypants.enderio.conduit.power; + +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.IInternalPowerReceptor; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerReceptor; + +public interface IPowerConduit extends IConduit, IInternalPowerReceptor { + + public static final String ICON_KEY ="enderio:powerConduit"; + public static final String ICON_CORE_KEY ="enderio:powerConduitCore"; + public static final String ICON_TRANSMISSION_KEY = "enderio:powerConduitTransmission"; + + IPowerReceptor getExternalPowerReceptor(ForgeDirection direction); + + ICapacitor getCapacitor(); + + float getEnergyStored(); + + void setEnergyStored(float energyStored); + +} diff --git a/common/crazypants/enderio/conduit/power/ItemPowerConduit.java b/common/crazypants/enderio/conduit/power/ItemPowerConduit.java new file mode 100644 index 00000000..0fd02d5c --- /dev/null +++ b/common/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -0,0 +1,53 @@ +package crazypants.enderio.conduit.power; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractItemConduit; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.ItemConduitSubtype; +import crazypants.enderio.power.ICapacitor; + +public class ItemPowerConduit extends AbstractItemConduit { + + static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemPowerConduit.unlocalisedName, ModObject.itemPowerConduit.name, "enderio:itemPowerConduit"), + new ItemConduitSubtype(ModObject.itemPowerConduit.unlocalisedName + "Enhanced", "Enhanced " + ModObject.itemPowerConduit.name, "enderio:itemPowerConduitEnhanced"), + new ItemConduitSubtype(ModObject.itemPowerConduit.unlocalisedName + "Ender", "Ender " + ModObject.itemPowerConduit.name, "enderio:itemPowerConduitEnder") + }; + + public static ItemPowerConduit create() { + ItemPowerConduit result = new ItemPowerConduit(); + result.init(subtypes); + return result; + } + + protected ItemPowerConduit() { + super(ModObject.itemPowerConduit); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack) { + return new PowerConduit(stack.getItemDamage()); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(itemStack, par2EntityPlayer, list, par4); + ICapacitor cap = PowerConduit.CAPACITORS[itemStack.getItemDamage()]; + list.add(String.format("I/O %d MJ/t", cap.getMaxEnergyExtracted())); + list.add(String.format("Storage %d MJ", cap.getMaxEnergyStored())); + } + + +} diff --git a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java new file mode 100644 index 00000000..eea92f16 --- /dev/null +++ b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -0,0 +1,251 @@ +package crazypants.enderio.conduit.power; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; + +import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; +import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.util.BlockCoord; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class NetworkPowerManager { + + private PowerConduitNetwork network; + + private int maxEnergyStored; + private float energyStored; + private float reserved; + + private int updateRenderTicks = 10; + private int inactiveTicks = 100; + + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + + private boolean lastActiveValue = false; + private int ticksWithNoPower = 0; + + private final Map starveBuffers = new HashMap(); + + public NetworkPowerManager(PowerConduitNetwork netowrk, World world) { + this.network = netowrk; + maxEnergyStored = 64; + } + + + public float addEnergy(float quantity) { + float used = quantity; + energyStored += quantity; + if (energyStored > maxEnergyStored) { + used -= energyStored - maxEnergyStored; + energyStored = maxEnergyStored; + } else if (energyStored < 0) { + used -= energyStored; + energyStored = 0; + } + updateConduitStorage(); + return used; + } + + public void applyRecievedPower() { + + updateStorage(); + + float extracted = extractRecievedEnergy(); + addEnergy(extracted); + checkReserves(); + float quantity = energyStored; + boolean active; + if (quantity > 0) { + ticksWithNoPower = 0; + active = true; + } else { + ticksWithNoPower++; + active = false; + } + + boolean doRender = active != lastActiveValue && (active || (!active && ticksWithNoPower > updateRenderTicks)); + + if (doRender) { + lastActiveValue = active; + for (IPowerConduit con : network.getConduits()) { + con.setActive(active); + } + } + + if (quantity <= 0 || receptors.isEmpty()) { + return; + } + + + int appliedCount = 0; + int numReceptors = receptors.size(); + int numEngines = 0; + while (quantity > 0 && appliedCount < numReceptors) { + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + + ReceptorEntry r = receptorIterator.next(); + float reservedForEntry = removeReservedEnergy(r); + + for (ForgeDirection dir : r.directions) { + + PowerReceiver pp = r.powerReceptor.getPowerReceiver(dir); + if(pp != null) { + if(pp.getType() != Type.ENGINE) { + + float used = 0; + float nonReservedPower = quantity - reserved; + float available = nonReservedPower + reservedForEntry; + float canOffer = Math.min(r.emmiter.getCapacitor().getMaxEnergyExtracted(),available); + float requested = pp.powerRequest(); + + //If it is possible to supply the minimum amount of energy + if(pp.getMinEnergyReceived() <= r.emmiter.getCapacitor().getMaxEnergyExtracted()) { + //Buffer energy if we can't meet it now + if(pp.getMinEnergyReceived() > canOffer && requested > 0) { + reserveEnergy(r, canOffer); + used += canOffer; + } else if (r.powerReceptor instanceof IInternalPowerReceptor) { + used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) r.powerReceptor, pp, canOffer, Type.PIPE, dir); + } else { + used = pp.receiveEnergy(Type.PIPE, Math.min(requested, canOffer), dir); + } + + } + quantity -= used; + + } else if(pp.getType() == Type.ENGINE && !(r.powerReceptor instanceof IInternalPowerReceptor)) { + numEngines++; + } + + if(quantity <= 0) { + break; + } + + } + } + appliedCount++; + } + float leaveForBlowingUpEngines = numEngines * 8; + if(leaveForBlowingUpEngines > maxEnergyStored) { + leaveForBlowingUpEngines = maxEnergyStored; + } + energyStored = Math.min(quantity, maxEnergyStored - leaveForBlowingUpEngines); + updateConduitStorage(); + } + + private float removeReservedEnergy(ReceptorEntry r) { + StarveBuffer starveBuf = starveBuffers.remove(r.coord); + if(starveBuf == null) { + return 0; + } + float result = starveBuf.stored; + reserved -= result; + return result; + } + + private void reserveEnergy(ReceptorEntry r, float amount) { + starveBuffers.put(r.coord, new StarveBuffer(amount)); + reserved += amount; + } + + private void checkReserves() { + if(reserved > maxEnergyStored * 0.9) { + starveBuffers.clear(); + reserved = 0; + } + } + + + private void updateConduitStorage() { + float energyLeft = energyStored; + for(IPowerConduit con : network.getConduits()) { + float give = con.getCapacitor().getMaxEnergyStored(); + if(give > energyLeft) { + give = energyLeft; + } + con.setEnergyStored(give); + energyLeft -= give; + } + } + + + boolean isActive() { + return energyStored > 0; + } + + private void updateStorage() { + maxEnergyStored = 0; + energyStored = 0; + for(IPowerConduit con : network.getConduits()) { + maxEnergyStored += con.getCapacitor().getMaxEnergyStored(); + energyStored += con.getEnergyStored(); + } + if(energyStored > maxEnergyStored) { + energyStored = maxEnergyStored; + } + + } + + private float extractRecievedEnergy() { + float extracted = 0; + for(IPowerConduit conduit : network.getConduits()) { + PowerHandler ph = conduit.getPowerHandler(); + extracted += ph.getEnergyStored(); + ph.update(); + ph.setEnergy(0); + } + return extracted; + } + + public void receptorsChanged() { + receptors.clear(); + receptors.addAll(network.getPowerReceptors()); + receptorIterator = receptors.listIterator(); + } + + + void onNetworkDestroyed() { + //Pass out all the stored energy to the conduits + for(IPowerConduit con : network.getConduits()) { + PowerHandler ph = con.getPowerHandler(); + float give = ph.getMaxEnergyStored() - ph.getEnergyStored(); + give = Math.min(give, energyStored); + ph.setEnergy(ph.getEnergyStored() + give); + energyStored -= give; + if(energyStored <= 0) { + return; + } + } + + } + + private static class StarveBuffer { + + float stored; + + public StarveBuffer(float stored) { + this.stored = stored; + } + + void addToStore(float val) { + stored += val; + } + + } + +} diff --git a/common/crazypants/enderio/conduit/power/PowerConduit.java b/common/crazypants/enderio/conduit/power/PowerConduit.java new file mode 100644 index 00000000..e299bdf5 --- /dev/null +++ b/common/crazypants/enderio/conduit/power/PowerConduit.java @@ -0,0 +1,234 @@ +package crazypants.enderio.conduit.power; + +import java.util.HashMap; +import java.util.Map; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.render.BoundingBox; +import crazypants.render.IconUtil; +import crazypants.vecmath.Vector3d; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerEmitter; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class PowerConduit extends AbstractConduit implements IPowerConduit { + + static final Map ICONS = new HashMap(); + + static final ICapacitor[] CAPACITORS = new BasicCapacitor[] { + new BasicCapacitor(0, 64, 64, 0, 0, 0, 64), + new BasicCapacitor(0, 128, 128, 0, 0, 0, 128), + new BasicCapacitor(0, 1024, 1024, 0, 0, 0, 1024) + }; + + static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; + + static ItemStack createItemStackForSubtype(int subtype) { + ItemStack result = new ItemStack(ModObject.itemPowerConduit.actualId, 1, subtype); + return result; + + } + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IconRegister register) { + for (String pf : POSTFIX) { + ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); + ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + } + ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + public static final float WIDTH = 0.075f; + public static final float HEIGHT = 0.075f; + + public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); + public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); + + public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); + + protected PowerConduitNetwork network; + private PowerHandler powerHandler; + + private int subtype; + + private float energyStored; + + public PowerConduit() { + } + + public PowerConduit(int meta) { + this.subtype = meta; + powerHandler = createPowerHandlerForType(); + } + + @Override + public ICapacitor getCapacitor() { + return CAPACITORS[subtype]; + } + + private PowerHandler createPowerHandlerForType() { + return PowerHandlerUtil.createHandler(CAPACITORS[subtype], this, Type.PIPE); + } + + public float getEnergyStored() { + return energyStored; + } + + public void setEnergyStored(float energyStored) { + this.energyStored = energyStored; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("subtype", (short) subtype); + nbtRoot.setFloat("energyStored", energyStored); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + subtype = nbtRoot.getShort("subtype"); + if (powerHandler == null) { + powerHandler = createPowerHandlerForType(); + } + energyStored = nbtRoot.getFloat("energyStored"); + if(energyStored < 0) { + energyStored = 0; + } + } + + @Override + public PowerReceiver getPowerReceiver(ForgeDirection side) { + return powerHandler.getPowerReceiver(); + } + + @Override + public PowerHandler getPowerHandler() { + return powerHandler; + } + + @Override + public void applyPerdition() { + } + + @Override + public void doWork(PowerHandler workProvider) { + } + + @Override + public World getWorld() { + return getBundle().getEntity().worldObj; + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (PowerConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction) { + IPowerReceptor rec = getExternalPowerReceptor(direction); + if(rec instanceof IPowerEmitter) { + return ((IPowerEmitter)rec).canEmitPowerFrom(direction.getOpposite()); + } + return rec != null; + } + + @Override + public void externalConnectionAdded(ForgeDirection direction) { + super.externalConnectionAdded(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorAdded(this, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, + getExternalPowerReceptor(direction)); + } + } + + @Override + public void externalConnectionRemoved(ForgeDirection direction) { + super.externalConnectionRemoved(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorRemoved(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + } + } + + @Override + public IPowerReceptor getExternalPowerReceptor(ForgeDirection direction) { + TileEntity te = bundle.getEntity(); + World world = te.worldObj; + if (world == null) { + return null; + } + TileEntity test = world.getBlockTileEntity(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + if (test instanceof IConduitBundle) { + return null; + } + if (test instanceof IPowerReceptor) { + return (IPowerReceptor) test; + } + return null; + } + + @Override + public ItemStack createItem() { + return createItemStackForSubtype(subtype); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + // Rendering + @Override + public Icon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); + } + return ICONS.get(ICON_KEY + POSTFIX[subtype]); + } + + @Override + public Icon getTransmitionTextureForState(CollidableComponent component) { + //return ICONS.get(ICON_TRANSMISSION_KEY); + return null; + } + +} diff --git a/common/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/common/crazypants/enderio/conduit/power/PowerConduitNetwork.java new file mode 100644 index 00000000..3e53478b --- /dev/null +++ b/common/crazypants/enderio/conduit/power/PowerConduitNetwork.java @@ -0,0 +1,136 @@ +package crazypants.enderio.conduit.power; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.util.BlockCoord; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class PowerConduitNetwork extends AbstractConduitNetwork { + + // ---------------------------------------------------------------------- + + NetworkPowerManager powerManager; + + + private Map powerReceptors = new HashMap(); + + private long timeAtLastApply = -1; + + public PowerConduitNetwork() { + } + + @Override + public void init(IConduitBundle tile, Collection connections, World world) { + super.init(tile, connections, world); + powerManager = new NetworkPowerManager(this, world); + powerManager.receptorsChanged(); + } + + @Override + public void destroyNetwork() { + for (IPowerConduit con : conduits) { + con.setActive(false); + } + powerManager.onNetworkDestroyed(); + super.destroyNetwork(); + } + + public NetworkPowerManager getPowerManager() { + return powerManager; + } + + @Override + public void addConduit(IPowerConduit con) { + super.addConduit(con); + Set externalDirs = con.getExternalConnections(); + for (ForgeDirection dir : externalDirs) { + IPowerReceptor pr = con.getExternalPowerReceptor(dir); + if (pr != null) { + TileEntity te = con.getBundle().getEntity(); + powerReceptorAdded(con, dir, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, pr); + } + } + if(powerManager != null) { + con.setActive(powerManager.isActive()); + } + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + public void powerReceptorAdded(IPowerConduit powerConduit, ForgeDirection direction, int x, int y, int z, IPowerReceptor powerReceptor) { + if(powerReceptor == null) { + return; + } + BlockCoord key = new BlockCoord(x, y, z); + ReceptorEntry re = powerReceptors.get(key); + if(re == null) { + re = new ReceptorEntry(powerReceptor, key, powerConduit); + powerReceptors.put(key, re); + } + re.directions.add(direction); + if(powerManager != null) { + powerManager.receptorsChanged(); + } + } + + public void powerReceptorRemoved(int x, int y, int z) { + powerReceptors.remove(new BlockCoord(x, y, z)); + powerManager.receptorsChanged(); + } + + public Collection getPowerReceptors() { + return powerReceptors.values(); + } + + @Override + public void onUpdateEntity(IConduit conduit) { + World world = conduit.getBundle().getEntity().worldObj; + if(world == null) { + return; + } + if(world.isRemote) { + return; + } + long curTime = world.getTotalWorldTime(); + if(curTime != timeAtLastApply) { + timeAtLastApply = curTime; + powerManager.applyRecievedPower(); + } + } + + + public static class ReceptorEntry { + + IPowerConduit emmiter; + IPowerReceptor powerReceptor; + BlockCoord coord; + //The different directions that we connect to the sucker + Set directions = new HashSet(); + + public ReceptorEntry(IPowerReceptor powerReceptor, BlockCoord coord,IPowerConduit emmiter) { + this.powerReceptor = powerReceptor; + this.coord = coord; + this.emmiter = emmiter; + } + + } + + +} diff --git a/common/crazypants/enderio/conduit/redstone/IRedstoneConduit.java b/common/crazypants/enderio/conduit/redstone/IRedstoneConduit.java new file mode 100644 index 00000000..1cc11cac --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/IRedstoneConduit.java @@ -0,0 +1,39 @@ +package crazypants.enderio.conduit.redstone; + +import java.util.Set; + +import crazypants.enderio.conduit.IConduit; + +import net.minecraftforge.common.ForgeDirection; + +public interface IRedstoneConduit extends IConduit { + + public static final String KEY_CONDUIT_ICON ="enderio:redstoneConduit"; + public static final String KEY_TRANSMISSION_ICON ="enderio:redstoneConduitTransmission"; + public static final String KEY_CORE_OFF_ICON ="enderio:redstoneConduitCoreOff"; + public static final String KEY_CORE_ON_ICON ="enderio:redstoneConduitCoreOn"; + + enum SignalColor { + RED + } + + //External redstone interface + + int isProvidingStrongPower(ForgeDirection toDirection); + + int isProvidingWeakPower(ForgeDirection toDirection); + + //signals + + //--- Server Side Only + Set getNetworkInputs(); + + Set getNetworkOutputs(ForgeDirection side); + + //--- Set on server side, used on client side for rendering + + + boolean isReplaceableByControl(Class replacenebtType); + + +} diff --git a/common/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/common/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java new file mode 100644 index 00000000..10697f17 --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -0,0 +1,41 @@ +package crazypants.enderio.conduit.redstone; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.*; +import crazypants.enderio.conduit.facade.ItemConduitFacade; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemStack; + +public class ItemRedstoneConduit extends AbstractItemConduit { + + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemRedstoneConduit.unlocalisedName, ModObject.itemRedstoneConduit.name, "enderio:itemRedstoneConduit"), + new ItemConduitSubtype(ModObject.itemRedstoneConduit.unlocalisedName + "switch", "Conduit Switch", "enderio:itemRedstoneSwitch") + + }; + + public static ItemRedstoneConduit create() { + ItemRedstoneConduit result = new ItemRedstoneConduit(); + result.init(subtypes); + return result; + } + + protected ItemRedstoneConduit() { + super(ModObject.itemRedstoneConduit); + } + + @Override + public Class getBaseConduitType() { + return IRedstoneConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack) { + if(stack.getItemDamage() == 1) { + return new RedstoneSwitch(); + } else { + return new RedstoneConduit(); + } + } + +} diff --git a/common/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/common/crazypants/enderio/conduit/redstone/RedstoneConduit.java new file mode 100644 index 00000000..337d0b20 --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -0,0 +1,221 @@ +package crazypants.enderio.conduit.redstone; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.render.IconUtil; +import crazypants.util.BlockCoord; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit { + + + static final Map ICONS = new HashMap(); + + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IconRegister register) { + ICONS.put(KEY_CORE_OFF_ICON, register.registerIcon(KEY_CORE_OFF_ICON)); + ICONS.put(KEY_CORE_ON_ICON, register.registerIcon(KEY_CORE_ON_ICON)); + ICONS.put(KEY_CONDUIT_ICON, register.registerIcon(KEY_CONDUIT_ICON)); + ICONS.put(KEY_TRANSMISSION_ICON, register.registerIcon(KEY_TRANSMISSION_ICON)); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + protected RedstoneConduitNetwork network; + + protected final Set externalSignals = new HashSet(); + + public RedstoneConduit() { + } + + @Override + public boolean isReplaceableByControl(Class replacenebtType) { + return true; + } + + @Override + public ItemStack createItem() { + return new ItemStack(ModObject.itemRedstoneConduit.actualId,1,0); + } + + @Override + public Class getBaseConduitType() { + return IRedstoneConduit.class; + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (RedstoneConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction) { + TileEntity te = bundle.getEntity(); + World world = te.worldObj; + if (world == null) { + return false; + } + int id = world.getBlockId(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + if (id > 0 && id != EnderIO.blockConduitBundle.blockID) { + + //We can connect to a block if it can provide power or it is receiving a string signal (not emitted by us) + + BlockCoord loc = getLocation().getLocation(direction); + + boolean toggleNetwork = network != null && network.isNetworkEnabled(); + if(toggleNetwork ) { + network.setNetworkEnabled(false); + } + boolean gettingStrongPower = world.getBlockPowerInput(loc.x, loc.y, loc.z) == 15; + if(toggleNetwork) { + network.setNetworkEnabled(true); + } + + + //We can get an input from the block when: + return + Block.blocksList[id].canProvidePower() || //The block can provide power + //Or its getting a strong signal that we are not providing + gettingStrongPower; + //( world.getBlockPowerInput(loc.x, loc.y, loc.z) == 15 && isProvidingStrongPower(direction) != 15 ); + } + return false; + } + + @Override + public Set getNetworkInputs() { + Set res = new HashSet(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (canConnectToExternal(dir)) { + int input = getExternalPowerLevel(dir); + if (input > 1) { //need to degrade external signals by one as they enter + BlockCoord loc = getLocation().getLocation(dir); + Signal signal = new Signal(loc.x, loc.y, loc.z, input - 1, SignalColor.RED); + res.add(signal); + } + } + } + return res; + } + + @Override + public Set getNetworkOutputs(ForgeDirection side) { + if (network == null) { + return Collections.emptySet(); + } + return network.getSignals(); + } + + @Override + public boolean onNeighborBlockChange(int blockId) { + World world = getBundle().getEntity().worldObj; + if (world.isRemote) { + return false; + } + if (blockId == EnderIO.blockConduitBundle.blockID) { + return false; + } + boolean res = super.onNeighborBlockChange(blockId); + + if (network == null || network.updatingNetwork) { + return false; + } + + if(blockId > 0 && Block.blocksList[blockId].canProvidePower() && network != null) { + //TODO: Just recalculate the signals, no need for a full rebuild + network.destroyNetwork(); + return false; + } + return res; + } + + private int getExternalPowerLevel(ForgeDirection dir) { + if (network != null) { + network.setNetworkEnabled(false); + } + World world = getBundle().getEntity().worldObj; + BlockCoord loc = getLocation(); + int result = world.getStrongestIndirectPower(loc.x, loc.y, loc.z); + + if (network != null) { + network.setNetworkEnabled(true); + } + return result; + + } + + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { + return 0; + } + + @Override + public int isProvidingWeakPower(ForgeDirection toDirection) { + if (network == null || !network.isNetworkEnabled()) { + return 0; + } + int result = 0; + for (Signal signal : network.getSignals()) { + result = Math.max(result, signal.strength); + } + return result; + } + + @Override + public Icon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return isActive() ? ICONS.get(KEY_CORE_ON_ICON) : ICONS.get(KEY_CORE_OFF_ICON); + } + //return ICONS.get(KEY_CONDUIT_ICON); + return isActive() ? ICONS.get(KEY_TRANSMISSION_ICON) : ICONS.get(KEY_CONDUIT_ICON); + } + + @Override + public Icon getTransmitionTextureForState(CollidableComponent component) { +// if (component.id == ForgeDirection.UNKNOWN) { +// return null; +// } +// return isActive() ? ICONS.get(KEY_TRANSMISSION_ICON) : null; + return null; + + } + + @Override + public String toString() { + return "RedstoneConduit [network=" + network + " connections=" + conduitConnections + " active=" + active + "]"; + } + +} diff --git a/common/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java b/common/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java new file mode 100644 index 00000000..3321a150 --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java @@ -0,0 +1,185 @@ +package crazypants.enderio.conduit.redstone; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduitBundle; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class RedstoneConduitNetwork extends AbstractConduitNetwork { + + private final Set signals = new HashSet(); + + boolean updatingNetwork = false; + + private boolean networkEnabled = true; + + public RedstoneConduitNetwork() { + } + + @Override + public Class getBaseConduitType() { + return IRedstoneConduit.class; + } + + @Override + public void init(IConduitBundle tile, Collection connections, World world) { + super.init(tile, connections, world); + updatingNetwork = true; + notifyNeigborsOfSignals(); + updatingNetwork = false; + } + + @Override + public void destroyNetwork() { + updatingNetwork = true; + for (IRedstoneConduit con : conduits) { + con.setActive(false); + } + //Notify neighbours that all signals have been lost + List copy = new ArrayList(signals); + signals.clear(); + for(Signal s : copy) { + notifyNeigborsOfSignalUpdate(s); + } + updatingNetwork = false; + super.destroyNetwork(); + } + + @Override + public void addConduit(IRedstoneConduit con) { + updatingNetwork = true; + super.addConduit(con); + Set newInputs = con.getNetworkInputs(); + signals.addAll(newInputs); + //Notify existing nodes of new signals + for (Signal signal : newInputs) { + notifyNeigborsOfSignalUpdate(signal); + } + //and new nodes neighbours of all signals + for (Signal signal : signals) { + notifyConduitNeighbours(con, signal); + } + updatingNetwork = false; + } + + public Set getSignals() { + if(networkEnabled) { + return signals; + } else { + return Collections.emptySet(); + } + } + + //Need to disable the network when determining the strength of external signals + //to avoid feed back looops + void setNetworkEnabled(boolean enabled) { + networkEnabled = enabled; + } + + public boolean isNetworkEnabled() { + return networkEnabled; + } + + public void addSignal(Signal signal) { + updatingNetwork = true; + signals.add(signal); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(signal); + updatingNetwork = false; + + } + + public void removeSignal(Signal signal) { + updatingNetwork = true; + signals.remove(signal); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(signal); + updatingNetwork = false; + } + + public void replaceSignal(Signal oldSig, Signal newSig) { + updatingNetwork = true; + signals.remove(oldSig); + signals.add(newSig); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(newSig); + updatingNetwork = false; + } + + @Override + public void notifyNetworkOfUpdate() { + for (IRedstoneConduit con : conduits) { + con.setActive(!getSignals().isEmpty()); + } + super.notifyNetworkOfUpdate(); + } + + @Override + public String toString() { + return "RedstoneConduitNetwork [signals=" + signalsString() + ", conduits=" + conduitsString() + "]"; + } + + private String conduitsString() { + StringBuilder sb = new StringBuilder(); + for (IRedstoneConduit con : conduits) { + TileEntity te = con.getBundle().getEntity(); + sb.append("<"); + sb.append(te.xCoord + "," + te.yCoord + "," + te.zCoord); + sb.append(">"); + } + return sb.toString(); + } + + String signalsString() { + StringBuilder sb = new StringBuilder(); + for (Signal s : signals) { + sb.append("<"); + sb.append(s); + sb.append(">"); + + } + return sb.toString(); + } + + private void notifyNeigborsOfSignals() { + for(Signal signal : signals) { + notifyNeigborsOfSignalUpdate(signal); + } + } + + private void notifyNeigborsOfSignalUpdate(Signal signal) { + for (IRedstoneConduit con : conduits) { + notifyConduitNeighbours(con, signal); + } + } + + private void notifyConduitNeighbours(IRedstoneConduit con, Signal signal) { + if (con.getBundle() == null) { + System.out.println("RedstoneConduitNetwork.notifyNeigborsOfSignalUpdate: NULL BUNDLE!!!!"); + return; + } + TileEntity te = con.getBundle().getEntity(); + + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, te.worldObj.getBlockId(te.xCoord, te.yCoord, te.zCoord)); + // Need to notify neighbours neighbours for changes to string signals + if (signal != null && signal.strength >= 15 && signal.x == te.xCoord && signal.y == te.yCoord && signal.z == te.zCoord) { + + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord + 1, te.yCoord, te.zCoord, te.worldObj.getBlockId(te.xCoord + 1, te.yCoord, te.zCoord)); + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord - 1, te.yCoord, te.zCoord, te.worldObj.getBlockId(te.xCoord - 1, te.yCoord, te.zCoord)); + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord + 1, te.zCoord, te.worldObj.getBlockId(te.xCoord, te.yCoord + 1, te.zCoord)); + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord - 1, te.zCoord, te.worldObj.getBlockId(te.xCoord, te.yCoord - 1, te.zCoord)); + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord + 1, te.worldObj.getBlockId(te.xCoord, te.yCoord, te.zCoord + 1)); + te.worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord - 1, te.worldObj.getBlockId(te.xCoord, te.yCoord, te.zCoord - 1)); + + } + } + +} diff --git a/common/crazypants/enderio/conduit/redstone/RedstoneSwitch.java b/common/crazypants/enderio/conduit/redstone/RedstoneSwitch.java new file mode 100644 index 00000000..82d0c830 --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/RedstoneSwitch.java @@ -0,0 +1,145 @@ +package crazypants.enderio.conduit.redstone; + +import java.util.List; +import java.util.Set; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.geom.Offset; +import crazypants.render.BoundingBox; +import crazypants.render.IconUtil; +import crazypants.util.BlockCoord; +import crazypants.vecmath.Vector3d; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; + +public class RedstoneSwitch extends RedstoneConduit { + + static final String SWITCH_TAG = "switch"; + public static final String SWITHC_ICON_OFF_KEY = "enderio:redstoneConduitSwitchOff"; + public static final String SWITCH_ICON_ON_KEY = "enderio:redstoneConduitSwitchOn"; + + private boolean isOn; + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IconRegister register) { + ICONS.put(RedstoneSwitch.SWITHC_ICON_OFF_KEY, register.registerIcon(SWITHC_ICON_OFF_KEY)); + ICONS.put(RedstoneSwitch.SWITCH_ICON_ON_KEY, register.registerIcon(SWITCH_ICON_ON_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + @Override + public boolean isReplaceableByControl(Class replacenebtType) { + return false; + } + + @Override + public ItemStack createItem() { + return new ItemStack(ModObject.itemRedstoneConduit.actualId,1,1); + } + + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { + if (network == null || !network.isNetworkEnabled()) { + return 0; + } + return isOn ? 15 : 0; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setBoolean("switchOn", isOn); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + isOn = nbtRoot.getBoolean("switchOn"); + } + + Icon getSwitchIcon() { + return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); + } + + @Override + public Icon getTextureForState(CollidableComponent component) { + if (SWITCH_TAG.equals(component.data)) { + return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); + } + return super.getTextureForState(component); + } + + + @Override + public List getCollidableComponents() { + if (collidables != null && !collidablesDirty) { + return collidables; + } + + Offset o = getBundle().getOffset(getBaseConduitType(), ForgeDirection.UNKNOWN); + Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, o); + + List result = super.getCollidableComponents(); + BoundingBox[] aabb = RedstoneSwitchRenderer.instance.getAABB(); + + for (BoundingBox bb : aabb) { + result.add(new CollidableComponent(IRedstoneConduit.class, bb.translate(trans), ForgeDirection.UNKNOWN, SWITCH_TAG)); + } + + return result; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res) { + if (res.component.data != null && res.component.data.equals(SWITCH_TAG)) { + toggleSwitch(); + return true; + } + return false; + } + + private void toggleSwitch() { + isOn = !isOn; + if (network == null) { + return; + } + TileEntity te = bundle.getEntity(); + Signal signal = new Signal(te.xCoord, te.yCoord, te.zCoord, 15, SignalColor.RED); + if (isOn) { + network.addSignal(signal); + } else { + network.removeSignal(signal); + } + } + + @Override + public Set getNetworkInputs() { + Set res = super.getNetworkInputs(); + if (isOn) { + BlockCoord loc = getLocation(); + Signal signal = new Signal(loc.x, loc.y, loc.z, 15, SignalColor.RED); + res.add(signal); + } + return res; + } + +} diff --git a/common/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/common/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java new file mode 100644 index 00000000..adcf4f36 --- /dev/null +++ b/common/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -0,0 +1,112 @@ +package crazypants.enderio.conduit.redstone; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.render.ConduitBundleRenderer; +import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.VertexRotation; +import crazypants.render.VertexTransform; +import crazypants.vecmath.Vector3d; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; + +public class RedstoneSwitchRenderer extends DefaultConduitRenderer { + + public static RedstoneSwitchRenderer instance = new RedstoneSwitchRenderer(); + + private static final float SIZE = 0.2f; + private static final float HW = SIZE/3; + private static final float HH = SIZE/2; + private static final float DEPTH = 0.05f; + private static final float HD = DEPTH/2; + + private static final float DIST = 0.25f; + + private static final float CON_HW = 0.015f; + + + private final VertexTransform[] xForms; + private final BoundingBox switchBounds; + private final BoundingBox connectorBounds; + + private final BoundingBox[] aabb; + + private RedstoneSwitchRenderer() { + BoundingBox bb = new BoundingBox(0.5- HW, 0.5- HH, 0.5- HD, 0.5+ HW, 0.5+ HH, 0.5 + HD); + switchBounds = bb.translate(0, 0, DIST); + + connectorBounds = new BoundingBox(0.5- CON_HW, 0.5- CON_HW, 0.5- CON_HW, 0.5+ CON_HW, 0.5+ CON_HW, 0.5 + DIST); + + Vector3d axis = new Vector3d(0,1,0); + Vector3d p = new Vector3d(0.5,0.5,0.5); + xForms = new VertexTransform[4]; + double angle = Math.toRadians(45); + for(int i=0; i < xForms.length; i++) { + //TODO + //xForms[i] = new Rotation(angle, axis, p); + xForms[i] = new VertexRotation(angle, axis, p); + angle += Math.toRadians(90); + } + + aabb = new BoundingBox[xForms.length]; + for(int i=0; i < xForms.length; i++) { + aabb[i] = switchBounds.transform(xForms[i]); + } + + } + + public BoundingBox[] getAABB() { + return aabb; + } + + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit.getClass() == RedstoneSwitch.class; + } + + @Override + public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle bundle, IConduit conduit, double x, double y, double z, float partialTick, + float worldLight) { + + super.renderEntity(conduitBundleRenderer, bundle, conduit, x, y, z, partialTick, worldLight); + + RedstoneSwitch sw = (RedstoneSwitch)conduit; + + Tessellator tessellator = Tessellator.instance; + float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(null)); + tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum); + + Icon[] icons = new Icon[6]; + for(int i=0;i sources) { + // Each source is 5 ints + int[] result = new int[sources.size() * 5]; + int i = 0; + for (SignalSource ss : sources) { + result[i] = ss.signal.x; + i++; + result[i] = ss.signal.y; + i++; + result[i] = ss.signal.z; + i++; + result[i] = ss.signal.strength; + i++; + result[i] = ss.signal.color.ordinal(); + i++; + result[i] = ss.fromDirection.ordinal(); + i++; + } + return result; + } + + public static Set fromIntArray(int[] enc) { + Set result = new HashSet(); + for(int i=0; i < enc.length; i+=5) { + Signal sig = new Signal(enc[i], enc[i+1], enc[i+2], enc[i+3], SignalColor.values()[enc[i+4]]); + result.add(new SignalSource(sig, ForgeDirection.values()[enc[i+4]])); + } + return result; + } + +} diff --git a/common/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/common/crazypants/enderio/conduit/render/ConduitBundleRenderer.java new file mode 100644 index 00000000..2015ebf3 --- /dev/null +++ b/common/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -0,0 +1,212 @@ +package crazypants.enderio.conduit.render; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.ForgeDirection; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.BlockConduitBundle; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.facade.BlockConduitFacade; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; + +public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { + + private static final float CONNECTOR_DEPTH = 0.05f; + private static final float CONNECTOR_WIDTH = 0.3f; + + private Map connectorBounds = new HashMap(); + + public ConduitBundleRenderer() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + connectorBounds.put(dir, createConnector(dir)); + } + } + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + IConduitBundle bundle = (IConduitBundle) te; + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (ConduitUtil.renderFacade(bundle, player)) { + return; + } + + // Lighting calcuations to allow for self illumination + float val = RenderUtil.claculateTotalBrightnessForLocation(te.worldObj, te.xCoord, te.yCoord, te.zCoord); + renderTileEntityAt(bundle, x, y, z, partialTick, val); + } + + + public void renderTileEntityAt(IConduitBundle bundle, double x, double y, double z, float partialTick, float brightness) { + + RenderUtil.bindBlockTexture(); + Minecraft.getMinecraft().entityRenderer.disableLightmap(0); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + //GL11.glPushAttrib(GL11.GL_POLYGON_BIT); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glShadeModel(GL11.GL_SMOOTH); + //GL11.glDisable (GL11.GL_CULL_FACE); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + + // Conduits + Set externals = new HashSet(); + for (IConduit con : bundle.getConduits()) { + ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); + renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness); + externals.addAll(con.getExternalConnections()); + } + + // Internal conectors between conduits + List connectors = bundle.getConnectors(); + for (CollidableComponent component : connectors) { + if (component.conduitType != null) { + IConduit con = bundle.getConduit(component.conduitType); + float selfIllum = Math.max(brightness, con.getSelfIlluminationForState(component)); + tessellator.setColorRGBA_F(selfIllum, selfIllum, selfIllum, 1); + CubeRenderer.render(component.bound, con.getTextureForState(component)); + } else { + Icon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + CubeRenderer.render(component.bound, tex); + } + } + + // External connection terminations + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); + } + + tessellator.draw(); + GL11.glPopMatrix(); + GL11.glPopAttrib(); + GL11.glPopAttrib(); + //GL11.glPopAttrib(); + + } + + private void renderExternalConnection(ForgeDirection dir) { + Icon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + BoundingBox[] bbs = connectorBounds.get(dir); + for (BoundingBox bb : bbs) { + CubeRenderer.render(bb, tex); + } + } + + private static BoundingBox[] createConnector(ForgeDirection dir) { + + BoundingBox[] res = new BoundingBox[2]; + + float cMin = 0.5f - CONNECTOR_WIDTH / 2; + float cMax = 0.5f + CONNECTOR_WIDTH / 2; + float dMin = 1 - CONNECTOR_DEPTH / 2; + float dMax = 1; + + res[0] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); + + cMin = 0.5f - CONNECTOR_WIDTH / 3; + cMax = 0.5f + CONNECTOR_WIDTH / 3; + dMin = 1 - CONNECTOR_DEPTH; + dMax = 1 - CONNECTOR_DEPTH / 2; + + res[1] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); + + return res; + } + + private static BoundingBox createConnectorComponent(ForgeDirection dir, float cornerMin, float cornerMax, float depthMin, float depthMax) { + float minX = (1 - Math.abs(dir.offsetX)) * cornerMin + dir.offsetX * depthMin; + float minY = (1 - Math.abs(dir.offsetY)) * cornerMin + dir.offsetY * depthMin; + float minZ = (1 - Math.abs(dir.offsetZ)) * cornerMin + dir.offsetZ * depthMin; + + float maxX = (1 - Math.abs(dir.offsetX)) * cornerMax + (dir.offsetX * depthMax); + float maxY = (1 - Math.abs(dir.offsetY)) * cornerMax + (dir.offsetY * depthMax); + float maxZ = (1 - Math.abs(dir.offsetZ)) * cornerMax + (dir.offsetZ * depthMax); + + minX = fix(minX); + minY = fix(minY); + minZ = fix(minZ); + maxX = fix(maxX); + maxY = fix(maxY); + maxZ = fix(maxZ); + + BoundingBox bb = new BoundingBox(minX, minY, minZ, maxX, maxY, maxZ); + bb = bb.fixMinMax(); + + return bb; + } + + private static float fix(float val) { + return val < 0 ? 1 + val : val; + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rb) { + + IConduitBundle bundle = (IConduitBundle) world.getBlockTileEntity(x, y, z); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + + if (bundle.hasFacade()) { + + int facadeId = bundle.getFacadeId(); + if (ConduitUtil.isFacadeHidden(bundle, player)) { + bundle.setFacadeId(0); + } + + BlockConduitFacade facb = (BlockConduitFacade) Block.blocksList[ModObject.blockConduitFacade.actualId]; + facb.setBlockBounds(0, 0, 0, 1, 1, 1); + rb.setRenderBoundsFromBlock(facb); + rb.renderStandardBlock(facb, x, y, z); + + bundle.setFacadeId(facadeId); + + } + + return true; + } + + @Override + public boolean shouldRender3DInInventory() { + return false; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + } + + @Override + public int getRenderId() { + return BlockConduitBundle.rendererId; + } + +} diff --git a/common/crazypants/enderio/conduit/render/ConduitRenderer.java b/common/crazypants/enderio/conduit/render/ConduitRenderer.java new file mode 100644 index 00000000..4e1a4665 --- /dev/null +++ b/common/crazypants/enderio/conduit/render/ConduitRenderer.java @@ -0,0 +1,12 @@ +package crazypants.enderio.conduit.render; + +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; + +public interface ConduitRenderer { + + boolean isRendererForConduit(IConduit conduit); + + void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y, double z, float partialTick, float worldLight); + +} diff --git a/common/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/common/crazypants/enderio/conduit/render/DefaultConduitRenderer.java new file mode 100644 index 00000000..ca58ac0a --- /dev/null +++ b/common/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -0,0 +1,296 @@ +package crazypants.enderio.conduit.render; + +import static crazypants.render.CubeRenderer.*; +import static net.minecraftforge.common.ForgeDirection.*; + +import java.util.Collection; + +import crazypants.enderio.conduit.*; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.render.BoundingBox; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; + +public class DefaultConduitRenderer implements ConduitRenderer { + + protected float transmissionScaleFactor; + + @Override + public boolean isRendererForConduit(IConduit conduit) { + return true; + } + + @Override + public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, + float worldLight) { + + Collection components = conduit.getCollidableComponents(); + Tessellator tessellator = Tessellator.instance; + + transmissionScaleFactor = conduit.getTransmitionGeometryScale(); + + Icon tex; + boolean active = conduit.isActive(); + for (CollidableComponent component : components) { + if (renderComponent(component)) { + float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(component)); + if (active && isNSEWUP(component.dir) && + conduit.getTransmitionTextureForState(component) != null) { + tessellator.setColorRGBA_F(selfIllum + 0.1f, selfIllum + 0.1f, + selfIllum + 0.1f, 0.75f); + tex = conduit.getTransmitionTextureForState(component); + renderTransmission(tex, component); + } + + tex = conduit.getTextureForState(component); + tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum); + renderConduit(tex, component); + } + + } + + } + + protected void renderConduit(Icon tex, CollidableComponent component) { + if (isNSEWUP(component.dir)) { + RoundedSegmentRenderer.renderSegment(component.dir, component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + } else { + drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + } + } + + protected void renderTransmission(Icon tex, CollidableComponent component) { + RoundedSegmentRenderer.renderSegment(component.dir, component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + } + + // @Override + public void renderEntity2(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, + float worldLight) { + + Collection components = conduit.getCollidableComponents(); + Tessellator tessellator = Tessellator.instance; + + transmissionScaleFactor = conduit.getTransmitionGeometryScale(); + + Icon tex; + boolean active = conduit.isActive(); + for (CollidableComponent component : components) { + if (renderComponent(component)) { + float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(component)); + if (active && isNSEWUP(component.dir) && conduit.getTransmitionTextureForState(component) != null) { + tessellator.setColorRGBA_F(selfIllum + 0.1f, selfIllum + 0.1f, selfIllum + 0.1f, 0.75f); + tex = conduit.getTransmitionTextureForState(component); + drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + } + + tex = conduit.getTextureForState(component); + tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum); + BoundingBox[] cubes = toCubes(component.bound); + for (BoundingBox cube : cubes) { + drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); + } + } + + } + + } + + protected boolean renderComponent(CollidableComponent component) { + return true; + } + + protected boolean isNSEWUP(ForgeDirection dir) { + return dir == NORTH || dir == SOUTH || dir == EAST || dir == WEST || dir == UP || dir == DOWN; + } + + protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir, boolean isTransmission) { + + setupVertices(bound); + + Tessellator tessellator = Tessellator.instance; + + if (isTransmission) { + setVerticesForTransmission(bound, dir); + } + + if (dir == NORTH || dir == UP || dir == EAST) { // maintain consistent texture + // dir relative to the cneter + // of the conduit + float tmp = minU; + minU = maxU; + maxU = tmp; + } + + boolean rotateSides = dir == UP || dir == DOWN; + boolean rotateTopBottom = dir == NORTH || dir == SOUTH; + + if (dir != NORTH && dir != SOUTH) { + tessellator.setNormal(0, 0, -1); + if (rotateSides) { + addVecWithUV(verts[1], maxU, maxV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], minU, minV); + addVecWithUV(verts[2], minU, maxV); + } else { + addVecWithUV(verts[1], minU, minV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + } + if (dir == WEST || dir == EAST) { + float tmp = minU; + minU = maxU; + maxU = tmp; + } + tessellator.setNormal(0, 0, 1); + if (rotateSides) { + addVecWithUV(verts[4], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[7], minU, maxV); + } else { + addVecWithUV(verts[4], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[7], minU, maxV); + } + if (dir == WEST || dir == EAST) { + float tmp = minU; + minU = maxU; + maxU = tmp; + } + } + + if (dir != UP && dir != DOWN) { + + tessellator.setNormal(0, 1, 0); + if (rotateTopBottom) { + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], minU, minV); + addVecWithUV(verts[7], maxU, minV); + } else { + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[7], maxU, minV); + } + + tessellator.setNormal(0, -1, 0); + if (rotateTopBottom) { + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], maxU, maxV); + addVecWithUV(verts[4], maxU, minV); + } else { + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], minU, minV); + addVecWithUV(verts[4], maxU, minV); + } + } + + if (dir != EAST && dir != WEST) { + + // if(id == NORTH) { + // float tmp = minU; + // minU = maxU; + // maxU = tmp; + // } + + tessellator.setNormal(1, 0, 0); + if (rotateSides) { + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], maxU, maxV); + } else { + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], minU, minV); + } + + tessellator.setNormal(-1, 0, 0); + if (rotateSides) { + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], minU, minV); + addVecWithUV(verts[3], minU, maxV); + } else { + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], maxU, maxV); + addVecWithUV(verts[3], minU, maxV); + } + } + } + + protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection dir) { + float xs = dir.offsetX == 0 ? transmissionScaleFactor : 1; + float ys = dir.offsetY == 0 ? transmissionScaleFactor : 1; + float zs = dir.offsetZ == 0 ? transmissionScaleFactor : 1; + setupVertices(bound.scale(xs, ys, zs)); + } + + // TODO: This is a really hacky, imprecise and slow way to do this + public BoundingBox[] toCubes(BoundingBox bb) { + + // NB This on handles the really simple conduit case! + + float width = bb.maxX - bb.minX; + float height = bb.maxY - bb.minY; + float depth = bb.maxZ - bb.minZ; + + if (width > 0 && height > 0 && depth > 0) { + if (width / depth > 1.5f || depth / width > 1.5f) { + // split horizontally + if (width > depth) { + int numSplits = Math.round(width / depth); + float newWidth = width / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minX; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(lastMax, bb.minY, bb.minZ, max, bb.maxY, bb.maxZ); + lastMax = max; + } + return result; + + } else { + + int numSplits = Math.round(depth / width); + float newWidth = depth / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minZ; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(bb.minX, bb.minY, lastMax, bb.maxX, bb.maxY, max); + lastMax = max; + } + return result; + + } + + } else if (height / width > 1.5) { + + int numSplits = Math.round(height / width); + float newWidth = height / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minY; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(bb.minX, lastMax, bb.minZ, bb.maxX, max, bb.maxZ); + lastMax = max; + } + return result; + + } + } + + return new BoundingBox[] { bb }; + } + +} diff --git a/common/crazypants/enderio/conduit/render/ItemConduitRenderer.java b/common/crazypants/enderio/conduit/render/ItemConduitRenderer.java new file mode 100644 index 00000000..d935006c --- /dev/null +++ b/common/crazypants/enderio/conduit/render/ItemConduitRenderer.java @@ -0,0 +1,68 @@ +package crazypants.enderio.conduit.render; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; + + +public class ItemConduitRenderer implements IItemRenderer { + + private final BoundingBox bb; + + public ItemConduitRenderer() { + float scale = 0.8f; + bb = BoundingBox.UNIT_CUBE.scale(scale,scale,scale); + } + + + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + if (type == ItemRenderType.INVENTORY) { + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + renderEquipped(item, renderBlocks); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEntity(item, renderBlocks); + } else { + System.out.println("FacadeRenderer.renderItem: Unsupported render type"); + } + } + + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } + + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(bb, item.getItem().getIconFromDamage(item.getItemDamage())); + Tessellator.instance.draw(); + } + +} diff --git a/common/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/common/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java new file mode 100644 index 00000000..86a583b4 --- /dev/null +++ b/common/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -0,0 +1,186 @@ +package crazypants.enderio.conduit.render; + +import static crazypants.util.ForgeDirectionOffsets.offsetScaled; +import static net.minecraftforge.common.ForgeDirection.SOUTH; + +import java.util.ArrayList; +import java.util.List; + +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.render.BoundingBox; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.Vector2d; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector3f; + + +import net.minecraft.client.renderer.Tessellator; +import net.minecraftforge.common.ForgeDirection; + +public class RoundedSegmentRenderer { + + private static Coord[][] DIR_COORDS = new Coord[ForgeDirection.VALID_DIRECTIONS.length][]; + + private static final Vector3d REF_TRANS = new Vector3d(0.5, 0.5, 0.5); + + static { + double circ = ConduitGeometryUtil.WIDTH * 0.7; + + Coord[] refCoords = createUnitSectionQuads(16, -0.25, 0.25); + + for (Coord coord : refCoords) { + coord.xyz.x = coord.xyz.x * circ; + coord.xyz.y = coord.xyz.y * circ; + } + Matrix4d rotMat = new Matrix4d(); + rotMat.setIdentity(); + rotMat.setTranslation(REF_TRANS); + + DIR_COORDS[SOUTH.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.SOUTH, 0.25)); + + rotMat.makeRotationY(Math.PI); + rotMat.setTranslation(REF_TRANS); + DIR_COORDS[ForgeDirection.NORTH.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.NORTH, 0.25)); + + rotMat.makeRotationY(Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + DIR_COORDS[ForgeDirection.EAST.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.EAST, 0.25)); + + rotMat.makeRotationY(-Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + DIR_COORDS[ForgeDirection.WEST.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.WEST, 0.25)); + + rotMat.makeRotationX(-Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + DIR_COORDS[ForgeDirection.UP.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.UP, 0.25)); + + rotMat.makeRotationX(Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + DIR_COORDS[ForgeDirection.DOWN.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.DOWN, 0.25)); + + } + + + private static Coord[] xformCoords(Coord[] refCoords, Matrix4d rotMat, Vector3d trans) { + Coord[] res = new Coord[refCoords.length]; + for (int i = 0; i < res.length; i++) { + res[i] = new Coord(refCoords[i]); + rotMat.transform(res[i].xyz); + rotMat.transformNormal(res[i].normal); + res[i].xyz.add(trans); + } + return res; + } + + private static Coord[] xformCoords(List refCoords, Matrix4d rotMat, Vector3d trans) { + Coord[] res = new Coord[refCoords.size()]; + for (int i = 0; i < res.length; i++) { + res[i] = new Coord(refCoords.get(i)); + rotMat.transform(res[i].xyz); + rotMat.transformNormal(res[i].normal); + res[i].xyz.add(trans); + } + return res; + } + + public static Coord[] createUnitCrossSection(double xOffset, double yOffset, double zOffset, int numCoords, int u) { + + Coord[] crossSection = new Coord[numCoords]; + + double angle = 0; + double inc = (Math.PI * 2) / (crossSection.length - 1); + for (int i = 0; i < crossSection.length; i++) { + double x = Math.cos(angle) * 0.5; + double y = Math.sin(angle) * 0.5; + angle += inc; + crossSection[i] = new Coord(); + crossSection[i].setXYZ(xOffset + x, yOffset + y, zOffset); + crossSection[i].setNormal(x, y, 0); + crossSection[i].setUV(u, y + 0.5); + } + return crossSection; + + } + + public static void renderSegment(ForgeDirection dir, BoundingBox bounds, float minU, float maxU, float minV, float maxV) { + float uScale = maxU - minU; + float vScale = maxV - minV; + + Vector3d offset = calcOffset(dir, bounds); + + Tessellator tes = Tessellator.instance; + Coord[] coords = DIR_COORDS[dir.ordinal()]; + for (Coord coord : coords) { + double u = minU + (coord.uv.x * uScale); + double v = minV + (coord.uv.y * vScale); + tes.setNormal(coord.normal.x, coord.normal.y, coord.normal.z); + tes.addVertexWithUV(offset.x + coord.xyz.x, offset.y + coord.xyz.y, offset.z + coord.xyz.z, u, v); + } + } + + + private static Vector3d calcOffset(ForgeDirection dir, BoundingBox bounds) { + Vector3d res = new Vector3d(); + Vector3d center = bounds.getCenter(); + if(dir != ForgeDirection.UP && dir != ForgeDirection.DOWN) { + res.set(0, center.y - REF_TRANS.y,0); + } else { + res.set(center.x - REF_TRANS.x, 0,0); + } + return res; + } + + public static Coord[] createUnitSectionQuads(int numCoords, double minZ, double maxZ) { + + Coord[] z0 = createUnitCrossSection(0, 0, minZ, numCoords + 1, 0); + Coord[] z1 = createUnitCrossSection(0, 0, maxZ, numCoords + 1, 1); + + Coord[] result = new Coord[numCoords * 4]; + for (int i = 0; i < numCoords; i++) { + int index = i * 4; + result[index] = new Coord(z0[i]); + result[index + 1] = new Coord(z0[i + 1]); + result[index + 2] = new Coord(z1[i + 1]); + result[index + 3] = new Coord(z1[i]); + } + return result; + + } + + public static class Coord { + + Vector3d xyz = new Vector3d(); + Vector2d uv = new Vector2d(); + Vector3f normal = new Vector3f(); + + Coord() { + } + + Coord(Coord other) { + xyz.set(other.xyz); + uv.set(other.uv); + normal.set(other.normal); + } + + void setXYZ(double x, double y, double z) { + xyz.set(x, y, z); + } + + void setUV(double u, double v) { + uv.set(u, v); + } + + void setNormal(double x, double y, double z) { + normal.set((float)x,(float)y,(float)z); + normal.normalize(); + } + + @Override + public String toString() { + return "Coord [xyz=" + xyz + ", uv=" + uv + "]"; + } + + } + +} diff --git a/common/crazypants/enderio/enderface/BlockEnderIO.java b/common/crazypants/enderio/enderface/BlockEnderIO.java new file mode 100644 index 00000000..8fa7d2ea --- /dev/null +++ b/common/crazypants/enderio/enderface/BlockEnderIO.java @@ -0,0 +1,113 @@ +package crazypants.enderio.enderface; + +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class BlockEnderIO extends Block implements ITileEntityProvider { + + public static BlockEnderIO create() { + BlockEnderIO result = new BlockEnderIO(); + result.init(); + return result; + } + + Icon frameIcon; + + private BlockEnderIO() { + super(ModObject.blockEnderIo.id, Material.rock); + setHardness(0.5F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockEnderIo.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockEnderIo.name); + GameRegistry.registerBlock(this, ModObject.blockEnderIo.unlocalisedName); + GameRegistry.registerTileEntity(TileEnderIO.class, ModObject.blockEnderIo.unlocalisedName + "TileEntity"); + GameRegistry.addRecipe(new ItemStack(this), "zxz", "xyx", "zxz", 'x', new ItemStack(Item.eyeOfEnder), 'y', new ItemStack(Block.enderChest), 'z', + new ItemStack(Item.diamond)); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { + if (entityPlayer.isSneaking()) { + return false; + } + if (entityPlayer.getCurrentEquippedItem() != null && entityPlayer.getCurrentEquippedItem().itemID == EnderIO.itemEnderface.itemID) { + ItemStack enderFaceStack = entityPlayer.getCurrentEquippedItem(); + NBTTagCompound nbttagcompound = enderFaceStack.getTagCompound(); + if (nbttagcompound == null) { + nbttagcompound = new NBTTagCompound(); + } + nbttagcompound.setBoolean(ItemEnderface.KEY_IO_SET, true); + nbttagcompound.setInteger(ItemEnderface.KEY_IO_X, x); + nbttagcompound.setInteger(ItemEnderface.KEY_IO_Y, y); + nbttagcompound.setInteger(ItemEnderface.KEY_IO_Z, z); + nbttagcompound.setInteger(ItemEnderface.KEY_DIMENSION, world.provider.dimensionId); + enderFaceStack.setTagCompound(nbttagcompound); + + entityPlayer.setCurrentItemOrArmor(0, enderFaceStack); + + if (world.isRemote) { + ChatMessageComponent c = ChatMessageComponent.func_111066_d("EnderIO Interface Selected"); + entityPlayer.sendChatToPlayer(c); + } + + } + return true; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + return 13; + } + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + return 100; + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:enderIO"); + frameIcon = iconRegister.registerIcon("enderio:enderIOFrame"); + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileEnderIO(); + } + +} diff --git a/common/crazypants/enderio/enderface/ContainerWrapper.java b/common/crazypants/enderio/enderface/ContainerWrapper.java new file mode 100644 index 00000000..e0d3238b --- /dev/null +++ b/common/crazypants/enderio/enderface/ContainerWrapper.java @@ -0,0 +1,114 @@ +package crazypants.enderio.enderface; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerWrapper extends net.minecraft.inventory.Container { + + public net.minecraft.inventory.Container wrapped; + + public ContainerWrapper(net.minecraft.inventory.Container wrapped) { + this.wrapped = wrapped; + this.inventoryItemStacks = wrapped.inventoryItemStacks; + this.inventorySlots = wrapped.inventorySlots; + this.windowId = wrapped.windowId; + } + + @Override + public boolean canDragIntoSlot(Slot par1Slot) { + return wrapped.canDragIntoSlot(par1Slot); + } + + @Override + public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer arg0) { + return true; + } + + @Override + public net.minecraft.inventory.Slot getSlot(int arg0) { + return wrapped.getSlot(arg0); + } + + @SuppressWarnings("rawtypes") + @Override + public java.util.List getInventory() { + return wrapped.getInventory(); + } + + @Override + public boolean enchantItem(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { + return wrapped.enchantItem(arg0, arg1); + } + + @Override + public net.minecraft.item.ItemStack slotClick(int arg0, int arg1, int arg2, net.minecraft.entity.player.EntityPlayer arg3) { + return wrapped.slotClick(arg0, arg1, arg2, arg3); + } + + @Override + public boolean func_94530_a(net.minecraft.item.ItemStack arg0, net.minecraft.inventory.Slot arg1) { + return wrapped.func_94530_a(arg0, arg1); + } + + @Override + public void addCraftingToCrafters(net.minecraft.inventory.ICrafting arg0) { + wrapped.addCraftingToCrafters(arg0); + } + + @Override + public void detectAndSendChanges() { + wrapped.detectAndSendChanges(); + } + + @Override + public void removeCraftingFromCrafters(net.minecraft.inventory.ICrafting arg0) { + wrapped.removeCraftingFromCrafters(arg0); + } + + @Override + public net.minecraft.inventory.Slot getSlotFromInventory(net.minecraft.inventory.IInventory arg0, int arg1) { + return wrapped.getSlotFromInventory(arg0, arg1); + } + + @Override + public net.minecraft.item.ItemStack transferStackInSlot(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { + return wrapped.transferStackInSlot(arg0, arg1); + } + + @Override + public void onCraftMatrixChanged(net.minecraft.inventory.IInventory arg0) { + wrapped.onCraftMatrixChanged(arg0); + } + + @Override + public void putStackInSlot(int arg0, net.minecraft.item.ItemStack arg1) { + wrapped.putStackInSlot(arg0, arg1); + } + + @Override + public void putStacksInSlots(net.minecraft.item.ItemStack[] arg0) { + wrapped.putStacksInSlots(arg0); + } + + @Override + public void updateProgressBar(int arg0, int arg1) { + wrapped.updateProgressBar(arg0, arg1); + } + + @Override + public short getNextTransactionID(net.minecraft.entity.player.InventoryPlayer arg0) { + return wrapped.getNextTransactionID(arg0); + } + + @Override + public boolean isPlayerNotUsingContainer(net.minecraft.entity.player.EntityPlayer arg0) { + return wrapped.isPlayerNotUsingContainer(arg0); + } + + @Override + public void setPlayerIsPresent(net.minecraft.entity.player.EntityPlayer arg0, boolean arg1) { + wrapped.setPlayerIsPresent(arg0, arg1); + } + +} diff --git a/common/crazypants/enderio/enderface/EnderIoRenderer.java b/common/crazypants/enderio/enderface/EnderIoRenderer.java new file mode 100644 index 00000000..0e830940 --- /dev/null +++ b/common/crazypants/enderio/enderface/EnderIoRenderer.java @@ -0,0 +1,157 @@ +package crazypants.enderio.enderface; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.EnderIO; +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector3d; + + +public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer { + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { + EntityLivingBase entityPlayer = tileEntityRenderer.entityLivingPlayer; + + Vector3d playerEye = new Vector3d(entityPlayer.posX, entityPlayer.posY + 1.62 - entityPlayer.yOffset, entityPlayer.posZ); + Vector3d blockOrigin = new Vector3d(te.xCoord + 0.5, te.yCoord + 0.5, te.zCoord + 0.5); + Matrix4d lookMat = VecmathUtil.createMatrixAsLookAt(blockOrigin, playerEye, RenderUtil.UP_V); + lookMat.setTranslation(new Vector3d()); + lookMat.invert(); + + int brightness = RenderUtil.setTesselatorBrightness(tileEntityRenderer.worldObj, te.xCoord, te.yCoord, te.zCoord); + render(x, y, z, lookMat, brightness); + } + + public void render(double x, double y, double z, Matrix4d lookMat, int brightness) { + + + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + + Icon tex = Item.eyeOfEnder.getIconFromDamage(0); + RenderUtil.bindItemTexture(); + float minU = tex.getMinU(); + float maxU = tex.getMaxU(); + float minV = tex.getMinV(); + float maxV = tex.getMaxV(); + + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glColor3f(1, 1, 1); + renderBillboard(lookMat, minU, maxU, minV, maxV, 0.8, brightness); + + // Glint + float maxUV = 32; + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + RenderUtil.bindGlintTexture(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float blendFactor = 1F; + GL11.glColor4f(0.5F * blendFactor, 0.25F * blendFactor, 0.8F * blendFactor, 1.0F); + + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float scale = 0.125F; + GL11.glScalef(scale, scale, scale); + float tans = Minecraft.getSystemTime() % 3000L / 3000.0F * 8.0F; + GL11.glTranslatef(tans, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8, brightness); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + tans = Minecraft.getSystemTime() % 4873L / 4873.0F * 8.0F; + GL11.glTranslatef(-tans, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8,brightness); + GL11.glPopMatrix(); + + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + + + + GL11.glColor4f(1, 1, 1, 1.0F); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + + + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setBrightness(brightness); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon); + Tessellator.instance.draw(); + GL11.glPopMatrix(); + + GL11.glDisable(GL11.GL_BLEND); + + } + + private void renderBillboard(Matrix4d lookMat, float minU, float maxU, float minV, float maxV, double size, int brightness) { + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + tes.setBrightness(brightness); + + double s = size / 2; + Vector3d v = new Vector3d(); + v.set(-s, s, 0); + lookMat.transform(v); + tes.addVertexWithUV(v.x, v.y, v.z, minU, maxV); + v.set(s, s, 0); + lookMat.transform(v); + tes.addVertexWithUV(v.x, v.y, v.z, maxU, maxV); + v.set(s, -s, 0); + lookMat.transform(v); + tes.addVertexWithUV(v.x, v.y, v.z, maxU, minV); + v.set(-s, -s, 0); + lookMat.transform(v); + tes.addVertexWithUV(v.x, v.y, v.z, minU, minV); + tes.draw(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + Matrix4d lookMat = new Matrix4d(); + lookMat.setIdentity(); + + lookMat = VecmathUtil.createMatrixAsLookAt(RenderUtil.ZERO_V, new Vector3d(1, 0, 0), RenderUtil.UP_V); + + render(0, 0, 0, lookMat, 0xF000F0); + + } + +} diff --git a/common/crazypants/enderio/enderface/GuiEnderface.java b/common/crazypants/enderio/enderface/GuiEnderface.java new file mode 100644 index 00000000..6d5be227 --- /dev/null +++ b/common/crazypants/enderio/enderface/GuiEnderface.java @@ -0,0 +1,507 @@ +package crazypants.enderio.enderface; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.common.network.PacketDispatcher; +import crazypants.enderio.ModObject; +import crazypants.enderio.PacketHandler; +import crazypants.render.RenderUtil; +import crazypants.util.BlockCoord; +import crazypants.vecmath.Camera; +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector3d; + +public class GuiEnderface extends GuiScreen { + + protected static final RenderBlocks RB = new RenderBlocks(); + + private float pitch = -45; + private float yaw = 45; + + private final EntityPlayer player; + private final World world; + private final int ioX; + private final int ioY; + private final int ioZ; + private boolean chunkLoaded; + + private List blocks = new ArrayList(); + + private int gw; + private int gh; + private int guiLeft; + private int guiTop; + private int finalGw; + private int finalGh; + // private boolean animateInX = true; + private boolean animateInX = false; + private boolean animateInY = false; + // private boolean animating = true; + float animationDuration = 180; + + private final Vector3d origin = new Vector3d(); + private final Vector3d eye = new Vector3d(); + private final Camera camera = new Camera(); + private final Matrix4d pitchRot = new Matrix4d(); + private final Matrix4d yawRot = new Matrix4d(); + + private float scaleAnimX; + + private int range; + + boolean dragging = false; + + private double distance; + + private long initTime; + + public GuiEnderface(EntityPlayer player, World world, int ioX, int ioY, int ioZ) { + this.player = player; + this.world = world; + this.ioX = ioX; + this.ioY = ioY; + this.ioZ = ioZ; + + distance = 10 + (range * 2); + + origin.set(ioX + 0.5, ioY + 0.5, ioZ + 0.5); + pitchRot.setIdentity(); + yawRot.setIdentity(); + + Chunk c = world.getChunkFromBlockCoords(ioX, ioZ); + chunkLoaded = c != null && c.isChunkLoaded; + RB.blockAccess = world; + + blocks.add(new ViewableBlocks(ioX, ioY, ioZ, ModObject.blockEnderIo.id)); + range = 3; + for (int x = ioX - range; x <= ioX + range; x++) { + for (int y = ioY - range; y <= ioY + range; y++) { + for (int z = ioZ - range; z <= ioZ + range; z++) { + int blockId = world.getBlockId(x, y, z); + if (blockId > 0 && blockId < Block.blocksList.length) { + blocks.add(new ViewableBlocks(x, y, z, blockId)); + } + } + } + } + } + + /** + * Adds the buttons (and other controls) to the screen in question. + */ + @Override + public void initGui() { + + finalGw = width * 1; + finalGh = height * 1; + // gw = finalGw - 1; + // gh = finalGh - 1; + gw = finalGw; + gh = finalGh; + // gw = 0; + // gh = 0; + guiLeft = (width - gw) / 2; + guiTop = (height - gh) / 2; + + initTime = world.getTotalWorldTime(); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + /** + * Handles mouse input. + */ + @Override + public void handleMouseInput() { + super.handleMouseInput(); + + if (Mouse.getEventButton() == 0) { + dragging = Mouse.getEventButtonState(); + } + + if (dragging) { + yaw -= (Mouse.getEventDX() / (double) mc.displayWidth) * 180; + pitch += (Mouse.getEventDY() / (double) mc.displayHeight) * 180; + pitch = (float) VecmathUtil.clamp(pitch, -80, 80); + } + + distance -= Mouse.getDWheel() * 0.01; + distance = VecmathUtil.clamp(distance, 0.1, 20); + + long elapsed = world.getTotalWorldTime() - initTime; + + if (Mouse.getEventButton() == 1 && !Mouse.getEventButtonState() && camera.isValid() && elapsed > 10) { + + int x = Mouse.getEventX(); + int y = Mouse.getEventY(); + Vector3d start = new Vector3d(); + Vector3d end = new Vector3d(); + if (camera.getRayForPixel(x, y, start, end)) { + end.scale(distance * 2); + end.add(start); + doSelection(start, end); + } + + } + + } + + private void doSelection(Vector3d start, Vector3d end) { + start.add(origin); + end.add(origin); + List hits = new ArrayList(); + for (ViewableBlocks ug : blocks) { + if (!ug.bc.equals(new BlockCoord(ioX, ioY, ioZ))) { + MovingObjectPosition res = Block.blocksList[ug.blockId].collisionRayTrace(world, ug.bc.x, ug.bc.y, ug.bc.z, + Vec3.createVectorHelper(start.x, start.y, start.z), Vec3.createVectorHelper(end.x, end.y, end.z)); + if (res != null) { + hits.add(res); + } + } + } + MovingObjectPosition hit = getClosestHit(Vec3.createVectorHelper(start.x, start.y, start.z), hits); + if (hit != null) { + int id = world.getBlockId(hit.blockX, hit.blockY, hit.blockZ); + openInterface(hit.blockX, hit.blockY, hit.blockZ); + } + + } + + public static MovingObjectPosition getClosestHit(Vec3 origin, Collection candidates) { + double minLengthSquared = Double.POSITIVE_INFINITY; + MovingObjectPosition closest = null; + + for (MovingObjectPosition hit : candidates) { + if (hit != null) { + double lengthSquared = hit.hitVec.squareDistanceTo(origin); + if (lengthSquared < minLengthSquared) { + minLengthSquared = lengthSquared; + closest = hit; + } + } + } + return closest; + } + + /** + * Draws the screen and all the components in it. + */ + @Override + public void drawScreen(int par1, int par2, float partialTick) { + + animateBackground(partialTick); + drawDefaultBackground(); + + RenderHelper.disableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + drawEnderfaceBackground(); + + if (!updateCamera(partialTick)) { + return; + } + applyCamera(partialTick); + + if (!animateInX && !animateInY) { + + if (chunkLoaded) { + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + RenderHelper.disableStandardItemLighting(); + mc.entityRenderer.enableLightmap(0); + RenderUtil.bindBlockTexture(); + + Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); + for (ViewableBlocks ug : blocks) { + RB.setRenderBounds(0, 0, 0, 1, 1, 1); + RB.renderBlockByRenderType(Block.blocksList[ug.blockId], ug.bc.x, ug.bc.y, ug.bc.z); + } + Tessellator.instance.draw(); + Tessellator.instance.setTranslation(0, 0, 0); + + RenderHelper.enableStandardItemLighting(); + TileEntityRenderer.instance.playerX = origin.x - eye.x; + TileEntityRenderer.instance.playerY = origin.y - eye.y; + TileEntityRenderer.instance.playerZ = origin.z - eye.z; + TileEntityRenderer.staticPlayerX = origin.x - eye.x; + TileEntityRenderer.staticPlayerY = origin.y - eye.y; + TileEntityRenderer.staticPlayerZ = origin.z - eye.z; + for (ViewableBlocks ug : blocks) { + TileEntity tile = world.getBlockTileEntity(ug.bc.x, ug.bc.y, ug.bc.z); + if (tile != null) { + TileEntityRenderer.instance.renderTileEntity(tile, partialTick); + } + } + + // mc.entityRenderer.disableLightmap(0); + } else { + drawCenteredString(fontRenderer, "EnderIO chunk not loaded.", width / 2, height / 2 - 32, 0xFFFFFFFF); + } + } + drawEffectOverlay(partialTick); + } + + private boolean updateCamera(float partialTick) { + ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + int vpx = guiLeft * scaledresolution.getScaleFactor(); + int vpy = guiTop * scaledresolution.getScaleFactor(); + int vpw = (int) ((float) gw / width * mc.displayWidth); + int vph = (int) ((float) gh / height * mc.displayHeight); + if (vpw <= 0 || vph <= 0) { + return false; + } + + camera.setViewport(vpx, vpy, vpw, vph); + camera.setProjectionMatrixAsPerspective(30, 0.05, 50, vpw, vph); + + eye.set(0, 0, distance); + pitchRot.makeRotationX(Math.toRadians(pitch)); + yawRot.makeRotationY(Math.toRadians(yaw)); + pitchRot.transform(eye); + yawRot.transform(eye); + camera.setViewMatrixAsLookAt(eye, RenderUtil.ZERO_V, RenderUtil.UP_V); + return camera.isValid(); + } + + private void applyCamera(float partialTick) { + Rectangle vp = camera.getViewport(); + GL11.glViewport(vp.x, vp.y, vp.width, vp.height); + GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); + GL11.glMatrixMode(GL11.GL_PROJECTION); + RenderUtil.loadMatrix(camera.getTransposeProjectionMatrix()); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + RenderUtil.loadMatrix(camera.getTransposeViewMatrix()); + + scaleAnimX += (partialTick * 0.25); + float v = 0.4f; + float sf = 1.0F * (1 + v / 32); + GL11.glRotatef((scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); + GL11.glScalef(sf, 1.0F, 1.0f); + GL11.glRotatef(-(scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); + + GL11.glTranslatef(-(float) eye.x, -(float) eye.y, -(float) eye.z); + } + + private float portalFade = 1; + + private void drawEffectOverlay(float partialTick) { + ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glLoadIdentity(); + GL11.glOrtho(0.0D, scaledresolution.getScaledWidth_double(), scaledresolution.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glLoadIdentity(); + GL11.glTranslatef(0.0F, 0.0F, -2000.0F); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDepthMask(false); + + RenderHelper.disableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + + GL11.glDisable(GL11.GL_LIGHTING); + mc.entityRenderer.disableLightmap(0); + + portalFade -= (partialTick * (1f / animationDuration)); + portalFade = Math.max(0, portalFade); + if (portalFade >= 0) { + drawRect(scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), 0, 0.3f, 0.16f, Math.max(0.3f, portalFade)); + } + + GL11.glEnable(GL11.GL_LIGHTING); + mc.entityRenderer.enableLightmap(0); + + renderPortalOverlay(0.9f - (0.1f * (1 - portalFade)), scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight()); + + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + } + + /** + * Renders the portal overlay. Args: portalStrength, width, height + */ + protected void renderPortalOverlay(float par1, int par2, int par3) { + if (par1 < 1.0F) { + par1 *= par1; + par1 *= par1; + par1 = par1 * 0.8F + 0.2F; + } + GL11.glColor4f(1.0F, 1.0F, 1.0F, par1); + RenderUtil.bindBlockTexture(); + Icon icon = Block.portal.getBlockTextureFromSide(1); + float f1 = icon.getMinU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxU(); + float f4 = icon.getMaxV(); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0D, par3, -90.0D, f1, f4); + tessellator.addVertexWithUV(par2, par3, -90.0D, f3, f4); + tessellator.addVertexWithUV(par2, 0.0D, -90.0D, f3, f2); + tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, f1, f2); + tessellator.draw(); + } + + private boolean animating() { + return gw < finalGw || gh < finalGh; + } + + private void drawRect(int width, int height, float r, float g, + float b, float a) { + Tessellator tessellator = Tessellator.instance; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor4f(r, g, b, a); + tessellator.startDrawingQuads(); + tessellator.addVertex(0.0D, height, 0.0D); + tessellator.addVertex(width, height, 0.0D); + tessellator.addVertex(width, 0.0D, 0.0D); + tessellator.addVertex(0.0D, 0.0D, 0.0D); + tessellator.draw(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + private void animateBackground(float partialTick) { + + if (!animating()) { + return; + } + + // if (animateInX) { + // animationDuration *= 0.8; + // } + int mag = (int) ((width / (animationDuration * 0.5f)) * partialTick); + int mag2 = mag * 2; + + int ymag = (int) ((height / (animationDuration * 0.5f)) * partialTick); + // int ymag = mag; + int ymag2 = ymag * 2; + + if (animateInX) { + gw -= mag2; + guiLeft += mag; + if (gw <= 0) { + animateInX = false; + // animateInY = false; + } + } else { + gw += mag2; + guiLeft -= mag; + } + + if (animateInY) { + gh -= ymag2; + guiTop += ymag; + if (gh <= 0) { + animateInY = false; + // animateInX= false; + } + } else { + gh += ymag2; + guiTop -= ymag; + } + + gw = Math.min(gw, finalGw); + gh = Math.min(gh, finalGh); + guiLeft = Math.max((width - finalGw) / 2, guiLeft); + guiTop = Math.max((height - finalGh) / 2, guiTop); + + } + + private void drawEnderfaceBackground() { + + int w = this.gw; + int h = this.gh; + int left = this.guiLeft; + int top = this.guiTop; + int cx = left + w / 2; + int cy = top + h / 2; + + // black outline + drawRect(left, top, left + w, top + h, 0xFF000000); + left += 1; + top += 1; + w -= 2; + h -= 2; + + // border + int topH = 0xFFFFFFFF; + int botH = 0xFF555555; + int rightH = 0xFF555555; + int leftH = 0xFFFFFFFF; + if (animateInX) { + leftH = 0xFF555555; + rightH = 0xFFFFFFFF; + } + if (animateInY) { + topH = 0xFF555555; + botH = 0xFFFFFFFF; + } + + // drawRect(left, top, left + w, top + 1, topH); + // drawRect(left, top, left + 1, top + h, leftH); + // drawRect(left + w - 1, top + 1, left + w, top + h, rightH); + // drawRect(left + 1, top + h - 1, left + w, top + h, botH); + + left += 1; + top += 1; + w -= 2; + h -= 2; + // green background + // drawRect(left, top, left + w, top + h, 0xFF004C2A); + drawRect(left, top, left + w, top + h, 0xFF00331C); + + } + + void openInterface(int targetX, int targetY, int targetZ) { + Packet250CustomPayload pkt = PacketHandler.getPacketEnderface(targetX, targetY, targetZ); + PacketDispatcher.sendPacketToServer(pkt); + } + + static class ViewableBlocks { + BlockCoord bc; + int blockId; + + private ViewableBlocks(int x, int y, int z, int blockId) { + super(); + this.bc = new BlockCoord(x, y, z); + this.blockId = blockId; + } + + } + +} diff --git a/common/crazypants/enderio/enderface/ItemEnderface.java b/common/crazypants/enderio/enderface/ItemEnderface.java new file mode 100644 index 00000000..63c12741 --- /dev/null +++ b/common/crazypants/enderio/enderface/ItemEnderface.java @@ -0,0 +1,122 @@ +package crazypants.enderio.enderface; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; + +public class ItemEnderface extends Item implements IGuiHandler { + + public static final String KEY_IO_SET = "enderFaceIoSet"; + public static final String KEY_IO_X = "enderFaceIoX"; + public static final String KEY_IO_Y = "enderFaceIoY"; + public static final String KEY_IO_Z = "enderFaceIoZ"; + public static final String KEY_DIMENSION = "enderFaceDimension"; + + public static ItemEnderface create() { + ItemEnderface result = new ItemEnderface(); + result.init(); + return result; + } + + protected ItemEnderface() { + super(ModObject.itemEnderface.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemEnderface.unlocalisedName); + setMaxStackSize(1); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemEnderface.name); + GameRegistry.addRecipe(new ItemStack(this), " x ", "xyx", " x ", 'x', new ItemStack(Item.diamond), 'y', new ItemStack(Item.eyeOfEnder)); + GameRegistry.registerItem(this, ModObject.itemEnderface.unlocalisedName); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENDERFACE, this); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:enderface"); + } + + @Override + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + return true; + } + + @Override + public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { + super.onCreated(itemStack, world, entityPlayer); + NBTTagCompound nbttagcompound = new NBTTagCompound(); + nbttagcompound.setBoolean(KEY_IO_SET, false); + nbttagcompound.setInteger(KEY_IO_X, -1); + nbttagcompound.setInteger(KEY_IO_Y, -1); + nbttagcompound.setInteger(KEY_IO_Z, -1); + nbttagcompound.setInteger(KEY_DIMENSION, -1); + itemStack.setTagCompound(nbttagcompound); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiEnderface(player, world, x, y, z); + } + + @Override + public ItemStack onItemRightClick(ItemStack itemStack, World world, final EntityPlayer entityPlayer) { + + if (!world.isRemote) { + return itemStack; + } + + NBTTagCompound tag = itemStack.getTagCompound(); + boolean tagsSet = tag != null && tag.getBoolean(KEY_IO_SET); + + if (tag != null && tag.getBoolean(KEY_IO_SET)) { + + int x = tag.getInteger(KEY_IO_X); + int y = tag.getInteger(KEY_IO_Y); + int z = tag.getInteger(KEY_IO_Z); + int dimension = tag.getInteger(KEY_DIMENSION); + + if(world.provider.dimensionId != dimension) { + ChatMessageComponent c = ChatMessageComponent.func_111066_d("EnderIO block is in a different dimension."); + entityPlayer.sendChatToPlayer(c); + return itemStack; + } + + Chunk c = world.getChunkFromBlockCoords(x, z); + if(c == null || !c.isChunkLoaded) { + ChatMessageComponent cm = ChatMessageComponent.func_111066_d("EnderIO block's chunk is not loaded."); + entityPlayer.sendChatToPlayer(cm); + return itemStack; + } + int blockId = world.getBlockId(x, y, z); + if (blockId != EnderIO.blockEnderIo.blockID) { + ChatMessageComponent cm = ChatMessageComponent.func_111066_d("EnderIO block has been destroyed."); + entityPlayer.sendChatToPlayer(cm); + return itemStack; + } + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, x, y, z); + return itemStack; + } + ChatMessageComponent cm = ChatMessageComponent.func_111066_d(" Enderface not synchronized with EnderIO."); + entityPlayer.sendChatToPlayer(cm); + return itemStack; + } + +} diff --git a/common/crazypants/enderio/enderface/TileEnderIO.java b/common/crazypants/enderio/enderface/TileEnderIO.java new file mode 100644 index 00000000..68d314f0 --- /dev/null +++ b/common/crazypants/enderio/enderface/TileEnderIO.java @@ -0,0 +1,7 @@ +package crazypants.enderio.enderface; + +import net.minecraft.tileentity.TileEntity; + +public class TileEnderIO extends TileEntity { + +} diff --git a/common/crazypants/enderio/machine/AbstractMachineBlock.java b/common/crazypants/enderio/machine/AbstractMachineBlock.java new file mode 100644 index 00000000..79fab59e --- /dev/null +++ b/common/crazypants/enderio/machine/AbstractMachineBlock.java @@ -0,0 +1,246 @@ +package crazypants.enderio.machine; + +import java.util.Random; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.render.IconUtil; + +public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler { + + public static final Icon[] REDSTONE_CONTROL_ICONS = new Icon[RedstoneControlMode.values().length]; + + static { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IconRegister iconRegister) { + REDSTONE_CONTROL_ICONS[RedstoneControlMode.IGNORE.ordinal()] = iconRegister.registerIcon("enderio:iconRedstoneIgnore"); + REDSTONE_CONTROL_ICONS[RedstoneControlMode.ON.ordinal()] = iconRegister.registerIcon("enderio:iconRedstoneOn"); + REDSTONE_CONTROL_ICONS[RedstoneControlMode.OFF.ordinal()] = iconRegister.registerIcon("enderio:iconRedstoneOff"); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + @SideOnly(Side.CLIENT) + public static Icon getRedstoneControlIcon(RedstoneControlMode mode) { + return REDSTONE_CONTROL_ICONS[mode.ordinal()]; + } + + @SideOnly(Side.CLIENT) + protected Icon[][] iconBuffer; + + protected final Random random; + + protected final ModObject modObject; + + protected final Class teClass; + + protected AbstractMachineBlock(ModObject mo, Class teClass) { + super(mo.id, new Material(MapColor.ironColor)); + modObject = mo; + this.teClass = teClass; + setHardness(2.0F); + setStepSound(soundMetalFootstep); + setUnlocalizedName(mo.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + random = new Random(); + + } + + protected void init() { + LanguageRegistry.addName(this, modObject.name); + GameRegistry.registerBlock(this, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + try { + return teClass.newInstance(); + } catch (Exception e) { + FMLCommonHandler.instance().raiseException(e, "Could not create tile entity from class " + teClass, true); + return null; + } + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { + if (entityPlayer.isSneaking()) { + return false; + } + entityPlayer.openGui(EnderIO.instance, getGuiId(), world, x, y, z); + return true; + } + + @Override + public void registerIcons(IconRegister iconRegister) { + + iconBuffer = new Icon[1][12]; + // first the 6 sides in OFF state + iconBuffer[0][0] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][1] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][2] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][3] = iconRegister.registerIcon(getMachineFrontIconKey(false)); + iconBuffer[0][4] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][5] = iconRegister.registerIcon("enderio:machineSide"); + + iconBuffer[0][6] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][7] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][8] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][9] = iconRegister.registerIcon(getMachineFrontIconKey(true)); + iconBuffer[0][10] = iconRegister.registerIcon("enderio:machineSide"); + iconBuffer[0][11] = iconRegister.registerIcon("enderio:machineSide"); + + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + // used to render the block in the world + TileEntity te = world.getBlockTileEntity(x, y, z); + int facing = 0; + if (te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity) te; + facing = me.facing; + } + if (isActive(world, x, y, z)) { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] + 6]; + } else { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing]]; + } + } + + @Override + public Icon getIcon(int blockSide, int blockMeta) { + // This is used to render the block as an item + return iconBuffer[0][blockSide]; + } + + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + @SuppressWarnings("unchecked") + T te = (T) world.getBlockTileEntity(x, y, z); + if (te != null) { + dropContent(0, te, world, te.xCoord, te.yCoord, te.zCoord); + } + super.breakBlock(world, x, y, z, par5, par6); + } + + public void dropContent(int newSize, T inventory, World world, int xCoord, int yCoord, int zCoord) { + for (int i = newSize; i < inventory.getSizeInventory(); i++) { + ItemStack itemstack = inventory.getStackInSlot(i); + if (itemstack == null) { + continue; + } + float f = random.nextFloat() * 0.8F + 0.1F; + float f1 = random.nextFloat() * 0.8F + 0.1F; + float f2 = random.nextFloat() * 0.8F + 0.1F; + + EntityItem entityitem = new EntityItem(world, xCoord + f, (float) yCoord + (newSize > 0 ? 1 : 0) + f1, zCoord + f2, new ItemStack( + itemstack.itemID, itemstack.stackSize, itemstack.getItemDamage())); + float f3 = 0.05F; + entityitem.motionX = (float) random.nextGaussian() * f3; + entityitem.motionY = (float) random.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) random.nextGaussian() * f3; + if (itemstack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } + world.spawnEntityInWorld(entityitem); + } + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + AbstractMachineEntity te = (AbstractMachineEntity) world.getBlockTileEntity(x, y, z); + switch (heading) { + case 0: + te.setFacing((short) 2); + break; + case 1: + te.setFacing((short) 5); + break; + case 2: + te.setFacing((short) 3); + break; + case 3: + te.setFacing((short) 4); + break; + default: + break; + } + world.markBlockForUpdate(x, y, z); + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + super.onBlockAdded(world, x, y, z); + world.markBlockForUpdate(x, y, z); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int blockId) { + AbstractMachineEntity te = (AbstractMachineEntity) world.getBlockTileEntity(x, y, z); + te.onNeighborBlockChange(blockId); + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // If active, randomly throw some smoke around + if (isActive(world, x, y, z)) { + float startX = x + 1.0F; + float startY = y + 1.0F; + float startZ = z + 1.0F; + for (int i = 0; i < 4; i++) { + float xOffset = -0.2F - rand.nextFloat() * 0.6F; + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = -0.2F - rand.nextFloat() * 0.6F; + world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + } + } + } + + protected abstract int getGuiId(); + + protected abstract String getMachineFrontIconKey(boolean active); + + private boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { + return ((AbstractMachineEntity) blockAccess.getBlockTileEntity(x, y, z)).isActive(); + } + +} diff --git a/common/crazypants/enderio/machine/AbstractMachineEntity.java b/common/crazypants/enderio/machine/AbstractMachineEntity.java new file mode 100644 index 00000000..e969c257 --- /dev/null +++ b/common/crazypants/enderio/machine/AbstractMachineEntity.java @@ -0,0 +1,353 @@ +package crazypants.enderio.machine; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.PacketHandler; +import crazypants.enderio.power.*; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.*; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.*; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public abstract class AbstractMachineEntity extends TileEntity implements IInventory, IInternalPowerReceptor, IMachine { + + public short facing; + + // Client sync monitoring + protected int ticksSinceSync = -1; + protected boolean firstUpdate = true; + protected boolean lastActive; + protected float lastSyncPowerStored = -1; + + // Power + protected ICapacitor capacitor; + + // Used on the client as the power provided isn't sinked + private float storedEnergy; + + + protected ItemStack[] inventory; + protected final int inventorySize; + + protected PowerHandler powerHandler; + + protected RedstoneControlMode redstoneControlMode; + + protected boolean redstoneCheckPassed; + + public AbstractMachineEntity(int inventorySize, Type powerType) { + this.inventorySize = inventorySize; + facing = 3; + capacitor = new BasicCapacitor(); + powerHandler = PowerHandlerUtil.createHandler(capacitor, this, powerType); + + inventory = new ItemStack[inventorySize]; + + redstoneControlMode = RedstoneControlMode.IGNORE; + } + + public AbstractMachineEntity(int inventorySize) { + this(inventorySize, Type.MACHINE); + } + + public RedstoneControlMode getRedstoneControlMode() { + return redstoneControlMode; + } + + public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { + this.redstoneControlMode = redstoneControlMode; + } + + @Override + public PowerHandler getPowerHandler() { + return powerHandler; + } + + @Override + public void applyPerdition() { + // TODO Apply values derived capcitor + + } + + public short getFacing() { + return facing; + } + + public void setFacing(short facing) { + this.facing = facing; + } + + public abstract boolean isActive(); + + public abstract float getProgress(); + + public int getProgressScaled(int scale) { + int result = (int) (getProgress() * scale); + return result; + } + + // --- Power + // -------------------------------------------------------------------------------------- + + public boolean hasPower() { + boolean hasPower = powerHandler.getEnergyStored() > 0; + return hasPower; + } + + public ICapacitor getCapacitor() { + return capacitor; + } + + public int getEnergyStoredScaled(int scale) { + // NB: called on the client so can't use the power provider + return (int) (scale * (storedEnergy / capacitor.getMaxEnergyStored())); + } + + public float getEnergyStored() { + return storedEnergy; + } + + // Needs NBT support for this + // public void setCapacitor(ICapacitor capacitor) { + // this.capacitor = capacitor; + // powerProvider.setCapacitor(capacitor); + // } + + @Override + public void doWork(PowerHandler workProvider) { + } + + @Override + public PowerReceiver getPowerReceiver(ForgeDirection side) { + return powerHandler.getPowerReceiver(); + } + + @Override + public World getWorld() { + return worldObj; + } + + protected float getPowerUsePerTick() { + return capacitor.getMaxEnergyExtracted(); + } + + // --- Process Loop + // -------------------------------------------------------------------------- + + @Override + public void updateEntity() { + + if (worldObj == null) { // sanity check + return; + } + + if (worldObj.isRemote) { + // check if the block on the client needs to update its texture + if (isActive() != lastActive) { + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + } + lastActive = isActive(); + return; + + } // else is server, do all logic only on the server + + float stored = powerHandler.getEnergyStored(); + powerHandler.update(); + powerHandler.setEnergy(stored); + + boolean requiresClientSync = false; + if (firstUpdate) { + // First update, send state to client + firstUpdate = false; + requiresClientSync = true; + } + + redstoneCheckPassed = true; + if(redstoneControlMode == RedstoneControlMode.ON) { + int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + if(powerLevel < 1) { + redstoneCheckPassed = false; + } + } else if(redstoneControlMode == RedstoneControlMode.OFF) { + int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + if(powerLevel > 0) { + redstoneCheckPassed = false; + } + } + + + requiresClientSync |= processTasks(redstoneCheckPassed); + + + // Update if our power has changed by more than 1% + requiresClientSync |= Math.abs(lastSyncPowerStored - powerHandler.getEnergyStored()) > powerHandler.getMaxEnergyStored() / 100; + + if (requiresClientSync) { + lastSyncPowerStored = powerHandler.getEnergyStored(); + // this will cause 'getPacketDescription()' to be called and its result + // will be sent to the PacketHandler on the other end of + // client/server connection + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + // And this will make sure our current tile entity state is saved + worldObj.updateTileEntityChunkAndDoNothing(xCoord, yCoord, zCoord, this); + } + + } + + protected abstract boolean processTasks(boolean redstoneCheckPassed); + + + // ---- Tile Entity + // ------------------------------------------------------------------------------ + + + + @Override + public Packet getDescriptionPacket() { + return PacketHandler.getPacket(this); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + + facing = nbtRoot.getShort("facing"); + + float storedEnergy = nbtRoot.getFloat("storedEnergy"); + powerHandler.setEnergy(storedEnergy); + // For the client as provider is not saved to NBT + this.storedEnergy = storedEnergy; + + // read in the inventories contents + inventory = new ItemStack[inventorySize]; + NBTTagList itemList = nbtRoot.getTagList("Items"); + + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = (NBTTagCompound) itemList.tagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + + int rsContr = nbtRoot.getInteger("redstoneControlMode"); + if(rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { + rsContr = 0; + } + redstoneControlMode = RedstoneControlMode.values()[rsContr]; + + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("facing", facing); + nbtRoot.setFloat("storedEnergy", powerHandler.getEnergyStored()); + + // write inventory list + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inventory.length; i++) { + if (inventory[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inventory[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); + + nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); + } + + // ---- Inventory + // ------------------------------------------------------------------------------ + + @Override + public boolean isInvNameLocalized() { + return false; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + if (worldObj == null) { + return true; + } + if (worldObj.getBlockTileEntity(xCoord, yCoord, zCoord) != this) { + return false; + } + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64D; + } + + @Override + public int getSizeInventory() { + return inventorySize; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public ItemStack getStackInSlot(int slot) { + return inventory[slot]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack fromStack = inventory[fromSlot]; + if (fromStack == null) { + return null; + } + if (fromStack.stackSize <= amount) { + inventory[fromSlot] = null; + return fromStack; + } + ItemStack result = new ItemStack(fromStack.itemID, amount, fromStack.getItemDamage()); + if (fromStack.stackTagCompound != null) { + result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); + } + fromStack.stackSize -= amount; + return result; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + if (contents == null) { + inventory[slot] = contents; + } else { + inventory[slot] = contents.copy(); + } + + if (contents != null && contents.stackSize > getInventoryStackLimit()) { + contents.stackSize = getInventoryStackLimit(); + } + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void openChest() { + } + + @Override + public void closeChest() { + } + + public void onNeighborBlockChange(int blockId) { + } + + + +} diff --git a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java new file mode 100644 index 00000000..2158b289 --- /dev/null +++ b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -0,0 +1,189 @@ +package crazypants.enderio.machine; + +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity implements ISidedInventory { + + protected PoweredTask currentTask = null; + + public AbstractPoweredTaskEntity(int inventorySize) { + super(inventorySize); + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + int[] res = new int[inventory.length]; + for(int i=0;i maxInputIndex) { + return false; + } + if (!isItemValidForSlot(i, itemstack)) { + return false; + } + if (inventory[i] == null) { + return true; + } + if (inventory[i].stackSize + itemstack.stackSize > inventory[i].getMaxStackSize()) { + return false; + } + return inventory[i].isItemEqual(itemstack); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + int outputIndex = inventory.length - 1; + if (outputIndex != 2) { + return false; + } + if (inventory[outputIndex] == null || inventory[outputIndex].stackSize < itemstack.stackSize) { + return false; + } + return itemstack.itemID == inventory[outputIndex].itemID; + } + + @Override + public boolean isActive() { + return currentTask == null ? false : currentTask.getProgress() > 0 && hasPower() && redstoneCheckPassed; + } + + @Override + public float getProgress() { + return currentTask == null ? 0 : currentTask.getProgress(); + } + + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { + + if(!redstoneChecksPassed) { + return false; + } + + boolean requiresClientSync = false; + // Process any current items + requiresClientSync |= checkProgress(); + + // Then see if we need to start a new one + IMachineRecipe nextRecipe = canStartNextTask(); + if (nextRecipe != null) { + requiresClientSync |= startNextTask(nextRecipe); + } + return requiresClientSync; + } + + protected boolean checkProgress() { + if (currentTask == null || !hasPower()) { + return false; + } + float used = powerHandler.useEnergy(0, getPowerUsePerTick(), true); + currentTask.update(used); + // then check if we are done + if (currentTask.isComplete()) { + taskComplete(); + } + return true; + } + + protected void taskComplete() { + int outputIndex = inventory.length - 1; + if (currentTask != null) { + ItemStack result = currentTask.getCompletedResult()[0]; + if (inventory[outputIndex] == null) { + inventory[outputIndex] = result.copy(); + } else { + int newStackSize = inventory[outputIndex].stackSize += result.stackSize; + inventory[outputIndex] = result.copy(); + inventory[outputIndex].stackSize = newStackSize; + } + } + currentTask = null; + } + + protected RecipeInput[] getInputs() { + RecipeInput[] res = new RecipeInput[inventorySize - 1]; + for(int i=0;i < res.length;i++) { + res[i] = new RecipeInput(i, inventory[i]); + } + return res; + } + + protected IMachineRecipe canStartNextTask() { + if (currentTask != null) { + return null; // already cooking something + } + if (!hasPower()) { + return null; // no heat to cook + } + + IMachineRecipe nextRecipe = MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), getInputs()); + if (nextRecipe == null) { + return null; // no template + } + + int outputIndex = inventory.length - 1; + // make sure we can merge the recipe output with our result + if (inventory[outputIndex] == null) { + return nextRecipe; + } + ItemStack nextResult = nextRecipe.getCompletedResult(getInputs())[0]; + if (inventory[outputIndex].stackSize + nextResult.stackSize > inventory[outputIndex].getMaxStackSize()) { + return null; // no room for output + } + + if(!canMergeWithCurrentOuput(nextResult)) { + return null; + } + + return nextRecipe; + } + + protected boolean canMergeWithCurrentOuput(ItemStack nextResult) { + if (!nextResult.isItemEqual(inventory[inventory.length - 1])) { + // next result is a different item type + return false; + } + return true; + } + + protected boolean startNextTask(IMachineRecipe nextRecipe) { + if (hasPower() && nextRecipe.isRecipe(getInputs())) { + // then get our recipe and take away the source items + currentTask = new PoweredTask(nextRecipe, getInputs()); + for(RecipeInput input : getInputs()) { + int consumed = nextRecipe.getQuantityConsumed(input); + decrStackSize(input.slotNumber, consumed); + } + return true; + } + return false; + } + + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + currentTask = PoweredTask.readFromNBT(nbtRoot.getCompoundTag("currentTask")); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + if (currentTask != null) { + NBTTagCompound currentTaskNBT = new NBTTagCompound(); + currentTask.writeToNBT(currentTaskNBT); + nbtRoot.setCompoundTag("currentTask", currentTaskNBT); + } + } + + + +} diff --git a/common/crazypants/enderio/machine/BlockElectricLight.java b/common/crazypants/enderio/machine/BlockElectricLight.java new file mode 100644 index 00000000..79f75c15 --- /dev/null +++ b/common/crazypants/enderio/machine/BlockElectricLight.java @@ -0,0 +1,95 @@ +package crazypants.enderio.machine; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import net.minecraft.world.*; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.ModObject; + +public class BlockElectricLight extends Block { + + + public static BlockElectricLight create() { + BlockElectricLight result = new BlockElectricLight(); + result.init(); + return result; + } + + public BlockElectricLight() { + super(ModObject.blockElectricLight.id, Material.rock); + setHardness(2.0F); + setStepSound(soundGlassFootstep); + setUnlocalizedName(ModObject.blockElectricLight.unlocalisedName); + //setCreativeTab(EnderIOTab.tabEnderIO); + setLightOpacity(0); + setLightValue(1); + } + + + private void init() { + LanguageRegistry.addName(this, ModObject.blockElectricLight.name); + GameRegistry.registerBlock(this, ModObject.blockElectricLight.unlocalisedName); + //GameRegistry.addRecipe(new ItemStack(this), "zxz", "xyx", "zxz", 'x', new ItemStack(Item.eyeOfEnder), 'y', new ItemStack(Block.enderChest),'z', new ItemStack(Item.diamond)); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:blockElectricLightFace"); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getBlockTexture(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { + // TODO Auto-generated method stub + return super.getBlockTexture(par1iBlockAccess, par2, par3, par4, par5); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int par1, int par2) { + // TODO Auto-generated method stub + return super.getIcon(par1, par2); + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5) { + super.onNeighborBlockChange(par1World, par2, par3, par4, par5); + } + + @Override + public boolean canPlaceBlockOnSide(World par1World, int x, int y, int z, int side) { + ForgeDirection dir = ForgeDirection.getOrientation(side); + ForgeDirection op = dir.getOpposite(); + return par1World.isBlockSolidOnSide(x + op.offsetX, y + op.offsetY, z + op.offsetZ, dir); +// ForgeDirection dir = ForgeDirection.getOrientation(side); +// return (dir == DOWN && par1World.isBlockSolidOnSide(x, y + 1, z, DOWN )) || +// (dir == UP && par1World.isBlockSolidOnSide(x, y - 1, z, UP )) || +// (dir == NORTH && par1World.isBlockSolidOnSide(x, y, z + 1, NORTH)) || +// (dir == SOUTH && par1World.isBlockSolidOnSide(x, y, z - 1, SOUTH)) || +// (dir == WEST && par1World.isBlockSolidOnSide(x + 1, y, z, WEST )) || +// (dir == EAST && par1World.isBlockSolidOnSide(x - 1, y, z, EAST )); + } + + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + return false; + } + + + +} diff --git a/common/crazypants/enderio/machine/GuiMachineBase.java b/common/crazypants/enderio/machine/GuiMachineBase.java new file mode 100644 index 00000000..18b7c9bf --- /dev/null +++ b/common/crazypants/enderio/machine/GuiMachineBase.java @@ -0,0 +1,129 @@ +package crazypants.enderio.machine; + +import java.awt.Rectangle; +import java.util.Iterator; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.network.PacketDispatcher; +import crazypants.enderio.PacketHandler; +import crazypants.enderio.machine.painter.PainterContainer; +import crazypants.render.GuiContainerBase; +import crazypants.render.GuiToolTip; +import crazypants.render.IconButton; +import crazypants.render.ItemButton; +import crazypants.render.RenderUtil; + +import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.network.packet.Packet; + +public abstract class GuiMachineBase extends GuiContainerBase { + + + protected static final int POWER_Y = 13; + protected final int POWER_X = 15; + protected static final int POWER_WIDTH = 11; + protected static final int POWER_HEIGHT = 53; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + + protected static final int BUTTON_SIZE = 16; + protected static final int REDSTONE_BUTTON_ID = 99; + + + private AbstractMachineEntity tileEntity; + + private IconButton redstoneButton; + + public GuiMachineBase(AbstractMachineEntity machine, Container container) { + super(container); + tileEntity = machine; + addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT),"") { + + @Override + protected void updateText() { + text.clear(); + text.add(Math.round(tileEntity.getEnergyStored()) + "/" + tileEntity.getCapacitor().getMaxEnergyStored() + " MJ"); + } + + }); + addToolTip(new GuiToolTip(new Rectangle(0, 0, 0, 0),"") { + + @Override + protected void updateText() { + text.clear(); + switch(tileEntity.getRedstoneControlMode()) { + case ON: + text.add("Active when"); + text.add("recieving a"); + text.add("redstone signal."); + break; + case OFF: + text.add("Active when not"); + text.add("recieving a"); + text.add("redstone signal."); + break; + case IGNORE: + default: + text.add("Allways active."); + } + + } + + @Override + public void onTick(int mouseX, int mouseY) { + bounds.setBounds(xSize - 5 - BUTTON_SIZE, 5, BUTTON_SIZE, BUTTON_SIZE); + super.onTick(mouseX, mouseY); + } + + }); + + } + + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + if(par1GuiButton.id == REDSTONE_BUTTON_ID) { + int ordinal = tileEntity.getRedstoneControlMode().ordinal(); + ordinal++; + if(ordinal >= RedstoneControlMode.values().length) { + ordinal = 0; + } + tileEntity.setRedstoneControlMode(RedstoneControlMode.values()[ordinal]); + redstoneButton.setIcon(AbstractMachineBlock.getRedstoneControlIcon(tileEntity.getRedstoneControlMode())); + Packet pkt = PacketHandler.getRedstoneControlPacket(tileEntity); + PacketDispatcher.sendPacketToServer(pkt); + } + } + + @Override + public void initGui() { + super.initGui(); + int x = guiLeft + xSize - 5 - BUTTON_SIZE; + int y = guiTop + 5; + + redstoneButton = new IconButton(fontRenderer, REDSTONE_BUTTON_ID, x, y, AbstractMachineBlock.getRedstoneControlIcon(tileEntity.getRedstoneControlMode()), RenderUtil.BLOCK_TEX); + redstoneButton.setSize(BUTTON_SIZE, BUTTON_SIZE); + + buttonList.add(redstoneButton); + } + + + + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + int i1 = tileEntity.getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(k + POWER_X, l + BOTTOM_POWER_Y - i1, 176, 31, 11, i1); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton)this.buttonList.get(i); + guibutton.drawButton(this.mc, 0, 0); + } + + } + +} diff --git a/common/crazypants/enderio/machine/IMachine.java b/common/crazypants/enderio/machine/IMachine.java new file mode 100644 index 00000000..7be23d52 --- /dev/null +++ b/common/crazypants/enderio/machine/IMachine.java @@ -0,0 +1,8 @@ +package crazypants.enderio.machine; + +public interface IMachine { + + + String getMachineName(); + +} diff --git a/common/crazypants/enderio/machine/IMachineRecipe.java b/common/crazypants/enderio/machine/IMachineRecipe.java new file mode 100644 index 00000000..fbc7a90a --- /dev/null +++ b/common/crazypants/enderio/machine/IMachineRecipe.java @@ -0,0 +1,21 @@ +package crazypants.enderio.machine; + +import net.minecraft.item.ItemStack; + +public interface IMachineRecipe { + + String getUid(); + + float getEnergyRequired(RecipeInput... inputs); + + public boolean isRecipe(RecipeInput... inputs); + + ItemStack[] getCompletedResult(RecipeInput... inputs); + + boolean isValidInput(int slotNumber, ItemStack item); + + String getMachineName(); + + int getQuantityConsumed(RecipeInput input); + +} diff --git a/common/crazypants/enderio/machine/MachineRecipeRegistry.java b/common/crazypants/enderio/machine/MachineRecipeRegistry.java new file mode 100644 index 00000000..f463521f --- /dev/null +++ b/common/crazypants/enderio/machine/MachineRecipeRegistry.java @@ -0,0 +1,62 @@ +package crazypants.enderio.machine; + +import java.util.*; + +public class MachineRecipeRegistry { + + public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); + + private final Map> machineRecipes = new HashMap>(); + + public void registerRecipe(String machine, IMachineRecipe recipe) { + getRecipesForMachine(machine).put(recipe.getUid(), recipe); + } + + public Map getRecipesForMachine(String machineName) { + Map res = machineRecipes.get(machineName); + if(res == null) { + res = new HashMap(); + machineRecipes.put(machineName, res); + } + return res; + } + + public IMachineRecipe getRecipeForUid(String uid) { + for(Map recipes : machineRecipes.values()) { + for(IMachineRecipe recipe : recipes.values()) { + if(uid.equals(recipe.getUid())) { + return recipe; + } + } + } + return null; + } + + public IMachineRecipe getRecipeForInputs(String machineName, RecipeInput... inputs) { + Map recipes = getRecipesForMachine(machineName); + if(recipes == null) { + return null; + } + for(IMachineRecipe recipe : recipes.values()) { + if(recipe.isRecipe(inputs)) { + return recipe; + } + } + return null; + } + + public List getRecipesForInput(String machineName, RecipeInput input) { + if(input == null) { + return Collections.emptyList(); + } + List result = new ArrayList(); + Map recipes = getRecipesForMachine(machineName); + for(IMachineRecipe recipe : recipes.values()) { + if(recipe.isValidInput(input.slotNumber, input.item)) { + result.add(recipe); + } + } + return result; + } + +} diff --git a/common/crazypants/enderio/machine/MachineRecipes.java b/common/crazypants/enderio/machine/MachineRecipes.java new file mode 100644 index 00000000..e21e75b1 --- /dev/null +++ b/common/crazypants/enderio/machine/MachineRecipes.java @@ -0,0 +1,40 @@ +package crazypants.enderio.machine; + +import static crazypants.enderio.ModObject.*; +import net.minecraft.block.Block; +import net.minecraft.item.*; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.ModObject; +import crazypants.enderio.material.Alloy; + +public class MachineRecipes { + + public static void addRecipes() { + ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0); + ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); + + ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0); + GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor); + + ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0); + ItemStack red = new ItemStack(Item.dyePowder, 1, 1); + ItemStack green = new ItemStack(Item.dyePowder, 1, 2); + ItemStack blue = new ItemStack(Item.dyePowder, 1, 4); + GameRegistry.addShapedRecipe(painter, "bbb", "RGB", "bcb", 'b', industialBinder, 'R', red, 'G', green, 'B', blue, 'c', capacitor); + + ItemStack reservoir = new ItemStack(blockReservoir.actualId, 1, 0); + ItemStack glassPane = new ItemStack(Block.thinGlass, 1, 0); + GameRegistry.addShapedRecipe(reservoir, "bgb", "gBg", "bgb", 'b', industialBinder, 'g', glassPane, 'B', Item.bucketEmpty); + + ItemStack alloySmelter = new ItemStack(blockAlloySmelter.actualId, 1, 0); + GameRegistry.addShapedRecipe(alloySmelter, "bbb", "CfC", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor, 'C', Item.cauldron); + + ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId,1,0); + ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId,1,Alloy.ACTIVATED_IRON.ordinal()); + ItemStack activatedGold = new ItemStack(ModObject.itemAlloy.actualId,1,Alloy.ACTIVATED_GOLD.ordinal()); + ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); + + GameRegistry.addShapedRecipe(solarPanel, "qqq", "gig", "bcb", 'q', fusedQuartz, 'g', activatedGold, 'i', activatedIron, 'b', industialBinder,'c', capacitor); + } + +} diff --git a/common/crazypants/enderio/machine/PoweredTask.java b/common/crazypants/enderio/machine/PoweredTask.java new file mode 100644 index 00000000..c23c70a8 --- /dev/null +++ b/common/crazypants/enderio/machine/PoweredTask.java @@ -0,0 +1,119 @@ +package crazypants.enderio.machine; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.*; +import net.minecraft.util.MathHelper; + +public class PoweredTask { + + public static final String KEY_INPUTS_SLOTS = "inputsSlots"; + public static final String KEY_INPUTS_STACKS = "inputsStacks"; + public static final String KEY_RECIPE = "recipeUid"; + public static final String KEY_USED_ENERGY = "usedEnergy"; + + private float usedEnergy = 0; + + private RecipeInput[] inputs; + + private float requiredEnergy; + + private IMachineRecipe recipe; + + public PoweredTask(IMachineRecipe recipe, RecipeInput... inputs) { + this(recipe, 0, inputs); + } + + public PoweredTask(IMachineRecipe recipe, float usedEnergy, RecipeInput... inputsIn) { + this.inputs = inputsIn; + int numInputs = 0; + for (int i = 0; i < inputsIn.length; i++) { + if (inputsIn[i] != null && inputsIn[i].item != null) { + numInputs++; + } + } + + inputs = new RecipeInput[numInputs]; + int index = 0; + for (int i = 0; i < inputsIn.length; i++) { + if (inputsIn[i] != null && inputsIn[i].item != null) { + inputs[index] = inputsIn[i]; + index++; + } + } + + this.recipe = recipe; + this.usedEnergy = usedEnergy; + requiredEnergy = recipe.getEnergyRequired(inputsIn); + } + + public void update(float availableEnergy) { + usedEnergy += availableEnergy; + } + + public boolean isComplete() { + return usedEnergy >= requiredEnergy; + } + + public float getProgress() { + return MathHelper.clamp_float(usedEnergy / requiredEnergy, 0, 1); + } + + public ItemStack[] getCompletedResult() { + return recipe.getCompletedResult(inputs); + } + + public void writeToNBT(NBTTagCompound nbtRoot) { + NBTTagCompound stackRoot; + + int[] inputSlots = new int[inputs.length]; + for (int i = 0; i < inputSlots.length; i++) { + inputSlots[i] = inputs[i].slotNumber; + } + nbtRoot.setIntArray(KEY_INPUTS_SLOTS, inputSlots); + + NBTTagList inputItems = new NBTTagList(); + for (RecipeInput ri : inputs) { + stackRoot = new NBTTagCompound(); + ri.item.writeToNBT(stackRoot); + inputItems.appendTag(stackRoot); + } + nbtRoot.setTag(KEY_INPUTS_STACKS, inputItems); + + nbtRoot.setString(KEY_RECIPE, recipe.getUid()); + nbtRoot.setFloat(KEY_USED_ENERGY, usedEnergy); + } + + public static PoweredTask readFromNBT(NBTTagCompound nbtRoot) { + if (nbtRoot == null) { + return null; + } + + IMachineRecipe recipe; + + float usedEnergy = nbtRoot.getFloat(KEY_USED_ENERGY); + + int[] inputSlots = nbtRoot.getIntArray(KEY_INPUTS_SLOTS); + if (inputSlots == null || inputSlots.length <= 0) { + return null; + } + NBTTagList inputItems = nbtRoot.getTagList(KEY_INPUTS_STACKS); + if (inputItems == null || inputItems.tagCount() != inputSlots.length) { + return null; + } + + RecipeInput[] inputs = new RecipeInput[inputSlots.length]; + for (int i = 0; i < inputSlots.length; i++) { + NBTBase stackTag = inputItems.tagAt(i); + ItemStack item = ItemStack.loadItemStackFromNBT((NBTTagCompound) stackTag); + inputs[i] = new RecipeInput(inputSlots[i], item); + } + + String uid = nbtRoot.getString(KEY_RECIPE); + recipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); + if (recipe != null) { + return new PoweredTask(recipe, usedEnergy, inputs); + } + return null; + + } +} diff --git a/common/crazypants/enderio/machine/RecipeInput.java b/common/crazypants/enderio/machine/RecipeInput.java new file mode 100644 index 00000000..fbcfc9fa --- /dev/null +++ b/common/crazypants/enderio/machine/RecipeInput.java @@ -0,0 +1,30 @@ +package crazypants.enderio.machine; + +import net.minecraft.item.ItemStack; + +public class RecipeInput { + + public static ItemStack getInputForSlot(int slot, RecipeInput... inputs) { + for(RecipeInput ri: inputs) { + if(ri.slotNumber == slot) { + return ri.item; + } + } + return null; + } + + public static RecipeInput create(int slotNumber, ItemStack item) { + return new RecipeInput(slotNumber, item); + } + + public final int slotNumber; + public final ItemStack item; + + public RecipeInput(int slotNumber, ItemStack item) { + super(); + this.slotNumber = slotNumber; + this.item = item; + } + + +} \ No newline at end of file diff --git a/common/crazypants/enderio/machine/RedstoneControlMode.java b/common/crazypants/enderio/machine/RedstoneControlMode.java new file mode 100644 index 00000000..ecfb902f --- /dev/null +++ b/common/crazypants/enderio/machine/RedstoneControlMode.java @@ -0,0 +1,9 @@ +package crazypants.enderio.machine; + +public enum RedstoneControlMode { + + IGNORE, + ON, + OFF + +} diff --git a/common/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java b/common/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java new file mode 100644 index 00000000..23a51a2e --- /dev/null +++ b/common/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java @@ -0,0 +1,104 @@ +package crazypants.enderio.machine.alloy; + +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import net.minecraft.item.ItemStack; + +public class BasicAlloyRecipe implements IMachineRecipe { + + public static final int DEFAULT_ENERGY_USE = 1600; + + private final String uid; + + private float energyRequired = DEFAULT_ENERGY_USE; + + private ItemStack[] inputs; + + private ItemStack output; + + public BasicAlloyRecipe(ItemStack output, String uid, ItemStack... recipeInputs) { + this.output = output.copy(); + this.uid = uid; + inputs = new ItemStack[recipeInputs.length]; + for(int i=0;i input.item.stackSize) { + return false; + } + } + return true; + } + + private RecipeInput[] getNonNullInputs(RecipeInput[] checking) { + int numNonNulls = 0; + for(int i=0;i { + + public static BlockAlloySmelter create() { + BlockAlloySmelter ppainter = new BlockAlloySmelter(); + ppainter.init(); + return ppainter; + } + + private BlockAlloySmelter() { + super(ModObject.blockAlloySmelter, TileAlloySmelter.class); + } + + @Override + protected void init() { + super.init(); + + // GameRegistry.addRecipe(new ItemStack(this), "bbb", "iri", "bbb", 'i', new ItemStack(Item.ingotIron), 'r', new ItemStack(Item.redstone), 'b', new ItemStack( +// ModObject.itemIndustrialBinder.id, 1, 0)); + IMachineRecipe recipe; + recipe = new BasicAlloyRecipe(new ItemStack(Item.axeDiamond), "Diamond Axe", new ItemStack(Item.diamond,3,0), new ItemStack(Item.stick,2,0)); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, recipe); + + recipe = new BasicAlloyRecipe(new ItemStack(Item.blazeRod), "Blazedy Blaze", new ItemStack(Item.ingotIron,1,0), new ItemStack(Item.ingotGold,1,0),new ItemStack(Item.diamond,1,0)); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, recipe); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileAlloySmelter) { + return new ContainerAlloySmelter(player.inventory, (TileAlloySmelter) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + return new GuiAlloySmelter(player.inventory, (TileAlloySmelter) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_ALLOY_SMELTER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:alloySmelterFrontOn"; + } + return "enderio:alloySmelterFront"; + } + +} diff --git a/common/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/common/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java new file mode 100644 index 00000000..3010acf4 --- /dev/null +++ b/common/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -0,0 +1,115 @@ +package crazypants.enderio.machine.alloy; + +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; +import net.minecraft.item.ItemStack; + +public class ContainerAlloySmelter extends Container { + + final TileAlloySmelter tileEntity; + private int progress = 0; + + public ContainerAlloySmelter(InventoryPlayer playerInv, TileAlloySmelter te) { + + this.tileEntity = te; + + addSlotToContainer(new Slot(tileEntity, 0, 54, 17) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 1, 78, 7) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 2, 103, 17) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(2, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 3, 79, 57) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) { + return tileEntity.isUseableByPlayer(entityplayer); + } + + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + ItemStack itemstack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + itemstack = origStack.copy(); + + if (slotIndex == 3) { + + if (!mergeItemStack(origStack, 4, 39, true)) { + return null; + } + slot.onSlotChange(origStack, itemstack); + + } else if (slotIndex != 1 && slotIndex != 0 && slotIndex != 2) { + + boolean merged = false; + + if (tileEntity.isItemValidForSlot(0, origStack)) { + merged = mergeItemStack(origStack, 0, 1, false); + } + if (!merged && tileEntity.isItemValidForSlot(1, origStack)) { + merged = mergeItemStack(origStack, 1, 2, false); + } + if (!merged && tileEntity.isItemValidForSlot(2, origStack)) { + merged = mergeItemStack(origStack, 2, 3, false); + } else if (!merged && slotIndex >= 4 && slotIndex < 30) { + if (!this.mergeItemStack(origStack, 31, 40, false)) { + return null; + } + } else if (!merged && slotIndex >= 31 && slotIndex < 40 && !this.mergeItemStack(origStack, 4, 31, false)) { + return null; + } + + } else if (!mergeItemStack(origStack, 4, 39, false)) { + return null; + } + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } + slot.onSlotChanged(); + + if (origStack.stackSize == itemstack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return itemstack; + } + + + +} diff --git a/common/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/common/crazypants/enderio/machine/alloy/GuiAlloySmelter.java new file mode 100644 index 00000000..ae157e41 --- /dev/null +++ b/common/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -0,0 +1,46 @@ +package crazypants.enderio.machine.alloy; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.render.RenderUtil; + + +public class GuiAlloySmelter extends GuiMachineBase { + + private TileAlloySmelter tileEntity; + + public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { + super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory)); + this.tileEntity = furnaceInventory; + } + + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/alloySmelter.png"); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + int scaled; + + if(tileEntity.getProgress() < 1 && tileEntity.getProgress() > 0) { + scaled = tileEntity.getProgressScaled(12); + drawTexturedModalRect(sx + 55, sy + 48 - scaled, 176, 12 - scaled, 14, scaled + 2); + drawTexturedModalRect(sx + 103, sy + 48 - scaled, 176, 12 - scaled, 14, scaled + 2); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } +} diff --git a/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java b/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java new file mode 100644 index 00000000..e4a7fc70 --- /dev/null +++ b/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine.alloy; + +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import net.minecraft.item.ItemStack; + +public class TileAlloySmelter extends AbstractPoweredTaskEntity { + + public TileAlloySmelter() { + super(4); + } + + @Override + public String getInvName() { + return "Alloy Smelter"; + } + + @Override + public String getMachineName() { + return ModObject.blockAlloySmelter.unlocalisedName; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + if(i >= 3) { + return false; + } + return !MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), RecipeInput.create(i, itemstack)).isEmpty(); + } + +} diff --git a/common/crazypants/enderio/machine/generator/BlockStirlingGenerator.java b/common/crazypants/enderio/machine/generator/BlockStirlingGenerator.java new file mode 100644 index 00000000..24bb4cb4 --- /dev/null +++ b/common/crazypants/enderio/machine/generator/BlockStirlingGenerator.java @@ -0,0 +1,45 @@ +package crazypants.enderio.machine.generator; + +import crazypants.enderio.*; +import crazypants.enderio.machine.AbstractMachineBlock; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +public class BlockStirlingGenerator extends AbstractMachineBlock { + + public static BlockStirlingGenerator create() { + BlockStirlingGenerator gen = new BlockStirlingGenerator(); + gen.init(); + return gen; + } + + protected BlockStirlingGenerator() { + super(ModObject.blockStirlingGenerator, TileEntityStirlingGenerator.class); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new StirlingGeneratorContainer(player.inventory, (TileEntityStirlingGenerator) world.getBlockTileEntity(x, y, z)); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiStirlingGenerator(player.inventory, (TileEntityStirlingGenerator) world.getBlockTileEntity(x, y, z)); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_STIRLING_GEN; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:stirlingGenFrontOn"; + } + return "enderio:stirlingGenFrontOff"; + } + + + +} diff --git a/common/crazypants/enderio/machine/generator/GuiStirlingGenerator.java b/common/crazypants/enderio/machine/generator/GuiStirlingGenerator.java new file mode 100644 index 00000000..9cbba15f --- /dev/null +++ b/common/crazypants/enderio/machine/generator/GuiStirlingGenerator.java @@ -0,0 +1,59 @@ +package crazypants.enderio.machine.generator; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.render.RenderUtil; + +@SideOnly(Side.CLIENT) +public class GuiStirlingGenerator extends GuiMachineBase { + + private TileEntityStirlingGenerator entity; + + public GuiStirlingGenerator(InventoryPlayer par1InventoryPlayer, TileEntityStirlingGenerator te) { + super(te, new StirlingGeneratorContainer(par1InventoryPlayer, te)); + this.entity = te; + } + + /** + * Draw the foreground layer for the GuiContainer (everything in front of the + * items) + */ + @Override + protected void drawForegroundImpl(int par1, int par2) { + String s = this.entity.isInvNameLocalized() ? this.entity.getInvName() : StatCollector.translateToLocal(this.entity.getInvName()); + this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 6, 4210752); + this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 94, 4210752); + } + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/stirlingGenerator.png"); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + int scaled; + + if(entity.getProgress() < 1 && entity.getProgress() > 0) { + scaled = entity.getProgressScaled(12); + drawTexturedModalRect(sx + 80, sy + 65 - scaled, 176, 12 - scaled, 14, scaled + 2); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + } +} + diff --git a/common/crazypants/enderio/machine/generator/StirlingGeneratorContainer.java b/common/crazypants/enderio/machine/generator/StirlingGeneratorContainer.java new file mode 100644 index 00000000..5b32581f --- /dev/null +++ b/common/crazypants/enderio/machine/generator/StirlingGeneratorContainer.java @@ -0,0 +1,81 @@ +package crazypants.enderio.machine.generator; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class StirlingGeneratorContainer extends Container { + + final TileEntityStirlingGenerator tileEntity; + private int progress = 0; + + public StirlingGeneratorContainer(InventoryPlayer playerInv, TileEntityStirlingGenerator te) { + + this.tileEntity = te; + + addSlotToContainer(new Slot(tileEntity, 0, 80, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) { + return tileEntity.isUseableByPlayer(entityplayer); + } + + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + ItemStack itemstack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + itemstack = origStack.copy(); + + if (slotIndex != 0) { + if (tileEntity.isItemValidForSlot(0, origStack)) { + if (!this.mergeItemStack(origStack, 0, 1, false)) { + return null; + } + } else if (slotIndex >= 30 && slotIndex < 39 && !this.mergeItemStack(origStack, 1, 28, false)) { + return null; + } + + } else if (!mergeItemStack(origStack, 1, 37, false)) { + return null; + } + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + if (origStack.stackSize == itemstack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return itemstack; + } + + +} diff --git a/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java b/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java new file mode 100644 index 00000000..b72a6695 --- /dev/null +++ b/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java @@ -0,0 +1,225 @@ +package crazypants.enderio.machine.generator; + +import java.util.*; + +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.util.BlockCoord; + +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.*; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerEmitter; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class TileEntityStirlingGenerator extends AbstractMachineEntity implements ISidedInventory, IPowerEmitter { + + public static final float ENERGY_PER_TICK = 1; + + /** How many ticks left until the item is burnt. */ + private int burnTime = 0; + private int totalBurnTime; + + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + private boolean receptorsDirty = true; + + public TileEntityStirlingGenerator() { + super(1, Type.ENGINE); + } + + @Override + public boolean canEmitPowerFrom(ForgeDirection side) { + return true; + } + + @Override + public String getMachineName() { + return ModObject.blockStirlingGenerator.unlocalisedName; + } + + @Override + public String getInvName() { + return "Stirling Generator"; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return TileEntityFurnace.isItemFuel(itemstack); + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + return new int[] { 0 }; + } + + @Override + public boolean canInsertItem(int i, ItemStack itemstack, int j) { + return isItemValidForSlot(i, itemstack); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return false; + } + + @Override + public boolean isActive() { + return burnTime > 0; + } + + @Override + public float getProgress() { + if (totalBurnTime <= 0) { + return 0; + } + return (float) burnTime / (float) totalBurnTime; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + burnTime = nbtRoot.getInteger("burnTime"); + totalBurnTime = nbtRoot.getInteger("totalBurnTime"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setInteger("burnTime", burnTime); + nbtRoot.setInteger("totalBurnTime", totalBurnTime); + } + + @Override + public void onNeighborBlockChange(int blockId) { + receptorsDirty = true; + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean needsUpdate = false; + + if (burnTime > 0) { + // powerProvider.getPowerReceiver().receiveEnergy(Type.ENGINE, + // ENERGY_PER_TICK, ForgeDirection.DOWN); + powerHandler.setEnergy(powerHandler.getEnergyStored() + ENERGY_PER_TICK); + burnTime--; + needsUpdate = true; + } + + needsUpdate |= transmitEnergy(); + + if (burnTime <= 0 && powerHandler.getEnergyStored() < powerHandler.getMaxEnergyStored() && redstoneCheckPassed) { + if (inventory[0] != null && inventory[0].stackSize > 0) { + burnTime = TileEntityFurnace.getItemBurnTime(inventory[0]); + if (burnTime > 0) { + totalBurnTime = burnTime; + decrStackSize(0, 1); + } + needsUpdate = true; + } + } + + return needsUpdate; + } + + private boolean transmitEnergy() { + + if (powerHandler.getEnergyStored() <= 0) { + powerHandler.update(); + return false; + } + float canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); + float transmitted = 0; + + float stored = powerHandler.getEnergyStored(); + powerHandler.update(); + float storedAfter = powerHandler.getEnergyStored(); + + + checkReceptors(); + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + + int appliedCount = 0; + int numReceptors = receptors.size(); + while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + + Receptor receptor = receptorIterator.next(); + PowerReceiver pp = receptor.receptor.getPowerReceiver(receptor.fromDir); + if (pp != null && pp.getMinEnergyReceived() <= canTransmit && pp.getType() != Type.ENGINE) { + float used; + if (receptor.receptor instanceof IInternalPowerReceptor) { + //System.out.println("TileEntityStirlingGenerator.transmitEnergy: Sending " + canTransmit + " to internal."); + used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) receptor.receptor, pp, canTransmit,Type.ENGINE,receptor.fromDir); + } else { + //System.out.println("TileEntityStirlingGenerator.transmitEnergy: Sending " + canTransmit + " to EXTERNAL. Receptor is: " + receptor.receptor); + used = pp.receiveEnergy(Type.ENGINE, canTransmit, receptor.fromDir); + } + transmitted += used; +// if (used > 0) { +// System.out.println("TileEntityStirlingGenerator.transmitEnergy: Trasnmitted energy " + used + " to " + receptor.receptor); +// } + canTransmit -= used; + } + if (canTransmit <= 0) { + break; + } + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + appliedCount++; + } + + powerHandler.setEnergy(powerHandler.getEnergyStored() - transmitted); + + return transmitted > 0; + + } + + private void checkReceptors() { + if (!receptorsDirty) { + return; + } + receptors.clear(); + + BlockCoord bc = new BlockCoord(xCoord, yCoord, zCoord); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord checkLoc = bc.getLocation(dir); + TileEntity te = worldObj.getBlockTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (te instanceof IPowerReceptor) { + IPowerReceptor rec = (IPowerReceptor) te; + PowerReceiver reciever = rec.getPowerReceiver(dir.getOpposite()); + receptors.add(new Receptor((IPowerReceptor) te, dir.getOpposite())); + } + } + receptorIterator = receptors.listIterator(); + receptorsDirty = false; + + } + + static class Receptor { + IPowerReceptor receptor; + ForgeDirection fromDir; + + private Receptor(IPowerReceptor rec, ForgeDirection fromDir) { + super(); + this.receptor = rec; + this.fromDir = fromDir; + } + } + +} diff --git a/common/crazypants/enderio/machine/painter/BasicPainterTemplate.java b/common/crazypants/enderio/machine/painter/BasicPainterTemplate.java new file mode 100644 index 00000000..e711b51c --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BasicPainterTemplate.java @@ -0,0 +1,119 @@ +package crazypants.enderio.machine.painter; + +import static crazypants.enderio.machine.RecipeInput.getInputForSlot; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import crazypants.util.Util; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class BasicPainterTemplate implements IMachineRecipe { + + public static float DEFAULT_ENERGY_PER_TASK = 200; //5 seconds at the default energy use of 2 mj per tick. + + public static boolean isValidSourceDefault(ItemStack paintSource) { + if(paintSource == null) { + return false; + } + Block block = Util.getBlockFromItemId(paintSource.itemID); + if(block == null) { + return false; + } + return Block.isNormalCube(block.blockID) || block.blockID == Block.glass.blockID; + } + + protected final int[] validIds; + + protected BasicPainterTemplate(int... validTargetBlocksIds) { + this.validIds = validTargetBlocksIds; + } + + @Override + public float getEnergyRequired(RecipeInput... inputs) { + return DEFAULT_ENERGY_PER_TASK; + } + + @Override + public boolean isRecipe(RecipeInput... inputs) { + return isValidTarget(getTarget(inputs)) && isValidPaintSource(getPaintSource(inputs)); + } + + @Override + public ItemStack[] getCompletedResult(RecipeInput... inputs) { + ItemStack target = getTarget(inputs); + ItemStack paintSource = getPaintSource(inputs); + if(target == null || paintSource == null) { + return null; + } + ItemStack result = new ItemStack(getResultId(target), 1, target.getItemDamage()); + PainterUtil.setSourceBlock(result, paintSource.itemID, paintSource.getItemDamage()); + return new ItemStack[] {result}; + } + + public ItemStack getTarget(RecipeInput... inputs) { + return getInputForSlot(0, inputs); + } + + public ItemStack getPaintSource(RecipeInput... inputs) { + return getInputForSlot(1, inputs); + } + + @Override + public boolean isValidInput(int slotNumber, ItemStack item) { + if(slotNumber == 0) { + return isValidTarget(item); + } + if(slotNumber == 1) { + return isValidPaintSource(item); + } + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockPainter.unlocalisedName; + } + + public boolean isValidPaintSource(ItemStack paintSource) { + return isValidSourceDefault(paintSource); + } + + public boolean isValidTarget(ItemStack target) { + //first check for exact matches, then check for item blocks + if(target == null) { + return false; + } + + for(int i=0; i < validIds.length; i++) { + if(validIds[i] == target.itemID) { + return true; + } + } + + Block blk = Util.getBlockFromItemId(target.itemID); + if(blk == null) { + return false; + } + for(int i=0; i < validIds.length; i++) { + if(validIds[i] == blk.blockID) { + return true; + } + } + return false; + } + + @Override + public String getUid() { + return getClass().getCanonicalName(); + } + + protected int getResultId(ItemStack target) { + return target.itemID; + } + + @Override + public int getQuantityConsumed(RecipeInput input) { + return input.slotNumber == 0 ? 1 : 0; + } + +} diff --git a/common/crazypants/enderio/machine/painter/BlockCustomFence.java b/common/crazypants/enderio/machine/painter/BlockCustomFence.java new file mode 100644 index 00000000..1a2fb7e8 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockCustomFence.java @@ -0,0 +1,190 @@ +package crazypants.enderio.machine.painter; + +import java.util.Random; + +import net.minecraft.block.*; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; + +public class BlockCustomFence extends BlockFence implements ITileEntityProvider { + + public static BlockCustomFence create() { + BlockCustomFence result = new BlockCustomFence(); + result.init(); + return result; + } + + public BlockCustomFence() { + super(ModObject.blockCustomFence.id, ModObject.blockCustomFence.unlocalisedName, Material.wood); + setUnlocalizedName(ModObject.blockCustomFence.unlocalisedName); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundWoodFootstep); + setCreativeTab(null); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockCustomFence.name); + GameRegistry.registerBlock(this, BlockItemCustomFence.class, ModObject.blockCustomFence.unlocalisedName); + GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomFence.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(int id, int damage) { + ItemStack result = new ItemStack(ModObject.blockCustomFence.id, 1, damage); + PainterUtil.setSourceBlock(result, id, damage); + return result; + } + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if(tef.getSourceBlockId() > 0) { + return Math.min(super.getLightOpacity(world, x, y, z), Block.lightOpacity[tef.getSourceBlockId()]); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + int id = world.getBlockId(x, y, z); + if (id == this.blockID) { + return true; + } + return super.canPlaceTorchOnTop(world, x, y, z); + } + + + @Override + public boolean canConnectFenceTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + int l = par1IBlockAccess.getBlockId(par2, par3, par4); + if(l == ModObject.blockCustomFenceGate.id) { + return true; + } + return super.canConnectFenceTo(par1IBlockAccess, par2, par3, par4); + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if (tef.getSourceBlockId() > 0 && tef.getSourceBlockId() < Block.blocksList.length) { + return blocksList[tef.getSourceBlockId()].getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } else { + System.out.println("BlockCustFence: No tile entity."); + } + return blocksList[Block.anvil.blockID].getBlockTexture(world, x, y, z, blockSide); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister par1IconRegister) { + this.blockIcon = par1IconRegister.registerIcon("enderio:conduitConnector"); + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityCustomBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int id = -1; + Block b = PainterUtil.getSourceBlock(stack); + if (b != null) { + id = b.blockID; + } + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + tef.setSourceBlockId(id); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + + } + + world.removeBlockTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + /** + * Called when the block receives a BlockEvent - see World.addBlockEvent. By + * default, passes it on to the tile entity at this location. Args: world, x, + * y, z, blockID, EventID, event parameter + */ + @Override + public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { + super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); + TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4); + return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + } + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Block.fence.blockID/* , Block.netherFence.blockID */); + } + + @Override + public ItemStack[] getCompletedResult(RecipeInput... inputs) { + ItemStack paintSource = RecipeInput.getInputForSlot(1, inputs); + return new ItemStack[] {createItemStackForSourceBlock(paintSource.itemID, paintSource.getItemDamage())}; + } + + } + +} diff --git a/common/crazypants/enderio/machine/painter/BlockCustomFenceGate.java b/common/crazypants/enderio/machine/painter/BlockCustomFenceGate.java new file mode 100644 index 00000000..36feb5fe --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockCustomFenceGate.java @@ -0,0 +1,164 @@ +package crazypants.enderio.machine.painter; + +import java.util.Random; + +import net.minecraft.block.*; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.world.*; +import cpw.mods.fml.common.registry.*; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; + +public class BlockCustomFenceGate extends BlockFenceGate implements ITileEntityProvider{ + + + public static int renderId; + + public static BlockCustomFenceGate create() { + BlockCustomFenceGate result = new BlockCustomFenceGate(); + result.init(); + return result; + } + + public BlockCustomFenceGate() { + super(ModObject.blockCustomFenceGate.id); + setCreativeTab(null); + setUnlocalizedName(ModObject.blockCustomFenceGate.unlocalisedName); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundWoodFootstep); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockCustomFenceGate.name); + GameRegistry.registerBlock(this, BlockItemCustomFenceGate.class, ModObject.blockCustomFenceGate.unlocalisedName); + GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomFenceGate.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if(tef.getSourceBlockId() > 0) { + return Math.min(super.getLightOpacity(world, x, y, z), Block.lightOpacity[tef.getSourceBlockId()]); + } + + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityCustomBlock(); + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if (tef.getSourceBlockId() > 0 && tef.getSourceBlockId() < Block.blocksList.length) { + return blocksList[tef.getSourceBlockId()].getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } else { + System.out.println("BlockCustFence: No tile entity."); + } + return blocksList[Block.anvil.blockID].getBlockTexture(world, x, y, z, blockSide); + } + + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int id = -1; + Block b = PainterUtil.getSourceBlock(stack); + if (b != null) { + id = b.blockID; + } + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + tef.setSourceBlockId(id); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + //world.markBlockForUpdate(x, y, z); + + int l = (MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3) % 4; + world.setBlockMetadataWithNotify(x, y, z, l, 2); + } + + + public static ItemStack createItemStackForSourceBlock(int id, int damage) { + ItemStack result = new ItemStack(ModObject.blockCustomFenceGate.actualId, 1, damage); + PainterUtil.setSourceBlock(result, id, damage); + return result; + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } + + } + + world.removeBlockTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Block.fenceGate.blockID/*, Block.netherFence.blockID*/); + } + + @Override + public ItemStack[] getCompletedResult(RecipeInput... inputs) { + ItemStack paintSource = RecipeInput.getInputForSlot(1, inputs); + return new ItemStack[] {createItemStackForSourceBlock(paintSource.itemID, paintSource.getItemDamage())}; + } + + } + +} diff --git a/common/crazypants/enderio/machine/painter/BlockCustomFenceGateRenderer.java b/common/crazypants/enderio/machine/painter/BlockCustomFenceGateRenderer.java new file mode 100644 index 00000000..a68b2de1 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockCustomFenceGateRenderer.java @@ -0,0 +1,221 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDirectional; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.ModObject; + +public class BlockCustomFenceGateRenderer implements ISimpleBlockRenderingHandler { + + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + renderer.renderBlockAsItem(Block.fenceGate, metadata, 1); + } + + @Override + public boolean shouldRender3DInInventory() { + return true; + } + + @Override + public int getRenderId() { + return BlockCustomFenceGate.renderId; + } + + @Override + public boolean renderWorldBlock(IBlockAccess blockAccess, int par2, int par3, int par4, Block block, int modelId, RenderBlocks rb) { + + BlockFenceGate par1BlockFenceGate = (BlockFenceGate)block; + + boolean flag = true; + int l = rb.blockAccess.getBlockMetadata(par2, par3, par4); + boolean flag1 = BlockFenceGate.isFenceGateOpen(l); + int i1 = BlockDirectional.getDirection(l); + float f = 0.375F; + float f1 = 0.5625F; + float f2 = 0.75F; + float f3 = 0.9375F; + float f4 = 0.3125F; + float f5 = 1.0F; + + if ((i1 == 2 || i1 == 0) && rb.blockAccess.getBlockId(par2 - 1, par3, par4) == Block.cobblestoneWall.blockID && rb.blockAccess.getBlockId(par2 + 1, par3, par4) == Block.cobblestoneWall.blockID || + (i1 == 3 || i1 == 1) && rb.blockAccess.getBlockId(par2, par3, par4 - 1) == Block.cobblestoneWall.blockID && rb.blockAccess.getBlockId(par2, par3, par4 + 1) == Block.cobblestoneWall.blockID || + (i1 == 2 || i1 == 0) && rb.blockAccess.getBlockId(par2 - 1, par3, par4) == ModObject.blockCustomWall.id && rb.blockAccess.getBlockId(par2 + 1, par3, par4) == ModObject.blockCustomWall.id || + (i1 == 3 || i1 == 1) && rb.blockAccess.getBlockId(par2, par3, par4 - 1) == ModObject.blockCustomWall.id && rb.blockAccess.getBlockId(par2, par3, par4 + 1) == ModObject.blockCustomWall.id) + { + f -= 0.1875F; + f1 -= 0.1875F; + f2 -= 0.1875F; + f3 -= 0.1875F; + f4 -= 0.1875F; + f5 -= 0.1875F; + } + + rb.renderAllFaces = true; + float f6; + float f7; + float f8; + float f9; + + if (i1 != 3 && i1 != 1) + { + f6 = 0.0F; + f8 = 0.125F; + f7 = 0.4375F; + f9 = 0.5625F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.875F; + f8 = 1.0F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + else + { + rb.uvRotateTop = 1; + f6 = 0.4375F; + f8 = 0.5625F; + f7 = 0.0F; + f9 = 0.125F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.875F; + f9 = 1.0F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.uvRotateTop = 0; + } + + if (flag1) + { + if (i1 == 2 || i1 == 0) + { + rb.uvRotateTop = 1; + } + + if (i1 == 3) + { + rb.setRenderBounds(0.8125D, f, 0.0D, 0.9375D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.8125D, f, 0.875D, 0.9375D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f, 0.0D, 0.8125D, f1, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f, 0.875D, 0.8125D, f1, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f2, 0.0D, 0.8125D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f2, 0.875D, 0.8125D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + else if (i1 == 1) + { + rb.setRenderBounds(0.0625D, f, 0.0D, 0.1875D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0625D, f, 0.875D, 0.1875D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f, 0.0D, 0.4375D, f1, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f, 0.875D, 0.4375D, f1, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f2, 0.0D, 0.4375D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f2, 0.875D, 0.4375D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + else if (i1 == 0) + { + rb.setRenderBounds(0.0D, f, 0.8125D, 0.125D, f3, 0.9375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.8125D, 1.0D, f3, 0.9375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f, 0.5625D, 0.125D, f1, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.5625D, 1.0D, f1, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f2, 0.5625D, 0.125D, f3, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f2, 0.5625D, 1.0D, f3, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + else if (i1 == 2) + { + rb.setRenderBounds(0.0D, f, 0.0625D, 0.125D, f3, 0.1875D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.0625D, 1.0D, f3, 0.1875D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f, 0.1875D, 0.125D, f1, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.1875D, 1.0D, f1, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f2, 0.1875D, 0.125D, f3, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f2, 0.1875D, 1.0D, f3, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + } + else if (i1 != 3 && i1 != 1) + { + f6 = 0.375F; + f8 = 0.5F; + f7 = 0.4375F; + f9 = 0.5625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.5F; + f8 = 0.625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.625F; + f8 = 0.875F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.125F; + f8 = 0.375F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + else + { + rb.uvRotateTop = 1; + f6 = 0.4375F; + f8 = 0.5625F; + f7 = 0.375F; + f9 = 0.5F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.5F; + f9 = 0.625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.625F; + f9 = 0.875F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.125F; + f9 = 0.375F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + + rb.renderAllFaces = false; + rb.uvRotateTop = 0; + rb.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); + return flag; + } + + + +} diff --git a/common/crazypants/enderio/machine/painter/BlockCustomStair.java b/common/crazypants/enderio/machine/painter/BlockCustomStair.java new file mode 100644 index 00000000..2c3b4ef0 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockCustomStair.java @@ -0,0 +1,168 @@ +package crazypants.enderio.machine.painter; + +import java.util.Random; + +import net.minecraft.block.*; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.*; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.common.registry.*; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import crazypants.util.Util; + +public class BlockCustomStair extends BlockStairs implements ITileEntityProvider { + + public static BlockCustomStair create() { + BlockCustomStair result = new BlockCustomStair(); + result.init(); + return result; + } + + protected BlockCustomStair() { + super(ModObject.blockCustomStair.actualId, Block.brick, 0); + setCreativeTab(null); + setUnlocalizedName(ModObject.blockCustomStair.unlocalisedName); + } + + + private void init() { + LanguageRegistry.addName(this, ModObject.blockCustomStair.name); + GameRegistry.registerBlock(this, BlockItemCustomStair.class, ModObject.blockCustomStair.unlocalisedName); + GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomStair.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + + public static ItemStack createItemStackForSourceBlock(int id, int damage) { + ItemStack result = new ItemStack(ModObject.blockCustomStair.id, 1, damage); + PainterUtil.setSourceBlock(result, id, damage); + return result; + } + + @Override + public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) { + int meta = world.getBlockMetadata(x, y, z); + boolean flipped = ((meta & 4) != 0); + return ((meta & 3) + side.ordinal() == 5) || (side == ForgeDirection.UP && flipped); + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if (tef.getSourceBlockId() > 0 && tef.getSourceBlockId() < Block.blocksList.length) { + return blocksList[tef.getSourceBlockId()].getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return blocksList[Block.anvil.blockID].getBlockTexture(world, x, y, z, blockSide); + } + + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityCustomBlock(); + } + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if(tef.getSourceBlockId() > 0) { + return Math.min(super.getLightOpacity(world, x, y, z), Block.lightOpacity[tef.getSourceBlockId()]); + } + + } + return super.getLightOpacity(world, x, y, z); + } + + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int id = -1; + Block b = PainterUtil.getSourceBlock(stack); + if (b != null) { + id = b.blockID; + } + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + tef.setSourceBlockId(id); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + + } + + world.removeBlockTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + } + + @Override + public ItemStack[] getCompletedResult(RecipeInput... inputs) { + ItemStack paintSource = RecipeInput.getInputForSlot(1, inputs); + return new ItemStack[] {createItemStackForSourceBlock(paintSource.itemID, paintSource.getItemDamage())}; + } + + @Override + public boolean isValidTarget(ItemStack target) { + if(target == null) { + return false; + } + Block blk = Util.getBlockFromItemId(target.itemID); + return blk instanceof BlockStairs; + } + } + + +} diff --git a/common/crazypants/enderio/machine/painter/BlockCustomWall.java b/common/crazypants/enderio/machine/painter/BlockCustomWall.java new file mode 100644 index 00000000..e71b326d --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockCustomWall.java @@ -0,0 +1,168 @@ +package crazypants.enderio.machine.painter; + +import java.util.Random; + +import net.minecraft.block.*; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.*; +import cpw.mods.fml.common.registry.*; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; + +public class BlockCustomWall extends BlockWall implements ITileEntityProvider { + + + public static BlockCustomWall create() { + BlockCustomWall result = new BlockCustomWall(); + result.init(); + return result; + } + + public BlockCustomWall() { + super(ModObject.blockCustomWall.id, Block.cobblestone); + setCreativeTab(null); + setUnlocalizedName(ModObject.blockCustomWall.unlocalisedName); + } + + + private void init() { + LanguageRegistry.addName(this, ModObject.blockCustomWall.name); + GameRegistry.registerBlock(this, BlockItemCustomWall.class, ModObject.blockCustomWall.unlocalisedName); + GameRegistry.registerTileEntity(TileEntityCustomBlock.class, ModObject.blockCustomWall.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + + public static ItemStack createItemStackForSourceBlock(int id, int damage) { + ItemStack result = new ItemStack(ModObject.blockCustomWall.id, 1, damage); + PainterUtil.setSourceBlock(result, id, damage); + return result; + } + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if(tef.getSourceBlockId() > 0) { + return Math.min(super.getLightOpacity(world, x, y, z), Block.lightOpacity[tef.getSourceBlockId()]); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + int id = world.getBlockId(x, y, z); + if (id == this.blockID) { + return true; + } + return super.canPlaceTorchOnTop(world, x, y, z); + } + + + @Override + public boolean canConnectWallTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + int l = par1IBlockAccess.getBlockId(par2, par3, par4); + if(l == ModObject.blockCustomFenceGate.id) { + return true; + } + return super.canConnectWallTo(par1IBlockAccess, par2, par3, par4); + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + if (tef.getSourceBlockId() > 0 && tef.getSourceBlockId() < Block.blocksList.length) { + return blocksList[tef.getSourceBlockId()].getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return blocksList[Block.anvil.blockID].getBlockTexture(world, x, y, z, blockSide); + } + + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityCustomBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int id = -1; + Block b = PainterUtil.getSourceBlock(stack); + if (b != null) { + id = b.blockID; + } + + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + tef.setSourceBlockId(id); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + + } + + world.removeBlockTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Block.cobblestoneWall.blockID); + } + + @Override + public ItemStack[] getCompletedResult(RecipeInput... inputs) { + ItemStack paintSource = RecipeInput.getInputForSlot(1, inputs); + return new ItemStack[] {createItemStackForSourceBlock(paintSource.itemID, paintSource.getItemDamage())}; + } + } + + +} diff --git a/common/crazypants/enderio/machine/painter/BlockItemCustomFence.java b/common/crazypants/enderio/machine/painter/BlockItemCustomFence.java new file mode 100644 index 00000000..3c891e92 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockItemCustomFence.java @@ -0,0 +1,21 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class BlockItemCustomFence extends ItemBlock { + + public BlockItemCustomFence(int id) { + super(id); + setHasSubtypes(true); + } + + public int getMetadata(int par1) { + return par1; + } + +} diff --git a/common/crazypants/enderio/machine/painter/BlockItemCustomFenceGate.java b/common/crazypants/enderio/machine/painter/BlockItemCustomFenceGate.java new file mode 100644 index 00000000..cc913073 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockItemCustomFenceGate.java @@ -0,0 +1,17 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.item.ItemBlock; + +public class BlockItemCustomFenceGate extends ItemBlock { + + public BlockItemCustomFenceGate(int id) { + super(id); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int par1) { + return par1; + } + +} diff --git a/common/crazypants/enderio/machine/painter/BlockItemCustomStair.java b/common/crazypants/enderio/machine/painter/BlockItemCustomStair.java new file mode 100644 index 00000000..6ef7cfd6 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockItemCustomStair.java @@ -0,0 +1,16 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.item.ItemBlock; + +public class BlockItemCustomStair extends ItemBlock { + + public BlockItemCustomStair(int id) { + super(id); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int par1) { + return par1; + } +} diff --git a/common/crazypants/enderio/machine/painter/BlockItemCustomWall.java b/common/crazypants/enderio/machine/painter/BlockItemCustomWall.java new file mode 100644 index 00000000..d4014674 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockItemCustomWall.java @@ -0,0 +1,16 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.item.ItemBlock; + +public class BlockItemCustomWall extends ItemBlock { + + public BlockItemCustomWall(int id) { + super(id); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int par1) { + return par1; + } +} diff --git a/common/crazypants/enderio/machine/painter/BlockPainter.java b/common/crazypants/enderio/machine/painter/BlockPainter.java new file mode 100644 index 00000000..3ef2a48b --- /dev/null +++ b/common/crazypants/enderio/machine/painter/BlockPainter.java @@ -0,0 +1,65 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; + +public class BlockPainter extends AbstractMachineBlock { + + public static final String KEY_SOURCE_BLOCK_ID = "sourceBlockId"; + public static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; + + public static BlockPainter create() { + BlockPainter ppainter = new BlockPainter(); + ppainter.init(); + return ppainter; + } + + private BlockPainter() { + super(ModObject.blockPainter, TileEntityPainter.class); + } + + @Override + protected void init() { + super.init(); + GameRegistry.addRecipe(new ItemStack(this), "bbb", "iri", "bbb", 'i', new ItemStack(Item.ingotIron), 'r', new ItemStack(Item.redstone), 'b', new ItemStack( + ModObject.itemIndustrialBinder.id, 1, 0)); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileEntityPainter) { + return new PainterContainer(player.inventory, (AbstractMachineEntity) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + return new GuiPainter(player.inventory, (AbstractMachineEntity) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_PAINTER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:painterFrontOn"; + } + return "enderio:painterFrontOff"; + } + +} diff --git a/common/crazypants/enderio/machine/painter/GuiPainter.java b/common/crazypants/enderio/machine/painter/GuiPainter.java new file mode 100644 index 00000000..2e67ab29 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/GuiPainter.java @@ -0,0 +1,48 @@ +package crazypants.enderio.machine.painter; + +import java.awt.Rectangle; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.render.GuiContainerBase; +import crazypants.render.GuiToolTip; +import crazypants.render.RenderUtil; + +@SideOnly(Side.CLIENT) +public class GuiPainter extends GuiMachineBase { + + private AbstractMachineEntity tileEntity; + + public GuiPainter(InventoryPlayer par1InventoryPlayer, AbstractMachineEntity furnaceInventory) { + super(furnaceInventory, new PainterContainer(par1InventoryPlayer, furnaceInventory)); + tileEntity = furnaceInventory; + } + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/painter.png"); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + + drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + int i1; + + i1 = tileEntity.getProgressScaled(24); + drawTexturedModalRect(k + 88, l + 34, 176, 14, i1 + 1, 16); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } +} + diff --git a/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java b/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java new file mode 100644 index 00000000..e0ba2426 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java @@ -0,0 +1,70 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +public class PaintedItemRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return type == ItemRenderType.INVENTORY || type == ItemRenderType.ENTITY; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + if (type == ItemRenderType.INVENTORY) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + renderEquipped(item, (RenderBlocks) data[0]); + } else if (type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEntity(item, (RenderBlocks) data[0]); + } else { + System.out.println("CustomFenceRenderer.renderItem: Unsupported render type"); + } + + } + + public void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + Block block = PainterUtil.getSourceBlock(item); + if (block != null) { + renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); + } + renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0f); + renderBlocks.clearOverrideBlockTexture(); + } + + public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + Block block = PainterUtil.getSourceBlock(item); + if (block != null) { + renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); + } + GL11.glPushMatrix(); + GL11.glTranslatef(0.75F, 0.0F, 0.0F); + renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0f); + GL11.glPopMatrix(); + renderBlocks.clearOverrideBlockTexture(); + } + + public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + Block block = PainterUtil.getSourceBlock(item); + if (block != null) { + renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); + } + renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0f); + renderBlocks.clearOverrideBlockTexture(); + } + +} diff --git a/common/crazypants/enderio/machine/painter/PainterContainer.java b/common/crazypants/enderio/machine/painter/PainterContainer.java new file mode 100644 index 00000000..8bcc39ed --- /dev/null +++ b/common/crazypants/enderio/machine/painter/PainterContainer.java @@ -0,0 +1,110 @@ +package crazypants.enderio.machine.painter; + +import crazypants.enderio.machine.AbstractMachineEntity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class PainterContainer extends Container { + + final AbstractMachineEntity tileEntity; + private int progress = 0; + + public PainterContainer(InventoryPlayer playerInv, AbstractMachineEntity te) { + + this.tileEntity = te; + + addSlotToContainer(new Slot(tileEntity, 0, 67, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 1, 37, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 2, 121, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) { + return tileEntity.isUseableByPlayer(entityplayer); + } + + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + ItemStack itemstack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + itemstack = origStack.copy(); + + if (slotIndex == 2) { + + if (!mergeItemStack(origStack, 3, 39, true)) { + return null; + } + slot.onSlotChange(origStack, itemstack); + + } else if (slotIndex != 1 && slotIndex != 0) { + + if (tileEntity.isItemValidForSlot(0, origStack)) { + if (!this.mergeItemStack(origStack, 0, 1, false)) { + return null; + } + } else if (tileEntity.isItemValidForSlot(1, origStack)) { + if (!this.mergeItemStack(origStack, 1, 2, false)) { + return null; + } + } else if (slotIndex >= 3 && slotIndex < 30) { + if (!this.mergeItemStack(origStack, 30, 39, false)) { + return null; + } + } else if (slotIndex >= 30 && slotIndex < 39 && !this.mergeItemStack(origStack, 3, 30, false)) { + return null; + } + + } else if (!mergeItemStack(origStack, 3, 39, false)) { + return null; + } + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + if (origStack.stackSize == itemstack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return itemstack; + } + + +} diff --git a/common/crazypants/enderio/machine/painter/PainterUtil.java b/common/crazypants/enderio/machine/painter/PainterUtil.java new file mode 100644 index 00000000..785003f7 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/PainterUtil.java @@ -0,0 +1,77 @@ +package crazypants.enderio.machine.painter; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.util.StringTranslate; + +public final class PainterUtil { + + + private PainterUtil() { + } + + public static boolean isMetadataEquivelent(ItemStack one, ItemStack two) { + if(one == null || two == null) { + return false; + } + return PainterUtil.getSourceBlockId(one) == PainterUtil.getSourceBlockId(two) && PainterUtil.getSourceBlockMetadata(one) == PainterUtil.getSourceBlockMetadata(two); + } + + public static Block getSourceBlock(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + if (tag != null) { + int blockId = tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + if (blockId >= 0 && blockId < Block.blocksList.length) { + return Block.blocksList[blockId]; + } + } + return null; + } + + public static int getSourceBlockId(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + if (tag != null) { + int blockId = tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + if (blockId >= 0 && blockId < Block.blocksList.length) { + return blockId; + } + } + return -1; + } + + public static int getSourceBlockMetadata(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + if (tag != null) { + return tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_META); + } + return 0; + } + + public static void setSourceBlock(ItemStack item, int sourceId, int meta) { + NBTTagCompound tag = item.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + item.setTagCompound(tag); + } + tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_ID, sourceId); + tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_META, meta); + + String sourceName = ""; + if (sourceId > 0) { + sourceName = Item.itemsList[sourceId].getUnlocalizedName(new ItemStack(sourceId, 1, meta)); + sourceName = StatCollector.translateToLocal(sourceName + ".name"); + } + String typeName; + typeName = Item.itemsList[item.itemID].getUnlocalizedName(item); + typeName = StatCollector.translateToLocal(typeName + ".name"); + + NBTTagCompound displayTags = new NBTTagCompound(); + displayTags.setString("Name", "Painted " + sourceName + " " + typeName); + tag.setCompoundTag("display", displayTags); + + } + +} diff --git a/common/crazypants/enderio/machine/painter/TileEntityCustomBlock.java b/common/crazypants/enderio/machine/painter/TileEntityCustomBlock.java new file mode 100644 index 00000000..00154bb4 --- /dev/null +++ b/common/crazypants/enderio/machine/painter/TileEntityCustomBlock.java @@ -0,0 +1,67 @@ +package crazypants.enderio.machine.painter; + +import crazypants.enderio.PacketHandler; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; + +public class TileEntityCustomBlock extends TileEntity { + + private static final String KEY_SOURCE_BLOCK_ID = "sourceBlockId"; + private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; + private int sourceBlockId; + private int sourceBlockMetadata; + + public TileEntityCustomBlock() { + this.sourceBlockId = -1; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + sourceBlockId = nbtRoot.getInteger(KEY_SOURCE_BLOCK_ID); + sourceBlockMetadata = nbtRoot.getInteger(KEY_SOURCE_BLOCK_META); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setInteger(KEY_SOURCE_BLOCK_ID, sourceBlockId); + nbtRoot.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); + } + + public int getSourceBlockId() { + return sourceBlockId; + } + + public void setSourceBlockId(int sourceBlockId) { + this.sourceBlockId = sourceBlockId; + } + + public int getSourceBlockMetadata() { + return sourceBlockMetadata; + } + + public void setSourceBlockMetadata(int sourceBlockMetadata) { + this.sourceBlockMetadata = sourceBlockMetadata; + } + + public Block getSourceBlock() { + if(sourceBlockId <= 0) { + return null; + } + return Block.blocksList[sourceBlockId]; + } + + @Override + public Packet getDescriptionPacket() { + return PacketHandler.getPacket(this); + } + + @Override + public boolean canUpdate() { + return false; + } + +} diff --git a/common/crazypants/enderio/machine/painter/TileEntityPainter.java b/common/crazypants/enderio/machine/painter/TileEntityPainter.java new file mode 100644 index 00000000..11277f5f --- /dev/null +++ b/common/crazypants/enderio/machine/painter/TileEntityPainter.java @@ -0,0 +1,70 @@ +package crazypants.enderio.machine.painter; + +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; + +public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISidedInventory { + + private static final short MAX_POWER_USE_PER_TICK = 6; + + public TileEntityPainter() { + // 0 = input slot, 1 = paint source, 2 = output slot + super(3); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return super.canExtractItem(i, itemstack, j) && PainterUtil.isMetadataEquivelent(itemstack, inventory[2]); + } + + @Override + public String getInvName() { + return "Auto Painter"; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemStack) { + if (i > 1) { + return false; + } + if (i == 0) { + return !MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), RecipeInput.create(i, itemStack)).isEmpty(); + } + if (inventory[0] == null) { + return BasicPainterTemplate.isValidSourceDefault(itemStack); + } + return MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), targetInput(), paintSource()) != null; + } + + @Override + public String getMachineName() { + return ModObject.blockPainter.unlocalisedName; + } + + private RecipeInput targetInput() { + return RecipeInput.create(0, inventory[0]); + } + + private RecipeInput paintSource() { + return RecipeInput.create(1, inventory[1]); + } + + @Override + protected boolean canMergeWithCurrentOuput(ItemStack nextResult) { + if (!nextResult.isItemEqual(inventory[2])) { + // next result is a different item type + return false; + } + + int cookedId = nextResult.getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + int invId = inventory[2].getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + if (cookedId != invId) { + // next result has a different source item than the current one + return false; + } + return true; + } + +} diff --git a/common/crazypants/enderio/machine/reservoir/BlockReservoir.java b/common/crazypants/enderio/machine/reservoir/BlockReservoir.java new file mode 100644 index 00000000..b8357223 --- /dev/null +++ b/common/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -0,0 +1,283 @@ +package crazypants.enderio.machine.reservoir; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.machine.reservoir.TileReservoir.Pos; +import crazypants.util.BlockCoord; +import crazypants.util.Util; +import crazypants.vecmath.Vector3d; + +public class BlockReservoir extends BlockContainer { + + public static BlockReservoir create() { + BlockReservoir result = new BlockReservoir(); + result.init(); + return result; + } + + private static enum MbFace { + TL("reservoirMbTl"), + TR("reservoirMbTr"), + BL("reservoirMbBl"), + BR("reservoirMbBr"), + T("reservoirMbT"), + B("reservoirMbB"), + L("reservoirMbL"), + R("reservoirMbR"); + + String iconName; + + private MbFace(String iconName) { + this.iconName = iconName; + } + + } + + private Icon[] mbIcons = new Icon[8]; + Icon switchIcon; + + private BlockReservoir() { + super(ModObject.blockReservoir.id, Material.rock); + setHardness(0.5F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockReservoir.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockReservoir.name); + GameRegistry.registerBlock(this, ModObject.blockReservoir.unlocalisedName); + GameRegistry.registerTileEntity(TileReservoir.class, ModObject.blockReservoir.unlocalisedName + "TileEntity"); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { + + ItemStack current = entityPlayer.inventory.getCurrentItem(); + if (current != null) { + + TileReservoir tank = (TileReservoir) world.getBlockTileEntity(x, y, z); + + // LiquidStack liquid = + // LiquidContainerRegistry.getLiquidForFilledItem(current); + FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); + + if (liquid != null) { + // Handle filled containers + int qty = tank.getController().doFill(ForgeDirection.UNKNOWN, liquid, true); + + if (qty != 0 && !entityPlayer.capabilities.isCreativeMode) { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(current)); + } + return true; + + } else { + // Handle empty containers + + FluidStack available = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid; + if (available != null) { + ItemStack filled = FluidContainerRegistry.fillFluidContainer(available, current); + + liquid = FluidContainerRegistry.getFluidForFilledItem(filled); + + if (liquid != null) { + if (!entityPlayer.capabilities.isCreativeMode) { + if (current.stackSize > 1) { + if (!entityPlayer.inventory.addItemStackToInventory(filled)) + return false; + else { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(current)); + } + } else { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(current)); + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, filled); + } + } + tank.drain(ForgeDirection.UNKNOWN, liquid.amount, true); + return true; + + } else if (ConduitUtil.isToolEquipped(entityPlayer) && tank.isMultiblock()) { + tank.setAutoEject(!tank.isAutoEject()); + for (BlockCoord bc : tank.multiblock) { + world.markBlockForUpdate(bc.x, bc.y, bc.z); + } + + } + + } + } + } + + return false; + + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof TileReservoir)) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (BlockCoord bc : tr.multiblock) { + min.x = Math.min(min.x, bc.x); + max.x = Math.max(max.x, bc.x + 1); + min.y = Math.min(min.y, bc.y); + max.y = Math.max(max.y, bc.y + 1); + min.z = Math.min(min.z, bc.z); + max.z = Math.max(max.z, bc.z + 1); + } + return AxisAlignedBB.getAABBPool().getAABB(min.x, min.y, min.z, max.x, max.y, max.z); + + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileReservoir(); + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + if (world.isRemote) { + return; + } + TileReservoir tr = (TileReservoir) world.getBlockTileEntity(x, y, z); + boolean res = tr.onBlockAdded(); + + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int blockId) { + if (world.isRemote) { + return; + } + TileReservoir te = (TileReservoir) world.getBlockTileEntity(x, y, z); + te.onNeighborBlockChange(blockId); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:reservoir"); + for (MbFace face : MbFace.values()) { + mbIcons[face.ordinal()] = iconRegister.registerIcon("enderio:" + face.iconName); + } + switchIcon = iconRegister.registerIcon("enderio:reservoirSwitch"); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (!(te instanceof TileReservoir)) { + return true; + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return true; + } + return false; + } + + @Override + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + // used to render the block in the world + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (!(te instanceof TileReservoir)) { + return blockIcon; + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return blockIcon; + } + + ForgeDirection side = ForgeDirection.getOrientation(blockSide); + Pos pos = tr.pos; + + if (tr.front == side || tr.front == side.getOpposite()) { // 2x2 area + + boolean isRight; + if (tr.isVertical()) { // to to flip right and left for back faces of + // vertical multiblocks + isRight = (pos.isRight && tr.front != side.getOpposite()) || (!pos.isRight && tr.front == side.getOpposite()); + } else { + isRight = pos.isRight; + } + if (pos.isTop) { + return isRight ? mbIcons[MbFace.TR.ordinal()] : mbIcons[MbFace.TL.ordinal()]; + } else { + return isRight ? mbIcons[MbFace.BR.ordinal()] : mbIcons[MbFace.BL.ordinal()]; + } + + } + if (tr.up == side || tr.up == side.getOpposite()) { // up or down face + if (tr.isVertical()) { + if (tr.right.offsetX != 0) { + return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } else { + return pos.isRight ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; + } + } else { + if (tr.up == side) { + return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } else { + return pos.isRight ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; + } + } + + } else { + if (tr.isVertical()) { + return pos.isTop ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; + } else { + if (tr.right != side) { + return pos.isTop ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } else { + return pos.isTop ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; + } + } + } + + } + +} diff --git a/common/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/common/crazypants/enderio/machine/reservoir/ReservoirRenderer.java new file mode 100644 index 00000000..c4a72b89 --- /dev/null +++ b/common/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -0,0 +1,169 @@ +package crazypants.enderio.machine.reservoir; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.ForgeDirection; + +import org.lwjgl.opengl.GL11; + +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.vecmath.Vector3d; + + +public class ReservoirRenderer extends TileEntitySpecialRenderer { + + private ResourceLocation texName = null; + private Icon tex = null; + private float switchSize = 0.25f; + private float switchHSize = switchSize / 2f; + private BoundingBox switchBB = new BoundingBox(0.5 - switchHSize, 0.5 - switchHSize, 0.5 - switchHSize, 0.5 + switchHSize, 0.5 + switchHSize, + 0.5 + switchHSize); + + private final BlockReservoir block; + + public ReservoirRenderer(BlockReservoir res) { + block = res; + } + + @Override + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { + + TileReservoir res = (TileReservoir) tileentity; + + float fullness = res.getFilledRatio(); + if ((res.isMultiblock() && !res.isMaster() && (fullness >= 0 || res.isAutoEject())) || (!res.isMultiblock() && + fullness <= 0) ) { + return; + } + + float val = RenderUtil.claculateTotalBrightnessForLocation(tileentity.worldObj, tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); + Minecraft.getMinecraft().entityRenderer.disableLightmap(0); + + + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glTranslatef((float) x, (float) y, (float) z); + + BoundingBox bb = res.getLiquidRenderBounds(); + + if (res.isMultiblock() && res.isAutoEject()) { + + // switch + RenderUtil.bindBlockTexture(); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorRGBA_F(val, val, val, 1); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + drawSwitch(dir, bb); + } + Tessellator.instance.draw(); + } + + if (fullness > 0) { + RenderUtil.bindTexture(getLiquidSheet()); + + float margin = 0.01f; + + Icon tex = getLiquidTexture(); + float maxV = tex.getMinV() + ((tex.getMaxV() - tex.getMinV()) * fullness); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorRGBA_F(val, val, val, 1); + CubeRenderer.render( + new BoundingBox(bb.minX + margin, bb.minY + margin, bb.minZ + margin, bb.maxX - margin, + bb.minY + (fullness * (Math.abs(bb.maxY - bb.minY))) - margin, bb.maxZ - margin), tex.getMinU(), tex.getMaxU(), tex.getMinV(), maxV); + Tessellator.instance.draw(); + } + + GL11.glPopAttrib(); + GL11.glPopMatrix(); + + } + + private Vector3d forward = new Vector3d(); + private Vector3d left = new Vector3d(); + private Vector3d up = new Vector3d(); + private Vector3d offset = new Vector3d(); + + private void drawSwitch(ForgeDirection dir, BoundingBox bb) { + Tessellator tes = Tessellator.instance; + + Vector3d cent = bb.getCenter(); + offset.set(cent); + + boolean isUp = dir.offsetY != 0; + + if(dir == ForgeDirection.UP) { + int i = 0; + } + + forward.set(dir.offsetX, dir.offsetY, dir.offsetZ); + forward.scale(0.5); + forward.x *= bb.sizeX(); + forward.y *= bb.sizeY(); + forward.z *= bb.sizeZ(); + + offset.add(forward); + + if(dir.offsetY == 0) { + offset.y += bb.sizeY() * 0.25; + } + if(dir.offsetX == 0) { + offset.x -= (isUp ? dir.offsetY : dir.offsetZ) * bb.sizeX() * 0.25; + } + if(dir.offsetZ == 0) { + offset.z += (isUp ? -dir.offsetY : dir.offsetX) * bb.sizeZ() * 0.25; + } + + left.set(isUp ? -dir.offsetY : -dir.offsetZ, 0, dir.offsetX); + + if (isUp) { + up.set(0, 0, -1); + } else { + up.set(0, 1, 0); + } + + forward.scale(0.5); + left.scale(0.125); + up.scale(0.125); + + Icon icon = block.switchIcon; + + tes.addVertexWithUV(offset.x + left.x - up.x, offset.y + left.y - up.y, + offset.z + left.z - up.z, icon.getMinU(), icon.getMaxV()); + tes.addVertexWithUV(offset.x - left.x - up.x, offset.y - left.y - up.y, + offset.z - left.z - up.z, icon.getMaxU(), icon.getMaxV()); + tes.addVertexWithUV(offset.x - left.x + up.x, offset.y - left.y + up.y, + offset.z - left.z + up.z, icon.getMaxU(), icon.getMinV()); + tes.addVertexWithUV(offset.x + left.x + up.x, offset.y + left.y + up.y, + offset.z + left.z + up.z, icon.getMinU(), icon.getMinV()); + + } + + private ResourceLocation getLiquidSheet() { + if (texName == null) { + texName = TextureMap.field_110575_b; + } + return texName; + } + + private Icon getLiquidTexture() { + if (tex == null) { + tex = ReservoirTank.WATER.getFluid().getStillIcon(); + } + return tex; + } +} diff --git a/common/crazypants/enderio/machine/reservoir/ReservoirTank.java b/common/crazypants/enderio/machine/reservoir/ReservoirTank.java new file mode 100644 index 00000000..3bef26c9 --- /dev/null +++ b/common/crazypants/enderio/machine/reservoir/ReservoirTank.java @@ -0,0 +1,66 @@ +package crazypants.enderio.machine.reservoir; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +public class ReservoirTank extends FluidTank { + + static final FluidStack WATER = FluidRegistry.getFluidStack("water", 0); + + ReservoirTank(int quantity, int capacity) { + super(WATER.getFluid(), quantity, capacity); + } + + ReservoirTank(int capacity) { + this(0, capacity); + } + + ReservoirTank(FluidStack liquid, int capacity) { + super(liquid, capacity); + } + + public int getAmount() { + return getFluid().amount; + } + + public float getFilledRatio() { + return (float) getAmount() / getCapacity(); + } + + public boolean isFull() { + return getAmount() >= getCapacity(); + } + + public void setAmount(int amount) { + FluidStack newLiquid = WATER.copy(); + newLiquid.amount = Math.min(getCapacity(), amount); + setFluid(newLiquid); + } + + @Override + public FluidStack getFluid() { + FluidStack l = super.getFluid(); + if (l == null) { + l = WATER.copy(); + setFluid(l); + } + return l; + } + + public int getAvailableSpace() { + return getCapacity() - getAmount(); + } + + public void addAmount(int amount) { + setAmount(getAmount() + amount); + } + + @Override + public void setCapacity(int capacity) { + super.setCapacity(capacity); + if (getAmount() > capacity) { + setAmount(capacity); + } + } +} diff --git a/common/crazypants/enderio/machine/reservoir/TankNeighbour.java b/common/crazypants/enderio/machine/reservoir/TankNeighbour.java new file mode 100644 index 00000000..81874456 --- /dev/null +++ b/common/crazypants/enderio/machine/reservoir/TankNeighbour.java @@ -0,0 +1,18 @@ +package crazypants.enderio.machine.reservoir; + +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; + +class TankNeighbour { + + final IFluidHandler container; + final ForgeDirection fillFromDir; + + TankNeighbour(IFluidHandler container, ForgeDirection fillFromDir) { + this.container = container; + this.fillFromDir = fillFromDir; + } + + + +} diff --git a/common/crazypants/enderio/machine/reservoir/TileReservoir.java b/common/crazypants/enderio/machine/reservoir/TileReservoir.java new file mode 100644 index 00000000..000f3f08 --- /dev/null +++ b/common/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -0,0 +1,630 @@ +package crazypants.enderio.machine.reservoir; + +import static net.minecraftforge.common.ForgeDirection.EAST; +import static net.minecraftforge.common.ForgeDirection.NORTH; +import static net.minecraftforge.common.ForgeDirection.UNKNOWN; +import static net.minecraftforge.common.ForgeDirection.UP; +import static net.minecraftforge.common.ForgeDirection.WEST; +import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; + +import java.util.ArrayList; + +import crazypants.enderio.ModObject; +import crazypants.enderio.PacketHandler; +import crazypants.render.BoundingBox; +import crazypants.util.BlockCoord; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +public class TileReservoir extends TileEntity implements IFluidHandler { + + enum Pos { + TL(true, false), + TR(true, true), + BL(false, false), + BR(false, true), + UNKNOWN(false, false); + + boolean isTop; + boolean isRight; + + private Pos(boolean isTop, boolean isRight) { + this.isTop = isTop; + this.isRight = isRight; + } + } + + static final FluidStack WATER_BUCKET = FluidRegistry.getFluidStack("water", BUCKET_VOLUME); + + BlockCoord[] multiblock = null; + + // Orientation of multibock + ForgeDirection front = UNKNOWN; + ForgeDirection up = UNKNOWN; + ForgeDirection right = UNKNOWN; + + // Position within multiblock + Pos pos = Pos.UNKNOWN; + + ReservoirTank tank = new ReservoirTank(BUCKET_VOLUME); + + ReservoirTank regenTank = null; + + boolean autoEject; + + private boolean tankDirty = false; + + private boolean neighboursDirty = false; + + private long ticksSinceFill = 0; + + private BoundingBox liquidRenderBounds = null; + + private ArrayList tankNeighbours; + + @Override + public void updateEntity() { + if (worldObj == null || worldObj.isRemote) { + return; + } + if (isMaster()) { + if (regenTank.isFull() && !tank.isFull()) { + ++ticksSinceFill; + if (ticksSinceFill >= 20) { + ticksSinceFill = 0; + tank.fill(WATER_BUCKET, true); + tankDirty = true; + } + } + if(autoEject && neighboursDirty) { + doUpdateTankNeighbours(); + } + if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getAmount() > 0) { + int ejectable = tank.getAmount(); + int amountPerNeighbour = ejectable / tankNeighbours.size(); + FluidStack source = WATER_BUCKET.copy(); + int used = 0; + for(TankNeighbour tc : tankNeighbours) { + source.amount = amountPerNeighbour; + used += tc.container.fill(tc.fillFromDir, source, true); + } + tank.drain(used, true); + tankDirty = true; + } + } + if (tankDirty) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + tankDirty = false; + } + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if(isMultiblock()) { + return 0; + } + return getController().doFill(from, resource, doFill); + } + + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return getController().doDrain(from, maxDrain, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource != null && !resource.isFluidEqual(tank.getFluid())) { + return null; + } + return drain(from, resource.amount, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if(tank.getFluid() == null) { + return true; + } + if(fluid != null && fluid.getID() == tank.getFluid().fluidID) { + return true; + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if(tank.getFluid() == null || fluid == null) { + return false; + } + return tank.getFluid().getFluid().getID() == fluid.getID(); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return getController().doGetTankInfo(from); + } + + private FluidTankInfo[] doGetTankInfo(ForgeDirection from) { + return new FluidTankInfo[]{tank.getInfo()}; + } + + @Override + public Packet getDescriptionPacket() { + return PacketHandler.getPacket(this); + } + + public void setAutoEject(boolean autoEject) { + TileReservoir c = getController(); + if (c != null) { + c.doSetAutoEject(autoEject); + } else { + doSetAutoEject(autoEject); + } + } + + private void doSetAutoEject(boolean newVal) { + if (newVal && !autoEject) { + updateTankNeighbours(); + } + this.autoEject = newVal; + } + + public boolean isAutoEject() { + TileReservoir c = getController(); + if (c != null) { + return c.doIsAutoEject(); + } else { + return doIsAutoEject(); + } + } + + private boolean doIsAutoEject() { + return autoEject; + } + + private void updateTankNeighbours() { + TileReservoir c = getController(); + if (c != null) { + c.neighboursDirty = true; + } + } + + + private void doUpdateTankNeighbours() { + if (tankNeighbours == null) { + tankNeighbours = new ArrayList(); + } + tankNeighbours.clear(); + for (BlockCoord bc : multiblock) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord check = bc.getLocation(dir); + if (!inMultiblock(check)) { + IFluidHandler tc = getTankContainer(check); + if (tc != null) { + tankNeighbours.add(new TankNeighbour(tc, dir.getOpposite())); + } + } + } + } + neighboursDirty = false; + } + + private boolean inMultiblock(BlockCoord check) { + for (BlockCoord bc : multiblock) { + if (check.equals(bc)) { + return true; + } + } + return false; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); + front = ForgeDirection.getOrientation(nbtRoot.getShort("front")); + up = ForgeDirection.getOrientation(nbtRoot.getShort("up")); + right = ForgeDirection.getOrientation(nbtRoot.getShort("right")); + pos = Pos.values()[nbtRoot.getShort("pos")]; + + autoEject = nbtRoot.getBoolean("autoEject"); + + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); + FluidStack regenLiquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("regenTank")); + + tank.setCapacity(regenLiquid == null ? BUCKET_VOLUME : BUCKET_VOLUME * 2); + if (liquid != null) { + tank.setFluid(liquid); + } else { + tank.setAmount(0); + } + + if (regenLiquid == null) { + regenTank = null; + } else { + regenTank = new ReservoirTank(regenLiquid, BUCKET_VOLUME * 2); + } + + boolean wasMulti = isMultiblock(); + + if (nbtRoot.getBoolean("isMultiblock")) { + int[] coords = nbtRoot.getIntArray("multiblock"); + multiblock = new BlockCoord[4]; + int c = 0; + for (int i = 0; i < 4; i++) { + multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); + } + + if (isMaster() && autoEject) { + updateTankNeighbours(); + } + + } else { + multiblock = null; + } + + if (wasMulti != isMultiblock()) { + liquidRenderBounds = null; + } + + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("front", (short) front.ordinal()); + nbtRoot.setShort("up", (short) up.ordinal()); + nbtRoot.setShort("right", (short) right.ordinal()); + nbtRoot.setShort("pos", (short) pos.ordinal()); + + nbtRoot.setBoolean("autoEject", autoEject); + + if (tank.getFluid() != null) { + nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); + } + if (regenTank != null) { + nbtRoot.setTag("regenTank", regenTank.getFluid().writeToNBT(new NBTTagCompound())); + } + + nbtRoot.setBoolean("isMultiblock", isMultiblock()); + if (isMultiblock()) { + int[] vals = new int[12]; + int i = 0; + for (BlockCoord bc : multiblock) { + vals[i++] = bc.x; + vals[i++] = bc.y; + vals[i++] = bc.z; + } + nbtRoot.setIntArray("multiblock", vals); + } + } + + public boolean onBlockAdded() { + boolean res = formMultiblock(); + return res; + } + + public boolean onNeighborBlockChange(int blockId) { + if (blockId == ModObject.blockReservoir.actualId) { + + if (!isCurrentMultiblockValid()) { + // if its not, try and form a new one + TileReservoir controller = getController(); + if (controller != null) { + controller.clearCurrentMultiblock(); + controller.formMultiblock(); + } else { + clearCurrentMultiblock(); + formMultiblock(); + } + return true; + } + } else if (isMultiblock() && isAutoEject()) { + updateTankNeighbours(); + } + return false; + } + + boolean isVertical() { + return up == UP; + } + + boolean isMaster() { + if (multiblock != null) { + return multiblock[0].equals(xCoord, yCoord, zCoord); + } + return false; + } + + float getFilledRatio() { + return getController().doGetFilledRatio(); + } + + public boolean isMultiblock() { + return multiblock != null; + } + + BoundingBox getLiquidRenderBounds() { + if (liquidRenderBounds == null) { + if (!isMultiblock()) { + return BoundingBox.UNIT_CUBE; + } + BoundingBox bounds = new BoundingBox(multiblock[0]); + for (int i = 1; i < multiblock.length; i++) { + bounds = bounds.expandBy(new BoundingBox(multiblock[i])); + } + liquidRenderBounds = bounds.translate(-multiblock[0].x, -multiblock[0].y, -multiblock[0].z); + } + return liquidRenderBounds; + } + + protected float doGetFilledRatio() { + float result = tank.getFilledRatio(); + if (isMaster()) { + result = regenTank.getFilledRatio() * 0.5f + result * 0.5f; + } + return result; + } + + int doFill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (!WATER_BUCKET.isFluidEqual(resource)) { + return 0; + } + + int ret = 0; + // fill buffer first + if (resource != null && isMaster()) { + resource = resource.copy(); + int filled = regenTank.fill(resource, doFill); + resource.amount -= filled; + ret += filled; + } + ret += tank.fill(resource, doFill); + tankDirty = doFill; + return ret; + } + + protected FluidStack doDrain(ForgeDirection from, int maxDrain, boolean doDrain) { + FluidStack ret = tank.drain(maxDrain, doDrain); + tankDirty = doDrain; + return ret; + } + + private void setMultiblock(BlockCoord[] mb) { + multiblock = mb; + updatePosition(); + + if (isMaster()) { + + regenTank = new ReservoirTank(BUCKET_VOLUME * 2); + tank.setCapacity(BUCKET_VOLUME * 2); + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res != null) { + FluidStack drained = res.doDrain(ForgeDirection.UNKNOWN, regenTank.getAvailableSpace(), true); + if (drained != null) { + regenTank.addAmount(drained.amount); + } + // incase regen tank is full, add to normal tank + drained = res.doDrain(ForgeDirection.UNKNOWN, tank.getAvailableSpace(), true); + if (drained != null) { + tank.addAmount(drained.amount); + } + } + } + + if (doIsAutoEject()) { + updateTankNeighbours(); + } + + } else { + regenTank = null; + tank.setCapacity(BUCKET_VOLUME); + } + tankDirty = true; + + liquidRenderBounds = null; + + // Forces an update + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isMultiblock() ? 1 : 0, 2); + } + + TileReservoir getController() { + if (isMaster() || !isMultiblock()) { + return this; + } + TileReservoir res = getReservoir(multiblock[0]); + return res != null ? res : this; + } + + private void updatePosition() { + if (multiblock == null) { + front = UNKNOWN; + up = UNKNOWN; + right = UNKNOWN; + return; + } + + boolean isVertical = false; + for (BlockCoord bc : multiblock) { + if (bc.y != yCoord) { + isVertical = true; + break; + } + } + if (isVertical) { + up = ForgeDirection.UP; + boolean isWestEast = false; + for (BlockCoord bc : multiblock) { + if (bc.x != xCoord) { + isWestEast = true; + break; + } + } + front = isWestEast ? NORTH : EAST; + right = isWestEast ? WEST : NORTH; + } else { + front = UP; + right = EAST; + up = NORTH; + } + + boolean isRight = false; + BlockCoord myCoord = new BlockCoord(this); + for (BlockCoord bc : multiblock) { + if (isInDir(myCoord, right, bc)) { + isRight = true; + } + } + boolean isTop = false; + for (BlockCoord bc : multiblock) { + if (isInDir(myCoord, up, bc)) { + isTop = true; + } + } + if (isTop) { + pos = isRight ? Pos.TR : Pos.TL; + } else { + pos = isRight ? Pos.BR : Pos.BL; + } + + } + + private boolean isInDir(BlockCoord from, ForgeDirection inDir, BlockCoord to) { + if (inDir.offsetX != 0) { + return from.x - inDir.offsetX == to.x; + } else if (inDir.offsetY != 0) { + return from.y - inDir.offsetY == to.y; + } else if (inDir.offsetZ != 0) { + return from.z - inDir.offsetZ == to.z; + } + return false; + } + + private void clearCurrentMultiblock() { + if (multiblock == null) { + return; + } + boolean fillTanks = false; + if (isMaster()) { + fillTanks = regenTank.isFull(); + regenTank = null; + } + + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res != null) { + res.setMultiblock(null); + if (fillTanks) { + res.tank.fill(WATER_BUCKET, true); + } else { + res.tank.drain(BUCKET_VOLUME, true); + } + } + } + multiblock = null; + tankDirty = true; + } + + private boolean isCurrentMultiblockValid() { + if (multiblock == null) { + return false; + } + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res == null || !res.isMultiblock()) { + return false; + } + } + return true; + } + + private boolean formMultiblock() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (isNonMultiReservoir(dir)) { + ForgeDirection[] cans = candidates(dir); + for (ForgeDirection neighbor : cans) { + if (isNonMultiReservoir(neighbor)) { + if (isNonMultiReservoir(dir.offsetX + neighbor.offsetX, dir.offsetY + neighbor.offsetY, dir.offsetZ + neighbor.offsetZ)) { + BlockCoord[] mb = new BlockCoord[4]; + mb[0] = inDirection(dir); + mb[1] = inDirection(neighbor); + mb[2] = inDirection(dir.offsetX + neighbor.offsetX, dir.offsetY + neighbor.offsetY, dir.offsetZ + neighbor.offsetZ); + mb[3] = new BlockCoord(xCoord, yCoord, zCoord); + for (BlockCoord bc : mb) { + TileReservoir res = getReservoir(bc); + res.setMultiblock(mb); + } + return true; + } + } + } + } + } + return false; + } + + private BlockCoord inDirection(int offsetX, int offsetY, int offsetZ) { + return new BlockCoord(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); + } + + private BlockCoord inDirection(ForgeDirection dir) { + return inDirection(dir.offsetX, dir.offsetY, dir.offsetZ); + } + + private IFluidHandler getTankContainer(BlockCoord bc) { + return getTankContainer(bc.x, bc.y, bc.z); + } + + private IFluidHandler getTankContainer(int x, int y, int z) { + if(worldObj == null) { + return null; + } + TileEntity te = worldObj.getBlockTileEntity(x, y, z); + if (te instanceof IFluidHandler) { + return (IFluidHandler) te; + } + return null; + } + + private TileReservoir getReservoir(BlockCoord bc) { + return getReservoir(bc.x, bc.y, bc.z); + } + + private TileReservoir getReservoir(int x, int y, int z) { + TileEntity te = worldObj.getBlockTileEntity(x, y, z); + if (te instanceof TileReservoir) { + return (TileReservoir) te; + } + return null; + } + + private boolean isNonMultiReservoir(int offsetX, int offsetY, int offsetZ) { + TileReservoir res = getReservoir(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); + if (res == null) { + return false; + } + return !res.isMultiblock(); + } + + private boolean isNonMultiReservoir(ForgeDirection dir) { + return isNonMultiReservoir(dir.offsetX, dir.offsetY, dir.offsetZ); + } + + private ForgeDirection[] candidates(ForgeDirection matchDir) { + ForgeDirection[] res = new ForgeDirection[4]; + res[0] = matchDir.getRotation(matchDir.offsetY == 0 ? ForgeDirection.UP : ForgeDirection.NORTH); + res[1] = res[0].getOpposite(); + res[2] = matchDir.getRotation(matchDir.offsetX == 0 ? ForgeDirection.EAST : ForgeDirection.NORTH); + res[3] = res[2].getOpposite(); + return res; + } + +} diff --git a/common/crazypants/enderio/machine/solor/BlockSolarPanel.java b/common/crazypants/enderio/machine/solor/BlockSolarPanel.java new file mode 100644 index 00000000..8120a170 --- /dev/null +++ b/common/crazypants/enderio/machine/solor/BlockSolarPanel.java @@ -0,0 +1,105 @@ +package crazypants.enderio.machine.solor; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.enderface.BlockEnderIO; +import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.machine.AbstractMachineBlock; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +public class BlockSolarPanel extends Block implements ITileEntityProvider { + + public static BlockSolarPanel create() { + BlockSolarPanel result = new BlockSolarPanel(); + result.init(); + return result; + } + + private static final float BLOCK_HEIGHT = 0.15f; + + Icon sideIcon; + + private BlockSolarPanel() { + super(ModObject.blockSolarPanel.id, Material.ground); + setHardness(0.5F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockSolarPanel.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockSolarPanel.name); + GameRegistry.registerBlock(this, ModObject.blockSolarPanel.unlocalisedName); + GameRegistry.registerTileEntity(TileEntitySolorPanel.class, ModObject.blockSolarPanel.unlocalisedName + "TileEntity"); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileEntitySolorPanel(); + } + + public Icon getIcon(int side, int meta) { + if(side == ForgeDirection.UP.ordinal()) { + return blockIcon; + } + return sideIcon; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int par5) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if(te instanceof TileEntitySolorPanel) { + ((TileEntitySolorPanel)te).onNeighborBlockChange(); + } + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:solarPanelTop"); + sideIcon = iconRegister.registerIcon("enderio:solarPanelSide"); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); + } + + @Override + public void setBlockBoundsForItemRender() { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); + } + + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + setBlockBoundsBasedOnState(par1World, par2, par3, par4); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + +} diff --git a/common/crazypants/enderio/machine/solor/TileEntitySolorPanel.java b/common/crazypants/enderio/machine/solor/TileEntitySolorPanel.java new file mode 100644 index 00000000..27a5a41d --- /dev/null +++ b/common/crazypants/enderio/machine/solor/TileEntitySolorPanel.java @@ -0,0 +1,188 @@ +package crazypants.enderio.machine.solor; + +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; + +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.util.BlockCoord; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerEmitter; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class TileEntitySolorPanel extends TileEntity implements IInternalPowerReceptor, IPowerEmitter { + + protected PowerHandler powerHandler; + private BasicCapacitor capacitor; + + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + private boolean receptorsDirty = true; + + private float energyPerTick = 1; + + public TileEntitySolorPanel() { + // TODO: + capacitor = new BasicCapacitor(); + powerHandler = PowerHandlerUtil.createHandler(capacitor, this, Type.ENGINE); + } + + @Override + public boolean canEmitPowerFrom(ForgeDirection side) { + return side == ForgeDirection.DOWN; + } + + @Override + public void doWork(PowerHandler workProvider) { + } + + @Override + public World getWorld() { + return worldObj; + } + + @Override + public PowerReceiver getPowerReceiver(ForgeDirection side) { + return powerHandler.getPowerReceiver(); + } + + public void onNeighborBlockChange() { + receptorsDirty = true; + } + + @Override + public void applyPerdition() { + } + + @Override + public PowerHandler getPowerHandler() { + return powerHandler; + } + + @Override + public void updateEntity() { + if (worldObj == null || worldObj.isRemote) { + return; + } + collectEnergy(); + transmitEnergy(); + } + + private void collectEnergy() { + if(!worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord)) { + return; + } + float fromSun = worldObj.getSunBrightness(1); + float collected = energyPerTick * fromSun; + powerHandler.setEnergy(Math.min(powerHandler.getMaxEnergyStored(), powerHandler.getEnergyStored() + collected)); + + } + + private boolean transmitEnergy() { + + if (powerHandler.getEnergyStored() <= 0) { + powerHandler.update(); + return false; + } + + // Mandatory power handler update + float stored = powerHandler.getEnergyStored(); + powerHandler.update(); + powerHandler.setEnergy(stored); + + float canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); + float transmitted = 0; + + checkReceptors(); + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + + int appliedCount = 0; + int numReceptors = receptors.size(); + while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + + Receptor receptor = receptorIterator.next(); + PowerReceiver pp = receptor.receptor.getPowerReceiver(receptor.fromDir); + if (pp != null && pp.getMinEnergyReceived() <= canTransmit && pp.getType() != Type.ENGINE) { + float used; + if (receptor.receptor instanceof IInternalPowerReceptor) { + used = PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) receptor.receptor, pp, canTransmit, Type.ENGINE, receptor.fromDir); + } else { + used = pp.receiveEnergy(Type.ENGINE, canTransmit, receptor.fromDir); + } + transmitted += used; + canTransmit -= used; + } + if (canTransmit <= 0) { + break; + } + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + appliedCount++; + } + + powerHandler.setEnergy(powerHandler.getEnergyStored() - transmitted); + + return transmitted > 0; + + } + + private void checkReceptors() { + if (!receptorsDirty) { + return; + } + receptors.clear(); + + BlockCoord bc = new BlockCoord(xCoord, yCoord, zCoord); + ForgeDirection dir = ForgeDirection.DOWN; + BlockCoord checkLoc = bc.getLocation(dir); + TileEntity te = worldObj.getBlockTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (te instanceof IPowerReceptor) { + IPowerReceptor rec = (IPowerReceptor) te; + PowerReceiver reciever = rec.getPowerReceiver(dir.getOpposite()); + if(reciever != null) { + receptors.add(new Receptor((IPowerReceptor) te, dir.getOpposite())); + } + } + + //NB: This is to supports connections from any direction +// BlockCoord bc = new BlockCoord(xCoord, yCoord, zCoord); +// for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { +// BlockCoord checkLoc = bc.getLocation(dir); +// TileEntity te = worldObj.getBlockTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); +// if (te instanceof IPowerReceptor) { +// IPowerReceptor rec = (IPowerReceptor) te; +// PowerReceiver reciever = rec.getPowerReceiver(dir.getOpposite()); +// receptors.add(new Receptor((IPowerReceptor) te, dir.getOpposite())); +// } +// } + receptorIterator = receptors.listIterator(); + receptorsDirty = false; + + } + + static class Receptor { + IPowerReceptor receptor; + ForgeDirection fromDir; + + private Receptor(IPowerReceptor rec, ForgeDirection fromDir) { + super(); + this.receptor = rec; + this.fromDir = fromDir; + } + } + + +} diff --git a/common/crazypants/enderio/material/Alloy.java b/common/crazypants/enderio/material/Alloy.java new file mode 100644 index 00000000..17f9a6b8 --- /dev/null +++ b/common/crazypants/enderio/material/Alloy.java @@ -0,0 +1,28 @@ +package crazypants.enderio.material; + +import net.minecraft.block.Block; +import net.minecraft.item.*; + +//public static final String[] alloyNames = new String[] {"Activated Iron", "Activated Gold", "Ender Iron", "Ender Gold"}; + +public enum Alloy { + + ACTIVATED_IRON("Activated Iron", "activatedIron", new ItemStack(Item.ingotIron), new ItemStack(Item.redstone), new ItemStack(Item.glowstone)), + ACTIVATED_GOLD("Activated Gold", "activatedGold", new ItemStack(Item.ingotGold), new ItemStack(Item.redstone), new ItemStack(Item.glowstone)), + ENDER_IRON("Ender Iron", "enderIron", new ItemStack(Item.ingotIron), new ItemStack(Item.enderPearl), new ItemStack(Item.glowstone)), + ENDER_GOLD("Ender Gold", "enderGold", new ItemStack(Item.ingotGold), new ItemStack(Item.enderPearl), new ItemStack(Item.glowstone)), + BLUE_STEEL("Blue Steel", "blueSteel", new ItemStack(Item.ingotIron), new ItemStack(Item.dyePowder,1,4), new ItemStack(Block.obsidian)); + + public final String unlocalisedName; + public final String uiName; + public final String iconKey; + public final ItemStack[] ingrediants; + + private Alloy(String uiName, String iconKey, ItemStack... ingrediants) { + this.unlocalisedName = name(); + this.uiName = uiName; + this.iconKey = "enderio:" + iconKey; + this.ingrediants = ingrediants; + } + +} diff --git a/common/crazypants/enderio/material/BlockFusedQuartz.java b/common/crazypants/enderio/material/BlockFusedQuartz.java new file mode 100644 index 00000000..348dad71 --- /dev/null +++ b/common/crazypants/enderio/material/BlockFusedQuartz.java @@ -0,0 +1,146 @@ +package crazypants.enderio.material; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.enderface.BlockEnderIO; +import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityCustomBlock; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class BlockFusedQuartz extends Block implements ITileEntityProvider { + + public static int renderId; + + public static BlockFusedQuartz create() { + BlockFusedQuartz result = new BlockFusedQuartz(); + result.init(); + return result; + } + + Icon itemIcon; + + private BlockFusedQuartz() { + super(ModObject.blockFusedQuartz.id, Material.glass); + setHardness(0.5F); + setStepSound(Block.soundGlassFootstep); + setUnlocalizedName(ModObject.blockFusedQuartz.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + private void init() { + LanguageRegistry.addName(this, ModObject.blockFusedQuartz.name); + GameRegistry.registerBlock(this, ModObject.blockFusedQuartz.unlocalisedName); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; + } + + @Override + public boolean canRenderInPass(int pass) { + FusedQuartzRenderer.renderPass = pass; + return true; + } + + @Override + public int getLightOpacity(World world, int x, int y, int z) { + return 0; + } + + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + int i1 = par1IBlockAccess.getBlockId(par2, par3, par4); + return i1 == this.blockID ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + blockIcon = iconRegister.registerIcon("enderio:fusedQuartz"); + itemIcon = iconRegister.registerIcon("enderio:fusedQuartzItem"); + } + + @Override + public TileEntity createNewTileEntity(World world) { + return null; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityCustomBlock(); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getBlockTileEntity(x, y, z); + + if (te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + if (itemStack != null) { + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + } + + } + + super.breakBlock(world, x, y, z, par5, par6); + } + + private ItemStack createItemStackForSourceBlock(int sourceBlockId, int sourceBlockMetadata) { + if(sourceBlockId <= 0) { + return null; + } + ItemStack result = new ItemStack(ModObject.itemFusedQuartzFrame.actualId,1,0); + PainterUtil.setSourceBlock(result, sourceBlockId, sourceBlockMetadata); + return result; + } + +} diff --git a/common/crazypants/enderio/material/FusedQuartzFrameRenderer.java b/common/crazypants/enderio/material/FusedQuartzFrameRenderer.java new file mode 100644 index 00000000..66b8ed75 --- /dev/null +++ b/common/crazypants/enderio/material/FusedQuartzFrameRenderer.java @@ -0,0 +1,67 @@ +package crazypants.enderio.material; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.painter.PainterUtil; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; +import net.minecraftforge.common.ForgeDirection; + +public class FusedQuartzFrameRenderer implements IItemRenderer { + + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + if (type == ItemRenderType.INVENTORY) { + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + renderEquipped(item, renderBlocks); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEntity(item, renderBlocks); + } + } + + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + renderFrame(item); + } + + private void renderFrame(ItemStack item) { + GL11.glDisable(GL11.GL_LIGHTING); + FusedQuartzRenderer r = new FusedQuartzRenderer(); + r.renderFrameItem(item); + GL11.glEnable(GL11.GL_LIGHTING); + } + + + +} diff --git a/common/crazypants/enderio/material/FusedQuartzRenderer.java b/common/crazypants/enderio/material/FusedQuartzRenderer.java new file mode 100644 index 00000000..eefc7975 --- /dev/null +++ b/common/crazypants/enderio/material/FusedQuartzRenderer.java @@ -0,0 +1,268 @@ +package crazypants.enderio.material; + +import static net.minecraftforge.common.ForgeDirection.DOWN; +import static net.minecraftforge.common.ForgeDirection.EAST; +import static net.minecraftforge.common.ForgeDirection.NORTH; +import static net.minecraftforge.common.ForgeDirection.SOUTH; +import static net.minecraftforge.common.ForgeDirection.UP; +import static net.minecraftforge.common.ForgeDirection.WEST; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityCustomBlock; +import crazypants.render.RenderUtil; +import crazypants.util.BlockCoord; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector2d; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector4d; + +public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { + + static int renderPass; + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.itemIcon); + renderer.renderBlockAsItem(Block.glass, 0, 1); + renderer.clearOverrideBlockTexture(); + } + + @Override + public boolean shouldRender3DInInventory() { + return true; + } + + @Override + public int getRenderId() { + return BlockFusedQuartz.renderId; + } + + @Override + public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (renderPass == 0) { + + RenderUtil.setTesselatorBrightness(blockAccess, x, y, z); + TileEntityCustomBlock tecb = null; + TileEntity te = blockAccess.getBlockTileEntity(x, y, z); + if(te instanceof TileEntityCustomBlock) { + tecb = (TileEntityCustomBlock)te; + } + + renderFrame(blockAccess, x, y, z, tecb, false); + + } else { + renderer.renderStandardBlock(block, x, y, z); + } + return true; + } + + public void renderFrameItem(ItemStack stack) { + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + TileEntityCustomBlock tecb = new TileEntityCustomBlock(); + tecb.setSourceBlockId(PainterUtil.getSourceBlockId(stack)); + tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + renderFrame(null,0,0,0,tecb,true); + Tessellator.instance.draw(); + + } + + private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityCustomBlock tecb, boolean forceAllEdges) { + Icon texture = EnderIO.blockFusedQuartz.itemIcon; + + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + + if(tecb != null && tecb.getSourceBlockId() > 0) { + texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata()); + } + renderFrame(blockAccess, x, y, z, tecb, face, texture, forceAllEdges); + } + } + + private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityCustomBlock tecb, ForgeDirection face, Icon texture, boolean forceAllEdges) { + + if (!forceAllEdges && !EnderIO.blockFusedQuartz.shouldSideBeRendered(blockAccess, x + face.offsetX, y + face.offsetY, z + face.offsetZ, + face.ordinal())) { + return; + } + + BlockCoord bc = new BlockCoord(x, y, z); + + List edges = new ArrayList(4); + if (face.offsetY != 0) { + edges.add(new Edge(bc, EAST)); + edges.add(new Edge(bc, WEST)); + edges.add(new Edge(bc, NORTH)); + edges.add(new Edge(bc, SOUTH)); + } else if (face.offsetX != 0) { + edges.add(new Edge(bc, DOWN)); + edges.add(new Edge(bc, UP)); + edges.add(new Edge(bc, SOUTH)); + edges.add(new Edge(bc, NORTH)); + } else { + edges.add(new Edge(bc, UP)); + edges.add(new Edge(bc, DOWN)); + edges.add(new Edge(bc, WEST)); + edges.add(new Edge(bc, EAST)); + } + + Tessellator tes = Tessellator.instance; + float cm = RenderUtil.getColorMultiplierForFace(face); + tes.setColorOpaque_F(cm, cm, cm); + + Vector2d uv = new Vector2d(); + int index = 0; + boolean invertWinding; + for (Edge edge : edges) { + + if (forceAllEdges || blockAccess.getBlockId(edge.bc.x, edge.bc.y, edge.bc.z) != EnderIO.blockFusedQuartz.blockID) { + + invertWinding = ForgeDirectionOffsets.isPositiveOffset(face); + + Vector3d edgeCenter = new Vector3d(x + 0.5, y + 0.5, z + 0.5); + edgeCenter.add(ForgeDirectionOffsets.offsetScaled(edge.dir, 0.5)); + edgeCenter.add(ForgeDirectionOffsets.offsetScaled(face, 0.5)); + + Vector3d edgeUp = new Vector3d(); + edgeUp.x = face.offsetX == 0 && edge.dir.offsetX == 0 ? 0.5 : 0; + edgeUp.y = face.offsetY == 0 && edge.dir.offsetY == 0 ? 0.5 : 0; + edgeUp.z = face.offsetZ == 0 && edge.dir.offsetZ == 0 ? 0.5 : 0; + + Vector3d in = ForgeDirectionOffsets.offsetScaled(edge.dir, -1 / 16d); + Vector3d corner = new Vector3d(); + if ((invertWinding && index % 2 == 0) || (!invertWinding && index % 2 != 0)) { + + corner.set(edgeCenter); + corner.add(edgeUp); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.sub(edgeUp); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.sub(edgeUp); + corner.add(in); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.add(edgeUp); + corner.add(in); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + } else { //reverse winding + + corner.set(edgeCenter); + corner.add(edgeUp); + corner.add(in); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.sub(edgeUp); + corner.add(in); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.sub(edgeUp); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + + corner.set(edgeCenter); + corner.add(edgeUp); + getUvForCorner(uv, corner,x,y,z,face,texture); + tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); + } + + } + index++; + } + } + + + private void getUvForCorner(Vector2d uv, Vector3d corner, int x, int y, int z, ForgeDirection face, Icon icon) { + Vector3d p = new Vector3d(corner); + p.x -= x; + p.y -= y; + p.z -= z; + + float uWidth = icon.getMaxU() - icon.getMinU(); + float vWidth = icon.getMaxV() - icon.getMinV(); + + uv.x = VecmathUtil.distanceFromPointToPlane(getUPlaneForFace(face), p); + uv.y = VecmathUtil.distanceFromPointToPlane(getVPlaneForFace(face), p); + + uv.x = icon.getMinU() + (uv.x * uWidth); + uv.y = icon.getMinV() + (uv.y * vWidth); + + } + + private Vector4d getVPlaneForFace(ForgeDirection face) { + switch (face) { + case DOWN: + case UP: + return new Vector4d(0,0,1,0); + case EAST: + case WEST: + case NORTH: + case SOUTH: + return new Vector4d(0,-1,0,1); + case UNKNOWN: + default: + break; + } + return null; + } + + private Vector4d getUPlaneForFace(ForgeDirection face) { + switch (face) { + case DOWN: + case UP: + return new Vector4d(1,0,0,0); + case EAST: + return new Vector4d(0,0,-1,1); + case WEST: + return new Vector4d(0,0,1,0); + case NORTH: + return new Vector4d(-1,0,0,1); + case SOUTH: + return new Vector4d(1,0,0,0); + case UNKNOWN: + default: + break; + } + return null; + } + + + private static class Edge { + final ForgeDirection dir; + final BlockCoord bc; + + public Edge(BlockCoord bc, ForgeDirection dir) { + this.dir = dir; + this.bc = bc.getLocation(dir); + } + + } + +} diff --git a/common/crazypants/enderio/material/ItemAlloy.java b/common/crazypants/enderio/material/ItemAlloy.java new file mode 100644 index 00000000..5065b6f6 --- /dev/null +++ b/common/crazypants/enderio/material/ItemAlloy.java @@ -0,0 +1,80 @@ +package crazypants.enderio.material; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; +import net.minecraft.util.*; +import cpw.mods.fml.common.registry.*; +import crazypants.enderio.*; + +public class ItemAlloy extends Item { + + private final Icon[] icons; + + public static ItemAlloy create() { + ItemAlloy alloy = new ItemAlloy(); + alloy.init(); + return alloy; + } + + private ItemAlloy() { + super(ModObject.itemAlloy.id); + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloy.unlocalisedName); + + + icons = new Icon[Alloy.values().length * 2]; + } + + private void init() { + LanguageRegistry.addName(this, ModObject.itemAlloy.name); + GameRegistry.registerItem(this, ModObject.itemAlloy.unlocalisedName); + for (int i = 0; i < Alloy.values().length; i++) { + LanguageRegistry.instance().addStringLocalization(getUnlocalizedName() + "." + Alloy.values()[i].unlocalisedName + ".name", Alloy.values()[i].uiName); + } + for (int i = 0; i < Alloy.values().length; i++) { + LanguageRegistry.instance().addStringLocalization(getUnlocalizedName() + "." + Alloy.values()[i].unlocalisedName + "Nugget" + ".name", Alloy.values()[i].uiName + " Nugget"); + } + } + + @Override + public Icon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, Alloy.values().length * 2); + return icons[damage]; + } + + @Override + public void registerIcons(IconRegister iconRegister) { + int numAlloys = Alloy.values().length; + for (int i = 0; i < numAlloys ; i++) { + icons[i] = iconRegister.registerIcon(Alloy.values()[i].iconKey); + } + for (int i = 0; i < numAlloys ; i++) { + icons[i + numAlloys] = iconRegister.registerIcon(Alloy.values()[i].iconKey + "Nugget"); + } + } + + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Alloy.values().length * 2); + if(i < Alloy.values().length) { + return super.getUnlocalizedName() + "." + Alloy.values()[i].unlocalisedName; + } else { + return super.getUnlocalizedName() + "." + Alloy.values()[i - Alloy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < Alloy.values().length * 2; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + +} diff --git a/common/crazypants/enderio/material/ItemCapacitor.java b/common/crazypants/enderio/material/ItemCapacitor.java new file mode 100644 index 00000000..2fcf9b57 --- /dev/null +++ b/common/crazypants/enderio/material/ItemCapacitor.java @@ -0,0 +1,43 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.*; +import crazypants.enderio.power.*; + +public class ItemCapacitor extends Item implements ICapacitorItem { + + private static final BasicCapacitor CAP = new BasicCapacitor(); + + public static ItemCapacitor create() { + ItemCapacitor result = new ItemCapacitor(); + result.init(); + return result; + } + + protected ItemCapacitor() { + super(ModObject.itemBasicCapacitor.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBasicCapacitor.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemBasicCapacitor.name); + GameRegistry.registerItem(this, ModObject.itemBasicCapacitor.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:basicCapacitor"); + } + + @Override + public ICapacitor getCapacitor() { + return CAP; + } + +} diff --git a/common/crazypants/enderio/material/ItemFusedQuartzFrame.java b/common/crazypants/enderio/material/ItemFusedQuartzFrame.java new file mode 100644 index 00000000..edf95f62 --- /dev/null +++ b/common/crazypants/enderio/material/ItemFusedQuartzFrame.java @@ -0,0 +1,91 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.facade.ItemConduitFacade; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.painter.BasicPainterTemplate; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityCustomBlock; +import crazypants.enderio.machine.painter.BlockCustomWall.PainterTemplate; + +public class ItemFusedQuartzFrame extends Item { + + public static ItemFusedQuartzFrame create() { + ItemFusedQuartzFrame result = new ItemFusedQuartzFrame(); + result.init(); + return result; + } + + protected ItemFusedQuartzFrame() { + super(ModObject.itemFusedQuartzFrame.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemFusedQuartzFrame.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemFusedQuartzFrame.name); + GameRegistry.registerItem(this, ModObject.itemFusedQuartzFrame.unlocalisedName); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new FramePainterRecipe()); + } + + @Override + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:fusedQuartzFrame"); + } + + + @Override + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, + float par9, float par10) { + + if(world.getBlockId(x, y, z) == ModObject.blockFusedQuartz.actualId) { + TileEntityCustomBlock tecb = (TileEntityCustomBlock)world.getBlockTileEntity(x, y, z); + if(tecb == null) { + return false; + } + //if(!world.isRemote) { + tecb.setSourceBlockId(PainterUtil.getSourceBlockId(itemStack)); + tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + world.markBlockForUpdate(x, y, z); + world.markBlockForRenderUpdate(x, y, z); + //} + if(!world.isRemote) { + if (!player.capabilities.isCreativeMode) { + itemStack.stackSize--; + } + } + return true; + } else { + return false; + } + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } + + public static final class FramePainterRecipe extends BasicPainterTemplate { + + public FramePainterRecipe() { + super(ModObject.itemFusedQuartzFrame.actualId); + } + + } +} diff --git a/common/crazypants/enderio/material/ItemIndustrialBinder.java b/common/crazypants/enderio/material/ItemIndustrialBinder.java new file mode 100644 index 00000000..653af419 --- /dev/null +++ b/common/crazypants/enderio/material/ItemIndustrialBinder.java @@ -0,0 +1,37 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.*; +import crazypants.enderio.*; + +public class ItemIndustrialBinder extends Item { + + + public static ItemIndustrialBinder create() { + ItemIndustrialBinder result = new ItemIndustrialBinder(); + result.init(); + return result; + } + + protected ItemIndustrialBinder() { + super(ModObject.itemIndustrialBinder.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemIndustrialBinder.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemIndustrialBinder.name); + GameRegistry.registerItem(this, ModObject.itemIndustrialBinder.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:industrialBinder"); + } + + +} diff --git a/common/crazypants/enderio/material/ItemYetaWrench.java b/common/crazypants/enderio/material/ItemYetaWrench.java new file mode 100644 index 00000000..6a4a1ee1 --- /dev/null +++ b/common/crazypants/enderio/material/ItemYetaWrench.java @@ -0,0 +1,72 @@ +package crazypants.enderio.material; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemYetaWrench extends Item implements IToolWrench { + + + public static ItemYetaWrench create() { + ItemYetaWrench result = new ItemYetaWrench(); + result.init(); + return result; + } + + protected ItemYetaWrench() { + super(ModObject.itemYetaWrench.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemYetaWrench.unlocalisedName); + setMaxStackSize(1); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemYetaWrench.name); + GameRegistry.registerItem(this, ModObject.itemYetaWrench.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:yetaWrench"); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + int blockId = world.getBlockId(x, y, z); + Block block = Block.blocksList[blockId]; + if (block != null && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + player.swingItem(); + return !world.isRemote; + } + return false; + } + + @Override + public boolean canWrench(EntityPlayer player, int x, int y, int z) { + return true; + } + + @Override + public void wrenchUsed(EntityPlayer player, int x, int y, int z) { + player.swingItem(); + } + + @Override + public boolean shouldPassSneakingClickToBlock(World par2World, int par4, int par5, int par6) { + return true; + } + + +} diff --git a/common/crazypants/enderio/material/MaterialRecipes.java b/common/crazypants/enderio/material/MaterialRecipes.java new file mode 100644 index 00000000..76e88fde --- /dev/null +++ b/common/crazypants/enderio/material/MaterialRecipes.java @@ -0,0 +1,43 @@ +package crazypants.enderio.material; + +import static crazypants.enderio.ModObject.*; +import net.minecraft.block.Block; +import net.minecraft.item.*; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.*; +import crazypants.enderio.machine.alloy.BasicAlloyRecipe; + +public class MaterialRecipes { + + public static void addRecipes() { + + ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 8, 0); + GameRegistry.addSmelting(Block.gravel.blockID, industialBinder, 0); + + industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0); + ItemStack basicCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); + GameRegistry.addShapedRecipe(basicCapacitor, " ", "gwi", "RbR", 'b', industialBinder, 'g', new ItemStack(Item.ingotGold), 'i', new ItemStack( + Item.ingotIron), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth); + + int meta = 0; + for(Alloy alloy : Alloy.values()) { + ItemStack ingot = new ItemStack(ModObject.itemAlloy.actualId, 1, meta); + ItemStack nugget = new ItemStack(ModObject.itemAlloy.actualId, 9, meta + Alloy.values().length); + IMachineRecipe recipe = new BasicAlloyRecipe(ingot, alloy.unlocalisedName, alloy.ingrediants); + GameRegistry.addShapelessRecipe(nugget, ingot); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, recipe); + meta++; + } + + ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); + IMachineRecipe recipe = new BasicAlloyRecipe(fusedQuartz, ModObject.blockFusedQuartz.unlocalisedName, new ItemStack(Item.netherQuartz,4,0)); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, recipe); + + ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId,1,0); + + GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', industialBinder, 's', new ItemStack(Item.stick)); + + } + +} diff --git a/common/crazypants/enderio/power/BasicCapacitor.java b/common/crazypants/enderio/power/BasicCapacitor.java new file mode 100644 index 00000000..2e343d9a --- /dev/null +++ b/common/crazypants/enderio/power/BasicCapacitor.java @@ -0,0 +1,94 @@ +package crazypants.enderio.power; + +public class BasicCapacitor implements ICapacitor { + + private int minEnergyReceived = 0; + private int maxEnergyReceived = 2; + private int maxEnergyStored = 5000; + private int minActivationEnergy = 0; + + private int powerLoss = 1; + private int powerLossRegularity = 200; + + private int maxEnergyExtracted = 2; + + public BasicCapacitor() { + } + + public BasicCapacitor(int minEnergyReceived, int maxEnergyReceived, int maxEnergyStored, int minActivationEnergy, int powerLoss, int powerLossRegularity, + int maxEnergyExtracted) { + configure(minEnergyReceived, maxEnergyReceived, maxEnergyStored, minActivationEnergy, powerLoss, powerLossRegularity, maxEnergyExtracted); + } + + protected void configure(int minEnergyReceived, int maxEnergyReceived, int maxEnergyStored, int minActivationEnergy, int powerLoss, int powerLossRegularity, + int maxEnergyExtracted) { + this.minEnergyReceived = minEnergyReceived; + this.maxEnergyReceived = maxEnergyReceived; + this.maxEnergyStored = maxEnergyStored; + this.minActivationEnergy = minActivationEnergy; + this.powerLoss = powerLoss; + this.powerLossRegularity = powerLossRegularity; + this.maxEnergyExtracted = maxEnergyExtracted; + + } + + @Override + public int getMinEnergyReceived() { + return minEnergyReceived; + } + + protected void setMinEnergyReceived(int minEnergyReceived) { + this.minEnergyReceived = minEnergyReceived; + } + + @Override + public int getMaxEnergyReceived() { + return maxEnergyReceived; + } + + protected void setMaxEnergyReceived(int maxEnergyReceived) { + this.maxEnergyReceived = maxEnergyReceived; + } + + @Override + public int getMaxEnergyStored() { + return maxEnergyStored; + } + + protected void setMaxEnergyStored(int maxEnergyStored) { + this.maxEnergyStored = maxEnergyStored; + } + + @Override + public int getMinActivationEnergy() { + return minActivationEnergy; + } + + protected void setMinActivationEnergy(int minActivationEnergy) { + this.minActivationEnergy = minActivationEnergy; + } + + @Override + public int getPowerLoss() { + return powerLoss; + } + + protected void setPowerLoss(int powerLoss) { + this.powerLoss = powerLoss; + } + + @Override + public int getPowerLossRegularity() { + return powerLossRegularity; + } + + protected void setPowerLossRegularity(int powerLossRegularity) { + this.powerLossRegularity = powerLossRegularity; + } + + @Override + public int getMaxEnergyExtracted() { + return maxEnergyExtracted; + } + +} diff --git a/common/crazypants/enderio/power/ICapacitor.java b/common/crazypants/enderio/power/ICapacitor.java new file mode 100644 index 00000000..88c35a90 --- /dev/null +++ b/common/crazypants/enderio/power/ICapacitor.java @@ -0,0 +1,16 @@ +package crazypants.enderio.power; + +public interface ICapacitor { + + int getMinEnergyReceived(); + int getMaxEnergyReceived(); + + int getMaxEnergyStored(); + int getMinActivationEnergy(); + + int getPowerLoss(); + int getPowerLossRegularity(); + + int getMaxEnergyExtracted(); + +} diff --git a/common/crazypants/enderio/power/ICapacitorItem.java b/common/crazypants/enderio/power/ICapacitorItem.java new file mode 100644 index 00000000..33ff5916 --- /dev/null +++ b/common/crazypants/enderio/power/ICapacitorItem.java @@ -0,0 +1,7 @@ +package crazypants.enderio.power; + +public interface ICapacitorItem { + + ICapacitor getCapacitor(); + +} diff --git a/common/crazypants/enderio/power/IInternalPowerReceptor.java b/common/crazypants/enderio/power/IInternalPowerReceptor.java new file mode 100644 index 00000000..e1fa09d6 --- /dev/null +++ b/common/crazypants/enderio/power/IInternalPowerReceptor.java @@ -0,0 +1,12 @@ +package crazypants.enderio.power; + +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; + +public interface IInternalPowerReceptor extends IPowerReceptor { + + PowerHandler getPowerHandler(); + + void applyPerdition(); + +} diff --git a/common/crazypants/enderio/power/PowerHandlerUtil.java b/common/crazypants/enderio/power/PowerHandlerUtil.java new file mode 100644 index 00000000..60c9eac3 --- /dev/null +++ b/common/crazypants/enderio/power/PowerHandlerUtil.java @@ -0,0 +1,98 @@ +package crazypants.enderio.power; + +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.conduit.power.NetworkPowerManager; +import crazypants.enderio.conduit.power.PowerConduitNetwork; +import net.minecraftforge.common.ForgeDirection; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PerditionCalculator; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import buildcraft.api.power.PowerHandler.Type; + +public class PowerHandlerUtil { + + public static PowerHandler createHandler(ICapacitor capacitor, IPowerReceptor pr, Type type) { + PowerHandler ph = new PowerHandler(pr, type); + ph.configure(capacitor.getMinEnergyReceived(),capacitor.getMaxEnergyReceived(),capacitor.getMinActivationEnergy(),capacitor.getMaxEnergyStored()); + ph.configurePowerPerdition(0, 0); + ph.setPerdition(new NullPerditionCalculator()); + return ph; + } + + public static float transmitInternal(IInternalPowerReceptor receptor, PowerReceiver pp, float quantity, Type type, ForgeDirection from) { + float used = quantity; + + if(receptor instanceof IConduitBundle) { + return transferToPowerNetwork((IConduitBundle)receptor, pp, quantity); + } + + PowerHandler ph = receptor.getPowerHandler(); + if(ph == null) { + return 0; + } + + float maxEnergyStored = pp.getMaxEnergyStored(); + float maxEnergyRecieved = pp.getMaxEnergyReceived(); + float energyStored = pp.getEnergyStored(); + + //Do all required functions except: + //- We will handle perd'n ourselves and there is not need to drain excess from our engines as they are self regulating + //- Also not making use of the doWork calls. + pp.receiveEnergy(type, quantity, from); + + ph.setEnergy(energyStored); + + if (used < pp.getMinEnergyReceived()) { + return 0; + } + + if (used > maxEnergyRecieved) { + used = maxEnergyRecieved; + } + + energyStored += used; + + if (energyStored > maxEnergyStored) { + used -= energyStored - maxEnergyStored; + energyStored = maxEnergyStored; + } else if (energyStored < 0) { + used -= energyStored; + energyStored = 0; + } + + + ph.setEnergy(energyStored); + + receptor.applyPerdition(); + + return used; + + } + + public static float transferToPowerNetwork(IConduitBundle bundle, PowerReceiver pp, float quantity) { + IPowerConduit receptor = bundle.getConduit(IPowerConduit.class); + if(receptor.getNetwork() == null) { + return 0; + } + NetworkPowerManager network = ((PowerConduitNetwork)receptor.getNetwork()).getPowerManager(); + float used = network.addEnergy(quantity); + return used; + } + + private static class NullPerditionCalculator extends PerditionCalculator { + + public float applyPerdition(PowerHandler powerHandler, float current, long ticksPassed) { + if(current <= 0) { + return 0; + } + float res = current - 0.001f; + if(res >= current) { + System.out.println("PowerHandlerUtil.NullPerditionCalculator.applyPerdition: Fail! current is: " + current + " res is:" + res); + } + return res; + } + } + +} diff --git a/common/crazypants/render/BoundingBox.java b/common/crazypants/render/BoundingBox.java new file mode 100644 index 00000000..53803178 --- /dev/null +++ b/common/crazypants/render/BoundingBox.java @@ -0,0 +1,149 @@ +package crazypants.render; + +import crazypants.util.BlockCoord; +import crazypants.vecmath.Vector3d; + +public final class BoundingBox { + + public static final BoundingBox UNIT_CUBE = new BoundingBox(0, 0, 0, 1, 1, 1); + + public final float minX; + public final float minY; + public final float minZ; + public final float maxX; + public final float maxY; + public final float maxZ; + + public BoundingBox(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) { + this.minX = minX; + this.minY = minY; + this.minZ = minZ; + this.maxX = maxX; + this.maxY = maxY; + this.maxZ = maxZ; + } + + public BoundingBox(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + this.minX = (float)minX; + this.minY = (float)minY; + this.minZ = (float)minZ; + this.maxX = (float)maxX; + this.maxY = (float)maxY; + this.maxZ = (float)maxZ; + } + + public BoundingBox(Vector3d min, Vector3d max) { + this(min.x, min.y, min.z, max.x, max.y, max.z); + } + + public BoundingBox(BoundingBox copy) { + this(copy.minX, copy.minY, copy.minZ, copy.maxX, copy.maxY, copy.maxZ); + } + + public BoundingBox(BlockCoord bc) { + this(bc.x,bc.y,bc.z,bc.x + 1,bc.y + 1,bc.z + 1); + } + + public BoundingBox expandBy(BoundingBox other) { + return new BoundingBox( + Math.min(minX, other.minX), Math.min(minY, other.minY), Math.min(minZ, other.minZ), + Math.max(maxX, other.maxX), Math.max(maxY, other.maxY), Math.max(maxZ, other.maxZ)); + } + + public boolean isValid() { + return minX < maxX && minY < maxY && minZ < maxZ; + } + + public BoundingBox scale(float x, float y, float z) { + x = 1 - x; + y = 1 - y; + z = 1 - z; + float w = ((maxX - minX) * x)/2; + float h = ((maxY - minY) * y)/2; + float d = ((maxZ - minZ) * z)/2; + return new BoundingBox(minX + w, minY + h, minZ + d, maxX - w, maxY - h, maxZ - d); + } + + public BoundingBox translate(float x, float y, float z) { + return new BoundingBox(minX + x, minY + y, minZ + z, maxX + x, maxY + y, maxZ + z); + } + + public BoundingBox translate(Vector3d translation) { + return translate((float)translation.x, (float)translation.y,(float)translation.z); + } + + public BoundingBox transform(VertexTransform iTransformation) { + Vector3d min = new Vector3d(minX, minY,minZ); + Vector3d max = new Vector3d(maxX, maxY,maxZ); + + iTransformation.apply(min); + iTransformation.apply(max); + + return new BoundingBox( + Math.min(min.x, max.x), Math.min(min.y, max.y), Math.min(min.z, max.z), + Math.max(min.x, max.x), Math.max(min.y, max.y), Math.max(min.z, max.z)); + + } + + public Vector3d getCenter() { + return new Vector3d(minX + (maxX - minX)/2, minY + (maxY - minY)/2,minZ + (maxZ - minZ)/2); + } + + public float sizeX() { + return Math.abs(maxX - minX); + } + + public float sizeY() { + return Math.abs(maxY - minY); + } + + public float sizeZ() { + return Math.abs(maxZ - minZ); + } + + public Vector3d getMin() { + return new Vector3d(minX,minY,minZ); + } + + public Vector3d getMax() { + return new Vector3d(maxX,maxY,maxZ); + } + + @Override + public String toString() { + return "BoundingBox [minX=" + minX + ", minY=" + minY + ", minZ=" + minZ + ", maxX=" + maxX + ", maxY=" + maxY + ", maxZ=" + maxZ + "]"; + } + + public BoundingBox fixMinMax() { + float mnX = minX; + float mnY = minY; + float mnZ = minZ; + float mxX = maxX; + float mxY = maxY; + float mxZ = maxZ; + boolean mod = false; + if(minX > maxX) { + mnX = maxX; + mxX = minX; + mod = true; + } + if(minY > maxY) { + mnY = maxY; + mxY = minY; + mod = true; + } + if(minZ > maxZ) { + mnZ = maxZ; + mxZ = minZ; + mod = true; + } + if(!mod) { + return this; + } + return new BoundingBox(mnX,mnY,mnZ,mxX,mxY,mxZ); + } + + + + +} diff --git a/common/crazypants/render/CubeRenderer.java b/common/crazypants/render/CubeRenderer.java new file mode 100644 index 00000000..08c7c226 --- /dev/null +++ b/common/crazypants/render/CubeRenderer.java @@ -0,0 +1,183 @@ +package crazypants.render; + +import crazypants.vecmath.Vector3d; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; + +public final class CubeRenderer { + + public static final Vector3d[] verts = new Vector3d[8]; + static { + for (int i = 0; i < verts.length; i++) { + verts[i] = new Vector3d(); + } + } + + public static void render(BoundingBox bb, Icon tex) { + render(bb, tex, null); + } + + public static void render(BoundingBox bb, Icon tex, VertexTransform xForm) { + render(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), xForm); + } + + public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV) { + render(bb, minU,maxU,minV,maxV,null); + } + + public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, VertexTransform xForm) { + setupVertices(bb, xForm); + + float tmp = minV; + minV = maxV; + maxV = tmp; + + Tessellator tessellator = Tessellator.instance; + + tessellator.setNormal(0, 0, -1); + + addVecWithUV(verts[1], minU, minV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + + tessellator.setNormal(0, 0, 1); + + addVecWithUV(verts[4], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[7], minU, maxV); + + tessellator.setNormal(0, 1, 0); + + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[7], maxU, minV); + + tessellator.setNormal(0, -1, 0); + + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], minU, minV); + addVecWithUV(verts[4], maxU, minV); + + tessellator.setNormal(1, 0, 0); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], minU, minV); + + tessellator.setNormal(-1, 0, 0); + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], maxU, maxV); + addVecWithUV(verts[3], minU, maxV); + } + + public static void render(BoundingBox bb, Icon[] faceTextures, VertexTransform xForm) { + setupVertices(bb, xForm); + float minU; + float maxU; + float minV; + float maxV; + Icon tex; + + Tessellator tessellator = Tessellator.instance; + + tessellator.setNormal(0, 0, -1); + tex = faceTextures[0]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[1], minU, minV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + + tessellator.setNormal(0, 0, 1); + tex = faceTextures[1]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[4], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[7], minU, maxV); + + tessellator.setNormal(0, 1, 0); + tex = faceTextures[2]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[7], maxU, minV); + + tessellator.setNormal(0, -1, 0); + tex = faceTextures[3]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], minU, minV); + addVecWithUV(verts[4], maxU, minV); + + tessellator.setNormal(1, 0, 0); + tex = faceTextures[4]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], minU, minV); + + tessellator.setNormal(-1, 0, 0); + tex = faceTextures[5]; + minU = tex.getMinU(); + maxU = tex.getMaxU(); + minV = tex.getMinV(); + maxV = tex.getMaxV(); + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], maxU, maxV); + addVecWithUV(verts[3], minU, maxV); + } + + public static void setupVertices(BoundingBox bound) { + setupVertices(bound, null); + } + + public static void setupVertices(BoundingBox bound, VertexTransform xForm) { + verts[0].set(bound.minX, bound.minY, bound.minZ); + verts[1].set(bound.maxX, bound.minY, bound.minZ); + verts[2].set(bound.maxX, bound.maxY, bound.minZ); + verts[3].set(bound.minX, bound.maxY, bound.minZ); + verts[4].set(bound.minX, bound.minY, bound.maxZ); + verts[5].set(bound.maxX, bound.minY, bound.maxZ); + verts[6].set(bound.maxX, bound.maxY, bound.maxZ); + verts[7].set(bound.minX, bound.maxY, bound.maxZ); + + if (xForm != null) { + for (Vector3d vec : verts) { + xForm.apply(vec); + } + } + } + + public static void addVecWithUV(Vector3d vec, double u, double v) { + Tessellator.instance.addVertexWithUV(vec.x, vec.y, vec.z, u, v); + } + + private CubeRenderer() { + } + +} diff --git a/common/crazypants/render/EmptySlot.java b/common/crazypants/render/EmptySlot.java new file mode 100644 index 00000000..45ee4855 --- /dev/null +++ b/common/crazypants/render/EmptySlot.java @@ -0,0 +1,43 @@ +package crazypants.render; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + + +class EmptySlot { + + private static final int WIDTH = ItemButton.DEFAULT_WIDTH; + private static final int HWIDTH = ItemButton.HWIDTH; + private static final int HEIGHT = ItemButton.DEFAULT_HEIGHT; + private static final int HHEIGHT = ItemButton.HHEIGHT; + + private int xPosition; + private int yPosition; + private GuiScreen g; + + public EmptySlot(GuiScreen g, int x, int y) { + xPosition = x; + yPosition = y; + this.g = g; + + } + + @SuppressWarnings("synthetic-access") + public void drawSlot() { + RenderUtil.bindItemTexture(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int hoverState = 0; + // top half + g.drawTexturedModalRect(xPosition, yPosition, 0, 46 + hoverState * 20, HWIDTH, HHEIGHT); + g.drawTexturedModalRect(xPosition + HWIDTH, yPosition, 200 - HWIDTH, 46 + hoverState * 20, HWIDTH, HHEIGHT); + // bottom half + g.drawTexturedModalRect(xPosition, yPosition + HHEIGHT, 0, 64 - HHEIGHT + (hoverState * 20), HWIDTH, HHEIGHT); + g.drawTexturedModalRect(xPosition + HWIDTH, yPosition + HHEIGHT, 200 - HWIDTH, 64 - HHEIGHT + (hoverState * 20), HWIDTH, HHEIGHT); + + } + +} \ No newline at end of file diff --git a/common/crazypants/render/GuiContainerBase.java b/common/crazypants/render/GuiContainerBase.java new file mode 100644 index 00000000..1a80d691 --- /dev/null +++ b/common/crazypants/render/GuiContainerBase.java @@ -0,0 +1,60 @@ +package crazypants.render; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public abstract class GuiContainerBase extends GuiContainer { + + private List toolTips = new ArrayList(); + + protected GuiContainerBase(Container par1Container) { + super(par1Container); + } + + protected void addToolTip(GuiToolTip toolTip) { + toolTips.add(toolTip); + } + + @Override + protected final void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + + drawForegroundImpl(mouseX, mouseY); + for (GuiToolTip toolTip : toolTips) { + toolTip.onTick(mouseX - guiLeft, mouseY - guiTop); + if (toolTip.shouldDraw()) { + drawTooltip(toolTip, mouseX - guiLeft, mouseY - guiTop); + } + } + } + + protected void drawForegroundImpl(int mouseX, int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + protected void drawTooltip(GuiToolTip toolTip, int mouseX, int mouseY) { + List list = toolTip.getToolTipText(); + if(mouseX > (xSize/2)) { + int maxWidth = 0; + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + String s = (String) iterator.next(); + int w = fontRenderer.getStringWidth(s); + if (w > maxWidth) { + maxWidth = w; + } + } + mouseX -= (maxWidth + 18); + } + drawHoveringText(list, mouseX, mouseY, fontRenderer); + } + +} diff --git a/common/crazypants/render/GuiToolTip.java b/common/crazypants/render/GuiToolTip.java new file mode 100644 index 00000000..dc489445 --- /dev/null +++ b/common/crazypants/render/GuiToolTip.java @@ -0,0 +1,74 @@ +package crazypants.render; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +public class GuiToolTip { + + private static final long DELAY = 500; + + protected Rectangle bounds; + + private long mouseOverStart; + + protected final List text; + + private int lastMouseX = -1; + + private int lastMouseY = -1; + + public GuiToolTip(Rectangle bounds, String... lines) { + this.bounds = bounds; + if (lines != null) { + text = new ArrayList(lines.length); + for (String line : lines) { + text.add(line); + } + } else { + text = new ArrayList(); + } + } + + public GuiToolTip(Rectangle bounds, List lines) { + this.bounds = bounds; + if(lines == null) { + text = new ArrayList(); + } else { + text = new ArrayList(lines); + } + } + + public void onTick(int mouseX, int mouseY) { + if(lastMouseX != mouseX || lastMouseY != mouseY) { + mouseOverStart = 0; + } + + if (bounds.contains(mouseX, mouseY)) { + if (mouseOverStart == 0) { + mouseOverStart = System.currentTimeMillis(); + } + } else { + mouseOverStart = 0; + } + + lastMouseX = mouseX; + lastMouseY = mouseY; + } + + public boolean shouldDraw() { + updateText(); + if (mouseOverStart == 0) { + return false; + } + return System.currentTimeMillis() - mouseOverStart >= DELAY; + } + + protected void updateText() { + } + + public List getToolTipText() { + return text; + } + +} diff --git a/common/crazypants/render/IconButton.java b/common/crazypants/render/IconButton.java new file mode 100644 index 00000000..a9225b47 --- /dev/null +++ b/common/crazypants/render/IconButton.java @@ -0,0 +1,107 @@ +package crazypants.render; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +public class IconButton extends GuiButton { + + public static final int DEFAULT_WIDTH = 24; + public static final int HWIDTH = DEFAULT_WIDTH / 2; + public static final int DEFAULT_HEIGHT = 24; + public static final int HHEIGHT = DEFAULT_HEIGHT / 2; + + protected int hwidth; + protected int hheight; + + protected Icon icon; + protected ResourceLocation texture; + + + public IconButton(FontRenderer fr, int id, int x, int y, Icon icon, ResourceLocation texture) { + super(id, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); + hwidth = HWIDTH; + hheight = HHEIGHT; + this.icon = icon; + this.texture = texture; + } + + public void setSize(int width, int height) { + this.width = width; + this.height = height; + hwidth = width/2; + hheight = height/2; + } + + + public Icon getIcon() { + return icon; + } + + public void setIcon(Icon icon) { + this.icon = icon; + } + + public ResourceLocation getTexture() { + return texture; + } + + public void setTexture(ResourceLocation textureName) { + this.texture = textureName; + } + + /** + * Draws this button to the screen. + */ + @SuppressWarnings("synthetic-access") + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + if (drawButton) { + + RenderUtil.bindTexture("textures/gui/widgets.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + width + && par3 < this.yPosition + height; + int hoverState = this.getHoverState(this.field_82253_i); + + // x, y, u, v, width, height + + // top half + drawTexturedModalRect(xPosition, yPosition, 0, 46 + hoverState * 20, hwidth, hheight); + drawTexturedModalRect(xPosition + hwidth, yPosition, 200 - hwidth, 46 + hoverState * 20, hwidth, hheight); + + // bottom half + drawTexturedModalRect(xPosition, yPosition + hheight, 0, 66 - hheight + (hoverState * 20), hwidth, hheight); + drawTexturedModalRect(xPosition + hwidth, yPosition + hheight, 200 - hwidth, 66 - hheight + (hoverState * 20), hwidth, hheight); + + mouseDragged(par1Minecraft, par2, par3); + + int l = 14737632; + + if (!this.enabled) { + l = -6250336; + } else if (this.field_82253_i) { + l = 16777120; + } + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + RenderUtil.bindTexture(texture); + int xLoc = xPosition + 2; + int yLoc = yPosition + 2; + drawTexturedModelRectFromIcon(xLoc, yLoc, icon, width - 4, height - 4); + + GL11.glPopAttrib(); + + + } + } +} diff --git a/common/crazypants/render/IconUtil.java b/common/crazypants/render/IconUtil.java new file mode 100644 index 00000000..c789a08d --- /dev/null +++ b/common/crazypants/render/IconUtil.java @@ -0,0 +1,39 @@ +package crazypants.render; + +import java.util.ArrayList; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeSubscribe; + +public class IconUtil { + + public static interface IIconProvider { + + public void registerIcons(IconRegister register); + + /** 0 = terrain.png, 1 = items.png */ + public int getTextureType(); + } + + static { + MinecraftForge.EVENT_BUS.register(new IconUtil()); + } + + private static ArrayList iconProviders = new ArrayList(); + + public static void addIconProvider(IIconProvider registrar) { + iconProviders.add(registrar); + } + + @ForgeSubscribe + public void onIconLoad(TextureStitchEvent.Pre event) { + for (IIconProvider reg : iconProviders) { + if (reg.getTextureType() == event.map.textureType) { + reg.registerIcons(event.map); + } + } + } + +} diff --git a/common/crazypants/render/ItemButton.java b/common/crazypants/render/ItemButton.java new file mode 100644 index 00000000..e93f4dec --- /dev/null +++ b/common/crazypants/render/ItemButton.java @@ -0,0 +1,84 @@ +package crazypants.render; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + + +public class ItemButton extends GuiButton { + + public static final RenderItem ITEM_RENDERER = new RenderItem(); + + public static final int DEFAULT_WIDTH = 24; + public static final int HWIDTH = DEFAULT_WIDTH / 2; + public static final int DEFAULT_HEIGHT = 24; + public static final int HHEIGHT = DEFAULT_HEIGHT / 2; + + private ItemStack item; + + private FontRenderer fr; + + protected int hwidth; + protected int hheight; + + public ItemButton(FontRenderer fr, int id, int x, int y, int itemId) { + super(id, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); + this.fr = fr; + item = new ItemStack(itemId, 1, 0); + hwidth = HWIDTH; + hheight = HHEIGHT; + } + + public void setSize(int width, int height) { + this.width = width; + this.height = height; + hwidth = width/2; + hheight = height/2; + } + + /** + * Draws this button to the screen. + */ + @SuppressWarnings("synthetic-access") + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + if (drawButton) { + + RenderUtil.bindTexture("textures/gui/widgets.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + width + && par3 < this.yPosition + height; + int hoverState = this.getHoverState(this.field_82253_i); + + // x, y, u, v, width, height + + // top half + drawTexturedModalRect(xPosition, yPosition, 0, 46 + hoverState * 20, hwidth, hheight); + drawTexturedModalRect(xPosition + hwidth, yPosition, 200 - hwidth, 46 + hoverState * 20, hwidth, hheight); + + // bottom half + drawTexturedModalRect(xPosition, yPosition + hheight, 0, 66 - hheight + (hoverState * 20), hwidth, hheight); + drawTexturedModalRect(xPosition + hwidth, yPosition + hheight, 200 - hwidth, 66 - hheight + (hoverState * 20), hwidth, hheight); + + mouseDragged(par1Minecraft, par2, par3); + + int l = 14737632; + + if (!this.enabled) { + l = -6250336; + } else if (this.field_82253_i) { + l = 16777120; + } + + int xLoc = xPosition + hwidth - 8; + int yLoc = yPosition + hheight - 10; + ITEM_RENDERER.renderItemIntoGUI(fr, par1Minecraft.renderEngine, item, xLoc, yLoc); + } + } + +} \ No newline at end of file diff --git a/common/crazypants/render/RenderUtil.java b/common/crazypants/render/RenderUtil.java new file mode 100644 index 00000000..b487bcf2 --- /dev/null +++ b/common/crazypants/render/RenderUtil.java @@ -0,0 +1,124 @@ +package crazypants.render; + +import java.nio.FloatBuffer; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; + +import org.lwjgl.opengl.GL11; + +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.Vector3d; + + +public class RenderUtil { + + public static final Vector3d UP_V = new Vector3d(0, 1, 0); + + public static final Vector3d ZERO_V = new Vector3d(0, 0, 0); + + private static final FloatBuffer MATRIX_BUFFER = GLAllocation.createDirectFloatBuffer(16); + + public static void loadMatrix(Matrix4d mat) { + MATRIX_BUFFER.rewind(); + MATRIX_BUFFER.put((float) mat.m00); + MATRIX_BUFFER.put((float) mat.m01); + MATRIX_BUFFER.put((float) mat.m02); + MATRIX_BUFFER.put((float) mat.m03); + MATRIX_BUFFER.put((float) mat.m10); + MATRIX_BUFFER.put((float) mat.m11); + MATRIX_BUFFER.put((float) mat.m12); + MATRIX_BUFFER.put((float) mat.m13); + MATRIX_BUFFER.put((float) mat.m20); + MATRIX_BUFFER.put((float) mat.m21); + MATRIX_BUFFER.put((float) mat.m22); + MATRIX_BUFFER.put((float) mat.m23); + MATRIX_BUFFER.put((float) mat.m30); + MATRIX_BUFFER.put((float) mat.m31); + MATRIX_BUFFER.put((float) mat.m32); + MATRIX_BUFFER.put((float) mat.m33); + MATRIX_BUFFER.rewind(); + GL11.glLoadMatrix(MATRIX_BUFFER); + } + + public static TextureManager engine() { + return Minecraft.getMinecraft().renderEngine; + } + + public static final ResourceLocation BLOCK_TEX = TextureMap.field_110575_b; + public static final ResourceLocation ITEM_TEX = TextureMap.field_110576_c; + public static final ResourceLocation GLINT_TEX = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + + public static void bindItemTexture(ItemStack stack) { + engine().func_110577_a(stack.getItemSpriteNumber() == 0 ? BLOCK_TEX : ITEM_TEX); + } + + public static void bindItemTexture() { + engine().func_110577_a(ITEM_TEX); + } + + public static void bindBlockTexture() { + engine().func_110577_a(BLOCK_TEX); + } + + public static void bindGlintTexture() { + engine().func_110577_a(BLOCK_TEX); + } + + public static void bindTexture(String string) { + engine().func_110577_a(new ResourceLocation(string)); + } + + public static void bindTexture(ResourceLocation tex) { + engine().func_110577_a(tex); + } + + public static FontRenderer fontRenderer() { + return Minecraft.getMinecraft().fontRenderer; + } + + public static float claculateTotalBrightnessForLocation(World worldObj, int xCoord, int yCoord, int zCoord) { + int i = worldObj.getLightBrightnessForSkyBlocks(xCoord, yCoord, zCoord, 0); + int j = i % 65536; + float fromSun = worldObj.getSunBrightness(1); + float fromLights = j / 255f; + int k = i / 65536; + float recievedPercent = worldObj.getLightBrightness(xCoord, yCoord, zCoord); + + float val = (fromSun + fromLights) * recievedPercent; + val = MathHelper.clamp_float(val, 0, 1); + return val; + } + + public static float getColorMultiplierForFace(ForgeDirection face) { + if (face == ForgeDirection.UP) { + return 1; + } + if (face == ForgeDirection.DOWN) { + return 0.5f; + } + if (face.offsetX != 0) { + return 0.6f; + } + return 0.8f; // z + } + + public static int setTesselatorBrightness(IBlockAccess world, int x, int y, int z) { + Block block = Block.blocksList[world.getBlockId(x, y, z)]; + int res = block == null ? world.getLightBrightnessForSkyBlocks(x, y, z, 0) : block.getMixedBrightnessForBlock(world, x, y, z); + Tessellator.instance.setBrightness(res); + Tessellator.instance.setColorRGBA_F(1, 1, 1, 1); + return res; + } + +} diff --git a/common/crazypants/render/VertexRotation.java b/common/crazypants/render/VertexRotation.java new file mode 100644 index 00000000..3fa1d323 --- /dev/null +++ b/common/crazypants/render/VertexRotation.java @@ -0,0 +1,23 @@ +package crazypants.render; + +import crazypants.vecmath.Quat4d; +import crazypants.vecmath.Vector3d; + +public class VertexRotation implements VertexTransform { + + private final Vector3d center; + private final Quat4d quat; + + public VertexRotation(double angle, Vector3d axis, Vector3d center) { + this.center = center; + quat = Quat4d.makeRotate(angle, axis); + } + + @Override + public void apply(Vector3d vec) { + vec.sub(center); + quat.rotate(vec); + vec.add(center); + } + +} diff --git a/common/crazypants/render/VertexTransform.java b/common/crazypants/render/VertexTransform.java new file mode 100644 index 00000000..bdb848aa --- /dev/null +++ b/common/crazypants/render/VertexTransform.java @@ -0,0 +1,10 @@ +package crazypants.render; + +import crazypants.vecmath.Vector3d; + +public interface VertexTransform { + + public abstract void apply(Vector3d vec); + + +} diff --git a/common/crazypants/util/BlockCoord.java b/common/crazypants/util/BlockCoord.java new file mode 100644 index 00000000..d4c1f521 --- /dev/null +++ b/common/crazypants/util/BlockCoord.java @@ -0,0 +1,63 @@ +package crazypants.util; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; + +public final class BlockCoord { + + public final int x; + public final int y; + public final int z; + + public BlockCoord(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + public BlockCoord(TileEntity tile) { + this(tile.xCoord,tile.yCoord,tile.zCoord); + } + + public BlockCoord getLocation(ForgeDirection dir) { + return new BlockCoord(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + x; + result = prime * result + y; + result = prime * result + z; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BlockCoord other = (BlockCoord) obj; + if (x != other.x) + return false; + if (y != other.y) + return false; + if (z != other.z) + return false; + return true; + } + + @Override + public String toString() { + return "BlockCoord [x=" + x + ", y=" + y + ", z=" + z + "]"; + } + + public boolean equals(int xCoord, int yCoord, int zCoord) { + return x == xCoord && y == yCoord && z == zCoord; + } + +} diff --git a/common/crazypants/util/ForgeDirectionOffsets.java b/common/crazypants/util/ForgeDirectionOffsets.java new file mode 100644 index 00000000..b67800f7 --- /dev/null +++ b/common/crazypants/util/ForgeDirectionOffsets.java @@ -0,0 +1,37 @@ +package crazypants.util; + +import crazypants.vecmath.Vector3d; +import net.minecraftforge.common.ForgeDirection; + +public final class ForgeDirectionOffsets { + + public static final Vector3d[] OFFSETS = new Vector3d[ForgeDirection.values().length]; + + static { + for(ForgeDirection dir : ForgeDirection.values()) { + OFFSETS[dir.ordinal()] = new Vector3d(dir.offsetX,dir.offsetY,dir.offsetZ); + } + } + + public static Vector3d forDir(ForgeDirection dir) { + return OFFSETS[dir.ordinal()]; + } + + public static Vector3d forDirCopy(ForgeDirection dir) { + return new Vector3d(OFFSETS[dir.ordinal()]); + } + + public static Vector3d offsetScaled(ForgeDirection dir, double scale) { + Vector3d res = forDirCopy(dir); + res.scale(scale); + return res; + } + + private ForgeDirectionOffsets() { + } + + public static boolean isPositiveOffset(ForgeDirection dir) { + return dir == ForgeDirection.SOUTH || dir == ForgeDirection.EAST || dir == ForgeDirection.UP; + } + +} diff --git a/common/crazypants/util/MetadataUtil.java b/common/crazypants/util/MetadataUtil.java new file mode 100644 index 00000000..c90dc6e9 --- /dev/null +++ b/common/crazypants/util/MetadataUtil.java @@ -0,0 +1,44 @@ +package crazypants.util; + +public class MetadataUtil { + + public static void printBits(int meta) { + for (int k = 0; k < 4; k++) { + if (((meta >> k) & 1) == 1) { + System.out.print(1); + } else { + System.out.print(0); + } + } + System.out.println(); + } + + public static String toBitString(int meta) { + StringBuilder sb = new StringBuilder(); + for (int k = 0; k < 4; k++) { + if (((meta >> k) & 1) == 1) { + sb.append(1); + } else { + sb.append(0); + } + } + return sb.toString(); + } + + public static boolean isBitSet(int position, int meta) { + return ((meta >> position) & 1) == 1; + } + + public static int setBit(int position, boolean value, int meta) { + if(value) { + return meta | (1 << position); + } + return meta & ~(1 << position); + } + + public static int toggleBit(int position, int meta) { + return setBit(position, !isBitSet(position, meta), meta); + } + + +} diff --git a/common/crazypants/util/PacketUtil.java b/common/crazypants/util/PacketUtil.java new file mode 100644 index 00000000..023292ec --- /dev/null +++ b/common/crazypants/util/PacketUtil.java @@ -0,0 +1,139 @@ +package crazypants.util; + +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.EnderIO; + +public class PacketUtil { + + public static Packet createTileEntityPacket(String channel, int id, TileEntity te) { + + ByteArrayOutputStream bos = new ByteArrayOutputStream(140); + DataOutputStream dos = new DataOutputStream(bos); + try { + dos.writeInt(id); + dos.writeInt(te.xCoord); + dos.writeInt(te.yCoord); + dos.writeInt(te.zCoord); + NBTTagCompound root = new NBTTagCompound(); + te.writeToNBT(root); + writeNBTTagCompound(root, dos); + + } catch (IOException e) { + // never thrown + } + + Packet250CustomPayload pkt = new Packet250CustomPayload(); + pkt.channel = channel; + pkt.data = bos.toByteArray(); + pkt.length = bos.size(); + pkt.isChunkDataPacket = true; + return pkt; + + } + + public static TileEntity handleTileEntityPacket(boolean readId, DataInputStream dis) { + int x; + int y; + int z; + try { + if (readId) { + int id = dis.readInt(); + } + x = dis.readInt(); + y = dis.readInt(); + z = dis.readInt(); + } catch (IOException e) { + FMLCommonHandler.instance().raiseException(e, "PacketUtil.readTileEntityPacket", false); + return null; + } + NBTTagCompound tags = readNBTTagCompound(dis); + + World world = EnderIO.proxy.getClientWorld(); + if (world == null) { + FMLCommonHandler.instance().raiseException(new Exception("World was null"), "PacketUtil.readTileEntityPacket", true); + return null; + } + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te == null) { + FMLCommonHandler.instance().raiseException(new Exception("TileEntity was null"), "PacketUtil.readTileEntityPacket", true); + return null; + } + te.readFromNBT(tags); + return te; + } + + public static ItemStack readItemStack(DataInputStream dataIn) throws IOException { + ItemStack var2 = null; + short itemID = dataIn.readShort(); + + if (itemID >= 0) { + byte stackSize = dataIn.readByte(); + short damage = dataIn.readShort(); + var2 = new ItemStack(itemID, stackSize, damage); + var2.stackTagCompound = readNBTTagCompound(dataIn); + } + + return var2; + } + + public static byte[] readByteArray(int length, DataInputStream dataIn) throws IOException { + + byte[] barray = new byte[length]; + dataIn.readFully(barray, 0, length); + return barray; + + } + + public static void writeItemStack(ItemStack spawnstack, DataOutputStream dataout) throws IOException { + if (spawnstack == null) { + dataout.writeShort(-1); + } else { + dataout.writeShort(spawnstack.itemID); + dataout.writeByte(spawnstack.stackSize); + dataout.writeShort(spawnstack.getItemDamage()); + writeNBTTagCompound(spawnstack.stackTagCompound, dataout); + } + } + + public static NBTTagCompound readNBTTagCompound(DataInputStream dataIn) { + try { + short var2 = dataIn.readShort(); + if (var2 < 0) { + return null; + } else { + byte[] var3 = readByteArray(var2, dataIn); + return CompressedStreamTools.decompress(var3); + } + } catch (IOException e) { + FMLCommonHandler.instance().raiseException(e, "Custom Packet", true); + return null; + } + } + + public static void writeNBTTagCompound(NBTTagCompound compound, DataOutputStream dataout) { + try { + if (compound == null) { + dataout.writeShort(-1); + } else { + byte[] var3 = CompressedStreamTools.compress(compound); + dataout.writeShort((short) var3.length); + dataout.write(var3); + } + } catch (IOException e) { + FMLCommonHandler.instance().raiseException(e, "PacketUtil.readTileEntityPacket.writeNBTTagCompound", true); + } + } + +} diff --git a/common/crazypants/util/Util.java b/common/crazypants/util/Util.java new file mode 100644 index 00000000..52be6dd8 --- /dev/null +++ b/common/crazypants/util/Util.java @@ -0,0 +1,49 @@ +package crazypants.util; + +import net.minecraft.block.Block; +import net.minecraft.item.*; + +public class Util { + + public static Block getBlock(int blockId) { + if (blockId <= 0) { + return null; + } + if (blockId > Block.blocksList.length) { + return null; + } + return Block.blocksList[blockId]; + } + + public static Item getItem(int itemId) { + if (itemId <= 0) { + return null; + } + if (itemId > Item.itemsList.length) { + return null; + } + return Item.itemsList[itemId]; + } + + public static Block getBlockFromItemId(int itemId) { + Item item = getItem(itemId); + if (item instanceof ItemBlock) { + return getBlock(((ItemBlock) item).getBlockID()); + } + return null; + } + + public static ItemStack consumeItem(ItemStack stack) { + if (stack.stackSize == 1) { + if (stack.getItem().hasContainerItem()) { + return stack.getItem().getContainerItemStack(stack); + } else { + return null; + } + } else { + stack.splitStack(1); + return stack; + } + } + +} diff --git a/common/crazypants/vecmath/Camera.java b/common/crazypants/vecmath/Camera.java new file mode 100644 index 00000000..873d98f7 --- /dev/null +++ b/common/crazypants/vecmath/Camera.java @@ -0,0 +1,146 @@ +package crazypants.vecmath; + +import java.awt.Rectangle; + +public class Camera { + + private Rectangle viewport; + + private Matrix4d projectionTranspose; + private Matrix4d projectionMatrix; + private Matrix4d projectionInverse; + + private Matrix4d viewTranspose; + private Matrix4d viewMatrix; + private Matrix4d viewInverse; + + public boolean isValid() { + return viewMatrix != null && projectionMatrix != null && viewport != null; + } + + public void setProjectionMatrixAsPerspective(double fovDegrees, double near, double far, int viewportWidth, int viewportHeight) { + setProjectionMatrix(VecmathUtil.createProjectionMatrixAsPerspective(fovDegrees, near, far, viewportWidth, viewportHeight)); + } + + public void setViewMatrixAsLookAt( Vector3d eyePos, Vector3d lookAtPos, Vector3d upVec) { + setViewMatrix(VecmathUtil.createMatrixAsLookAt(eyePos, lookAtPos, upVec)); + } + + public Vector3d getEyePoint() { + Matrix4d vpm = new Matrix4d(); + Matrix4d ivm = getInverseViewMatrix(); + if (ivm == null) { + return null; + } + Matrix4d ipm = getInverseProjectionMatrix(); + if (ipm == null) { + return null; + } + vpm.mul(ivm, ipm); + + Vector3d eye = new Vector3d(); + ivm.getTranslation(eye); + return eye; + } + + public boolean getRayForPixel(int x, int y, Vector3d eyeOut, Vector3d normalOut) { + if(isValid()) { + VecmathUtil.computeRayForPixel(viewport, getInverseProjectionMatrix(), getInverseViewMatrix(), x, y, eyeOut, normalOut); + return true; + } + return false; + } + + public Vector2d getScreenPoint(Vector3d point3d) { + Vector4d transPoint = new Vector4d(point3d.x, point3d.y, point3d.z, 1); + + viewMatrix.transform(transPoint); + projectionMatrix.transform(transPoint); + + int halfWidth = viewport.width / 2; + int halfHeight = viewport.height / 2; + Vector2d screenPos = new Vector2d(transPoint.x, transPoint.y); + screenPos.scale(1 / transPoint.w); + screenPos.x = screenPos.x * halfWidth + halfWidth; + screenPos.y = -screenPos.y * halfHeight + halfHeight; + + return screenPos; + } + + public void setViewport(Rectangle viewport) { + if (viewport != null) { + setViewport(viewport.x, viewport.y, viewport.width, viewport.height); + } + } + + public void setViewport(int x, int y, int width, int height) { + viewport = new Rectangle(x, y, width, height); + } + + public Rectangle getViewport() { + return viewport; + } + + public Matrix4d getProjectionMatrix() { + return projectionMatrix; + } + + public Matrix4d getTransposeProjectionMatrix() { + return projectionTranspose; + } + + public Matrix4d getInverseProjectionMatrix() { + if (projectionMatrix != null) { + if (projectionInverse == null) { + projectionInverse = new Matrix4d(projectionMatrix); + projectionInverse.invert(); + } + return projectionInverse; + } else { + return null; + } + } + + public void setProjectionMatrix(Matrix4d matrix) { + if (projectionMatrix == null) { + projectionMatrix = new Matrix4d(); + projectionTranspose = new Matrix4d(); + } + projectionMatrix.set(matrix); + projectionTranspose.set(matrix); + projectionTranspose.transpose(); + projectionInverse = null; + } + + public Matrix4d getViewMatrix() { + return viewMatrix; + } + + public Matrix4d getTransposeViewMatrix() { + return viewTranspose; + } + + public Matrix4d getInverseViewMatrix() { + if (viewMatrix != null) { + if (viewInverse == null) { + viewInverse = new Matrix4d(viewMatrix); + viewInverse.invert(); + } + return viewInverse; + } else { + return null; + } + } + + public void setViewMatrix(Matrix4d matrix) { + if (viewMatrix == null) { + viewMatrix = new Matrix4d(); + viewTranspose = new Matrix4d(); + } + viewMatrix.set(matrix); + viewTranspose.set(matrix); + viewTranspose.transpose(); + viewInverse = null; + } + +} diff --git a/common/crazypants/vecmath/Matrix4d.java b/common/crazypants/vecmath/Matrix4d.java new file mode 100644 index 00000000..f14757d8 --- /dev/null +++ b/common/crazypants/vecmath/Matrix4d.java @@ -0,0 +1,525 @@ +package crazypants.vecmath; + +public class Matrix4d { + + public double m00 = 0; + public double m01 = 0; + public double m02 = 0; + public double m03 = 0; + public double m10 = 0; + public double m11 = 0; + public double m12 = 0; + public double m13 = 0; + public double m20 = 0; + public double m21 = 0; + public double m22 = 0; + public double m23 = 0; + public double m30 = 0; + public double m31 = 0; + public double m32 = 0; + public double m33 = 0; + + public Matrix4d() { + } + + public Matrix4d(Matrix4d other) { + m00 = other.m00; + m01 = other.m01; + m02 = other.m02; + m03 = other.m03; + + m10 = other.m10; + m11 = other.m11; + m12 = other.m12; + m13 = other.m13; + + m20 = other.m20; + m21 = other.m21; + m22 = other.m22; + m23 = other.m23; + + m30 = other.m30; + m31 = other.m31; + m32 = other.m32; + m33 = other.m33; + } + + public Matrix4d(double m00, double m01, double m02, double m03, + double m10, double m11, double m12, double m13, + double m20, double m21, double m22, double m23, + double m30, double m31, double m32, double m33) { + + this.m00 = m00; + this.m01 = m01; + this.m02 = m02; + this.m03 = m03; + + this.m10 = m10; + this.m11 = m11; + this.m12 = m12; + this.m13 = m13; + + this.m20 = m20; + this.m21 = m21; + this.m22 = m22; + this.m23 = m23; + + this.m30 = m30; + this.m31 = m31; + this.m32 = m32; + this.m33 = m33; + + } + + public final void setIdentity() { + m00 = 1.0; + m01 = 0.0; + m02 = 0.0; + m03 = 0.0; + + m10 = 0.0; + m11 = 1.0; + m12 = 0.0; + m13 = 0.0; + + m20 = 0.0; + m21 = 0.0; + m22 = 1.0; + m23 = 0.0; + + m30 = 0.0; + m31 = 0.0; + m32 = 0.0; + m33 = 1.0; + } + + public void set(Matrix4d other) { + m00 = other.m00; + m01 = other.m01; + m02 = other.m02; + m03 = other.m03; + + m10 = other.m10; + m11 = other.m11; + m12 = other.m12; + m13 = other.m13; + + m20 = other.m20; + m21 = other.m21; + m22 = other.m22; + m23 = other.m23; + + m30 = other.m30; + m31 = other.m31; + m32 = other.m32; + m33 = other.m33; + + } + + public void set(double[] values) { + m00 = values[0]; + m01 = values[1]; + m02 = values[2]; + m03 = values[3]; + m10 = values[4]; + m11 = values[5]; + m12 = values[6]; + m13 = values[7]; + m20 = values[8]; + m21 = values[9]; + m22 = values[10]; + m23 = values[11]; + m30 = values[12]; + m31 = values[13]; + m32 = values[14]; + m33 = values[15]; + } + + public double getElement(int row, int col) { + switch (row) { + case 0: + switch (col) { + case 0: + return m00; + case 1: + return m01; + case 2: + return m02; + case 3: + return m03; + default: + break; + } + break; + + case 1: + switch (col) { + case 0: + return m10; + case 1: + return m11; + case 2: + return m12; + case 3: + return m13; + default: + break; + } + break; + + case 2: + switch (col) { + case 0: + return m20; + case 1: + return m21; + case 2: + return m22; + case 3: + return m23; + default: + break; + } + break; + + case 3: + switch (col) { + case 0: + return m30; + case 1: + return m31; + case 2: + return m32; + case 3: + return m33; + default: + break; + } + break; + + default: + break; + } + return 0; + } + + public void setElement(int row, int column, double val) { + switch (row) { + + case 0: + switch (column) { + case 0: + m00 = val; + break; + case 1: + m01 = val; + break; + case 2: + m02 = val; + break; + case 3: + m03 = val; + break; + default: + break; + } + break; + + case 1: + switch (column) { + case 0: + m10 = val; + break; + case 1: + m11 = val; + break; + case 2: + m12 = val; + break; + case 3: + m13 = val; + break; + default: + break; + } + break; + + case 2: + switch (column) { + case 0: + m20 = val; + break; + case 1: + m21 = val; + break; + case 2: + m22 = val; + break; + case 3: + m23 = val; + break; + default: + break; + } + break; + + case 3: + switch (column) { + case 0: + m30 = val; + break; + case 1: + m31 = val; + break; + case 2: + m32 = val; + break; + case 3: + m33 = val; + break; + default: + break; + } + break; + + default: + break; + } + + } + + + + public void getTranslation(Vector3d trans) { + trans.x = m03; + trans.y = m13; + trans.z = m23; + } + + public void setTranslation(Vector3d trans) { + m03 = trans.x; + m13 = trans.y; + m23 = trans.z; + } + + public void makeRotationX(double angle) { + setIdentity(); + double sin = Math.sin(angle); + double cos = Math.cos(angle); + m11 = cos; + m12 = -sin; + m21 = sin; + m22 = cos; + } + + public void makeRotationY(double angle) { + setIdentity(); + double sin = Math.sin(angle); + double cos = Math.cos(angle); + m00 = cos; + m02 = sin; + m20 = -sin; + m22 = cos; + } + + public void makeRotationZ(double angle) { + setIdentity(); + double sin = Math.sin(angle); + double cos = Math.cos(angle); + m00 = cos; + m01 = -sin; + m10 = sin; + m11 = cos; + } + + public void transform(Vector3d vec) { + double x = m00 * vec.x + m01 * vec.y + m02 * vec.z + m03; + double y = m10 * vec.x + m11 * vec.y + m12 * vec.z + m13; + vec.z = m20 * vec.x + m21 * vec.y + m22 * vec.z + m23; + vec.x = x; + vec.y = y; + } + + public void transform(Vector4d vec) { + double x = m00 * vec.x + m01 * vec.y + m02 * vec.z + m03 * vec.w; + double y = m10 * vec.x + m11 * vec.y + m12 * vec.z + m13 * vec.w; + double z = m20 * vec.x + m21 * vec.y + m22 * vec.z + m23 * vec.w; + vec.w = m30 * vec.x + m31 * vec.y + m32 * vec.z + m33 * vec.w; + vec.x = x; + vec.y = y; + vec.z = z; + } + + public void transformNormal(Vector3f normal) { + double x = m00 * normal.x + m01 * normal.y + m02 * normal.z; + double y = m10 * normal.x + m11 * normal.y + m12 * normal.z; + normal.z = (float) (m20 * normal.x + m21 * normal.y + m22 * normal.z); + normal.x = (float) x; + normal.y = (float) y; + + } + + public void transformNormal(Vector3d normal) { + double x = m00 * normal.x + m01 * normal.y + m02 * normal.z; + double y = m10 * normal.x + m11 * normal.y + m12 * normal.z; + normal.z = m20 * normal.x + m21 * normal.y + m22 * normal.z; + normal.x = x; + normal.y = y; + } + + public void mul(Matrix4d m1, Matrix4d m2) { + set(m1); + mul(m2); + } + + public void mul(Matrix4d m) { + double m00Tmp = m00 * m.m00 + m01 * m.m10 + m02 * m.m20 + m03 * m.m30; + double m01Tmp = m00 * m.m01 + m01 * m.m11 + m02 * m.m21 + m03 * m.m31; + double m02Tmp = m00 * m.m02 + m01 * m.m12 + m02 * m.m22 + m03 * m.m32; + double m03Tmp = m00 * m.m03 + m01 * m.m13 + m02 * m.m23 + m03 * m.m33; + + double m10Tmp = m10 * m.m00 + m11 * m.m10 + m12 * m.m20 + m13 * m.m30; + double m11Tmp = m10 * m.m01 + m11 * m.m11 + m12 * m.m21 + m13 * m.m31; + double m12Tmp = m10 * m.m02 + m11 * m.m12 + m12 * m.m22 + m13 * m.m32; + double m13Tmp = m10 * m.m03 + m11 * m.m13 + m12 * m.m23 + m13 * m.m33; + + double m20Tmp = m20 * m.m00 + m21 * m.m10 + m22 * m.m20 + m23 * m.m30; + double m21Tmp = m20 * m.m01 + m21 * m.m11 + m22 * m.m21 + m23 * m.m31; + double m22Tmp = m20 * m.m02 + m21 * m.m12 + m22 * m.m22 + m23 * m.m32; + double m23Tmp = m20 * m.m03 + m21 * m.m13 + m22 * m.m23 + m23 * m.m33; + + double m30Tmp = m30 * m.m00 + m31 * m.m10 + m32 * m.m20 + m33 * m.m30; + double m31Tmp = m30 * m.m01 + m31 * m.m11 + m32 * m.m21 + m33 * m.m31; + double m32Tmp = m30 * m.m02 + m31 * m.m12 + m32 * m.m22 + m33 * m.m32; + double m33Tmp = m30 * m.m03 + m31 * m.m13 + m32 * m.m23 + m33 * m.m33; + + m00 = m00Tmp; + m01 = m01Tmp; + m02 = m02Tmp; + m03 = m03Tmp; + m10 = m10Tmp; + m11 = m11Tmp; + m12 = m12Tmp; + m13 = m13Tmp; + m20 = m20Tmp; + m21 = m21Tmp; + m22 = m22Tmp; + m23 = m23Tmp; + m30 = m30Tmp; + m31 = m31Tmp; + m32 = m32Tmp; + m33 = m33Tmp; + } + + public void transpose() { + double tmp = m10; + m10 = m01; + m01 = tmp; + + tmp = m20; + m20 = m02; + m02 = tmp; + + tmp = m30; + m30 = m03; + m03 = tmp; + + tmp = m21; + m21 = m12; + m12 = tmp; + + tmp = m31; + m31 = m13; + m13 = tmp; + + tmp = m32; + m32 = m23; + m23 = tmp; + } + + public void invert() { + double det = determinant(); + if (det == 0) { + throw new RuntimeException("Cannot invert matrix with a determinat of 0."); + } + double detInv = 1f / det; + + // first row + double t00 = determinant3x3(m11, m21, m31, m12, m22, m32, m13, m23, m33); + double t01 = -determinant3x3(m01, m21, m31, m02, m22, m32, m03, m23, m33); + double t02 = determinant3x3(m01, m11, m31, m02, m12, m32, m03, m13, m33); + double t03 = -determinant3x3(m01, m11, m21, m02, m12, m22, m03, m13, m23); + // second row + double t10 = -determinant3x3(m10, m20, m30, m12, m22, m32, m13, m23, m33); + double t11 = determinant3x3(m00, m20, m30, m02, m22, m32, m03, m23, m33); + double t12 = -determinant3x3(m00, m10, m30, m02, m12, m32, m03, m13, m33); + double t13 = determinant3x3(m00, m10, m20, m02, m12, m22, m03, m13, m23); + // third row + double t20 = determinant3x3(m10, m20, m30, m11, m21, m31, m13, m23, m33); + double t21 = -determinant3x3(m00, m20, m30, m01, m21, m31, m03, m23, m33); + double t22 = determinant3x3(m00, m10, m30, m01, m11, m31, m03, m13, m33); + double t23 = -determinant3x3(m00, m10, m20, m01, m11, m21, m03, m13, m23); + // fourth row + double t30 = -determinant3x3(m10, m20, m30, m11, m21, m31, m12, m22, m32); + double t31 = determinant3x3(m00, m20, m30, m01, m21, m31, m02, m22, m32); + double t32 = -determinant3x3(m00, m10, m30, m01, m11, m31, m02, m12, m32); + double t33 = determinant3x3(m00, m10, m20, m01, m11, m21, m02, m12, m22); + + m00 = t00 * detInv; + m11 = t11 * detInv; + m22 = t22 * detInv; + m33 = t33 * detInv; + m10 = t10 * detInv; + m01 = t01 * detInv; + m02 = t02 * detInv; + m20 = t20 * detInv; + m21 = t21 * detInv; + m12 = t12 * detInv; + m30 = t30 * detInv; + m03 = t03 * detInv; + m31 = t31 * detInv; + m13 = t13 * detInv; + m23 = t23 * detInv; + m32 = t32 * detInv; + + } + + public double determinant() { + double result = + m00 + * ((m11 * m22 * m33 + m21 * m32 * m13 + m31 * m12 * m23) + - m31 * m22 * m13 + - m11 * m32 * m23 + - m21 * m12 * m33); + result -= m10 + * ((m01 * m22 * m33 + m21 * m32 * m03 + m31 * m02 * m23) + - m31 * m22 * m03 + - m01 * m32 * m23 + - m21 * m02 * m33); + result += m20 + * ((m01 * m12 * m33 + m11 * m32 * m03 + m31 * m02 * m13) + - m31 * m12 * m03 + - m01 * m32 * m13 + - m11 * m02 * m33); + result -= m30 + * ((m01 * m12 * m23 + m11 * m22 * m03 + m21 * m02 * m13) + - m21 * m12 * m03 + - m01 * m22 * m13 + - m11 * m02 * m23); + return result; + } + + private double determinant3x3(double e00, double e01, double e02, double e10, double e11, double e12, double e20, double e21, double e22) { + return e00 * (e11 * e22 - e12 * e21) + e01 * (e12 * e20 - e10 * e22) + e02 * (e10 * e21 - e11 * e20); + } + + @Override + public String toString() { + return "Matrix4d(\n" + + " " + m00 + ", " + m01 + ", " + m02 + ", " + m03 + "\n" + + " " + m10 + ", " + m11 + ", " + m12 + ", " + m13 + "\n" + + " " + m20 + ", " + m21 + ", " + m22 + ", " + m23 + "\n" + + " " + m30 + ", " + m31 + ", " + m32 + ", " + m33 + "\n" + + ")\n"; + } +} diff --git a/common/crazypants/vecmath/Quat4d.java b/common/crazypants/vecmath/Quat4d.java new file mode 100644 index 00000000..1e408bc1 --- /dev/null +++ b/common/crazypants/vecmath/Quat4d.java @@ -0,0 +1,48 @@ +package crazypants.vecmath; + + +public class Quat4d { + + public static Quat4d makeRotate(double angle, Vector3d axis) { + double epsilon = 0.0000001; + + double x = axis.x; + double y = axis.y; + double z = axis.z; + double length = Math.sqrt(x * x + y * y + z * z); + if (length < epsilon) { + // ~zero length axis, so reset rotation to zero. + return new Quat4d(); + } + + double inversenorm = 1.0 / length; + double coshalfangle = Math.cos(0.5 * angle); + double sinhalfangle = Math.sin(0.5 * angle); + + Quat4d res = new Quat4d(); + res.x = x * sinhalfangle * inversenorm; + res.y = y * sinhalfangle * inversenorm; + res.z = z * sinhalfangle * inversenorm; + res.w = coshalfangle; + return res; + } + + public double x; + public double y; + public double z; + public double w; + + public Quat4d() { + } + + public void rotate(Vector3d vec) { + double d = -x * vec.x - y * vec.y - z * vec.z; + double d1 = w * vec.x + y * vec.z - z * vec.y; + double d2 = w * vec.y - x * vec.z + z * vec.x; + double d3 = w * vec.z + x * vec.y - y * vec.x; + vec.x = d1 * w - d * x - d2 * z + d3 * y; + vec.y = d2 * w - d * y + d1 * z - d3 * x; + vec.z = d3 * w - d * z - d1 * y + d2 * x; + } + +} diff --git a/common/crazypants/vecmath/VecmathUtil.java b/common/crazypants/vecmath/VecmathUtil.java new file mode 100644 index 00000000..f09082c8 --- /dev/null +++ b/common/crazypants/vecmath/VecmathUtil.java @@ -0,0 +1,633 @@ +package crazypants.vecmath; + +import java.awt.Rectangle; + +import net.minecraft.util.MathHelper; + +public class VecmathUtil { + + /** + * Returns the distance from a point to a plane. + * + * @param plane + * the plane. + * @param point + * the point. + * @return the distance between them. + */ + public static double distanceFromPointToPlane( Vector4d plane, Vector3d point) { + Vector4d newPoint = new Vector4d(point.x, point.y, point.z, 1); + return plane.dot(newPoint); + } + + + public static void computePlaneEquation(Vector4d a, Vector4d b, Vector4d c, Vector4d result) { + computePlaneEquation(new Vector3d(a.x,a.y,a.z), new Vector3d(b.x,b.y,b.z), new Vector3d(c.x,c.y,c.z), result); + } + + public static Vector3d clamp(Vector3d v, double min, double max) { + v.x = clamp(v.x,min,max); + v.y = clamp(v.y,min,max); + v.z = clamp(v.z,min,max); + return v; + } + + public static double clamp(double val, double min, double max) { + return val < min ? min: (val > max ? max : val); + } + + /** + * Compute the plane equation Ax + By + Cz + D = 0 for the plane defined by the three + * points which lie on the plane, a, b, and c, and placing the result into r. The plane equation + * can be summarised as the normal vector of the plane (A,B,C) and the distance to the plane from + * the origin (D). + * + * @param a + * vector a. + * @param b + * vector b. + * @param c + * vector c. + * @param result + * the result (A,B,C,D) of plane equation. + */ + public static void computePlaneEquation( Vector3d a, Vector3d b, + Vector3d c, Vector4d result) { + Vector3d i = new Vector3d(); + Vector3d j = new Vector3d(); + Vector3d k = new Vector3d(); + + //compute normal vector + i.x = c.x - a.x; + i.y = c.y - a.y; + i.z = c.z - a.z; + + j.x = b.x - a.x; + j.y = b.y - a.y; + j.z = b.z - a.z; + + k.cross(j, i); + k.normalize(); + + //plane equation: Ax + By + Cz + D = 0 + result.x = k.x; //A + result.y = k.y; //B + result.z = k.z; //C + result.w = -(result.x * a.x + result.y * a.y + result.z * a.z); //D + } + + /** + * Projects the point onto the plane. + * + * @param plane + * the plane. + * @param point + * the point. + */ + public static void projectPointOntoPlane( Vector4d plane, Vector4d point) { + double distance = plane.dot(point); + Vector4d newPoint = new Vector4d(point); + Vector3d planeNormal = new Vector3d(plane.x, plane.y, plane.z); + planeNormal.normalize(); + planeNormal.scale(distance); + newPoint.sub(new Vector4d(planeNormal.x, planeNormal.y, planeNormal.z, 0)); + point.set(newPoint); + } + + /** + * This method calculates the intersection between a line and a plane. + * + * @param plane + * the plane (x,y,z = normal, w = distance from origin) + * @param pointInLine + * a point in the line. + * @param lineDirection + * the direction of the line. + * @return the intersection or null if there is no intersection or the line is on the plane. + */ + public static Vector3d computeIntersectionBetweenPlaneAndLine( Vector4d plane, + Vector3d pointInLine, Vector3d lineDirection) { + //check for no intersection + Vector3d planeNormal = new Vector3d(plane.x, plane.y, plane.z); + if (planeNormal.dot(lineDirection) == 0) { + //line and plane are perpendicular + return null; + } + //check if line is on the plane + if (planeNormal.dot(pointInLine) + plane.w == 0) { + return null; + } + + //we have an intersection + Vector4d point = new Vector4d(pointInLine.x, pointInLine.y, pointInLine.z, 1); + Vector4d lineNorm = new Vector4d(lineDirection.x, lineDirection.y, lineDirection.z, 0); + double t = -(plane.dot(point) / plane.dot(lineNorm)); + + Vector3d result = new Vector3d(pointInLine); + lineDirection.scale(t); + result.add(lineDirection); + return result; + } + + /** + * This function computes the ray that goes from the eye, through the specified pixel. + * + * @param camera + * the camera. + * @param x + * the x pixel location (x = 0 is the left most pixel) + * @param y + * the y pixel location (y = 0 is the bottom most pixel) + * @param eyeOut + * the eyes position. + * @param normalOut + * the normal description the directional component of the ray. + */ + public static void computeRayForPixel(Rectangle vp, Matrix4d ipm, Matrix4d ivm, int x, int y, + Vector3d eyeOut, Vector3d normalOut) { + + //grab the eye's position + ivm.getTranslation(eyeOut); + + Matrix4d vpm = new Matrix4d(); + vpm.mul(ivm, ipm); + + //Calculate the pixel location in screen clip space (width and height from -1 to 1) + double screenX = (x - vp.getX()) / vp.getWidth(); + double screenY = (y - vp.getY()) / vp.getHeight(); + screenX = (screenX * 2.0) - 1.0; + screenY = (screenY * 2.0) - 1.0; + + //Now calculate the XYZ location of this point on the near plane + Vector4d tmp = new Vector4d(); + tmp.x = screenX; + tmp.y = screenY; + tmp.z = -1; + tmp.w = 1.0; + vpm.transform(tmp); + + double w = tmp.w; + Vector3d nearXYZ = new Vector3d(tmp.x / w, tmp.y / w, tmp.z / w); + + //and then on the far plane + tmp.x = screenX; + tmp.y = screenY; + tmp.z = 1; + tmp.w = 1.0; + vpm.transform(tmp); + + w = tmp.w; + Vector3d farXYZ = new Vector3d(tmp.x / w, tmp.y / w, tmp.z / w); + + normalOut.set(farXYZ); + normalOut.sub(nearXYZ); + normalOut.normalize(); + + } + +// /** +// * Make a rotation Quat which will rotate vec1 to vec2 +// *

+// * This routine uses only fast geometric transforms, without costly acos/sin computations. It's +// * exact, fast, and with less degenerate cases than the acos/sin method. +// *

+// * For an explanation of the math used, you may see for example: +// * http://logiciels.cnes.fr/MARMOTTES/marmottes-mathematique.pdf +// *

+// * NB: This is the rotation with shortest angle, which is the one equivalent to the acos/sin +// * transform method. Other rotations exists, for example to additionally keep a local horizontal +// * attitude. +// * +// * @param from +// * rotate from this vector +// * @param to +// * to this one +// * @return the rotation to apply to from to get to to. +// */ +// +// public static Quat4d makeRotate( Vector3d from, Vector3d to) { +// +// Quat4d res = new Quat4d(); +// +// // This routine takes any vector as argument but normalized +// // vectors are necessary, if only for computing the dot product. +// // Too bad the API is that generic, it leads to performance loss. +// // Even in the case the 2 vectors are not normalized but same length, +// // the sqrt could be shared, but we have no way to know beforehand +// // at this point, while the caller may know. +// // So, we have to test... in the hope of saving at least a sqrt +// Vector3d sourceVector = new Vector3d(from); +// Vector3d targetVector = new Vector3d(to); +// +// double fromLen2 = sourceVector.lengthSquared(); +// double fromLen; +// // normalize only when necessary, epsilon test +// if ((fromLen2 < 1.0 - 1e-7) || (fromLen2 > 1.0 + 1e-7)) { +// fromLen = Math.sqrt(fromLen2); +// sourceVector.x /= fromLen; +// sourceVector.y /= fromLen; +// sourceVector.z /= fromLen; +// +// } else { +// fromLen = 1.0; +// } +// +// double toLen2 = targetVector.lengthSquared(); +// // normalize only when necessary, epsilon test +// if ((toLen2 < 1.0 - 1e-7) || (toLen2 > 1.0 + 1e-7)) { +// double toLen; +// // re-use fromLen for case of mapping 2 vectors of the same length +// if ((toLen2 > fromLen2 - 1e-7) && (toLen2 < fromLen2 + 1e-7)) { +// toLen = fromLen; +// } else { +// toLen = Math.sqrt(toLen2); +// } +// +// targetVector.x /= toLen; +// targetVector.y /= toLen; +// targetVector.z /= toLen; +// } +// +// // Now let's get into the real stuff +// // Use "dot product plus one" as test as it can be re-used later on +// double dotProdPlus1 = 1.0 + sourceVector.dot(targetVector); +// +// // Check for degenerate case of full u-turn. Use epsilon for detection +// if (dotProdPlus1 < 1e-7) { +// +// // Get an orthogonal vector of the given vector +// // in a plane with maximum vector coordinates. +// // Then use it as quaternion axis with pi angle +// // Trick is to realize one value at least is >0.6 for a normalized vector. +// if (Math.abs(sourceVector.x) < 0.6) { +// +// double norm = Math.sqrt(1.0 - sourceVector.x * sourceVector.x); +// res.x = 0.0; +// res.y = sourceVector.z / norm; +// res.z = -sourceVector.y / norm; +// res.w = 0.0; +// } else if (Math.abs(sourceVector.y) < 0.6) { +// double norm = Math.sqrt(1.0 - sourceVector.y * sourceVector.y); +// res.x = -sourceVector.z / norm; +// res.y = 0.0; +// res.z = sourceVector.x / norm; +// res.w = 0.0; +// } else { +// double norm = Math.sqrt(1.0 - sourceVector.z * sourceVector.z); +// res.x = sourceVector.y / norm; +// res.y = -sourceVector.x / norm; +// res.z = 0.0; +// res.w = 0.0; +// } +// } else { +// // Find the shortest angle quaternion that transforms normalized vectors +// // into one other. Formula is still valid when vectors are colinear +// double s = Math.sqrt(0.5 * dotProdPlus1); +// double val = (2.0 * s); +// targetVector.x /= val; +// targetVector.y /= val; +// targetVector.z /= val; +// +// Vector3d tmp = new Vector3d(); +// tmp.cross(sourceVector, targetVector); +// +// res.x = tmp.x; +// res.y = tmp.y; +// res.z = tmp.z; +// res.w = s; +// } +// +// return res; +// } +// +// /** +// * Makes a rotation of angle (radians) around the axis specified by the x,y,z values. +// * +// * @param angle +// * the angle in radians for the rotation +// * @param axis +// * the axis to rotate about. +// * @return the quaternion defining the rotation. +// */ + + + /** + * Creates a perspective projection matrix. + * + * @param fovDegrees + * The field of view angle in degrees. + * @param near + * near plane. + * @param far + * far plane. + * @param viewportWidth + * viewport width. + * @param viewportHeight + * viewport height. + * @return the matrix. + */ + + public static Matrix4d createProjectionMatrixAsPerspective(double fovDegrees, double near, + double far, int viewportWidth, int viewportHeight) { + + Matrix4d matrix = new Matrix4d(); + //for impl details see gluPerspective doco in OpenGL reference manual + double aspect = (double)viewportWidth / (double)viewportHeight; + + double theta = (Math.toRadians(fovDegrees) / 2d); + double f = Math.cos(theta) / Math.sin(theta); + + double a = (far + near) / (near - far); + double b = (2d * far * near) / (near - far); + + matrix.set(new double[] { f / aspect, 0, 0, 0, 0, f, 0, 0, 0, 0, a, b, 0, 0, -1, 0 }); + + return matrix; + } + + /** + * Creates a projection matrix as per glFrustrum. + * + * @param left + * coordinate of left clip plane. + * @param right + * coordinate of right clip plane. + * @param bottom + * coordinate of bottom clip plane. + * @param top + * coordinate of left top plane. + * @param zNear + * distance of the near plane. + * @param zFar + * distance of the near plane. + * @return the matrix. + */ + + public static Matrix4d createProjectionMatrixAsPerspective(double left, double right, + double bottom, double top, double zNear, double zFar) { + + double A = (right + left) / (right - left); + double B = (top + bottom) / (top - bottom); + double C = (Math.abs(zFar) > Double.MAX_VALUE) ? -1. : -(zFar + zNear) / (zFar - zNear); + double D = (Math.abs(zFar) > Double.MAX_VALUE) ? -2. * zNear : -2.0 * zFar * zNear + / (zFar - zNear); + + Matrix4d matrix = new Matrix4d(); + matrix.set(new double[] { 2.0 * zNear / (right - left), 0.0, 0.0, 0.0, 0.0, + 2.0 * zNear / (top - bottom), 0.0, 0.0, A, B, C, -1.0, 0.0, 0.0, D, 0.0 + + }); + + matrix.transpose(); + return matrix; + } + + /** + * Sets the orthographic projection matrix. + * + * @param left + * the left value. + * @param right + * the right value. + * @param bottom + * the bottom value. + * @param top + * the top value. + * @param near + * near plane. + * @param far + * far plane. + * @return the ortho matrix. + */ + + public static Matrix4d createProjectionMatrixAsOrtho(double left, double right, double bottom, + double top, double near, double far) { + + Matrix4d matrix = new Matrix4d(); + //for impl details see glOrtho doco in OpenGL reference manual + double tx = -((right + left) / (right - left)); + double ty = -((top + bottom) / (top - bottom)); + double tz = -((far + near) / (far - near)); + + matrix.set(new double[] { 2d / (right - left), 0, 0, tx, 0, 2d / (top - bottom), 0, ty, 0, 0, + -2d / (far - near), tz, 0, 0, 0, 1 }); + + return matrix; + } + + /** + * Sets the near and far values on an existing perspective projection matrix. + * + * @param projMat + * the matrix to be modified. + * @param near + * the new near value. + * @param far + * the new far value. + */ + public static void setNearFarOnPerspectiveProjectionMatrix( Matrix4d projMat, + double near, double far) { + + projMat.transpose(); + + double transNearPlane = (-near * projMat.getElement(2, 2) + projMat.getElement(3, 2)) + / (-near * projMat.getElement(2, 3) + projMat.getElement(3, 3)); + double transFarPlane = (-far * projMat.getElement(2, 2) + projMat.getElement(3, 2)) + / (-far * projMat.getElement(2, 3) + projMat.getElement(3, 3)); + + double ratio = Math.abs(2.0 / (transNearPlane - transFarPlane)); + double center = -(transNearPlane + transFarPlane) / 2.0; + + Matrix4d mat = new Matrix4d(); + mat.setIdentity(); + mat.setElement(2, 2, ratio); + mat.setElement(3, 2, center * ratio); + + projMat.mul(mat); + projMat.transpose(); + + } + + /** + * Creates a look at matrix. + * + * @param eyePos + * the position of the eye. + * @param lookAtPos + * the point to look at. + * @param upVec + * the up vector. + * @return the look at matrix. + */ + + public static Matrix4d createMatrixAsLookAt( Vector3d eyePos, + Vector3d lookAtPos, Vector3d upVec) { + + Vector3d eye = new Vector3d(eyePos); + Vector3d lookAt = new Vector3d(lookAtPos); + Vector3d up = new Vector3d(upVec); + + Vector3d forwardVec = new Vector3d(lookAt); + forwardVec.sub(eye); + forwardVec.normalize(); + + Vector3d sideVec = new Vector3d(); + sideVec.cross(forwardVec, up); + sideVec.normalize(); + + Vector3d upVed = new Vector3d(); + upVed.cross(sideVec, forwardVec); + upVed.normalize(); + + Matrix4d mat = new Matrix4d(sideVec.x, sideVec.y, sideVec.z, 0, upVed.x, upVed.y, upVed.z, 0, + -forwardVec.x, -forwardVec.y, -forwardVec.z, 0, 0, 0, 0, 1); + + eye.negate(); + //mat.transform(eye); + mat.transformNormal(eye); + mat.setTranslation(eye); + + return mat; + } + + + /** + * Pre-multiplies the vector by the matrix. + * + * @param v + * the vector. + * @param mat + * the matrix. + * @return the result of the multiplication. + */ + + public static Vector3d preMultiply( Vector3d v, Matrix4d mat) { + Matrix4d m = new Matrix4d(mat); + m.transpose(); + double d = 1.0f / (m.getElement(0, 3) * v.x + m.getElement(1, 3) * v.y + m.getElement(2, 3) + * v.z + m.getElement(3, 3)); + double x = (m.getElement(0, 0) * v.x + m.getElement(1, 0) * v.y + m.getElement(2, 0) * v.z + m + .getElement(3, 0)) * d; + double y = (m.getElement(0, 1) * v.x + m.getElement(1, 1) * v.y + m.getElement(2, 1) * v.z + m + .getElement(3, 1)) * d; + double z = (m.getElement(0, 2) * v.x + m.getElement(1, 2) * v.y + m.getElement(2, 2) * v.z + m + .getElement(3, 2) * d); + return new Vector3d(x, y, z); + } + + /** + * Extracts the s,t,r and q eye planes from the specified matrix. + * + * @param matrix + * the matrix to extract the planes from. + * @return the s,t,r and q planes from the specified matrix. + */ + + public static Vector4d[] getEyePlanesForMatrix( Matrix4d matrix) { + + Matrix4d copy = new Matrix4d(matrix); + copy.transpose(); + + Vector4d[] res = new Vector4d[4]; + //s plane + res[0] = new Vector4d(copy.getElement(0, 0), copy.getElement(1, 0), copy.getElement(2, 0), + copy.getElement(3, 0)); + //t plane + res[1] = new Vector4d(copy.getElement(0, 1), copy.getElement(1, 1), copy.getElement(2, 1), + copy.getElement(3, 1)); + //r plane + res[2] = new Vector4d(copy.getElement(0, 2), copy.getElement(1, 2), copy.getElement(2, 2), + copy.getElement(3, 2)); + //q plane + res[3] = new Vector4d(copy.getElement(0, 3), copy.getElement(1, 3), copy.getElement(2, 3), + copy.getElement(3, 3)); + + return res; + } + + /** + * Computes the cross product of the two tuples. + * + * @param vec1 + * the first tuple. + * @param vec2 + * the second tuple. + * @return the cross product of the two tuples. + */ + + public static Vector3d cross( Vector3d vec1, Vector3d vec2) { + Vector3d res = new Vector3d(); + res.cross(new Vector3d(vec1), new Vector3d(vec2)); + return res; + } + + /** + * Returns the distance between the two point from and to. + * + * @param from + * the from point. + * @param to + * the to point. + * @return the distance between the two point from and to. + */ + public static double distance( Vector3d from, Vector3d to) { + return from.distance(to); + } + + /** + * Returns the distance squared between the two point from and to. + * + * @param from + * the from point. + * @param to + * the to point. + * @return the distance squared between the two point from and to. + */ + public static double distanceSquared( Vector3d from, Vector3d to) { + return from.distanceSquared(to); + } + + /** + * Extracts the directional vectors from the specified view matrix. + * + * @param matrix + * the view matrix. + * @param upVecOut + * the up vector. + * @param sideVecOut + * the side vector. + * @param lookVecOut + * the look vector. + */ + public static void getVectorsForMatrix( Matrix4d matrix, Vector3d upVecOut, + Vector3d sideVecOut, Vector3d lookVecOut) { + + sideVecOut.set(matrix.getElement(0, 0), matrix.getElement(0, 1), matrix.getElement(0, 2)); + sideVecOut.normalize(); + + upVecOut.set(matrix.getElement(1, 0), matrix.getElement(1, 1), matrix.getElement(1, 2)); + upVecOut.normalize(); + + lookVecOut.set(matrix.getElement(2, 0), matrix.getElement(2, 1), matrix.getElement(2, 2)); + lookVecOut.negate(); + lookVecOut.normalize(); + + } + + /** + * Extracts the up vector from the specified view matrix. + * + * @param matrix + * the matrix. + * @return the up vector from the specified view matrix. + */ + + public static Vector3d getUpFromMatrix( Matrix4d matrix) { + Vector3d res = new Vector3d(matrix.getElement(1, 0), matrix.getElement(1, 1), + matrix.getElement(1, 2)); + res.normalize(); + return res; + } + + +} diff --git a/common/crazypants/vecmath/Vector2d.java b/common/crazypants/vecmath/Vector2d.java new file mode 100644 index 00000000..f30033ba --- /dev/null +++ b/common/crazypants/vecmath/Vector2d.java @@ -0,0 +1,82 @@ +package crazypants.vecmath; + +public class Vector2d { + + public double x; + public double y; + + public Vector2d() { + x = 0; + y = 0; + } + + public Vector2d(double x, double y) { + this.x = x; + this.y = y; + } + + public Vector2d(Vector2d other) { + this(other.x, other.y); + } + + public void set(double x, double y) { + this.x = x; + this.y = y; + } + + public void set(Vector2d vec) { + x = vec.x; + y = vec.y; + } + + public void add(Vector2d vec) { + x += vec.x; + y += vec.y; + } + + public void sub(Vector2d vec) { + x -= vec.x; + y -= vec.y; + } + + public void negate() { + x = -x; + y = -y; + } + + public void scale(double s) { + x *= s; + y *= s; + } + + public void normalize() { + double scale = 1.0 / Math.sqrt(x * x + y * y); + scale(scale); + } + + + public double lengthSquared() { + return x * x + y * y; + } + + public double length() { + return Math.sqrt(lengthSquared()); + } + + public double distanceSquared(Vector2d v) { + double dx, dy, dz; + dx = x-v.x; + dy = y-v.y; + return (dx*dx+dy*dy); + } + + public double distance(Vector2d v) { + return Math.sqrt(distanceSquared(v)); + } + + @Override + public String toString() { + return "Vector2d(" + x + ", " + y + ")"; + } + +} diff --git a/common/crazypants/vecmath/Vector3d.java b/common/crazypants/vecmath/Vector3d.java new file mode 100644 index 00000000..19b13270 --- /dev/null +++ b/common/crazypants/vecmath/Vector3d.java @@ -0,0 +1,101 @@ +package crazypants.vecmath; + +public class Vector3d { + + public double x; + public double y; + public double z; + + public Vector3d() { + x = 0; + y = 0; + z = 0; + } + + public Vector3d(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + public Vector3d(Vector3d other) { + this(other.x, other.y, other.z); + } + + public void set(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + public void set(Vector3d vec) { + x = vec.x; + y = vec.y; + z = vec.z; + } + + public void add(Vector3d vec) { + x += vec.x; + y += vec.y; + z += vec.z; + } + + public void sub(Vector3d vec) { + x -= vec.x; + y -= vec.y; + z -= vec.z; + } + + public void negate() { + x = -x; + y = -y; + z = -z; + } + + public void scale(double s) { + x *= s; + y *= s; + z *= s; + } + + public void normalize() { + double scale = 1.0 / Math.sqrt(x * x + y * y + z * z); + scale(scale); + } + + public double dot(Vector3d other) { + return x * other.x + y * other.y + z * other.z; + } + + public void cross(Vector3d v1, Vector3d v2) { + x = v1.y * v2.z - v1.z * v2.y; + y = v2.x * v1.z - v2.z * v1.x; + z = v1.x * v2.y - v1.y * v2.x; + } + + public double lengthSquared() { + return x * x + y * y + z * z; + } + + public double length() { + return Math.sqrt(lengthSquared()); + } + + public double distanceSquared(Vector3d v) { + double dx, dy, dz; + dx = x-v.x; + dy = y-v.y; + dz = z-v.z; + return (dx*dx+dy*dy+dz*dz); + } + + public double distance(Vector3d v) { + return Math.sqrt(distanceSquared(v)); + } + + @Override + public String toString() { + return "Vector3d(" + x + ", " + y + ", " + z + ")"; + } + +} diff --git a/common/crazypants/vecmath/Vector3f.java b/common/crazypants/vecmath/Vector3f.java new file mode 100644 index 00000000..32a784f9 --- /dev/null +++ b/common/crazypants/vecmath/Vector3f.java @@ -0,0 +1,94 @@ +package crazypants.vecmath; + +public class Vector3f { + + public float x; + public float y; + public float z; + + public Vector3f() { + x = 0; + y = 0; + z = 0; + } + + public Vector3f(double x, double y, double z) { + this.x = (float)x; + this.y = (float)y; + this.z = (float)z; + } + + public Vector3f(float x, float y, float z) { + this.x = (float)x; + this.y = (float)y; + this.z = (float)z; + } + + public Vector3f(Vector3d other) { + this(other.x, other.y, other.z); + } + + public Vector3f(Vector3f other) { + this(other.x, other.y, other.z); + } + + public void set(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + + public void set(Vector3f vec) { + x = vec.x; + y = vec.y; + z = vec.z; + } + + public void add(Vector3f vec) { + x += vec.x; + y += vec.y; + z += vec.z; + } + + public void sub(Vector3f vec) { + x -= vec.x; + y -= vec.y; + z -= vec.z; + } + + public void negate() { + x = -x; + y = -y; + z = -z; + } + + public void scale(float s) { + x *= s; + y *= s; + z *= s; + } + + public void normalize() { + double scale = 1.0 / Math.sqrt(x * x + y * y + z * z); + x *= scale; + y *= scale; + z *= scale; + } + + public double dot(Vector3f other) { + return x*other.x + y*other.y + z*other.z; + } + + public double lengthSquared() { + return x*x + y*y + z*z; + } + + public double length() { + return Math.sqrt(lengthSquared()); + } + + @Override + public String toString() { + return "Vector3f(" + x + ", " + y + ", " + z + ")"; + } +} diff --git a/common/crazypants/vecmath/Vector4d.java b/common/crazypants/vecmath/Vector4d.java new file mode 100644 index 00000000..33ca21cb --- /dev/null +++ b/common/crazypants/vecmath/Vector4d.java @@ -0,0 +1,92 @@ +package crazypants.vecmath; + +public class Vector4d { + + public double x; + public double y; + public double z; + public double w; + + + public Vector4d() { + x = 0; + y = 0; + z = 0; + w = 0; + } + + public Vector4d(double x, double y, double z, double w) { + this.x = x; + this.y = y; + this.z = z; + this.w = w; + } + + public Vector4d(Vector4d other) { + this(other.x, other.y, other.z, other.w); + } + + public void set(Vector4d vec) { + x = vec.x; + y = vec.y; + z = vec.z; + w = vec.w; + } + + public void set(double x, double y, double z, double w) { + this.x = x; + this.y = y; + this.z = z; + this.w = w; + } + + public void add(Vector4d vec) { + x += vec.x; + y += vec.y; + z += vec.z; + w += vec.w; + } + + public void sub(Vector4d vec) { + x -= vec.x; + y -= vec.y; + z -= vec.z; + w -= vec.w; + } + + public void negate() { + x = -x; + y = -y; + z = -z; + w = -w; + } + + public void scale(double s) { + x *= s; + y *= s; + z *= s; + w *= s; + } + + public void normalize() { + double scale = 1.0 / Math.sqrt(x * x + y * y + z * z + w * w); + scale(scale); + } + + public double dot(Vector4d other) { + return x*other.x + y*other.y + z*other.z + w*other.w; + } + + public double lengthSquared() { + return x*x + y*y + z*z + w*w; + } + + public double length() { + return Math.sqrt(lengthSquared()); + } + + @Override + public String toString() { + return "Vector4d(" + x + ", " + y + ", " + z + ", " + w + ")"; + } +} diff --git a/common/crazypants/vecmath/ViewFrustum.java b/common/crazypants/vecmath/ViewFrustum.java new file mode 100644 index 00000000..afb03c22 --- /dev/null +++ b/common/crazypants/vecmath/ViewFrustum.java @@ -0,0 +1,172 @@ +package crazypants.vecmath; + +public class ViewFrustum { + + public static final int LTN = 0; + public static final int LTF = 1; + public static final int LBN = 2; + public static final int LBF = 3; + public static final int RTN = 4; + public static final int RTF = 5; + public static final int RBN = 6; + public static final int RBF = 7; + + public static final int VERTEX_COUNT = 8; + + public static final int PLANE_COUNT = 6; + + private static final int TOP = 0; + private static final int BOTTOM = 1; + private static final int LEFT = 2; + private static final int RIGHT = 3; + private static final int NEAR = 4; + private static final int FAR = 5; + + private Vector4d vertices[] = new Vector4d[8]; + private Vector4d planes[] = new Vector4d[6]; + + private Vector3d eye; + + private Vector3d min; + private Vector3d max; + + public ViewFrustum() { + eye = new Vector3d(); + min = new Vector3d(); + max = new Vector3d(); + for (int i = 0; i < VERTEX_COUNT; i++) { + vertices[i] = new Vector4d(); + } + for (int i = 0; i < PLANE_COUNT; i++) { + planes[i] = new Vector4d(); + } + } + + public ViewFrustum(ViewFrustum other) { + eye = new Vector3d(other.eye); + min = new Vector3d(other.min); + max = new Vector3d(other.max); + for (int i = 0; i < VERTEX_COUNT; i++) { + vertices[i] = new Vector4d(other.vertices[i]); + } + for (int i = 0; i < PLANE_COUNT; i++) { + planes[i] = new Vector4d(other.planes[i]); + } + } + + public boolean containsPoint(Vector3d point) { + for (Vector4d plane : planes) { + if (distanceFromPointToPlane(plane, point) < 0) { + return false; + } + } + return true; + } + + private Vector3d toThreeComponent(Vector3d from) { + return new Vector3d(from.x, from.y, from.z); + } + + private double distanceFromPointToPlane(Vector4d plane, Vector3d point) { + Vector4d newPoint = new Vector4d(point.x, point.y, point.z, 1); + return plane.dot(newPoint); + } + + public Vector4d getVertex(int index) { + return vertices[index]; + } + + public Vector3d getEye() { + return eye; + } + + public Vector3d getMin() { + return min; + } + + public Vector3d getMax() { + return max; + } + + public Vector4d getLeftPlane() { + return getPlane(LEFT); + } + + public Vector4d getRightPlane() { + return getPlane(RIGHT); + } + + public Vector4d getTopPlane() { + return getPlane(TOP); + } + + public Vector4d getBottomPlane() { + return getPlane(BOTTOM); + } + + public Vector4d getNearPlane() { + return getPlane(NEAR); + } + + public Vector4d getFarPlane() { + return getPlane(FAR); + } + + /** + * @param ivm + * the inverse view transformation matrix + * @param ipm + * the inverse projection matrix + */ + public void computeFrustum(Matrix4d ivm, Matrix4d ipm) { + + Matrix4d vpm = new Matrix4d(); + vpm.mul(ivm, ipm); + + ivm.getTranslation(eye); + + vertices[LBF].set(-1, -1, 1, 1); + vertices[LTF].set(-1, 1, 1, 1); + vertices[RTF].set(1, 1, 1, 1); + vertices[RBF].set(1, -1, 1, 1); + vertices[LBN].set(-1, -1, -1, 1); + vertices[LTN].set(-1, 1, -1, 1); + vertices[RTN].set(1, 1, -1, 1); + vertices[RBN].set(1, -1, -1, 1); + + min.set(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + max.set(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + + for (int i = 0; i < VERTEX_COUNT; i++) { + vpm.transform(vertices[i]); + double w = vertices[i].w; + // apply perspective + vertices[i].x /= w; + vertices[i].y /= w; + vertices[i].z /= w; + + min.x = Math.min(min.x, vertices[i].x); + min.y = Math.min(min.y, vertices[i].y); + min.z = Math.min(min.z, vertices[i].z); + + max.x = Math.max(max.x, vertices[i].x); + max.y = Math.max(max.y, vertices[i].y); + max.z = Math.max(max.z, vertices[i].z); + } + + VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LBF], vertices[LTF], planes[LEFT]); + VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LBF], vertices[LTF], planes[LEFT]); + VecmathUtil.computePlaneEquation(vertices[RBN], vertices[RTF], vertices[RBF], planes[RIGHT]); + VecmathUtil.computePlaneEquation(vertices[LTN], vertices[LTF], vertices[RTF], planes[TOP]); + VecmathUtil.computePlaneEquation(vertices[LBN], vertices[RBF], vertices[LBF], planes[BOTTOM]); + VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LTN], vertices[RTN], planes[NEAR]); + VecmathUtil.computePlaneEquation(vertices[LBF], vertices[RTF], vertices[LTF], planes[FAR]); + + } + + private final Vector4d getPlane(int index) { + assert ((index >= 0) && (index < PLANE_COUNT)) : "Illegal index : 0 <= index < " + PLANE_COUNT; + return planes[index]; + } + +} diff --git a/lib/cglib-nodep-2.2.3.jar b/lib/cglib-nodep-2.2.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..35d6d7c3a7ca43f0ae689b7c3a6dc23d634d8261 GIT binary patch literal 322553 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

t5F98xhQSCAl$ZNh@m^~%^&qm(I46;{T8pF zPf1ws3n_Q|@CODH1Ohh&Iq=0gd{4lYitP3D!rY^D160n)aP)c-ESs;SS8YYojDfT7 zpgDcVDDHCtd^|&c6M^oZmYUW`-O~nwkW-3r8WWjS7vnr1D1J<$4f~!z;-M9CY-zJa z%r`_S@aT@@DBv8vD1GqyxQE0Y6d@w;KEn2-p*BR}fzlb=6vK8-o;Cu3oH;&cK58JS z-B)Cw`jS7TxYi^O`FegOJkj5qaUL%3oGmaph*0fUi;uM)#7 z%D&xdnopX;-1(XbHt>d;g>j}7Mbv0+w9n6sjE{*LAdlK%o>ye0&+%~Y?PM9E@9M}l zfx_<#PzBQ~=6)sfUje40Cm?kTfqPAU{jCo^yJ%MUDE3D6qc5fUo3cyn z?xUQ?^OCHvf7JK=4rH1|Qj|M`^$IO%xLMiC<>FHkR!XIYnQ8~kl{L+G>-uF2CboVudd~bf-=6&bljQzKGbX3l#@+GVxr=`5>HfRi4i{^y zf1*oB1pocvKXi22vYp>LI>fA}_@Od=JL@U}nB|0zs?FSWQgY za7|&Y7$nb!RD(_5M12eA z#NmK|sQ()n^S@rgf2a!o9m=R`{iB@wk_DE4?1zC?L8`(cB}v;W-cXgIcBjM=5HY&r z3n%A5M9#uQt!mv^*-`To)vJz}>u`RmwtC9{SzfuDjwvW@D&nI*WAL3+(*4rZ*h+&U15detsb;K2ZP^6nI8AuTVBkfCY*rc^1Zbb<)DZ zNqYti3CX+$ks_4XOb!7LeJ$O0)cxh5t{C%h0a-m;m9rFD(}BkXTM4shBq4;d?zdpD z=MvN7LEA#6)SIZ4t)`<*_udZ_jyw#PO1(b(i*eyPakgbtdY1K;dw4;PTczHnF$fqIU66uuaNlE${8(bF=rA&zn?Uc zE7|pO^L|cg|3o{jp#8E)ryt95Sy_OQJ|q}-0+CmFCYmjzK!QDx2Y~E}2Q_QUW|%hB z*2)nm{M?>kBpy@n#uEhy;j|WXu`09BR+o*uMTqI*DRgC*B`n5Yf-04s9E!6Sf{}x^ zj9NbBh&>w!M-NG`1v1aE@yZ@+c8j_NW34qHtv|_CbQU$EXC>phk&V@3tSPd#WN;oQ z5f^55WHjc$+C`b<4K{Le+MJQ@cpCBOl!AtqI zd7SRVu=Y@2-M0i_^uGvf9l>@J0v1wN;TAP*^K9^5V%)HgR4`)M>tQ^wt1IB?!=Q@K zeRWvPG##nJD0f^k49uO{7g#Q^Ud)RK5$5A0>w?Z0BHHrj4$l*n*=gT{56e;)PrV11 zktoIv+FY_}9D;~MIJE=>PWfy0dZ03$BK#@p3rzVejYMp!?m0y5#dO9Ewp@0Wiqhpa zTqQQ?+Kn*=d|X=B?Nw;Jq%(!QLG||Yu^wtwbUYZr?r0NnX>=MPN|P3$F{kI6tp#!v z@MqLC=_mHn%d1$lCEB)jv!d%BWO3({$(WRn_SSNW!l$iw!M{Q*hQOb|9Z!^Eqr2~s z>Q~v^jsyFeF#{B;PhPmcT2meSSyBB0V!)g~ZMA%7?S|rwPjY30hOlBSe&yN zMMlocwJ(4kgnJ05B5mN7N9MUwF)8@Fq&S#StcP6bs@Hp}Q*}yKF&bu<7L8(4D zLth}*(eSskP$&ArQByXT z$}hV`kKer(q55(uA0tC|$ZpR*RoVHSPaRtO z=EbdN=!ggQl-v7)3H>!A0;pM1{y|xOCaz*#t84heL({B+HE9Qv+>+63&3Qm$df5Wc z*pk_1f}n}jnC7Gr$&4^ZCVWLTu~~jLV8gbG`{mm)x%tW$atEY#7dO_*sE8+HaB?HX zQ)4)(_IyQbI$|?`D%JedHopzL~5M@#^V_Q zuaY2{X9W6p+;u)Ix7}8sOJE>)t(dQ5X==rMzk>+z?O&AQ>rs!-#or^L?r)PM;s3m; z|NB<1VxxvFg6c~~a}-QVzh4}p2%RR0ED5}!Nz;_vs!uwni5OMp(kLxRVC>)~Ft@vR zb4zW*+gCrjVV83ld+%=M3Ke$=bH-Mt{+qB@=?@#G zk{KrRCAqHFwwkcG7Z@$6HjV0ZVLlhuz4Lrq$1EYMy!xWfjN!=TWy!IUiV6}`=OPgX zdy;+!yc#qZS7NYm^{*8X7w+_+U`XJ@J2c4gnNKsnIGU9#W~Gf%GoSY>R5wtLjOwMI zK4q&`GY%?IZI?q3Jc34f4^*1+c_Hz^mA8cT!c1>aZnCPVwJ+p`uRAHZc=p7TF)TG4 zuJf7EYrCP)a8FUgL(c{t6BK?g%t!7+CLHi6`8qQNLHd1t560<;J2h_$x9_xEKa_*A zv3`<0cZ{=UI@*j_Qh4y|7&soBOL`N5_Qnau(OC>9yP4V8=4V1lL!X2S?{vr;yG;cK z-}*(#1^-Pt)T4AAVVq?G6_!1L?=Zycf+CLg*#E#BtXBWzQjR)w+VAA&qPI^NmESJa zu^2Vq*73!F|_ug2ewwp>X zIkkG^d#mhAf!)00nEO+s!%~**dkkqBua%-&rcfZIJiMxoKp1H^ue7Qh=OyG3qwj5&l!LM8kWDHmEIeY={u@B|q=-gU12v8z4wmRC@l1}UV~#dL zTiQ!r?X5^eN~*X3L-{KqqV%B6Cy)B3TbQ3+I)|vVsbrCN(XO9vFfFu&`Kh3&ZVJ&C zXq=_ZTfK$7U1zBrY8rs8jT4n`Rje{iW7&?Zhon~&D_uX8`t0hsnK#3RPZj8$zb&jdLT87P8x$ z&DrY*AuS+@xuYn6#W&(AkWY3(GC2as5lt{Mo!q)*GpNBDk{$IONka~hn+YPrCDkEB zsuxURuy}?+GKj2LL}U}TPa%(U!V<_h=D!Hm2W%jVKquKBpz7h7?C8@lZ&A)eko4_gl=RNMiMqw`I~A3FRLk_(3#SAnV$XWtE4D zOjHztn1~pbcQ`pEb+3OL8~xBDf_Yvv`}>AIWeeWZ{W$WmBXKi-6++11Xbir(OP=^4;r zvdUJ3vWdNBg~fn7D*lHMRF=t%KdhS*n7rzgnTA+|_>dYTZPFjF zaJH#{u|2i#x44rN-q=H9r%A${HrPVOABx14EE)!Sc2JX3Tj!~uD=~HbkYrhsg8Cv8 z?sDfS7D$?yBdD$L^1NsDpkV=;A>F+6M85sO95@lY9Duwp{N+`8kh z>{YK6*1<@WO3_%HYSeoUZ!+-o7M#8r%wj|E{$QiwLf56wmdg+T-Qjjb=5n0xj=DQL z{jlm@@S1GcLR}(f>=4WA0IODrZXNw3r0CbK%IKMg641Cyjigo}f-h!3B^V3)0r(P@ zzfAmZN~;B91=SpSf&>R6R5iG0b>ctfhRd0b<@i?VUExJ|vB&}q7#1ncY==4mRfFxo z`CaI*^*dmKzL3gCBkF%hO03p?wGe1J#0xyR7 zPr5fQXQGzH9>InCA-vjXVgx*xR^ig@PcZZgc7u4Sym z9Jw*o(`L(|CW_5A#JKE zm{*s!RtxrtJe8UbjeQLgiv|;6y((O;n``4MgTL1KG;&zRBqV)6Tcyf*oo85R!S&XU zpb8=evtP?l+aiJQ9`~5wUfO=`Nb$SqfLDaPZ;gF&Ag~yAaV@9fG0>>cTBlzeC#tZ) zy&V1+f7MmpZz|^an>6{S)MGVc2<9i>BoN^!7G6RNPuT2n^q{Cm)p^R`);76)0VwZA zdyUUv$ub;m(BEG{en0u>8F)*$>%YnvQJKMUnI%SM#~>nL_ECeW0|OTx4d61o;5?E9 zEHSwYOPEMT2tErgwv9kz%|$~~EZw(;AE1D(ZsZZ5i8B39Q8&8Pjb}QzXdJ!sXdhkE>X4T6g_*k*`Ve1v z#D6$IqMSua2D>g5NZK=NdRwc;TIlY+5AqeklBLoewu+jH5g;~w&Jf*l;rq2pY7!V2 zFo24wz^}EjuE>CSC(|wk?X4U+P(;N zqW6ZVOYw|5hSiw2P10E*?t^?Jx`?b_sbPr$GGfJh7 z1xi1FD{YBMQ_1l$12^)ec!?6@Ar7+v!4%ickG)~-KLPr7HC?P_Efkyg4wafR&APXa z!6<}7$iCe(tRmK{D$006Q;M@=Mik{Qsh%p>WpqzTo>D%=UkiNi4-^%32_IFcXG9%0K4Hn3{Sk1x;Er?yiZm(#bb z!2Gb=7d5XH3Gl0GW|N*Mj6k7S1`V3^IzYj8xpz;%`}v-EBVfiShz z)lc9&Dn+jcD=OmL))zU1*apK^-z#_(NsgxT25b`kgX8x#Kbj$}9CCTf?=!N5?8OO6mE{Z-{`%5t!(-2r z-=F`!x5W^HM0fG*lcs<@mm0&tCa8^e(6V5w&o6q&81BXVpzsXG`C&3n4y;C^0F2Gd zRZ+{|d&-Q_E4@X$2|;SgcFNF|J*R9ZR*UJCA)X3ncyFN4K^fA-UaY&dZbnW01mO>9 z0(OO(NC_p2_;!o8X_Rak^aX>4Xn( z$jJOj0#7o?io$zbsI0zI{d`?{Wg4=3y}@>gHOV9w+*wZ&zeY~EctlqX(3%ozPRQn5 zKmyUsPs}0C&WnCWQwU**vB%d;!~V7fzx}gi2IICym7D2}t~ZuW@mD8^BR2r*@s<}Y zR0x{0)nBhvqq#d(LJaV;STc|Rna{}_@~@BhI_nkd=SL( z-%yh?--H}+^X>QmF1=;(r?GBG)rNM6MTC8Ow>v4qU4f512V|^!mBi^#Dj~jxbuB_I z#;Dx7pty$A%0C`IWmB0#Z!KR0a45e#z3dOEmm4Yofqrw7i`AaK|EoQn3waD97Ms-=O7{gD#ZX1WPH^dSqB=>c< zGLV6d^%}3iRmBK~0xd7d7gJ9I)s^2WY5DHtDXx6a$~9_vUX4y;6K>AS;U7?1W!D84BD~W5FHl)^vZ?Y@O zU`vq7jySs0;x8_2)278CUf0Np8o&9{zUm)36I^*EB3T^tM)U}$cGzNLl4jIz8?*HoNxq*trWUQ>U2w=6l?Qy*ERz3D z3RrB_A7C=j-w{M>)<~)w(=Re(GFZF%oFyLbWD0oo6J!xH%RV> z74~$d?c8!D3#R26=?G_Kp_$TW%k3U#5bCn6Z*$x{Lk}M`^s;g@9(ggt5iRxn7&|e@ z9c7x$J@PlGCr@@ygo7Z$GnqQ1i1fMB3;~uKU&-q&5XQHWC(a0w1z8H`jF>%rPPsSX zI@y|$qiLI_rtw*vo~3MwK*r05H#as)596E=ky<0`%Im}`(+>>F)buqW`Rhw!*O`sK z*5+!@t+v)>XSBQaoxM~tUoE54YZhrqJGJS)m9wlnK$M_z45<+9&T$ z##^4ltQ_qIHFK=HYg@_h`B}0~h&*_CI+tfPW*{pD#mqdWpJQM!^qvqp>Oc&$G^QRa z&=+ce6sa5*N{gw;&5aVQ%S~QTnekga7OAS-2ucNx-61mHG)m;fd$kz$%xk)+HX{UD zm8=NUpzIlolHpeNGlwT(%Rz*D!FVtYc{s~+RbkWy?qY3DfuAwMJu*mXl&R=)<*yo= z#D@SZRQoG}0;Z&5_%G_8VaE8i-f=r9rnUvSL^QbIQyMJxKX;(6=vq%+%%hW2c8_gC zA@1Dmh)`&CJP+*c&%+41=Qq9xP9uEIpsg1;INz?B9_O6z!k;DiU<3_Qs$}eLppprD zZL<$UmfLuQ*586BHb=lxX6rrur$@X`r#3CuMhAPcnh3J>Dr`QM8Q<+ zLR2E=#4XB8k1#!^-(s%t-TQ8z5NdOT6?ej_5qFoyQ%+AL0GCPM7s?#dD~an;oE|ujRXY5@PDr*2^$+1X9GiPlmCBA_pcKwH4SI2WwhUYux;~g(YLrJO0wG>%?F|N4-QQSNj!C3U(b#~zW1EQ*>*9zzc0;JKp74?d3?m% zL5Y%SgBDf{j1Ce1Wk(^G;21 zgL+K@!z)s9kSmIwvM;c@ZDP@xQRxWbrP1+!axU~S)=Q2#DjkFFZ_C~6emrd!In`<+2j@OQ*9#ST%O?S2=2D>SIP zYHTjQN>|P4n88-archZwu0hqHCzuO)w8J7_I+LSCcPq0MtOPizW>j9OxXV=l)X#I! z6=|*2$pLeIo*++_h2;`jxYUg{1H4n|tdA|vH2|&V+~J0*Y1$CGQDnddRo%wCRO}kl zcUtRS<$&jL#F$!e}nZE%pv&QY?70i+$N8tu# zcZyN@*veCa$$UZ~iqTXi@7v`$3^T7TYD0&ib#sdGO95@r`y5?exq8*k@6W=N3(1l{ zzQxlki12wr1U$H;$3qMW6ZIw>6m^y_kNqK~mI?k>LC4gIS#5I_BN$SXZ9MOvtPbp$3tzad`7-Y^k z>Zdc=VYaYpspFq`SL{dZom%c+p&o+~2P77jaxjyx#Z$6k5*HP2|Hu3QP^iV!6)X2pm5_;^8Kj>Q5XA-q$b<6N){n^X;#G=j%4a9p)TV*hGrh( zs|l#*Eyx;6wV}>nbTm0@WK*)t_hKsOCZU1Q@Gfl5jkyV4uv_9a3;Q~E~_Qzvsl&v=UN zDVJN>*cPufH`O0WKEBl>@K~Atw6r|;T=tWRIlUWWvlu23wYqbFM&I20G@G%sA)yAXq0_XQhP474*k{YEV=idLOFImRNK1_H$Pe?tit^bt!r)Z*f{{%mF-M|=HmJaB=F=~y-!~4i35KA#xPL04Gq%u6q9(fVr9dSxwYmgb zFv~~GU(R4RpPFM%?DQRhz1r$|`Q)xg6p1rw6h!8NC_YCte)NuP7xnEA)7(Mi+dV)r zc7H(21JA6WXN0FgL9d7$K`Z)X=`f4!Ha{i8Jh;{yI<{3=lzPJFd|0oCSROY_RoCmA zuSs6^uU2yJAYDU+b9`RMB!<3LQqW^b8+~XjlLH_6^S3+y#|Nl+*qaoP^!`IU{qMWv zby`20iNoUcHNF9Lo={D1++F^-RC{XO5%#mXi?v^N9!9-;u`s-%X4B?-xZc>`{{iF` zW9G0^SSz;o(Cd{?#~0(}1L$WFy6mCG2jtHZE*zei+&$pK4+^qd=-m(9u$+>E{!YSQ z@I+g)_;@Qk%uNwZt4u9eF0({TT&;=rnYR{7AJZ7`UT_=rlK3%j4UFNW}qC?A_yvw*>n6 zFqxjUd#nPv7ejsfqBC@1XJ~W8uH@c%gRJ{ARx*Y`gY52Is!Y{C2WClH$?q9fZIAvV z>ULVL4ah`(#9KXh@9+P1^UgoLCM{Pr)IZiY#c%7|e-i}zU;2Z8>o$Xxt&}!JQF&p8 zYN`0Q_%nbAi-=gs`a_E3%r&iHSgaj=vCJe7Ah^3-P+!FMbYCWbv$wGr|6Tx__4K(O#db#<({L315_7d~z3UJ&!?R z;k7^nruMMWScTy#uCH}jnA{AxL7}SGq%o&XUbq+aMiT_l%O0+g zn}JnsDfy)Ke(>E?+`kJOFZN37|IlN6AnKqS3BYFATiVe;8 z3t0?5g*)V7;MTL%!0RvSP&^`8aLjlBL%y=ts${*Cda zmF2jS#gEZOj?nE+JnpCJEn!VWl%Mr?-yC3a-94C#S~NWOw2u)oxlp+e+8MH4*lhl;C-xejz~ z6yXgwcZlB)H_!FvBIK--vxMUTZvcSpUAW;R2{j@DOMpudSP&O0=)OilKps~~xLzDT z?MmVscuHN^Dyl`M3U`m10eQoK0-*w9k`ah9DiDz;>TZ+h5puqPWN%)7#NNvB2|UBF zX_-g#=Y9>E0XP&h2t5b5A$~r}#Jh$hNGR1Q>kNc$ede3I0oE}#xM?nt?l8pEKcq(3 z`H}cI_K5`@==ZHWQip`7BmiE*mL(gJ>9{Fe7ywz5Mb9XNupHVLxKRTTzM6QV1;tgHBEs8Q6hz7&|JqR}D$^qHW8s&a-n z>E6ERHgfu!N7>_&E8pTMmq9YbwUYVvjiOUtspmPx3+M5D=x+sOsa7@S;wOwAOPUf} zG)pskULf3bvORiwW+i01U=4a(qVX>FK z`X(>_k9fuZsScFvTpW!|{_Si@R+y9>_%4RQ$^a2W3clO)HXvzp?`jsZkRh>v4tYkp zQkS6qg$&o*UTs8VneX#_!d**R{Z!D5$qesh%V~DX+qROk7DmL*JsQGw$@J6spvouQrw5Ep9&-{1UlvLm{I4mLz$ky9SL!i)wke@;@gl%_pfBZ|M30({llsM@9FT6 zporjz1ITI8z{FbpPzxadbQvP#6!3GV^sXTPaoB7RgEP~}rVT|cwBZHC&iMo2iIgA! zDWoM$OUk!gpn7RTrTBfv@_qM3m#ncX=<$7Q>;1a>Wb1F%L$1@!@ugR6HYkG<hh@F_xVeM=I8{t2GGwXcGAsnk`Zg48UTY(JsX2To(ag_PR%>OU z3=~dak##O66I|fKs;8MGDzJ~hVa8^<6)c2u*)~we=$>D8a|?}GV;J_!s!Ph-&NeFD z{01&1GRMF(6U)?Us>?OVfNZ92OCfDIHq}wVe#q6fB3~Js9XfgK>~25DNiHW$k*#@s zDUOXUB6O%w3RPo5)y#$f(-1`!$>rdw5t9n>g26%H5-@~v1UqYHU-(-akEP$l_hm0=mZVWBe~Y~h_m|x101O> zte63wHHC@u`*Iu>4Y?_#^o?I@Q{P1NheujC^%lTC-m!4qHfr>^fqgYvp-uXEhg^S^ zEePeYFYj~A98RLlvC~*w%%johJFdN7y?s&;xlx042{4ayMmwHjZxm4f1p+MOwfd4U znMf8dNzaa6sF=UD3|ze9i>_hY3Mo~zrRcw3ek%>`NuOV-0wea}QXwib=@6~#OxsPF zek~f!LW0n28#O3zu>kEK99U}UF#->+p+;q2D62ovCvi1o>2Det2FqcnN(K`K>uAIw z{Plb?)ci+15P^x3*tF`tz(<#6j6tLiX(Fc_%C@8e+rIE|Lxx0sBMGHymlHO=kHwDd zcfuthyP)}$7ziMeP!u#{u?aZ>#o(SMzQ3{lQ#6|q5Y4El0@II;8K-DfsvgWvOK!4H zX+D#bDQ&3NAbH}{xjepM{!)|Jai6IKp|P-n`K2%25bCv?Bk|h^0)v)5J5yc#5lB)N;?~ewCO?35+7#_Lraz0p@YDgFemZM$^ zpOsI6oN`P@)?&A1ry4WUSofm#?+d$35Hjh!_3$v?>Q^_F=DHIBbDLmdp+PA?aZB_i z9CS6JK&fV&fV=MRhITcI^>1N9UtY2~Gw&stzaG)`5BIsBBt~lH1e7nHURBr-x-_E4 zh-AM;^u12#vtTVoV5!JNC#qV;`_^EspAV>+*ifp~A?O{}PmUdhgb5QDhrAq5Hs~7$ z=7jGm*6HP>VLEy8`H1!Z;Qap>d#B*q0&QC~wr$(CZQHhO+qUf$Co6VVY}>Z8f|q^v zdH3w2TlZts{F_yyMrZ52x0c@YJJkwJqvV_*`9+Y2B>BZ~oATYvbNN-hN|s8O!rnX_ zg@;HuD>=c{Fhy0@U<7Xj5%aycQLbA*?9~G+P-*jAgqu3uB?|M)s9Ja`2!VXIvH&=~ z0R)B!HpfGUJd>~H9P~;led9jqDSC?|^4f2zH&@gBv)%tkT{c?;?cfJ-$E*LVcV+_yv;%3u3kgJ^yKBMk4_$$$1qgqx{xrn()DXm74S=KL zwCG7%=hEwHCf5@(*OPNF%nnrFYbp*3UZpe(|TjmTf_7sohw`^jRGL~4k)q0m}}Qbwio+A>5P|eDQ-nwVHM{`XO#a#`~er+ihIBA z4fRD|mE0otY@2){VS4jGwCkp7m@__%)_ij%!yO4w%~*qunirpoHHlvifw z@i-(itSX)5%BBk?bA?^kvACeezzZUKryd``ka#CE;fd|epPN!oap!L`30+D;W*L}9 zc0ihGh({B9fiWo`h?oAd@gXEcVhY$5UvF^UBT5r& z(8HRb`}0S|Yle@PhgaDYD2z!ZV^wW^bcYvqq!+FaX2xHXnE_FEx>P*ht+_$-SwhJ# zk6Jt_URsRWmK!8vDZO>(_xiMCU)&hjNme|xYc^*sw`W}CC+GUO^~}a~n&@)|{$0N_ zUBjIZ^?eF`ao@ezD$TTHo&h=OLwyxXy5-dN92R`vMSz|wt|<;zj47t* zXPgww-lEF~*0CLBpR*8X&Mh|Kv(+Fmnaj}E_truy3D5<>F_ZGX?B>LE@WA2C*b4o8 z!hLQ1FiLaZ1L(y&9qPxak&W`e8R-K|k)XOBHi<88W8*>k^K{76xDTL{x9P^?1?9e+ z@??;|wSDq#oZdC;HE2g*pN%=+eBei?Y z>&E_aia48Y|0c=PNYTEmfqcd)*wgzD?XF`T$5_i2&yzgjN-_?wtXdx7L7ot5o)~Xl z|I{hrxp}6Pxg#~=^?vS~9Z&pUhd4j)z&!8B9`D5GoKeIs8Ed`0D)qO&SldGv&0j!k z?_u?KKpc5|5BGBH$vyWEQ0&osS+Q+r#qJUBM4HpuRE$04%(}a@aUa4b-cBJsZ{>ND zOp@kjYs21R=$9tA%q@YO4pn z{|j@uhfaDH>`%+_`qO^m{*Ps=kd3{u^}j<`in{X1f+)NTzi2PeELsGhTeLye>{34g zG4NSf87)~F${^zxt`yMAI?cE-KGl;VNU~0|;lC&ja<{|~s(gRHOy_z}^Ew}&{G#6h zxI7>n^rA>%=e_@EfCXscf4d#|v2o)5`gg zbYxaLZB$5Cb9A<&=WxWCCgUuu^YEnfYNiy$nC@>B^_=fbbQ@KK5HOpjq~F?HB5jLG z_Jqdm9Jn`?3gQNgYPq}Qyt*So9K6ymH<{-82?dha&qsAA6}OhZoV5{!^U*$Z;5=}z z3Q;Ru3^k8I3SAtzFrqvc8K0*t&%;duP(_oo=m47IkI*Wn&8CuU$vNP~S7^g*xq6EH z!oTRF03Th#q($1D8%EIE7I4}VN-7JG| zeWg!^+1_Ga|8OJ}D>4!~o$f<%i~mFn?e5So66{1rYd8V{AO3D-fSM~O+cCC z3h(H3tBwBZ6`eiRU_upidhg}SI?F?Sl8uM&&fZLjR7}=|6TeEZ^r2)M#^-TMX)_Wg zjCM+3<8NooNZz!>U1QALGkLJsJd`wwoidC3j*G*GV|5)yc5n^GHn2Y#8^9)0HZ}n{ zzl&h&zakl!AA5yY({I}Yvkz _#NTZ1CE|d};5isxtKx-aGRiJk*4J+^NjsAkM@`E-2-}nYz?AS zB1_Nq%V2Qf`I}*mL@z6fRxdWCv5C^oco2lNe?th~oA*4-{?|s&>tqd$8N|_sZ#MpL zB7w=Iz}Y)B-on>+j_vVvg+%5`h?+6hZ{PUby7}>;vF8ao!&=7NBf@YYKuZ)}lY}Ya zP$WWIS!A{H_6qxkv&Glzy=yt5!+4tx@(~)I4G5qM26m)_IK(}2AW)gTM%-|tieG1f zCB&@@5H$?QH9^vddeutmT zb<7-K8Wr!lM>}rV)rzJl9?*z=fPn_k=cL>37r9i*vm>!e?-L2SO)woZjo%8uZZMAX zVOKW-yji;|wZb&tNwij*QT$xdwj|OSa3;4oI^LYM_c=xO;4nRoy2u`;`UPrMsssP^ zFS+XCpe14g5P_Sgq2`Ka$wjw%f*h$GtIV>3F=57k~&FWg8Y9m~rxc zX$d%oYTVCJXi{|#sW zJQ3nV;+lX5z9*^P63ifHa@$Hh@6uM@oF-YC1&(-ZZ#XROBr#4boYA4#dZ(BJB_!vr zqP1p{I5`CFCsMWO0jUmSlT6E!t>h|pt#dE7CI{J}1=pq&WeIon8)NH_KC zY=I1m3JJf{mvtsgqG7X5d7(GC%t-ZkqRiEWaTL?*=n4C5GT#LKX%sj;tdYCf?z|1j}@Z@0$wp_?_%=9w&?_^invv{S)Kjwj4U)*aM#B@0i5tz`F7k?OAe$_#Ybq+l%Z3+qSE?4->|SC zR1`63WgV!ga|vS!2U8FNVgSq}C25PPRGW$1W}ngVP9Gr}7+KEIgY=1Eo|g;qyE~<| zwzmvo9Nr7h&GaBofmo^`h_?kCLcXk`P0KK+a>#isz;5>Dc`li4+yPO`8z#J>K?$`v z%aUpd3}IE0*bptz7vCr<4#A5tEi$iJ>bDLPQZiaa>BO`Ow4bLONoti*OF!WyiQyN; z0qgoL7-SbI5A5&lDJ(|_8;Ns!D)Qye`3Xiv%e zqzQ>JoBK}ng34$G;xkz{(>?b`%=IC%pb3lw0#{32bN$+I*IYsvrGeSFY>X0SQ7f#p z1z+*3?c@&l67N)$Uy94(F}ujqd(3rv(004j$G5P2J;>m^K^@E0L&Rq3NF6YgBQ+RG zBMnlzLMDig!fc*hjdS^WgG+yryN3?P;G^=BG!=8obT?yxU|}s@LH~3113P*(WdG3` zTEO`qwjBRkwe?Sn@793y$u`CH+h$prx7S^93$EdAWNKyUUhQynv0)gG`_lorwd9z> z^0{tWqA!&c2MdU*2&mWx4IWW&dZ;im=ThoaX%qC~yA#E}9~uS0ck|aza-BpM@bmZQ zyYI~l-uJ^BzI~qG*`7EcOEfa*v9?(U>Cy_)Rs5)zR#9Zh+B{x-iIO$A(OGlmqX5KY zc0G9#)~xpOqZrsy8dG5A0X*wX++`#LNW7faTt^1x4Xm~=B>X1Of>Sj$nHTlh#Fxy%Ca}eiT0e zW5LXdr0i_jc1IhWT!I3PA1yKiIV)0&k6chlcT9fnpsEvPR|QzD4$sGcz|=P$GBgls z_^GI1CIw1)yr>{wGCmorwF#vR#2Ijw2_nU7zS5>$n9QDj(WrS(^awg1{Z5`lN3Pf* zW9W2vjw$Tn!%QguTMrg1vLi;nezx~#x4`lViUmv>fhucWrD9&ICOKpoS_SR;E}-w3 zWUAkT#7Zg2z}uUVFo^>i+t&k^i(*2Go(SlGaSbU?1mYzZBOb+~ zHcF06y{D5jr)|-QzxCL_$!M_L^}GfOzn}lW2g;TTAEHjCBnW2xH6oc{gc#Sa({LdR zOF}A>mNF=12_?KtM4>YjN?x1mi7hezR&^C|wy%4Gb-1UJmJCj5S}Tz=hF?O)d#q znKf%r;h=_if)BfJ$MOKLOOEp;S2on^b>Ojk7T-^*{q1JIh$FK=ho?jD&_yQ%s0jny zph94F6**+w9oQqnL_jSfAbC9;8*{G&SYvd|%eNWuk~U;p7vOp8S62S~ggt0ZbH3SV zCf)8kcsyn9c?SqgZWU`s26*n!%;H`x!-4;36nWS&8lLUIJt$Fr2dJ6_+6q1>PFs>Z zGKQkZaBJuzGVW<^IEiBSv}+uKPMg{O=W_Y^s4?S6!4xh zD?hP1-!xaT+M3phKZcYkEgnMUq=P3?(wYKKALDkvGH9Uvw|N_;EPgkGpB~XMbO+qo z$6wM+fBS)SSCTx-vZAq70#wFZ)$aQi8@BU$L{#`M_@-?Y-qJw(-Ryao9V*>mB(&V0 zokH*);S<-e7557Zrd!@MMql(D^KC|Yyr>~%P{M3h^yDG{XQl1}O#Pw4DT)qzDYh8FTjfE%xonr$D_9q$9_Vkv zjANo5w-EHiy0=l6%_{QyGSxBHN}66q(MHIo11v8iN|s9*;bnbxU&lR4PvYl9IMS7C z%(mF_N-OT?Ow8AHyEpQk|WEuGy)Y`;*bev!|6s*lpt;aKnTt$}h6_ zy|HGe*p|FRx^Wp?g^k*E#Yb*DM3{9Jp|_0FV=_wMn-d|nzd z4h#EOkG{mrw}tg9dJLY}M$=4bZA8Y9kU1CG;F9z3D2+J0OZ(v}`NiaE%BgOV*d4%^NU8WBk`sj{B`H9ulzzg4LgbYro%`GzZSDdIOFcAQg!AA3Uq$j-cbO zIw0sLK2BnC=Hv9GGPd+B~M+k1Mo)z7{s1ILWbNyB}5p(!sR1Y=vxz(Mf3&??$ zPxt8HKI??*#S)+UZunv_oyvD;#TwdR3SqVr*jG8Vf^zzk+GAc3tz0<8;aEF>>{a6A z_GLYqg!GWq_i4uqBz1;W*=Otrw11x~zE6|03F@LNZY0kJKFmf!v>E_tdxCC?!O^U? z;$9QsjxkEj)$xY7UyVL8ZqBMcT_bkgFh=z}LM$tOW_L8Yt;=`f4A5e3ie0GqT7bAC zfD|f}re~{1!0<`gIIMbMpx%?3Gq;N?QMo9(QOzd?E5($5y3TdOf@s6AS4Ax)CW( z_{%}d4zbM4E-&rAhAZd|$wX6vS5`tXkRC~a?fl#toB0*$yN51Ig~4|tmd*SC_*D>$ ze=UBBO~ZaJi*%wNPw^Nn;|TrLGU( zbD&aYO^i6G{&5$}=v%8!FMg_P$$mJt#1|U)uUgS38`h(njyUtSgz$D0wquMcaw3~$`&hQSd2TmT_3I>m^imujEzO7yF z1w+=SkLm5e6o)em{qg1t(w4ZoZ3Wsar?W`JC<mNCGqCK4GtSu_+CFYuO8SVal&@tzH1GVx2h$UVUd{{A>aFSEs= zXeTf{b4v^(IG>QVO5}Oaxi&4Rox(bP*r+GKbfb^eY-%kRxls#}jgP5UkcjmVP4;OE ziUO3kS007z`kV&{?E#EBZCqhDR?5)_6^Mwf*yPMcJ>$)IKv{b7t_v-oVzUfQ!95(Q zbSf3RywfwokBrM=dHab`k>rFcsw{0RFS!bLTV-QuV`fX-lGNhcR``%nB4WQ#+vJ#I zPBOKev(vC;T++{roO3!=DMk>due+C8)Nd7a#+S z3p=IuqOW#=OKL0qf?OJhqFfllozICT7b#3DAR`x)l?%$s0b%8Yv~ogP+||sQNd?bz zdT^3VZ=yz7&aHw@&5eP7&o}I)e!SrSkH+I4E3f;K%+NJIV}i?{=l=q`{huwhf3_Z~ za)Li>buc-L>sG2iwCo=9(l3B`qTLX9A=_=zG}`BC9jZRr;P|`6L$#p80up4IlZS5| z`~X83NM&KxhVeqCKO*B))M(X0TAikYsWlT+Ac!NsyQCB)k|TYynyQ3dAd>yfHWMI< zYjAJPr8B17{qg4Ww4z0{ucp(Yha^8?mf43-w9?5$;t_lclcV5{N|n0iK*2%a`LYP| z5&AwO{}Aph^-Kg_@Ve~$=l6xahuS*&ftXBwASS~9aXj*GAj5y)3ZaU!|G*V|lj*S! z{1D!CwX#|jxDi`GMv3TB6No~cB$j}4maoay#v7uq2=3HhVLAIsC2$aO5?&P}G&iUe zs*orj+|0ML+nB%Z9v;vEeijEW5+}P{c0qrHEA$Y^=ec1-v)qaWZ2}-3%=c?=g%Dx8 z)4wudn1EFWE=eu*S0H1{sg%~3g_a!UZCDI6D*8zl8xy4Pnakxn0>CqGG)Ms5^Nfe+ke?F_C&}p35=0U?W`S{Pp~5+-n-77 z>Eb^2`I-)n#DqejWjfj#15dDB8}$!BsX?M3XMMX7We_LE!5t`D8UxEtZ6BJTy)=o4 z3J(Cue`>3lOo*RYb0Hb0*%gj}`4gmM?8j_57{YAF(Jro9o=Uf*>LbGGOzSF+})-b!1ihT?M z7+FI)VaPwgWyuuvVlNGx;i}!d^bzmoy7Cb|>gH>vuU~wNf*J%}E=!-52JLiNE_dBL z(DU}Jopy}gncYWhUGomlb^krSLHmi94xD+__3(L?nmNgDW_5@eet_oQrPlj*ulHRX zCpSm+`(K*zfA~Zc6{Th64-m!r!(;g0lnef&8J9D(HB~Y-H2D{`BISP{r_IxCp;d$i zsR9NP*#^=T5Jb&ofF+NViPf{tm7lp$2&dULb=vN3>F-C+koocN{*2VX5BL>t;6gN{ zfU++)ncc55oo}`}`M-U*ff7c2!!Wfy!a9vJV5OH~n$94K4IEc!AAB1~J#;zFOkraT zyQmX7|BgDwUvwQoiVG(g9>Os9j&kShO%EewZ#KZO!TwB|4A!!^ZLD%BU2$QXc4|@$JByZB zvw{J}n4b&xfKePGf*|OhJ-L!fH*9r@Y*kJR3?>a5gKowU!o_DwVIJOh>_BV79%((1 z=xlJroVn0T*Ej#DQ6FRln?j_G&JHqUQKm5Qu4LToYmd9gFu=I9%MZ(j5!Cy|Ov3!l zn7{NKB01%YI>=&Hlp&NQcv42G!`|H`VyiJ@LO<8Ctyo}V_j4=>f(b@;MymvgyVq_d zH!zCzXlc_C8dlkcgGHv!W^>(wyLaFw&0&gKBb^=QAMPcH4wJti0=2`}+^xGOnM?vT z)sbY8wOQpPexF6E_X<6zAh}+&x%~_BWT@DleIt%CPr@IWdcD;_rDb3kNmd#EbATrA zHXQmfx!)h?5zZjtxjF=Ij!%LuEBiZ!`gdqNhTpHCWeZ%@e#IDq$_mB%7{oieJqAsK zxaDezT%G4=kiTPUPWTL680`CR@);jdYXEv>Li`NpoyvuD{tmLzR+YDN+A>uO4occ* zP#(n%?*9J%g3o^~wX{hZBUqd=!jC6%$u#wk}l|6=c=hE6t~q8^qm|K$`rS3y@A=x3h1^6ROZhMD@JutLDw0htJ*7@ZMf z2po22)OJ47mCbEsHh)QZR+zs4A9YJNv;;5Zn&D+S$9rbe`Q+i^6IcNCZwNH4?}9f= zZD8$t*-`tv&Fa9zx)BMt5|6}738jwrdJaV|XTxFBFC5zdh*I)9A{p(|z%@*3{n$ex zJ}HV1uX3zKXo| zX_YVJ*$I6p5?61!eC3nh0&0N4G{G{kO^!arVb@=4$SQ}{9zYFf6jU$ zaM(DmZ{1D(2!!KZze{OM(tK7chR5B`9V!cAs)f&UJd+w^CL zesAw507INPOmOQS^>$j(3QbehX`D61MB1?@^?F@{l|^IexY2-4EkR!6dD zs-C%qV%<^EM8ZD(&9eT9gj6SNBtNnph>R`_Lm##a#N4%^lA=|ZUzFnvld!jon8KGA;8SzKS9PvYSYVg6zP~nD6xI2B(Ke-aVF-(sk9i6=mY) zTjWH@BDXVaY%(*CxNQ}AbHHW|c?P`@i0+t7>8R)o5_{HO4oE3Z)lx?SUJ#myFASRu z1y9SMF$_BP&BO$w1g~&6F@k9`C!B)`8nd+yDyDDzhfsT#lhFvb5yzfuYa}z4OLMH& z!p^d_R+tz4p@qV%w#KIRZC34sNjlv1pSFYSuIHvxYtF6*zcG0d##?RMyE66+6S{^^ zXF?0v>!sXnLuRE#{s4Vu6{Uh&d|^})cSPXvdvU`s4?NbDF`1mYoe#*%Q&p+ccR zz&}I1(Vs@j;ju|VGz9|AJxOSXbV;s5SjHlV<+BspXB!=;f;3?q^M*Mu_e2^Di9_(t!x&Zp zTJVs_>5~ro3v7hX=>3P8+j%RN{6iDSxqQv^xAXZUh)^hQ@hfDLxNH~Syx%yp%VBG{3B71guh7tqj&}S310t~;?>moha7<9|4=Ra{t!q1gKC*IYY1Zw zTtfrGD%m@rlmG-2TDp3oAuPlpP)Fq>D-{0rhie%`us?JSH*78Q?|~OELZLi{bzLYY zL@Jslk&0%62HHFZn{|&24G)50#zZno=wjt68E5r+urP*Cj-oL^%vY(W17sX&NZzq? zjVx`8(SS?qjt@G`aW4|#YU-%e9ToMZHiq@o688?MmPIk<4`Uj{EJgRqH9<2wfaZ0- z`zQH-_WZ_mzlF^o&rkpHe4_t7Q2*Qe{?qA0RemZGMFifq6uZtEG%W!|fj%Hw3+Nzy z6h#V^xplI%1Qx!8D<|!=6y2sy)m!+ts00eDqMppx;uz<2tE=$(vFoc`PUq{%%-^4H z7Z2(Hjy#4KEbYnl(vY<}bJ37f%^pOminiGsGp~UlBeUJrJ!;6POBCcz!@6~xNL&~} zt|~eJ7-G{#QSCN-VQ}yL1f}W9*uT+1!x|<%4JE@MWi^OGVpdBdqGKRTN)X3plPk$D z-YHhwDzH16M8w67v!UpAi(u%3VD!wz+c3jsCIt{I(A06K88Ce_EzyWEtyw7{1mOCD z`NHUedo|f@#93MDc9Fa~3HF$T%dIr2OmXalDdSwA%`oD>4yL)&>{77hK9o)B$4Cq_ zROm9*)V7M9#TiHru*53YxfrZFW>xj1vQ>?}ry6CX2VBohkTsWG(@!{mKxGQyqY=A!(;3{#-S5B68A zZr@Uy1r=>JxOQPUaHG6_W~Y0{w$H)lx1+{DLGpBHyGkWc&|1P-C?f2Uw>nYFt1D$| zRfE#5oOI&*&L^x|kNaKTdxS=rIAjC>?a`MI-THWQxvPQg&P%utcTgy^8IJ+<20Xa7 z7gsmuQ9fx)=fcF=(pah0p;dDWdshg=)Y0Fx)J@c8g~n;GMjKo1+Mu`$8?4Qm$RO3| zarQkBOl?#jXxFQN4nvI)pU&e_ZINHJg;N`|JY5-o>UR@XJFm{kS_Dq0wQ`DT1q_Tr zXEAtMi#VCAYj8yTDDOKE03I$&!z8Lx+wiJ0flw*}OOj&nr)cm9PBz!zlHma~ao`bL zfseiSw*~zXqoVO;`I2~-BZ-ba1apS%F5Jra}+_EiCj>pZq&|8YTcjmwDD~;F_k=FhA#_9iFwA-7Q{{QPr z$}Wa3|9)ZJ)?5LWMMq7Th$&5!BI0L6R*2U^X%DyDsgtE6vO%$IGYk zcT?>8KC?qrcm4Rg@l1K#xYQ{^*^fES={MXvoG+6%{QUla8b1?M%53RDYAm%%8mO?N z_RUp?=QlG^iLtFST}vrEaAS$wuJ+-hz^43`XgM6iupZ*R(3NBCWWz_9XAUD6MSf7> za#c27`9wsT6`+?Jk4!={EwmRNuryN$@1jMlMrx^6%4#}tiMF$}Dpb3PZujt<1Y!C( zV3}V=6~rCus%|t*UCK0GI!uqZZD{-{0}a3?HlnLSb&Q7#=Hrujm8Z>*nLMf~(}%1u z`#wO3IL+!w8b* z%rmSqMpS{)8OyW!}Jr%tTNOCf3kJ`*mmREn9omD2`atij^1S1E$Je)JZOsI*Jrj zow=7~ilFRski|uo1{o5Rl~dVu4bjGZXTPptLldFAzEe|Tc>n; zX|4@}xX=r4*u?y?AS>`;LvAc_eB@!Def{hCcYmQ8A)NHp%gllANB&&l_8t`RX$vdK zFEJF&tT0rO6SKx#RN`lN#(TUH6E*h~&G-Z7V(CMm4nVDyask)vXXTsEsSkZfSVFxe zDxp3Tml6l5Mv>16J`>jBA(Dx+w@PfVC9M`>ddm37N0=k70Jng74r4F%621K<6sWcb z15*1WTAIdNBi*zB#Cuyr`-r)e-LwM4v(0}aUE9d81;n$5_Y-}Fy9V3+4S-`b^=B56 zq`aH;ntAln{;@IvYO_WoKnwtIp$q`<^8;XK>O${qMsI9xV`)VH z&ri`I+$>21tA5S-QzuTdrD6b8LWiC(R2v=j+0VXA&Ux% zN|vc$3L9=zjOO|8dR8?stsuE66c)3CJ-I35cyleq4r`#k3T6!Kw}j#2~B@|vo$y0=q}k=jzNmPQkW+LV@#vbrLEwW-?5x@nV>>1UK` z>Qih>wUrgf(NI;p>PjBXpNfhqB$6svnsG0c^t!6OeKC}k#oFC{Ho-Vm>hy~H-xhkm ztq9Sx6>F;WriR&2tkH8PhasY<(P)p1z=K!R9PfMtm4bC6=Et6NI)F>DR6Alf&>YX) z?37En6{}QBwH39RbELTytOl@BNfNcXRteji>-DB3$2!QU0N%@IUcf&RL4#V;@L;=c zobB6vN0jtUjO#sH_%Gu@gdeKFbrxJd!&mIDZl|(4v=rt5fOA2P8?}8Csr1_^4{rcS z1qY?dm+SLpEFQqL%xhvoJ_46L$$Vp}bX<^VQB?G_wt5HW$QWE(Bp)irMd7qe=I>mD z$RvZxG79QQ3SB*EBFYg^-2w2IT%w|7-a87GC`+q4zRHP=`O-W7NVbqom3mH|Fi}{W z6!XJ;f$4eCblB`{%4fbu1CQ_7THS{NT84bqG7#>hk?D&M;lnUsTi|6z2@4)1%kjiP z>$%G}%8hm9upYT~v6LGYnTK~VFfHJlu|BiYLV~dej?GtEKN+nN$+T#6GqIhiU?o9H zvRTqv7&w+LR&JX*zX46f zUO`Drp&?CfPDZyZc7j$Xs%hy?IYB9fLqj>D?9x&hP2F8P4vNFmR&yMPV!NPy{vh?jnT2C7v>>$(uy zvRCG*HQ?$}Q3R_}?8A!6yqB5nI-TltvNw;F{M@L|s|v_)agys6ue5Omh(dd8Sao0V zCD$3xxX}7iGdevtaglEkSX5{&z0WR7p*;(A`;@1bB`v7i$x}sUpKfTn5O2YVHlma{ z0Jx6DECe7@b_W!*YT%npNe@H)(9dOEQRZIZE(J2|MoCvIyR)Cst&jQmf%~*N5^pM0 zT`MsAOBXc3`Z6g(fVr%l*<11;A9^V6CAtLnMq)E@1XkERFOwk z-O4))fZ>;bZy4u+;i}Pauo(BMmi0>M(4=-7z0{c5QLLKupcnPb<8^@hbm=8pTwl9} z7TI6)?=9Giyy&QJDh*9;0IoR!M8_=|C9DnIK29n#@CMhh;lQA(mb_{?Gf)i{Sgl^pS>GBnrFz3#mc=&w7lb`;0S3xF^)fzUl|yhR_!Pjj7Rajpi@PQ8ppo&_oh#UK<19cEy#I z;;1oJ=;NP1nOw^c>6 zQstACG7K^(gEAwJCECOf6X{)BXs!{-Vr@rbottSlrI_GlkpjwaL;xU}QPkXGzkzW* z{oMmmZjq2_ELPdYQW*w4+3jhh#2+utDo8M`Tq7njf|1`tD2h!rqKk zLAignbByqUQ#yxy9Ek+#cd*uXs{5>fdzw;(NKuVQvkTb~0ud6|%7m~eS>M?If+-!elvSXWGu%ilGFzeNYBd;%iVg}8Gi;O= zrHL;(f`CMdx$&22$mKKMp)w9yJb-Gg5iqZ%U~$s2Te8NAqs zVv&^7RpN^Q4e=^vNH_co5VXTGtVWwbU7thP@?z0EnYL!Vhm6u)9?31EnZUvV|NLQ= zM_GrsV&qR%H$j4aQQY0T)V0;8jjgC3>nX2EYV-~Pm)|voQc;wiYHpYX+=D}exCF=#l6oICf zA3ii#^B!OCsHLeE-IMK=^woE~OU9QbRrb`aZ8Ne?{Cuw^Za6BHY$O~nUn?aZyh;Ad zd}tg&iB+q3WL-E-#sQTK<)KXvinM(Imfk^1=%|2Wh9pm58JF*fFSK6($MeTW{Lz22 zBHm>6c1cWur#h};$Qd&t`VLTeVvABQK~)w2jo#mdT?T87(pO#pkC%-ajH z>m~EHwA(VB{V3ndjl4kiedCFyzeMUqD}!|xpvg2U+DAVA+relfWZ ziYOjCr=!UHNFu&~iH3*Eep9i*E!SX@hclIW3o2vqlO)k7BG;bZ#*9m``C$uRia@e& zhr~9Z&yFt?QJ6Lu-+- z?8bMp$UG~hucwuJ&qFvCSnWGYFglKe5sEWfuHw$Lg3Pcc2sK4XE@(`{TJad>Tb3il z-E?RYnJW^w4FwvU&Bguhl$A7d4#?>$4ezYATm|=m;&x4Z&~3`A%?YiBe?Mld0acRv_1umuqPcC3-AsW36_#`F z;W6Akvc2uRC!6veP={8QL(8OP1Lk1+QeBOnX|DyL(8W0TtDTHh93w|Pxes9-$|~u0 zP-+MBnbH*KUW@Pkw*L~=HRE6&`VUU#JxWJ%=(p>(Z_Ux>00amznQzrI0}^*O;kfun z{#_a@U$~)XZz0bwow4m#Bf459%l4?zdlhA$s(iM3jsc0!SXe;_QfF6P*VOIyiG`&R z-8{qj8P}aBE=p~T&3)@-^9N?|Gc)h_%OkM05C-CGSuf?{RtGBXQyQDTHby7nqK?Oh zHOhwwZ*u`zX?t~Rbz0qai%`mqB{x-}BF?JZ83rn z_XviQm#!M%+c~b_n1%4=~0<#N@lml zPnK*d-vwI1X`ZPrH#4fiQ6tslUyInLzR8O5hR*LLg zlFtzP+wL{hBDuC~=qp4zmVoegUWp2(5GINoRavTxkbc~gPN67Wy70!ryiuX>yUDa@ z+3(<{T4{4N&s@k%@WNN#f%~-NUSZb{FVfbf_D?G$+c)G>o4EoI%GD;&%N$4~0iP{V ze1vXQE7iHqG+hhVdiS{En{7eY{B>}pFF|BU3h}`;jnpE{dt8oIppUDL7xR_T@ufK@ zb$oKHh>x$97w|RG@kKgMJ~&rappUJV7u~{De<{#IQ_l~3e{6q;Su`J6GB4!guJeOA zciulAEz-kN=ZEV(I0I45lYV%;fc-dLh&;UmlTuGko_EYY#M3>EP%_nor*-pwo=18C zbYk-;QVD(@XvVABke@=Dk0_KXH=@L;Y7WDq zknM@QS6Ff)Go2%&vBe%*g$sFWUN*92RlqQB-&hbX@8tEifP4u3d(YPev(jy&7q);& z5y^ptn<8ee$QD|FWjJe5@`M)4w3uOS$zyPk*&%vBnc}k4h^gMrVSQ+0Z4!q4aanjQ zjx=Kai0uzo$7j_rf^Qu=(>Nk-X-p)d#vk$E_#|wCWfTUQID!xvyzmaY9d<$X=lAz6 zsW`q5W!)7@eI~m~^@1&iA{1{H!zL#CW~tfI5(;?>FZ-p8z@=%+|7SI?hN8o$vwbM;~r!^+b`&r(XwYtk)aO zoUm=~-7H*(D&pO&tqZr;lhw>q#tf_j7kj^hdjUMq@8JQVg4;`{3?n>O&*ufYU?f)N z(Xu3A_XXZGvvbO=u#4`>+q}=wE0aH0;TDQR7In%`&ps zQzbWz#7d+isgCdU$m5^5Jb&|Ib%8Y>JkmR}@hAq8c#|S78xwWe8msZ|c@=WJ?=A(s zB#5QqNN&}Nbkew^CKjT4w%hZcB_YnqJG`P*d26b7TC3tI<{f6Tp5gWhL}$5+l(rtWEw#!z z-11eq1>#w83W8yIT`W$K6}_-(c+pGIy-vl$qgkVy7Y7bJQ})@DSI3aMnC6f^s_swg zoW#*n59j21;zM*lNPbj(OqJ7b=-e6BfW%|MgPJWBy(s%nqVHF!3LYEh+3D`QBvkjG z0@5OkPf?o%?~Ta1qmrKAvJnj+yJ2g5xVGX`KlxsL0Ss>lhhoKd)A38m)@23Pf$d@c zmg03p-~s0bW886w;fPHjH^=9JoG(0*@)F}b)-arLCQ8plCq4=*%FstRJ{Dz&@uMxA zmG5hKLF)9FasP61pfb|R@vhR!5rH>*cINxF`|br5!x}u~fx5!3WWWN0bik_Pp9XZ$ zENIjfcacrWundQE0IRbj71&^xfWbfbbcKRZ4v%yotFt2+=r}^axIOSRjDivS^AFf7 z`JCpA#qc*?TczP2-2obCv;F)Z=k`#6)96(e9(gyZ4-s zK?NCm$tP-8OdBt&IGzLjOc+f~<}uK#U^=Zh?HYj%$1~w8$!xMqT*BXw^_QjLxGj;% zH;uq9xSMw($x8!bk8J#qcjP@E8<|%&i`kV`FYZ*w)s>H;4-w6;Sg8F{K7Y^Xv*P>1mzqSG3o1P%Wc@dCf$led(*1%6#*x zsLb*YL+o80+m9~AP^T|Q!kXtb1gc%P`}?3N1?TGJ?UN#(O_7MPwv(-=8CmMZGe=Rx zh|#v78jb2kb(7;$=CaY7764@=4gG9BKKe=aV@i4D_TvwMC65rx zo!HbT-Wt>oW?)AW#GlW9oFJ_z``(9PYm`>WLG~vPYkz@SeX=@NiU|9fKD$KiDHx|IF7W}&rh!nKtt-sq?cogkVkyK9hM&`hObduU_lwt z`esnN@$NGtKZL%2=z~D#bdv8`kE)z(@yJ<<9TeoPLtifDjZRRn(hg#pI-(tD*%B|N zp;_Q8!ZFH?v973hiXBI>LQhPrBwx#>k>~RZKGKJt&kew&1)S%}kLM}$Tbjc=97`JF z`^OwtK!R3C_1@Q}vR>wl*H&TKES$$|kddmLYj8=Kp|24Yksg?}P0Ts&fT7uWNZ0|T z>eHY^yf8@tWE;i+s|XS)4y1+~4FSQDbaoRNv0i@$dIG)ljdi}ATP2SX9OCWih7NUq zv9UG5fuk@f0s^6wX6W^6cXPPx9u@4Z!7eBSteZ?_R>%$?3%R@W#A8(HLRYfqLmm;w zJ2C6OIE=d#OJ@gAFT^dLst9w)C~T8pGeEbi)w(I8(8h*Il7MUSbW|s8T_OhLYKiGd z4T-Hegt*xUD1#6j8l{rTGq+dB%$=ugt%ktmG>j=slQ?5=pYB5w!^Wj+QZwO?yc&@g zePw~85YK9$iUV~2PTY5N&YVxn<)2^h@H0ZX0*vvtnsmT98I7V z53&4h4I1>W-8>f2mB;=$VaI6HCl`fW$s}h9LQpMb+9^anWMwKp5t5fjf7z1JW_~gvZ*cbEFQQM zC~Km(Du$?c8r@v^$>?O5(86dJd2s`%UHK-A0c6&!-P>2;9#e(u$5+1a;uQ*wi0Rdc zc1^nyy|mVPoye?x^l*sDzNdu=6f}M2I^jpj`MBGOb&H~8;%*#IFu*lr$jk10Oqk^4zsJ z{Bot*88uAr6RK?*Ke|xzX0IavF>x1Qj|Y)kL{*ZCYnE7C8UaImn_voqmiTvm_-|^x zys<7n?aA<~>!O^)j2iM)A^w7gyWR7C8Omc_mw1DDvI3oP^Zs3R-a!-aQx#&z(FEe@ zYHYBKY0-Ae8s|E_%)94Wt?%Ye!xI^h!sYtQPHBBca6Y{7LK?g*j$GTcK#KgyAhuI_sb&~7eoNgFE^xTnn?GUQ(q+`Vr~^y z%(U#uee^Z@>AbwY* zBsFhcWVYxaS-R9g?xsM+>f$|d9x=t1>hYj4GEA4vo)Srfd2{fj`uzxQP$NTg6>ef- z=O0_}ZodSxz~ipSNM=8}2yThs-4FzEMa2!DzJiBk`1VQGZ4fvCgz3B>Jt0u{e0B*{ z*~-VE;owgZB6~7BN5|4Etw2WZ{E2ODJ4#`YSY-`ZR?%#|)iZQAq{hud&VddW_30^S z$lSo08>Sg9bbqrMqn9l>6+;@yrt-5=79T@_fiFg0a8x?dz0rOia_8VS%uPX!-I=u2 zehH~R1PHcBV$m?tjLh3!DFi>mZf8mIs2$Q#X7Ril{_Z#Y4K&F}VP}nrJW1C5!maVqCgtNxpFRvKu0IGl!F)5@>a*wcl&CCC%WD0_0UBRBGSlN}^5D05;ilK)0qG zwz7&=f*7H0p&PyG;1le5GsPtF4twX0!b5nI$d7yRl<=U|>0OO%Ddj?O@0xul^ZZ5Y z_pUC#f9&Ju8OZQ5i1&w-Z}TaeNCJ5H7k-ysxueZ00(6Yr&EXF-kvtv=vQ!4(SQ}V~ zmq``BaiD?`(s;*DZjp4Kb5Ozf7r35x2emP9!=~(?zxpkCQg8;rQV?%9tD)F|VyCTd z?))roHu6{V0C@m4m<%0aJ7zaW{1tEKA1Xvc^1%Qa2X8HjK6>_NdJrA*3g z^nYW{{~qX{IrbdTgonp$$lbj4zYL^{T`9}ALbFHB?mLnX!vv+iulqc1PktN#bl(X; z2S@qz$H4}ROQpNv;4VQlae-r}jy2!zK+YQWeV;pWMcz+JvdKhw*xrD≠k%tX{hE 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

}YC(x|Y>cy=YIvng*b@QTyS6&!cl-fTFt} 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 z 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 literal 0 HcmV?d00001 diff --git a/resources/CGLibLiscence.txt b/resources/CGLibLiscence.txt new file mode 100644 index 00000000..3d332846 --- /dev/null +++ b/resources/CGLibLiscence.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/CutterFrontOff.pdn b/resources/assets/enderio/textures/blocks/CutterFrontOff.pdn new file mode 100644 index 0000000000000000000000000000000000000000..439543b44f6f2b2c8229c7fc692be50cb5c9830d GIT binary patch literal 7273 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/CutterFrontOff.png b/resources/assets/enderio/textures/blocks/CutterFrontOff.png new file mode 100644 index 0000000000000000000000000000000000000000..d7f6109e4e27ff5bb13e9557ee3f4853eb512f1e GIT binary patch literal 415 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/CutterFrontOn.png b/resources/assets/enderio/textures/blocks/CutterFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..49e2cb682d013f4d1c966c2bc9f3934b46810639 GIT binary patch literal 416 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFront.png b/resources/assets/enderio/textures/blocks/alloySmelterFront.png new file mode 100644 index 0000000000000000000000000000000000000000..057d8096ca30f7a239b558a32cdbcc9da88fc03d GIT binary patch literal 517 zcmV+g0{Z=lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004WNklgp1whZvV9p zzr(}NVe`J(er)+t)1g1x&z7&t>29ik;d+=miztdlo6$V*)bCT!i~%OdmW<=^7(@X> z63y{;tbo;Fl{mwK9TH7H^c4U~>-Q{BbB9E;>va`?AJ_5%PZlgguHV*7<_k<>k074F zg(fc(z9a{dr=}n|Lc>cafCIey%f5T#mP(~crP63LZckAx7ERM+lpL-AmK!_|cwFHM z*LCalI=XVX3})MQKA*=P0lo^r8ydi}EfkL90932hTCIk?uIt#tAd3OiESk+_Gnq`G zP{7qN3?T$XDwX0$-b4Yc1jA5G*U;IHZJ36Z(@e{>EDH0vOkscb@zn6NtOP zeQVs3$x7*Tx;<+@OdsP3awU0hYMHo@JT8fpPW;DRkWKLixMwK9wPQ>-00000NkvXX Hu0mjfBUsz# literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png b/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..70eede124b66a546200a6f131e303816175b804c GIT binary patch literal 534 zcmV+x0_pvUP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004nNklTCr;Fx(7h-dug37R3ml1ErrvJq)*g zJRZHkqe)nFPsK)99BoGmSRGah5JH||!3?T+Vkj>Cr2;_d_@Oz>% literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockElectricLightFace.png b/resources/assets/enderio/textures/blocks/blockElectricLightFace.png new file mode 100644 index 0000000000000000000000000000000000000000..ec64eb0f52d2f8abc87dc126b655cd7a2b58105b GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvVg+T^vI!{F6Nt1RG3D1b79c{_Wqc-oX}hczRU{n?&G6HW`lXY$4MR zxN_WVSlBy(ji<$zd0FxVfzX@--2o;7oC~Bp7&ti@CP|&C`@4Hu4A4jhPgg&ebxsLQ E0FuZ&uK)l5 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/conduitBundle.png b/resources/assets/enderio/textures/blocks/conduitBundle.png new file mode 100644 index 0000000000000000000000000000000000000000..8916b298ad8ea63eb32c14e384dabac56df64f69 GIT binary patch literal 480 zcmV<60U!Q}P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003`Nkluj5E;C;1>lf`rN1haV@3pLBcTQfmQz;TqoIAkP(pA?=~Bm;^YE@3=35+9kHbjz|VH%}CS) zw#iP}Ec+D!J7@FkpDREKjED{N3ET@;!|iZEBH*gfaAB0H!I0xa1Ha>48kX_IxrcSvNAOM+c396b?s`P OVg^rFKbLh*2~7Zw!lvI6;>1s;*b z3=DkxL735kHCP2GC{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}K@g z7sn6_|D}`e3biP3xLxhucKY7`mo>uE&NCPm-d<_!{7B>Yd>@{@J>Py7q?G)7GT|DF z+gek>z=tPfPUspOdz1UbP0l+XkKsrGD{ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/enderIO.pdn b/resources/assets/enderio/textures/blocks/enderIO.pdn new file mode 100644 index 0000000000000000000000000000000000000000..df676ea938b084d1fa1cc18164023d222de85157 GIT binary patch literal 8504 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 Z;rH%Pt$i1)Wq?7-;OXk;vd$@?2>||>qNo4> literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/enderIOFrame.pdn b/resources/assets/enderio/textures/blocks/enderIOFrame.pdn new file mode 100644 index 0000000000000000000000000000000000000000..81f6f1716b244800020e3cf20c1547d5a0692661 GIT binary patch literal 8716 zcmeHLd0bP+zE8?}04s>QvWQzX3P}hMETGwdKoYVL)>=GCPLh-DgzUksRl$wcR$OZF z>9c6XwtCwNt!u5e+A1h&-Kt)__(k4-p_k~-8X#BFEhV0=Q}gM z`Tf508>DkX`K0S_+92cv{aGl=KRX3qt%w|uIONxuNqb^KS zh&%KJK!X#O^tinm^0EGdZ$?xYqjXoG9ITG{%Y9?sd`x96iF0vx{zbDv((8lsE}J^N(Si7^BCMN zcCkzel{spGzC`WjaQJpHXr}NvYK^Nr3x1HxP$=cx0=`~qEs>VwdnEEqafvNI)2(39 zS@v?dfFa`1P4pZUnu@t(sM4iM&d(7i=jWOVSv<2T2QBo-i)C_=UVuxo2xS3Jj*4ZL z>;zeYn4iM3(6X)4OfH*IjO7~>9o{61)^N^zpdtrycwRy@zHH!v(Z4o{JPOr#3`&`6`-;_R(X!Hgzd2j90ZR> z%Pv%=GDU8Y%#FJ+ab^L{%y(v`@RKD%U5Ub;l~Y0Jq^c5wh^rwu43C~ilh_J%9utGl zHAjW?Z*o-NMoFSx zP{3jeQ?eayyIUnFz%;ppqAJGPqbFyx^X(#q$y1SR<+1j{QGkVRZ0q)q)tj^ zq$aX3Iy*H0&USF0NfK(O8M8Qoz>5&v&d2Rm!j5SIyNEV`q~X9W21fp1+%TsdvxzYW z3YQq+YiK}22$( zO03zgCTu2L^}k@&nN$8R!Dp7vgf^ofz^s(;?gt5gnm{Pv)&;%YfRVF>vdF>ini5*(EpI1ng8#$g^@8}C4M^gtN%j5OGe#Wm@1OnOQZGcMKy zj)*u$T&%-u#mEZzd3qd2mQJ2q)Vsif(29YB`rt7FBSAZ2a_2%^uJ>Q2y%{phWVopb9f)jl)w?7&F`6KA{}J?U8`pMrU~rOJxyg+rd4H; zIrEJLN?~?!g~*_Eit{-fc!X1L`Gy$PX9#xSXwXjR8G@M#?i=I~0JzJrz%o8V=r~=5 z{mzF5qqAqDQUhZ^JEa#I+qX@B%onVn8;!hVa0Jk}U8vW5sAB+1=pWn9pa;f13+vmh ze*iWd(sD3(kg-sVgJL`s6QGy~!~j2kNIw4p%|Y4^G?zIrkHasjoAR`t2&Rb%1gOIlC97TTpC)3va!dRNlc z-LnV6AD+YhQ~%C*v|eL_)2w?~$WW2Jzfg2d1KNWc96YA?tFFOG*%yG!6jH$#$TT2& z5}6kv2=q(RLDN75Ne7~*Lk4J2q0f>Xrh^JH1Bjju9MGUbevsKM0W5NgOVFcxJ#c>JMD z|Ec5qflf#l7Ej0zQg_`gKy+HbB*5x}gCQ1t0<(dj_(OLe-A|tKM+OKH1H011fHIgI z2A6fGgaI&1LxkWx3{modaYF`Bj!y%BVIYy(+}>IkS)^9fTMI*t)QWp+VeFAwNpCF- zMpB#COB(=v>!0&$IQ1YE;CoG;)qg^7FNT}M?RsISNeG)6HFYb8nw{-T%iK(;PRot;M+bCFUHJ-&C4|rY9ov(kOIRWL$j|~w8Xe0SRP^g_$NNFVRDPbFO8}u5a0Eph3ONBfKH#o2mh#@NI3_=@WnHJj% zxCp%J0;Xh8Ar+FqC7?o`0R#zL3MzeoAwQD9FM&!BNzJiI$V|{6p{SHJDkM!3sti=9 zJRnG@S)kGf3Nk4Pg@Q^qR3f4Rjc%w;Dx_BuN&_lX$g?CAAfdickaI~WEvR%uu@D_- zbT61=#6H}^T&@Ty11n9bVp?=*fq%RhhEo=G-XC>*OeLNLO7WNmxgbT+_F>q`1kZ3s~X1~h|b*fcATb(p(z+^Ej@FY$S|LmK3)(taTv{0 zv0w1fvB;I~TK4SvS<|qp^Y1c_cAytyO;MsVe;xH@Ky=iDmk-rTKfkUHIJ{pN_DzNC z#K2t@AKKscSJW=txqimpkCxB6G%I5Ft%K&QgS#5vXnQhr^{$4dxQY!6?s@`qvSMD{ z*80Y0lgI3BIdu2-nqS=QwEB*1)U*Rv$9e__DZ|1~uWj-?@^DPel(oW1kLEMKsK0iE zH*MU|#h(}IkdDR(&7g%VYmE&D{^EXXpLTWjqxLuMm7cxPawT)#&W_LntLHrY^w7kl zqs@!DEd7VMpL6w?+o{OSQ^>+I8cq+JYkPE!OKWHs#56RVk#Bir)tQoIs|vz5pM7^* z-1dV@TEZh0kzpf;?x0iahDQ#Yu*Y_NAiXN)+KHGp@9aCrlLj~$9ok#9>zbR_jeR)i z!i~&uZn!Auqfa}BF5m4n5K$>JR{7^FTzGNnkF7VaogdSD-FtBBS6c_Rpz)&RjH!&A z;vX(>7VTSj=G^$><~g+=1}=O05_Mz?=6TF{wT63mIKw;XG=tc@@nEHDr0Mfz`q;`} zi?+YEwtn^tAD@f9d28Z_`Nx)DuKjL;pw_wm#)$3F)1E&*A+#Z60pA?L*?6}z-Od~) zJRL1OUu?+xVEgqPb=J*qUL5~*>5Da~_kMjctbR#IDXD?!@qgi9p3wXybeLHiBzuN2^ zG3p?6S?*rppm)-88mApeK9_pHzxwc@O@k(E zqw{_n-w@?`&#o}I!9(x-CI6#} z_ZOL%uboQkbZyx>o{^E!y5MTcqJ?+MBJNdP|M9y!ugVU6visz@cM)(ve-;&YH-|wB`^FiF_`P$5X~4FJ6X@#pgMa|ae4yYxK6vW z*>Uki!?687w!ibu@~1nuHr-XVZ1{HP!;-rdSKMo#rp@^7{aY1#DzC}by#K2<UhiW{661^QCt`pPFqJhl4QmmXnX>~ zh&vJJ&@Geh4ylTc?tCOq-`IhLE^Z$ftrIMKZRw{&Rt;-=@7>&-v1{(Xvgh{$>tpYm zMv5QJW@d%8dS7lWPsdfaH_tGR`TDG^u6Yl8%bT?x`>4O*BETWaQ7aoS*yz+rH^_<8!ss6-EL$=k`4SI9*(iPr;yFbND zD+hGetfHU0-f61d+r;_x9Ib6Y(|*d4p!7K`>0;;1J5gIIo%zR!-<3#{ZTf@Xg43BB zcMraHNV?GT{o3N3zde74(f0Evp3R4Mj{54c^uoC6MdN=?UUzi&wrhi{l23j2?a~_W z{+ut?mtM&IWM~WXim>Kp+myRQub-XRxoP(F!yWU|FE*^JobEb%<>CCRb(2e4+FM55 z+adZ$`d(>4?}u9=U<|8{?R)2iq0 zJriP-j-C+Pt|$#zARW9OYmGKhw~x6;dmPrxoHBX#eE;qZQyyFWQ}r{UZ@&W5WWn%jeT)jCD<+U0`}Iu=-3vYLM0Y`qx&_UjAxV4T+3 zpRJ%Td*kwsUDIPGd9Fn9KKP_ItTycSmivF*vG_N1g<`a^19fE15zYSgxEJkLQ$1K?M-kgk@hkI5&eZ1z__af%T9hw7iPnz!ki0t2#Wm~cHR@)5X zN5=m6Go3X9qc-Za)y0aA=5afZR_DCDEz-FHz_X6{Ti8;?&VRDZZ k+N`qQ^Cr36vU_8LR{RumcKUl8ZBJIsqQo7o4uhZl7Y=9w3IG5A literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/enderIOFrame.png b/resources/assets/enderio/textures/blocks/enderIOFrame.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a69b5614492adcd1a900b680b89812ae5fd48d GIT binary patch literal 838 zcmV-M1G)T(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0008DNklEU6JS zEG;F_mfH2}&}mEC=`u{|GNoI9rj(YJ#TF1mxI~E2s8LXnXv8NU^gl2@_@CkFJWzbq zhm(_ga^`pM`MxtMo85l=KcN7mg1|hIleKa%#WQ})!35dExTuW@bPgtY=8un1&C9|Q zK9-n{vKaNA00K!jJ8x29@}&T4@g9 z8pO7MzW8;N_hRrZ3?jYb1y|{VxNgJf(ja9k1}8coJ+@;k7ia@qVGHAHS`1~>Fl03J zkrrz28Tgw<)DKdS*6heV3!r|OLZ?p!>-1fO(%v=z!ULAv;*j0p5neVUvF*al8xdEX zDuk9zR2v3ndf+JD$NsN%rJgB|pVA=aV$GvGN_!$Aq(!%Q8Nr4@iTravre23|c1Q(@ zMwxjlDw?#MIsx#agL!F2Lso+lH4MldNN#h8kQ29f6{;T+2tG8yL^{Yme~{7%Bs zmmK<}EAY+_D06qw4uqP+@YMBi(7ADxqa87k3&A#^wRIqmqckH=jU#hfbOkR!STRE0 zbtBv`l8`3MAIk7A8W37BLp%*=t?&Ft8R@4SHoi?mO;*J=9q=ybp^aZd;YEPPGC^Fk zkdPL7k?HRdLyQhq9#^7v$!BE(t?;}Ya|m=z`y_feiD>mU1H^REV~X9XrO z8l2S*Tl2#{_m;^e9!K*Belra!*D0JXlVFf!xa2eKt%AcwMg<0=mYlQ7Yz77l4D%KR Vn)W$NlLlJB;OXk;vd$@?2>|KnM6&<@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/fusedQuartz.pdn b/resources/assets/enderio/textures/blocks/fusedQuartz.pdn new file mode 100644 index 0000000000000000000000000000000000000000..a28e483ff0250cd45432de1180f0034ec12a2ebd GIT binary patch literal 5083 zcmeHKU2q#$72b`cmDW*WIiaO#lBueO7GhVHWy!X{3ek__$cbfJw%phmBi6gutF`w> z*;oNP#6eP8fJi@6QE5fO_>3baL!#R zl07PJJ21mcxSBnCfA*ex?>XN+=hJjHKlpQ&8LdcqP7`DjTvsH!oD2;Ng@R?G$YtB9 zt3sWaRx%U~1udaQq(>CHJP$pJp(jIw;rKu#9E&D~!_kq%P%Lz0RIFOIp&c2u%T;YT zSkdKVNSRMh71kps#$_V~B|lp%j}>L8rLmcs$)pzWy)x3DC}SmcDnDC@#_D=)WMQU=ofG0%c~M+XrLxu}G>5Y(QL3F8rxPl(#X@>MTb^FnkdNh4 zY5i=aUXWKOCej;)%5nMBn4BQBQ}M}_$O&mmFI0LhaSnB^BxWizh9WIyaDS=vM4=cT zGuI|$nYOX-f2AaopT|{#(UW>rRsAl|nwza#HqlzTqTvYs zwpXz{JS@b;_|QONFh(LH2@me}W1BWvs*3AeO$>|o+EyY%91T|+2i8Qqz?tscI zQ=02Lhh_LK*ebsh1e%HWqu2%FE_l3n3>t56%=P;_0`u;7AhzBaN5xCyS|fE&4Fep@ za^29;b%<;zD`8uZV;tW3>?pQ_iUgD(5)TDcND!fckxn8nHUe6xw%hxK6Ew6@Vv-ueobPD8($sp-CauHVzO7neOCMBg z0HYJVTK7VQ-w$Hf4mV!9k8r&)+;LjTCL6ZvVB@NftHv_sDgkp>cn*eg`ij9HfKT0c ztv^IaK=r${lITPzRO1SET%{31=t2i!QV)g=dPqbNk3QznH9T4}fZ>D=hOp}a6o*iJ z0)+oT5Sz$L#xO}MGj1U-@$H!hk{1u!`s3{+Ag$P%P@z-+LwZ-mG%Ccj6=HdExvr151-g&R-je)xUX>up;b;&fwKynB1wXUsa=Kzp!0-~H`F z&f-*VR)9+QhfsVHL@Pyq3K}dzjbiRFRQO&Htq=O3;YNu3dlaFmy0wxDd3%;X))H*P z^lK%>YNoaxhoLqIC32;mT1iK8hJ36?D*;6-0%e+52>UV*ikFT&$SL~V;Z%+$Q2E0fE5MTgSD<S|xjph!RgAX4C;X#yi0v+PlV~K(u*~Gg!3mB_JaCFmU znk1TG*3+sXt|453H{pvP1kq%PN1^UP7;X<_1eqJXwhg)WB2|Oq`xPrKh-k755D55J$zrIW@nje(EXE9k z3_k**-Lovl5A-gV0C8K@r=dYrvCO@J=5^ue#O5{OG2aK8*MrA=9cW$)9`mdRf%*Z# z4PR1ldk}f=hfu_Y5AKF+mxp3}S+J(*KN6orRv;!335I!=MF7(zg>RNcqaZHZ=rL`j zu`2_D-bHFPtYNuB=rN1PKp(LP3N(D1*$@Do%yta=`Ed|vtR6HXmH-+OOAn4?3E($a zfVg1Pamr`!d(6k&xX2ZlTW|gBg&r8n{8WARh4pEPvGaeKx^ACwom+UZo_evk@5YtI z>o;$BF8t~zwF~T%qup;hYFfH3v~+#{%Rk)Zy5FC@a^V{>W~cn6OS{c8kypNQ><9TL zzHs#Bk1oA@-(c_5cNf=QdiI%jFMs>;Vz2e;Th`J`Z$E1N=5J4&`(43OzV(l}^#l7q zH^2AwfgihSf1lSM`{QfR{PO(sgYT_fy=PT>&B0v4%9f?Ubq>FVdQ&MBb@0FUxBxc~qF literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/fusedQuartzItem.png b/resources/assets/enderio/textures/blocks/fusedQuartzItem.png new file mode 100644 index 0000000000000000000000000000000000000000..87965e8002431473ff02fbf19439a263bbe6321b GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvO@r zT^vI!{F4&`gMavQvPmCcVEO<5zdC0#!ySea&m==V<^u`m|Hmiru$(B;keJPw;LwvM zaO^45qK_*WzZfxSdL=UGxnE$YndLY`L;S(v0%nbKK2MTc|1*5|n6bLZ*ZVrq4hBzG KKbLh*2~7Zn*+mQh literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/iconRedstoneControls.pdn b/resources/assets/enderio/textures/blocks/iconRedstoneControls.pdn new file mode 100644 index 0000000000000000000000000000000000000000..4ee2c2cdea3989a282942c2d4da2618c64bf5756 GIT binary patch literal 7098 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/iconRedstoneIgnore.png b/resources/assets/enderio/textures/blocks/iconRedstoneIgnore.png new file mode 100644 index 0000000000000000000000000000000000000000..66fb3019f6b2a5350d34acf14393176ed736e376 GIT binary patch literal 489 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00044Nkl-CR8KGPv8oD~jmr=)K-UZv#sJ@; z2A~)MWN7{d3LxY6yu4sT!ho*y0AjF0C_pnr6C7YLfzMKsaP~VO25HtrGXMns0p&m# z9I&6Eq5TGkq4FRdV6g>GTK|1))i4Zr4V4GQ4qWjQElm`^gT%J_>HRNJ5XLazk(d}* z4+z5zc&w;^5qR7D_5atYi2r{JQiuc|%gZ4QfF&4^v!L>DFuy+Fe~pspe~>&VOrXN3 zUO)~+s5~4@FZcLwqb~zC0E9n4)u03-dNhJ{LP2_v;eT5LS)g79hQF+=aEo9V9E~6V zN)*@<(u@kv|JHiaU;{o&OQUPXpBi5Qai6{B|6Dc6|DY(ws~HBshH!F*AS*`4I5i^! fP~Z@kof#MacOmC?{Hj^N00000NkvXXu0mjfyal~t literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/iconRedstoneOff.png b/resources/assets/enderio/textures/blocks/iconRedstoneOff.png new file mode 100644 index 0000000000000000000000000000000000000000..0ffb2f7c7d10ac2a08b9b31cd2692d34c5055220 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR#mT^vI!{F5bEe>h4oAFk(DXe;t$S2#OsibTNVl<)VChxOJltBLRa zv;E?9#rq8_m*)MS>ofI)c|u+7fqM32)=#`M;@&yV6u;EW^Z&NgiAnhfdbrO2zgBf= t%FY8Z-g8Wt|NZ}eo+FVdQ&MBb@0QU7)Q2+n{ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/liquidConduit.pdn b/resources/assets/enderio/textures/blocks/liquidConduit.pdn new file mode 100644 index 0000000000000000000000000000000000000000..bc4e8d316b80b680b1e5d1ac21b8aa024423ca7b GIT binary patch literal 6764 zcmeHLc~}%zw(o+b=>n9+kSH!RU}O#ZI?}|Z8#?SugR)54qPyrW=momEfksh3jkr$C zOX4z0AdZg2C<>xZoEV&-xZx5<+~zqVF)`y9C1Oxel)0xGWcirqWWM+Q%Da4h>TdPB z_nz}R=bj=}lpNHKu_BA*nm9F~AbDk!T(9K2286oulq984>P>YOVI*}l-!<5kM-!!_ zd>*A&&P6?xR>OA<@(l^__YDq=2=fgLj|dHRjf#{RXuVb)6{%Mm)cL$(je_q=&5ce; zFY`|jE3^Vsk|mkSm`nw#MMG1NCKP1Dvmo3rLJ1W?RdgJq#<(2=f5%M3uX zh2@21rQz9Wna~+8i&5st$^-%torIcUB7sa^S|WxQqRS+i>CtmV%GB&IVVOR)JXJU^ zM-h`)5Ry?ItBy%b35`}uWbx&+NSG#5$f=n8n6lVRtth=*5$By+Sdo?-lw2W`2?AtU zvE|u;GD=XC6PvEgQRk>L(i79-OB5N=T48cwcA!!1uMCNmNc=K`Wm=I!nVo4M%f<0& z$qIpy7Rw~rh2p@(7;U(|v@BH+8(*qU5-YvEgM;A!f*4h7Mv=sjrWOjB_Ae5AzAMi! zD$;LA;eJDwjACKvkHs251)flB%#cV;B`A$vq}3;rdS4NtCwzEAmKft0-9lY0S_Tks7|npiAwFy(Jp3qG%CC7i(!!&M}eFf}t$O#8&(zJ8cX!sY@dD z1RT+Rs3Av5SW`gI8~z8Q5uC0 zPfg3TIu(`wzo6DUpZ`nnyxcs{84E{hW!Vk>a0}?+fB@53z}Wcuh7nFNp+iQt6X(j=l#tK&$M zC=EQK4U|fbOVi0x3c?+F2~mT~1=GGjpr_GkXO^JT!8!i}ihyRg=_Daf(Ws0z?+~;y zRi`bba!FhH!imktn zqk;>W7m-GbQV4Ju#<4{mRx`;u0=UYsE~HdYEXQHg5+R&PsO>kr zL|_EUQJ5tVuxW*$mn#Sq0_I}GejGvrmJV+?l=C`jhmAlBM<@*1%l)Dg4DOdnOaw7- zF`H2D4xvsSg&M}0G8PqW>EA`Q8;VZ26GFkKf|v$kIudMfzW>0@A?$I~QaxF&H=jP} z@?w=XAMPvy?l9jBG!&;P(Bd;-8F24k5E=k}f?6swMJj+X=Z(9{U@T!4az-!NL-=6g z2rvl;TjO9N95iYNVTBo-30-f3m<7Te2^$Y2MkO&qt&SYNA;%;!A+OFrAc?U6oxd?M z8HlFzYND7)2_Upv73;Lcq)tzfv?XoO6%aDgjv4eG&Pc3H9ZW)EW2&3dlEIn75NtRd z`>lVmp7)5gQM?{p7JP8h$TuXWZGb*7F4tw`kZEy7js{@vLQnJt?uEqgRqYKRKsknc zKB$7fg~ad#U(~>Wj?4rQOnGlF7cn}i96M|8L4J7-Yc?in3RZCSU z1CWsD{v-5SosC*b(L(C(4mVI@w1H5 z1O+A%8bzGQloexKjBABiok44{mY^RSIQdHE!kv$su!M0UOPMJ-M((9Sn_!FpSn%V7 zAi-h-eW#6c(Y{P!0Fh(Lb1bBg-EgIYIStBAxLiCGjf0OdKkx&_A;N}w;0cbw^oEb@ z1y5mmBS!REfZ=}`>0n{Yd=$duDaGtrBPj+djy4U@-pN{>notckfnyBMeuF9&z_ama z%Z5Q(Mriy;W$+vt<-T$fMn}105~s`U7~E9=1_6wLibE9)A{he}k1C^}AgVD? z38?b&fQhIvxT^uXAt%O}7l)h|hkV9v$Z2uNN9=~26^A^+0^H}{bU8GWaXAa{hkxZa zz*a8uScP608jLFmI+gk2;>yVa6e&qL8pbgU+={t;;fY~jD)5#O=|9uTfUZm=mCFwr~d<7d}bC3YVk5C)Xay+$Vp?*9Y2~ZXWG-VKgp<@t$jpHHANBwvn5)1;c zlR*GtjzIttj)$-S_2UE*fM5@XgklHAgkleSgklH#gkleCLa~E&q1Z2A9;gR!pjZ!| zo@G|$yq3#SyY#2A1`Lv}l=QU8&1d=rh1(WzmnWLNc`0!1s?c^S$RTHEn=U^>{JU?i zTb$)%$R(f}RSC1lc`uRWH+x&Cq-{_hr#typU zQ8oRy91ign+qX(^pvhiZTk%1|W=|Kf72M5s@vfWP`17B0%N!)noPxHnW;C*C_bv3}q_)=0_wOGU zEjMednt0@!>-&r16FibV;v3{qYjzymdbPPJc@5D@thsP#?Jc*-dp>T-J-gt_m1WAx z=L3pajn`B=g8tN9nl_`WOWYE0;-25hJ;il=?~G2d$3)wv38x=@74ame`PvFfICZ{b zNY-MV?d`fR8_IVsFYH>m_o3nF+x1IBs6#(%eHvEX(^s#roZ=iGp+2&I)wl9D%EU$Q zw=L?}{oJc}gGH{w!K<(5#;u4o36EzlxD;`>;FB*mS1(z~eX#6oV&Cyi8tdlpeGWA% zv$p#_%kwxLb)J_VR%QR;wD(d3-L3iW4lKHd&0ldpa-jDos}E1EcOjc(1@fieb=!Xs zk6WFd+Ez{U+8>FC?Ag({E?2CjyLv9{o8Xi8McmbGRXINIhVh7N{Wp(R-n2R3cFn7G zWizp7{{C+dHcq;zdGH{;tbS4Dk(lN0JlE`Tzhi$fl=ys2ugmMMkriG=uOBV-d*a-F zxw!d$+M|w~$&H=&zu{$V=Sb8J4KbGfyF$rY@iuplW3!)meBWWV{_v5{%o^Pco73(+ z?Ehd|klBR%zj~d>^)9%RG^^^Zj{FilP(CHa;G($o4uUG5I2- z5lq4GVMy?Ex|*L}g!-NJlx}?5>eF!R(}Cb_b4j>*vA47T z$J<-`EGjsA?~l=nncJ{d43f5Vr!>3g%T5VnTh;}gnz=M`S_^Nv3){g=;AtL@uUaj< z(dv`$XzevOc(?NNvunJXe!Jw)el<6m&F6XOFJ8WMV{vs<-NofDljF?yy8FJ?y|4Ji z^Jxd4gv_vADfC&maoaAzjE@d)y3xCE;o9nht+I*%W6A1&eEIn)mq!VU|L!vVVOI6Y zyBQS^Dz5}*-mbZ`g_?9CHvVk7qho9I!>@nC|4g>^^2~f(9`yRnjc2SUpV~(ic^vhW z?Q3+u$qnkuYX92(85!kws`L+^I5|5l+jP=L@qPKZHQE&?&&5u1e?IBqi|Y?&e^qUA(!j<5^N&?YYMf8!E{qbB^>KiK>}>&ONHMaCYz0 z?>|1d@iYpT9pur%sk&wN|qhRkh~u6ypb4#=wu=<#$+s9v7@rTNtlx7TediMw-a zf9GP6+v-lYj(an7Z_ij?a_#;@ts8Oc)64l~(l3s7t?sDrYFR}5{$NM+A1}q+HQ+t> zpH}acA2$Zp99IVCmlZWszIHxlZOKf3z@n{hqbi@6}g+Q?=o=>#<%}zVflE z(#J_QKOy`@`PtiT&TmBj_qyM8Hr;)9!_pRosAff)=e$o(?T++wdjH#hTy=cLUzS8m z`s-epPi?vM<`}-PW)JhF>A->B6#S6A;?vh^>+EK;8m$laqJN9nY%l*VKmL-f<6rz@ R`d0p>-N6|A`6vHHV2S_$ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/liquidConduit.png b/resources/assets/enderio/textures/blocks/liquidConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..7104cd9ac0927d5a04c5c793235999f80e2f5723 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvO5TT^vI!{F66q*z(7pGc7@2`%iztG=a^#*iz=GOEYt_E0ifp3p0i+ zFez;4@9#I^y>sVI0dGu9OvKF-4HG8@w$7Y6)5P0h)&d_XCNnd$Q@M&yLMHw7lUZP) vnCLz4NK$|qgVBa`p(Mj?I$k#0{_ryd<=GA$IQr3{^+rBEgXTA(mZ3rTvp%f2j$%8q7J zwb^RLn~A5ObCd}brkN^9`sH!d?DvxlTbU2Sf?-QCmGGtgg;<#lN0Rx`#4yQL#dJTJ zP6U+6xulIB4UJ7o@eI$#C&xuOBxk~joLE(b(WK8B@W(^L@o`=tXY)11mm01HEP0x;p^PT{iwvq+wtPtZ$DNA5v+BNH~4!9TG&Z+TArhixt#tKuGV9XsK_KHrg-xBrI zoRZTz7WMmFa%Or)j+Jc__F}(37zwNMBr_(~>q2oP5>+j%kIc-6EuPTyLZL1sLm7Vn z?R|`&=Y_aub}ClNdnvWzqRN44byBg~I5lEdxv-tH%#z$}J(@^T)Xah{HW8tc6UpiF z{HW|3nV{22#y`)_QSnjRB%jI$@^kq)GEWW%QWKND@_=L9V+(qmw#j)r{&hBhyi3n#lw#X)il1ijf&fWUUo(peTz)Pers>Rnbn0@vv0O*rOJKbXF(?l^Pb_Z~HSdKm${GA&j*WXXO8Mnti;B;{|?|>e5d;XG5ii}#~1f>%Vbn&vE zm&>Bev4(~t>oqqwG(4Pm*Q2{tnUlsjg@z;cwi+yIgwQ@^Oow3|x(@t;c12-`3}IeY zz)nWvd5tsmHO=E_HYu@K7okgBnl7r`;smhFpYave1v!C} zc%}~-Qd@#{A$`hm-F3~WNk!s?{8m#*W<;sT=l%<3-MRID3BL2XonSMJKxV~ynmDAN+UEi=ribd@5gLiEM(a@bE;SMTigjS9tj_XsT)Vv<f~^9o<#0GSe5u7!T}3anhVq@}-cSd8dGTP0Q_0cIk)L99UndOG14 zTD*a=ju$=>oY%d9V(UlasNg~!b6j0tfdGf&hP9}pYcp5lXZjR6?=*nV`?o{e#Iq=k zvboKsB6=XqcCXo_)XUtU*w z*064g3YTF$YFigoI0jH&r>Q`|4Gk!xYidBLz@UcqN(=3RC1`HLg{a-%hUP^m8rr-2 zMJH&YX~`TJfQPq%da{MOVF{|o@Ui8nXiM)GwFjb;=2{n{3ULXDjYxFq!0|qWi$lmW zl(Gs}Q#vkfx_huF=HR`e;r;5HKtmy6MkFppQ+43TA0R9M{F+jhX+$Z2=`gLRr5Q&w zMVFyPy%0LIg93{PxMu>chX8B#KuFOBKMq}+L3{$l6-abniNulwh7u)i@pW95z_`zy zeLw=E2YX-Co(TAOr9_vtbO6G7S6LFvoTTua+$pQl49##o+Ms1I8(H1x(2|kvM!k`e zG-obC=-_m^Yu-bjrA;@A)lIeFf9u;;!7+Gs_T zx=UGJZoPlKjWo8IbwWb5x|9_lgM*~4x0FSBTngoNQS|Uj=#515tMY==5vGNF$lpkK zaU*W*!n=NfbYVB5pAIN@PGZ7yPBgHnkiU~@2khLq!W;T- zb^?foMhc_PLgHe~Hq#Z9co>a@1C4_VX+NO3#&>6{2fo02t=HAw3yz@my4!m7aIYVX zQ=qsrhoTc3E$gmmXAqd!*BFp35m749#by&Iq|wNODte&NN~{Ee>t%)(Y)g`JgN)Kz zmV?nH-ZsvaM5*p8ip(7F86{WnA^MSMrII^PT@O4xH`9S+I=HoS{0Gnp`5ZcaH!u5W zW-c$GB#Z47%QV9)bzBG6w^Gdgf5xxOX zD~yEZ48;HRxj=p!!~U?V8kvs@s~Ju)^hR-r#^X0 z@bxX1-LU}+-tg`HjRQeAZIp?{xxabp@^zTW=#L+KKHmNNyDxuvXL`+rkD9viN9Nvn z#&7u?_WZF=-}SqZgQvT0+I8QvV~_7Wy#CG8f8Vw4t&6`Se&e%e|K!1Lf9jh@mMOr= zMFqcn@<+3~V;l6Z3H6)5Pu=s~-PC^Lwmmxz{lR3$)%`si-`Kaqw`Ifidp!FOn6?}| z@jX`hl3|r^*FzWmtg>+QiF@|k$xY`*r+Ul-o| z;$H_3fBC+rUrz0%A99UP9oqA1Wp(C|<;mL~s2}30yC24G-|QBSU!Qwm`r-MFwZr?~ zT3EB~De>^Hjz3d0-C{mJ@bC>o;yXpp?)zWfaNfTD)34Y3hhO^I;OWn7+W08#xZ|M* zOHbS-oZ=60Pe1nJ%_r`^?cS?y-%R%C$~!MQa%9)%?|$$Hn@*nk){!Hx2jZrK%&8wf z_X_#S$=|-6ym9F6OQJ9B|GIJCBYza4x8BQdd2HRWE4v^0>FS$bdo}TuO}9QO9{9d<&w@4o4OR$~N&o-= literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCore.png b/resources/assets/enderio/textures/blocks/liquidConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..d8c1a1e1c15e05d5860df893b8d267951563ba25 GIT binary patch literal 481 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 CsmkF1 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/liquidConduitExtract.png b/resources/assets/enderio/textures/blocks/liquidConduitExtract.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4830d5f3a9fd9dee9182c0b9df51aa94469e75 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvS#s zx;Tbd_$P1Ju;q_GXIg^5_MiTOY(mdH4`18f_(OaGugQU5{3jUL70ML(qV<_B8QflP z*m1MPP=M9tt!hKpcV&}kbBELphDBy_4!q|VN;PiT${fn7(}b2KpVr*-W3TFn-y&Aft#v*CUmgB)|xwfhGfy^JPo zf6gFfB>zZgf@7FufTV(gwPNE*7AV%!Pz5`(9!pUXO@geCxKg>Xgy literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/machineSide.pdn b/resources/assets/enderio/textures/blocks/machineSide.pdn new file mode 100644 index 0000000000000000000000000000000000000000..8f06b299a473cead14bf41336441791d4e05cff8 GIT binary patch literal 5764 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/painterFrontOff.png b/resources/assets/enderio/textures/blocks/painterFrontOff.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a95c5a179f36a7206a67a838f62e51b033e3c8 GIT binary patch literal 417 zcmV;S0bc%zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003HNklx5QcLGHy*{U-oU*Z zwR~XVV+urYfPs=>oEh{AtT~K_^0U$sRz6aHrJ6teb*G8y_Iq#X2JEt3@|UFlX?Du; za~>U|_%~)J#=&<}H~0>m#1UW_E<4XwQ4|KCgSH;5s;buUT7Z4Ne+BR}UjR_7%d<7} zW&&^}#_|rH4wx8)KOvpj85dEW1k-_mHeVZd#DV6C2@pr*tfG|w9Nhk_QnmO*s$JI7 z%?03c_NUzhC{M{IKmv6ISOg2`CZNie=nlY>W&qyqF`y?AfGfe!6pX-Rmo3cNw|q+g z+D*69xo=?sH-UjY7=8>V?quYQO$U9Yx{?-E5Yr=4am>TLp?>cQ!y+aB$&dg<00000 LNkvXXu0mjfuvw)h literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/painterFrontOn.png b/resources/assets/enderio/textures/blocks/painterFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..7d1faea2f49edf956058b3d3e8bf15ea815e390f GIT binary patch literal 433 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png new file mode 100644 index 0000000000000000000000000000000000000000..3d5e8c69cb5dad0b6c86db49c697f86848f09f9e GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fyQcix;Tbd_$Oab5p*z(5MWf$a+GSABf-(Z)!W1Kh3g|{4_9v|SL1>g zFD|@z;juu)h2P0JZ9@F)xrx(z=eexutLmv+-YdsadgImfDob~F_XXK2iZ{kAQr#5d zow919PV>yyOv0H8(oJf!R;#X*FlzVEH=3BX;Zp*~_Q)liR}D`3m}=UHEN4?l z>e!GNP|OtN8sWTpno09~Yv&Ez&2zLT#AGSCIvn;fwq#@8kfjh*&=%3;&wSzT+gq1- zy!d$d;&}eW@z~k1m@r&Sa`v2%WqrO|fFonHU| literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnder.png b/resources/assets/enderio/textures/blocks/powerConduitEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..839809e9c9343029d4e8d2469b18c509d2cb6b60 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP?dqF zi(`m|e{#ZR6BW*jj?B&Ttus01`U@<)=^@bT!~0^Po4~@)oJuCroJvvI8%$UjTAx=s U>V7c-TF1cP>FVdQ&MBb@0C;LIx&QzG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png new file mode 100644 index 0000000000000000000000000000000000000000..567c562aa22070b44faf4168867f30966976dcb7 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP?fr; zi(`m|e{#ZR6BW*jj?NP|n0R)S@Mf3^xhMxSN39TaakiJ!;bnZhxQ4N+$E63Tg~8L+ K&t;ucLK6U=mn!@K literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitTransmission.png b/resources/assets/enderio/textures/blocks/powerConduitTransmission.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c432c8f566c166977a78548afff1e21089d9f5 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvTiET^vI!{F4KI>AMR_U3K6A;}WTVrx_V$udo;RB>N~5sEonW)z4*} HQ$iB}V8|_u literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduit.png b/resources/assets/enderio/textures/blocks/redstoneConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..025a7cca388c73b97ea08b582c3646899d839213 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WNR_9H tV~B-+vWI|xI%jW|0vibPTJbVHVh}KFXB2$#+6}0R!PC{xWt~$(6975#B;^1A literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.pdn b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.pdn new file mode 100644 index 0000000000000000000000000000000000000000..06d6734fc1ce9aa5656b2657d21a36ea642e742d GIT binary patch literal 6313 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 IS-=AS0!yYfp8x;= literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png new file mode 100644 index 0000000000000000000000000000000000000000..43b4e0cc7b4be9e04304c7f8b5a5de6cb6dd83a5 GIT binary patch literal 530 zcmV+t0`2{YP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004jNkl2uxpexDEOhrE= z2F{E>t+IXKDqOUPCUs;K%}Jd>ENG!bm(mr?+Dn+l?1ZnL10F$Ul`UTI=bY#JdEc{l zn9Ip7QUJp=rEpb{Qn@6RYDKEoRV6+%S{FpLd=%Zc5oAEjQuQxFYs99w+flf}o|>T?>VUz2fy=D{GDby`W(d{UbF zUiu!5SHS2-18m0M&`#FBUtQ{oB?u`HI$c!-!2cVbWcHGqc!goi>mYq9C=$Hjx=G7nG#{;r(-0P0l+ UKON#yOaK4?07*qoM6N<$g1UCxEzWiM!uPisaNZ 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 KJBDmvfqwyVY&cf{ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png new file mode 100644 index 0000000000000000000000000000000000000000..df9bce29c92f6825d6e679f5861ac69b330daf13 GIT binary patch literal 533 zcmV+w0_y#VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004mNkl|37=_dOFe11GaZ(#1 zWHMXcK}aR(3``OyjB&|0CN_d#=TcY%#KuM}1QEm{t$BngrVIS?UC0gSRL0^!mV3W{ zIp^lq^Ld#^3SblpQra$w?bzaau6R{XiO-g8iCHnV%4S)L#Vs)mV+P=Iy}m2QM_q}} zA{m_bl}_WHga;kj51LA?wlBWlkXmg=K{UX!DiVf)++1Ev9{O?m6!jAHc-T$un|^ZF z*i*U=+UeCGo&cj84X9YA1f7=LhMn}qu8u!fH%I7Wd1Lgxv^IKMTv2+qyzwxO(q42T zj_b?-(4bOC_FgE~8um+2;ii3!j83`!DVywn;tk;043xtHQPz5nBd!aK# z$Os#uBYYY_EQu#EC9c2_%VN2Vhln|GC-%f&19%ufcqnu;6`TI~xOi|}<^gKJ-<6kd XDp?he6lP|V00000NkvXXu0mjfoZ#9G literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitch.pdn b/resources/assets/enderio/textures/blocks/redstoneConduitSwitch.pdn new file mode 100644 index 0000000000000000000000000000000000000000..873879de8e3e008273128efee43ba2d790a66f31 GIT binary patch literal 6227 zcmeHKd2k!$71!F5tW6wZ6Oxc}SO^miA3ChVPHdBvOfSg4L%F=a|k&!k7a zGeJ6GOpMtrgO&-OZ-&zkMf0o>_J_s?r>H{QCfU4pQ!G3%HJ!-xh0_clPbMav6Jvg>cPhtHL6@2J4!I01oYUhr zq^z8Su@pnoo}gir=EA`NI++_DqDF>u?iQzQI_A(%h6l_xui3{jjub`b#s+6nZefh_ zMzfYd+ME|GLEi+g2Lr_i^l?wZ!An$MdfJyX=aMr4%4eME^n@M0&QRZQ*qIX9mY_sM z#loOBHDh**9(rn+chIJhjHxRibZnyX`a*Ql9UWy79e$6<`UCwzJvDA+24=kdlk~>P z7H5DGH~BmJL%#lWm=UJki5VL|)n&GJ+6Sm0287Q? zvz+AQrC~;DchVBws;w~g6vB43Y90BsloyyDj>$^`oo?0o^3gOK8)S;3e2U?ExO_TY zUkj+NKv9&K%siH<-GIN-Lqu&h+7h!^ja?mP#?aZN!rh*=V3T|-pJ6zu4jwFFMJFp} zd69{$OTnj-LsMOfO7dhB*5^e=7-A$EU$L>$i9^Q)`xF&Qg`!qjORTJ3$b-@BVMPh; zq|uyFdZ+fXc}(T5gHNZKm;@m%wg<9IjHT1;3=?l3rZY^4PUo5V0ce@mh(+f0GaMtZ zv34+|JOy?kY&C7(Tpk*b1eQy*YBOSt7t(C>zhKrat^Z5#Et|KX%@ib`0s8tGL zv2`7^$hbI>;Y3zq3k)JV_&8HRzibg!o-(Dfe(7Zu199#gb-bnw@Bu=!8LyF>ma~zLt&m=u8Hi z#iY}w;S-@V>aVrY#R8Hk$qP|nMjnOD1ds~^8_Xa(LCn`LT?m3?lv%kB8svHq^8>n} zLm*M*0X@(ldqK<(xEwl4WY~WuA=+|zCX$A#C&0irpO$!`J`-WZN@37gs_)C?I98fV zGZ79;TdZaqGZ83ogHZ5#p&}BXcmQ%vv0R7ALvsn2vvd+5G=ydevE&e}rML$EN+jfI zXcWH*@lSfQf;S-U`3~ilB}0usgTMqPLj|C*01A_t z3^fXkGL)GNLZ<@NP>Eeqo@j?h7z!j-a}AYPC0Aju5~JiA>{Viu#9F7J5|d;T_A0SR z>Y%5>==g#W1taB%QX$nW2h$1Oh77S;_#Rx2#gxJK*2jf zpeHaGs?J1mZ!4;35OM-QSII5Be@)Ir1kw?GL?9E<@Kt6*)-7f>*~suQk&Q(l3uOc( z;3)`5w#5*VpeI=nX!yphAnxk|MutHPx#Kd;i}est_SyyCU>m;=Xp2$_D1Q_Cnw!!?cF=usyya>q2Z^O+|+(t zQ@o@1*Y90ze0Zljl-c^qj`;IEiHYI+AG-8scVA)q(W6K2c<4{79ysPo+#9&|!QU00 z+;e}|cxdpUZ!9y`$DaSzz8Bwl=HMIOxkZ1mkQcXXH9xxjFS$$V9`_S-S?$Na((gOU z`5nhI2X52WUo^bq$Op%I=02G{bnUvt^252pl}(@Owh1?`+539m@wNjyA2)2@ckh8u zE*iRWTdL+M+scE_*kpM5XbHo5b|UFWRyhHWwH2jSICxBlka z;Wr-McDOrv{qE^|PTW;IV4J<~uYo()KXUVW%MY%2{k|7|xg+wAU2SjfzpP3Bu9AOu z;N!mi&))OtlbgGrPIb@SyZ_L}+io-IpWU{0Y4Om(v%?pP-}SCK*nFh&|)jT>jFm;2t4e5Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00044NklJg}Q2&+U;{v6y*TG$Nl~djYp3(4Fi%SsaAt~haBgY zdc7+S5ddA+$n#u!*|2i8N_I%j^ZZCS%d&XK7Ge3|-tle(K+{!nhXbCF{RF6DC@=}0 z$h6D@05nip9F}Z3-!=lO*oMXBJeu)4`ab|}+Vh8$B{Ko26JqOhQ9e&6d_n?%7aSt^ z8vsR63`GS1?Vv5Rhc=OX{YFRH1Mr*Qrf@O=zh0MlS$j z3YAG>e^@jDUX!SR*^gbbun*%iUh>00000NkvXXu0mjfjRL`$ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png new file mode 100644 index 0000000000000000000000000000000000000000..13b3be3c3709c2ae6d6ead8c9eba844ab2339ffa GIT binary patch literal 486 zcmV@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00041NklpUqCi=ZBvuN zaB=I}q$|^<38FOASld!ArCi+TbMYWJNB&7VO%*h;F8%~&&V1+0oc}22s!FFw0JOn? zMwcTpEt71=Cg;i#!Z$M+>4q*f*2gp)UXZ3~2LKLFr?<3texh)*B1KU;GtC>0myiBHeHVA-GG}tFoA{!=>nu1mFjY*!&HE zBuIv&5`c107RuWL>bgFX0JPV`HNSP?WB^)%)>JJZTg*TD0Oc;>S>QKlIa)6PvJ0(A zQr~O(0PoSdf!Sa>m`?&=OV|@Og c@OP>73Hg8(UT(JVFaQ7m07*qoM6N<$f-kbgKL7v# literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png b/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png new file mode 100644 index 0000000000000000000000000000000000000000..04396d7aa994e173efd2533fe21bac344e0f1fde GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvOTbT^vI!{F8T_KTz8ybf%zv;&UZ4&LqR9dKC;R8V3uQ*BO7D=R8e8 z>@Y8bC3|F3gwHhb3A)VeN}E(PXY6Y9&{Mn3Fys2lS52E0c#LLp@B~#eE$RQXq{nxH fh|faCJLwGOG20gE$<5;f+Qs1M>gTe~DWM4f;lN4X literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoir.pdn b/resources/assets/enderio/textures/blocks/reservoir.pdn new file mode 100644 index 0000000000000000000000000000000000000000..f233bf56c1cbb7a5a66015f47f9ad4ac218ddf29 GIT binary patch literal 9868 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 YZ=qK`hV~6zF#rGn07*qoM6N<$g699-`Tzg` literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirFront.pdn b/resources/assets/enderio/textures/blocks/reservoirFront.pdn new file mode 100644 index 0000000000000000000000000000000000000000..d42f5cae65ffe005519111f4447fad3eb5195fb2 GIT binary patch literal 8749 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 NgQu&X%Q~loCIB%nMWFxy literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirMbL.png b/resources/assets/enderio/textures/blocks/reservoirMbL.png new file mode 100644 index 0000000000000000000000000000000000000000..0e18ea457b8c4bfb092002137fe49edfbe22b560 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2GC{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP*u05 zi(`m|e{umw!5@E4Ht7QnoC?Pof`c#rH}ILnXy9w7dHO$l>RRUHMZ64|TlnX*9&_7x z{r~JE_nCkq96UTMx7SHmO6D+}5tziYqwq1?o%boy42KPxPZ%+<-08meCw^lR>qoW* zpu7OX#T4m=9FAIE2F5Q3R8BW!US2japMm4RA_2MHC&|bEGc;}e_3?w+mUy7E7(8A5 KT-G@yGywo1ty!1= literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirMbR.png b/resources/assets/enderio/textures/blocks/reservoirMbR.png new file mode 100644 index 0000000000000000000000000000000000000000..ad76c6e47ce34c7d6a74c40fa133d1f6f8ebe63e GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psF5E z7sn6_|FwM^c^ec2TxGqawC_5^9B|XsSvj{^az)HR+nkcg#{VD9l#u58b8@jlC4bkh zT#a_6beRp;CKcRw?`OWdM@V9tuk0g-o9|gxy?nx9aLmQkj*-DqQ(;lDpSZwADSkIu z4n={6H+#=>XQaI0e31I~^$qP0r}<5cjxkQ0%sipxw_TOYfr)<3;zuQ)JnWx*{4UU4 N44$rjF6*2UngD98T{r*$ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirMbT.png b/resources/assets/enderio/textures/blocks/reservoirMbT.png new file mode 100644 index 0000000000000000000000000000000000000000..4e1d9e174e7bdb356233bd979b9610990770ecaa GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvUPZ zT^vI!{F4hf3jX+WvPmCsP?IoCxWXWCAhTiR%9r&Ld^|iY$tz4`5+oQdKbgGgPkq2O zE0H-to8=EHh%h@yy*-@XxH0g}*Z*oCw+Czpy~VsiQGq9@JCWf;%7m7@C#f44U$iyw zFeJ{<-Y8Y@_!#dFrV{3aN3O1}KX@AwXRt|Z^V-XQYz3ReKX!)d$@lJD_Mf&G=qd(J LS3j3^P6!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psGYq z7sn6_|KtLWfpp$82}rr${p#7HIbQ&&=>EvYvlm Stm7@9WelFKelF{r5}E)AxJCK^ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirMbTr.png b/resources/assets/enderio/textures/blocks/reservoirMbTr.png new file mode 100644 index 0000000000000000000000000000000000000000..0763ab6bfc1e42dcd4564bc86c806b449d5649fc GIT binary patch literal 228 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/reservoirSwitch.png b/resources/assets/enderio/textures/blocks/reservoirSwitch.png new file mode 100644 index 0000000000000000000000000000000000000000..135dcad667849343cabf64bae9decf71813a1f0e GIT binary patch literal 650 zcmV;50(Jd~P)N2bPDNB8 zb~7$DE-^4L^m3s900IU{L_t(IPo>jcNRx3C2Jmz3T~}RMXjDX?-Ykg?qKI0S$y}5p zDNBlm8u^h{h!fPU6)r>fs&9!7rD!h(%~-iDt8sRa*d&m|-6 zIA@^594$!;8>#i#0L^^%6WJ%1>AcAc6+a3FfB|3t7yt%<0bl?a00w{o*s9QAOGX8% zTLdD#V<9GRsJaISD!Z}&`Xi(j#s+pO%ZVy1b0R>_fMa!56!HDIV(dlwwRQ$HiGT!I zer({l-T^i5gn#inX6KfWqw7YBx>*cJFN%RIgA;k23m;~`AruNB7!2a=m=A|{R#yB8y$7NdY`)Q6f*2NYGENIH9agB4f?iUucC_g}-}o{j=t_F>3M z+OYdV1GcID5#m}4N<$x>4*H^i>E(M!u0GgY3u{1jeILvNQ&?G92imM2NQ(H)1DSUm zs4>68(6}G2v1yd?y+~8H#0K=Q#HTFR*&(mB;zX?lN2&y*7k6OqWljVnpDZS_O~ijD k*)0M4O5;D1rrAt?0NyWiQ+tfY#Q*>R07*qoM6N<$g1!a{D*ylh literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/solarPanelSide.png b/resources/assets/enderio/textures/blocks/solarPanelSide.png new file mode 100644 index 0000000000000000000000000000000000000000..af36bd899ab7742d3f308a28514fbc477ad86c07 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvO}tT^vI!{F4h51bea+*g%-aikFX%LB#6-V_@t-Eub0(Pgg&ebxsLQ E0E2rd^8f$< literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/solarPanelTop.png b/resources/assets/enderio/textures/blocks/solarPanelTop.png new file mode 100644 index 0000000000000000000000000000000000000000..15bae1f774f1749728532e6275a1aabb9a86494e GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDMfiPqHot61OL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvQS9T^vI!{F4(lo2YO$ni%}pd3)*`1|@}N1M!Z=ISu=6uPb#wYZUIZ zIAD&ieBKnW2a=_ z%xkljGUj;@)54~}dEKFJc_YWn?g^|(LKBuMGThd>)Bn2d2G9=-44$rjF6*2UngGZ9 BSU>;( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFront.pdn b/resources/assets/enderio/textures/blocks/stirlingGenFront.pdn new file mode 100644 index 0000000000000000000000000000000000000000..dbcf4560d696c25ea2e04abead39a1fa6f1025b9 GIT binary patch literal 7023 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