From 0dee1ee434eb7f37f092293b592dcfced8595254 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 1 May 2015 15:59:42 -0400 Subject: [PATCH] Porting more code over, switch to new IWidgetIcon system --- .../java/crazypants/enderio/ClientProxy.java | 4 +- .../enderio/block/BlockDarkSteelAnvil.java | 3 +- .../enderio/block/BlockDarkSteelLadder.java | 3 +- .../block/BlockDarkSteelPressurePlate.java | 3 +- .../block/BlockReinforcedObsidian.java | 3 +- .../enderio/conduit/AbstractItemConduit.java | 2 +- .../enderio/conduit/BlockConduitBundle.java | 4 +- .../enderio/conduit/TileConduitBundle.java | 4 +- .../conduit/facade/FacadeRenderer.java | 3 +- .../conduit/facade/ItemConduitFacade.java | 4 +- .../conduit/gas/AbstractGasConduit.java | 2 +- .../conduit/gas/AbstractGasTankConduit.java | 4 +- .../enderio/conduit/gas/GasConduit.java | 6 +- .../conduit/gas/GasConduitNetwork.java | 4 +- .../conduit/gas/GasConduitRenderer.java | 7 +- .../enderio/conduit/gas/GasOutput.java | 1 + .../enderio/conduit/gas/GasUtil.java | 4 +- .../enderio/conduit/gas/ItemGasConduit.java | 2 +- .../conduit/geom/CollidableComponent.java | 4 +- .../conduit/geom/ConduitGeometryUtil.java | 2 +- .../conduit/geom/ConnectionModeGeometry.java | 13 +- .../conduit/gui/BaseSettingsPanel.java | 22 +- .../enderio/conduit/gui/GasSettings.java | 6 +- .../conduit/gui/GuiExternalConnection.java | 20 +- .../gui/GuiExternalConnectionSelector.java | 6 +- .../enderio/conduit/gui/LiquidSettings.java | 20 +- .../enderio/conduit/gui/PowerSettings.java | 2 +- .../enderio/conduit/gui/RedstoneSettings.java | 10 +- .../enderio/conduit/gui/TabFactory.java | 3 +- .../conduit/gui/item/BasicItemFilterGui.java | 28 +- .../gui/item/ExistingItemFilterGui.java | 24 +- .../conduit/gui/item/ItemSettings.java | 35 +- .../conduit/gui/item/ModItemFilterGui.java | 19 +- .../conduit/gui/item/PowerItemFilterGui.java | 6 +- .../enderio/conduit/item/ItemConduit.java | 4 +- .../conduit/item/ItemConduitNetwork.java | 2 +- .../conduit/item/ItemExtractSpeedUpgrade.java | 3 +- .../conduit/item/ItemFunctionUpgrade.java | 3 +- .../conduit/item/NetworkedInventory.java | 2 +- .../item/filter/ExistingItemFilter.java | 4 +- .../conduit/item/filter/IItemFilter.java | 4 +- .../item/filter/ItemExistingItemFilter.java | 2 +- .../conduit/item/filter/ItemFilter.java | 4 +- .../item/filter/ItemModItemFilter.java | 2 +- .../item/filter/ItemPowerItemFilter.java | 4 +- .../conduit/item/filter/ModItemFilter.java | 4 +- .../conduit/item/filter/PowerItemFilter.java | 4 +- .../conduit/liquid/AbstractLiquidConduit.java | 8 +- .../conduit/liquid/AbstractTankConduit.java | 2 +- .../conduit/liquid/AdvancedLiquidConduit.java | 6 +- .../liquid/AdvancedLiquidConduitNetwork.java | 2 +- .../liquid/AdvancedLiquidConduitRenderer.java | 38 +- .../conduit/liquid/EnderLiquidConduit.java | 6 +- .../liquid/EnderLiquidConduitNetwork.java | 5 +- .../conduit/liquid/ItemLiquidConduit.java | 2 +- .../enderio/conduit/liquid/LiquidConduit.java | 6 +- .../conduit/liquid/LiquidConduitNetwork.java | 4 +- .../conduit/liquid/LiquidConduitRenderer.java | 45 +- .../enderio/conduit/liquid/LiquidOutput.java | 1 + .../enderio/conduit/me/ItemMEConduit.java | 2 +- .../enderio/conduit/me/MEConduit.java | 6 +- .../enderio/conduit/power/PowerConduit.java | 4 +- .../conduit/power/PowerConduitRenderer.java | 4 +- .../redstone/InsulatedRedstoneConduit.java | 4 +- .../InsulatedRedstoneConduitRenderer.java | 4 +- .../conduit/redstone/RedstoneConduit.java | 2 +- .../conduit/redstone/RedstoneSwitch.java | 4 +- .../redstone/RedstoneSwitchBounds.java | 6 +- .../redstone/RedstoneSwitchRenderer.java | 6 +- .../conduit/render/ConduitBundleRenderer.java | 8 +- .../render/DefaultConduitRenderer.java | 6 +- .../conduit/render/ItemConduitRenderer.java | 4 +- .../render/RoundedSegmentRenderer.java | 2 +- .../enderio/enderface/BlockEnderIO.java | 4 +- .../enderio/enderface/EnderIoRenderer.java | 13 +- .../enderio/enderface/GuiEnderface.java | 11 +- .../enderio/fluid/ItemBucketEio.java | 3 +- .../crazypants/enderio/gui/CheckBoxEIO.java | 11 - .../crazypants/enderio/gui/ColorButton.java | 109 --- .../enderio/gui/IAdvancedTooltipProvider.java | 17 - .../crazypants/enderio/gui/IGuiOverlay.java | 31 - .../enderio/gui/IResourceTooltipProvider.java | 9 - .../crazypants/enderio/gui/ITabPanel.java | 23 - .../crazypants/enderio/gui/IconButtonEIO.java | 185 ----- .../java/crazypants/enderio/gui/IconEIO.java | 292 +++----- .../enderio/gui/IoConfigRenderer.java | 10 +- .../enderio/gui/MultiIconButtonEIO.java | 45 -- .../enderio/gui/RedstoneModeButton.java | 5 +- .../crazypants/enderio/gui/TextFieldEIO.java | 101 --- .../enderio/gui/ToggleButtonEIO.java | 80 -- .../crazypants/enderio/gui/TooltipAddera.java | 2 + .../crazypants/enderio/gui/VScrollbarEIO.java | 191 ----- .../item/ConduitProbeOverlayRenderer.java | 4 +- .../enderio/item/ItemConduitProbe.java | 4 +- .../crazypants/enderio/item/ItemMagnet.java | 2 +- .../enderio/item/ItemSoulVessel.java | 2 +- .../enderio/item/ItemYetaWrench.java | 4 +- .../item/YetaWrenchOverlayRenderer.java | 4 +- .../item/darksteel/IDarkSteelUpgrade.java | 3 +- .../item/darksteel/ItemDarkSteelArmor.java | 2 +- .../item/darksteel/ItemDarkSteelAxe.java | 2 +- .../item/darksteel/ItemDarkSteelPickaxe.java | 2 +- .../item/darksteel/ItemDarkSteelShears.java | 2 +- .../item/darksteel/ItemDarkSteelSword.java | 2 +- .../item/darksteel/ItemGliderWing.java | 4 +- .../item/darksteel/PoweredItemRenderer.java | 5 +- .../enderio/item/darksteel/SoundRenderer.java | 2 +- .../item/skull/EndermanSkullRenderer.java | 32 +- .../enderio/machine/AbstractMachineBlock.java | 4 +- .../machine/AbstractMachineRenderer.java | 12 +- .../enderio/machine/OverlayRenderer.java | 9 +- .../machine/TechneMachineRenderer.java | 13 +- .../machine/alloy/ContainerAlloySmelter.java | 4 +- .../machine/alloy/GuiAlloySmelter.java | 16 +- .../machine/alloy/VanillaSmeltingRecipe.java | 2 +- .../enderio/machine/buffer/GuiBuffer.java | 15 +- .../enderio/machine/buffer/TileBuffer.java | 4 +- .../enderio/machine/capbank/BlockCapBank.java | 2 +- .../enderio/machine/capbank/GuiCapBank.java | 20 +- .../capbank/render/CapBankRenderer.java | 9 +- .../machine/capbank/render/FillGauge.java | 4 +- .../machine/capbank/render/IoDisplay.java | 4 +- .../machine/crafter/ContainerCrafter.java | 4 +- .../enderio/machine/crafter/GuiCrafter.java | 10 +- .../machine/crusher/CrusherRecipeManager.java | 6 +- .../enderio/machine/crusher/GuiCrusher.java | 5 +- .../machine/enchanter/BlockEnchanter.java | 10 +- .../enchanter/EnchanterModelRenderer.java | 3 +- .../machine/enchanter/GuiEnchanter.java | 18 +- .../machine/farm/FarmingStationRenderer.java | 6 +- .../farm/FarmingStationSpecialRenderer.java | 2 +- .../enderio/machine/farm/GuiFarmStation.java | 12 +- .../CombustionGeneratorModelRenderer.java | 3 +- .../combustion/GuiCombustionGenerator.java | 6 +- .../combustion/TranslatedCubeRenderer.java | 13 +- .../stirling/GuiStirlingGenerator.java | 6 +- .../generator/zombie/GuiZombieGenerator.java | 6 +- .../zombie/ZombieGeneratorRenderer.java | 6 +- .../machine/gui/GuiButtonIoConfig.java | 6 +- .../enderio/machine/gui/GuiMachineBase.java | 12 +- .../machine/gui/GuiOverlayIoConfig.java | 14 +- .../machine/gui/GuiPoweredMachineBase.java | 3 +- .../machine/hypercube/BlockHyperCube.java | 2 +- .../machine/hypercube/GuiChannelList.java | 5 +- .../machine/hypercube/GuiHyperCube.java | 72 +- .../machine/hypercube/HyperCubeModel.java | 2 +- .../machine/hypercube/HyperCubeModel2.java | 2 +- .../machine/hypercube/HyperCubeRenderer.java | 7 +- .../machine/invpanel/GuiInventoryPanel.java | 31 +- .../enderio/machine/killera/GuiKillerJoe.java | 14 +- .../machine/killera/KillerJoeRenderer.java | 6 +- .../machine/killera/TileKillerJoe.java | 2 +- .../machine/light/BlockItemElectricLight.java | 4 +- .../machine/light/ElectricLightRenderer.java | 8 +- .../machine/monitor/GuiPowerMonitor.java | 25 +- .../machine/obelisk/ObeliskRenderer.java | 6 +- .../obelisk/ObeliskSpecialRenderer.java | 3 +- .../obelisk/attractor/GuiAttractor.java | 14 +- .../obelisk/attractor/TileAttractor.java | 6 +- .../aversion/AversionObeliskController.java | 4 +- .../obelisk/aversion/GuiAversionObelisk.java | 14 +- .../obelisk/aversion/TileAversionObelisk.java | 4 +- .../inhibitor/GuiInhibitorObelisk.java | 4 +- .../obelisk/weather/GuiWeatherObelisk.java | 10 +- .../obelisk/xp/GuiExperienceObelisk.java | 28 +- .../machine/obelisk/xp/ItemXpTransfer.java | 2 +- .../enderio/machine/painter/GuiPainter.java | 2 +- .../machine/painter/PaintedBlockRenderer.java | 6 +- .../machine/painter/PaintedItemRenderer.java | 3 +- .../machine/power/BlockCapacitorBank.java | 2 +- .../machine/power/CapBankRenderer2.java | 12 +- .../machine/power/CapacitorBankRenderer.java | 8 +- .../enderio/machine/power/GaugeBounds.java | 5 +- .../machine/power/GuiCapacitorBank.java | 12 +- .../enderio/machine/ranged/RangeRenerer.java | 9 +- .../machine/reservoir/BlockReservoir.java | 2 +- .../machine/reservoir/ReservoirRenderer.java | 6 +- .../machine/reservoir/TileReservoir.java | 2 +- .../slicensplice/GuiSliceAndSplice.java | 3 +- .../machine/solar/BlockItemSolarPanel.java | 4 +- .../machine/solar/BlockSolarPanel.java | 2 +- .../machine/solar/SolarPanelRenderer.java | 13 +- .../enderio/machine/soul/GuiSoulBinder.java | 8 +- .../machine/soul/SoulBinderRenderer.java | 6 +- .../machine/spawner/BlockPoweredSpawner.java | 2 +- .../machine/spawner/GuiPoweredSpawner.java | 10 +- .../enderio/machine/tank/BlockItemTank.java | 4 +- .../enderio/machine/tank/BlockTank.java | 2 +- .../enderio/machine/tank/GuiTank.java | 4 +- .../machine/tank/TankFluidRenderer.java | 7 +- .../machine/tank/TankItemRenderer.java | 7 +- .../machine/transceiver/gui/ChannelTab.java | 32 +- .../machine/transceiver/gui/FilterTab.java | 15 +- .../machine/transceiver/gui/GeneralTab.java | 17 +- .../transceiver/gui/GuiChannelList.java | 10 +- .../transceiver/gui/GuiTransceiver.java | 21 +- .../transceiver/render/TransceiverModel.java | 3 +- .../render/TransceiverModelAlt.java | 3 +- .../render/TransceiverRenderer.java | 9 +- .../machine/vacuum/BlockVacuumChest.java | 4 +- .../machine/vacuum/GuiVacuumChest.java | 33 +- .../machine/vacuum/TileVacuumChest.java | 2 +- .../machine/vacuum/VacuumChestRenderer.java | 6 +- .../enderio/machine/vat/BlockVat.java | 2 +- .../enderio/machine/vat/GuiVat.java | 14 +- .../wireless/BlockWirelessCharger.java | 4 +- .../wireless/WirelessChargerRenderer.java | 12 +- .../enderio/material/BlockIngotStorage.java | 2 +- .../enderio/material/FusedQuartzRenderer.java | 10 +- .../enderio/material/MaterialRecipes.java | 44 +- .../enderio/material/PowderIngot.java | 4 +- .../nei/AlloySmelterRecipeHandler.java | 2 +- .../enderio/nei/EnchanterRecipeHandler.java | 2 +- .../enderio/nei/SagMillRecipeHandler.java | 2 +- .../nei/SliceAndSpliceRecipeHandler.java | 2 +- .../enderio/nei/SoulBinderRecipeHandler.java | 2 +- .../enderio/nei/VatRecipeHandler.java | 4 +- .../enderio/rail/BlockEnderRail.java | 2 +- .../teleport/ContainerTravelAccessable.java | 4 +- .../enderio/teleport/ContainerTravelAuth.java | 4 +- .../enderio/teleport/GuiTravelAccessable.java | 26 +- .../enderio/teleport/GuiTravelAuth.java | 6 +- .../enderio/teleport/ItemTravelStaff.java | 4 +- .../teleport/anchor/BlockTravelAnchor.java | 2 +- .../anchor/TravelEntitySpecialRenderer.java | 6 +- .../enderio/teleport/telepad/GuiTelePad.java | 24 +- .../teleport/telepad/IToggleableGui.java | 2 +- .../teleport/telepad/ItemCoordSelector.java | 2 +- .../teleport/telepad/TelePadRenderer.java | 9 +- .../telepad/TelePadSpecialRenderer.java | 3 +- .../telepad/TeleportEntityRenderHandler.java | 3 +- .../enderio/teleport/telepad/TileTelePad.java | 2 +- .../teleport/telepad/ToggleTravelButton.java | 6 +- .../enderio/waila/IWailaInfoProvider.java | 3 +- .../crazypants/enderio/waila/WailaCompat.java | 6 +- .../enderio/xp/ExperienceBarRenderer.java | 5 +- .../enderio/xp/ExperienceContainer.java | 3 +- .../java/crazypants/gui/FakeEmptySlot.java | 42 -- src/main/java/crazypants/gui/GhostSlot.java | 26 - .../java/crazypants/gui/GuiContainerBase.java | 636 ---------------- .../java/crazypants/gui/GuiIconRenderer.java | 101 --- .../java/crazypants/gui/GuiScreenBase.java | 230 ------ .../crazypants/gui/GuiScrollableList.java | 407 ---------- src/main/java/crazypants/gui/GuiToolTip.java | 105 --- src/main/java/crazypants/gui/IGuiScreen.java | 30 - src/main/java/crazypants/gui/IconButton.java | 98 --- .../java/crazypants/gui/IconToggleButton.java | 33 - src/main/java/crazypants/gui/ItemButton.java | 85 --- .../crazypants/gui/ListSelectionListener.java | 7 - .../java/crazypants/gui/TemplateSlot.java | 41 - .../java/crazypants/gui/ToolTipManager.java | 74 -- .../java/crazypants/render/BoundingBox.java | 384 ---------- .../java/crazypants/render/ColorUtil.java | 69 -- .../render/ConnectedTextureRenderer.java | 338 --------- .../java/crazypants/render/CubeRenderer.java | 340 --------- .../crazypants/render/CustomCubeRenderer.java | 58 -- .../crazypants/render/CustomRenderBlocks.java | 709 ------------------ .../render/IConnectedTextureRenderer.java | 7 - .../java/crazypants/render/IRenderFace.java | 15 - src/main/java/crazypants/render/IconUtil.java | 69 -- .../java/crazypants/render/RenderUtil.java | 679 ----------------- .../render/TechneModelRenderer.java | 57 -- .../java/crazypants/render/TechneUtil.java | 369 --------- .../crazypants/render/VertexRotation.java | 57 -- .../render/VertexRotationFacing.java | 28 - .../crazypants/render/VertexTransform.java | 15 - .../render/VertexTransformComposite.java | 47 -- .../crazypants/render/VertexTranslation.java | 60 -- 268 files changed, 1010 insertions(+), 7004 deletions(-) delete mode 100644 src/main/java/crazypants/enderio/gui/CheckBoxEIO.java delete mode 100644 src/main/java/crazypants/enderio/gui/ColorButton.java delete mode 100644 src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java delete mode 100644 src/main/java/crazypants/enderio/gui/IGuiOverlay.java delete mode 100644 src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java delete mode 100644 src/main/java/crazypants/enderio/gui/ITabPanel.java delete mode 100644 src/main/java/crazypants/enderio/gui/IconButtonEIO.java delete mode 100644 src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java delete mode 100644 src/main/java/crazypants/enderio/gui/TextFieldEIO.java delete mode 100644 src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java delete mode 100644 src/main/java/crazypants/enderio/gui/VScrollbarEIO.java delete mode 100644 src/main/java/crazypants/gui/FakeEmptySlot.java delete mode 100644 src/main/java/crazypants/gui/GhostSlot.java delete mode 100644 src/main/java/crazypants/gui/GuiContainerBase.java delete mode 100644 src/main/java/crazypants/gui/GuiIconRenderer.java delete mode 100644 src/main/java/crazypants/gui/GuiScreenBase.java delete mode 100644 src/main/java/crazypants/gui/GuiScrollableList.java delete mode 100644 src/main/java/crazypants/gui/GuiToolTip.java delete mode 100644 src/main/java/crazypants/gui/IGuiScreen.java delete mode 100644 src/main/java/crazypants/gui/IconButton.java delete mode 100644 src/main/java/crazypants/gui/IconToggleButton.java delete mode 100644 src/main/java/crazypants/gui/ItemButton.java delete mode 100644 src/main/java/crazypants/gui/ListSelectionListener.java delete mode 100644 src/main/java/crazypants/gui/TemplateSlot.java delete mode 100644 src/main/java/crazypants/gui/ToolTipManager.java delete mode 100644 src/main/java/crazypants/render/BoundingBox.java delete mode 100644 src/main/java/crazypants/render/ColorUtil.java delete mode 100644 src/main/java/crazypants/render/ConnectedTextureRenderer.java delete mode 100644 src/main/java/crazypants/render/CubeRenderer.java delete mode 100644 src/main/java/crazypants/render/CustomCubeRenderer.java delete mode 100644 src/main/java/crazypants/render/CustomRenderBlocks.java delete mode 100644 src/main/java/crazypants/render/IConnectedTextureRenderer.java delete mode 100644 src/main/java/crazypants/render/IRenderFace.java delete mode 100644 src/main/java/crazypants/render/IconUtil.java delete mode 100644 src/main/java/crazypants/render/RenderUtil.java delete mode 100644 src/main/java/crazypants/render/TechneModelRenderer.java delete mode 100644 src/main/java/crazypants/render/TechneUtil.java delete mode 100644 src/main/java/crazypants/render/VertexRotation.java delete mode 100644 src/main/java/crazypants/render/VertexRotationFacing.java delete mode 100644 src/main/java/crazypants/render/VertexTransform.java delete mode 100644 src/main/java/crazypants/render/VertexTransformComposite.java delete mode 100644 src/main/java/crazypants/render/VertexTranslation.java diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index f41ce7eb..da244334 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -16,6 +16,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; + +import com.enderio.core.client.render.IconUtil; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -134,7 +137,6 @@ import crazypants.enderio.teleport.telepad.TelePadRenderer; import crazypants.enderio.teleport.telepad.TelePadSpecialRenderer; import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler; import crazypants.enderio.teleport.telepad.TileTelePad; -import crazypants.render.IconUtil; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java index d932918a..bcc95f67 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java @@ -1,5 +1,7 @@ package crazypants.enderio.block; +import com.enderio.core.client.gui.IResourceTooltipProvider; + import net.minecraft.block.BlockAnvil; import net.minecraft.client.gui.GuiRepair; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +19,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; public class BlockDarkSteelAnvil extends BlockAnvil implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java index e1c3d790..c54e3bce 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java @@ -1,5 +1,7 @@ package crazypants.enderio.block; +import com.enderio.core.client.gui.IResourceTooltipProvider; + import net.minecraft.block.Block; import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; @@ -12,7 +14,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; public class BlockDarkSteelLadder extends BlockLadder implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java index f078c4ab..98255583 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java @@ -26,7 +26,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; @@ -34,6 +33,8 @@ import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; + +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Util; public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock { diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java index 5db0d574..6d36f5f8 100644 --- a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -2,6 +2,8 @@ package crazypants.enderio.block; import java.util.List; +import com.enderio.core.client.gui.IResourceTooltipProvider; + import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -13,7 +15,6 @@ import net.minecraft.world.World; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.waila.IWailaInfoProvider; public class BlockReinforcedObsidian extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 8b1b1d40..7edda08b 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -14,6 +14,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.registry.GameRegistry; @@ -22,7 +23,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import com.enderio.core.common.util.BlockCoord; public abstract class AbstractItemConduit extends Item implements IConduitItem { diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index f861c787..bfce292e 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -27,6 +27,8 @@ import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode; import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.FMLCommonHandler; @@ -64,8 +66,6 @@ import crazypants.enderio.item.ItemConduitProbe; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; import crazypants.util.IFacade; @Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = "MineFactoryReloaded") diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index b575c2c5..7d00ff48 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -21,6 +21,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import appeng.api.networking.IGridNode; import appeng.api.util.AECableType; + +import com.enderio.core.client.render.BoundingBox; + import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,7 +43,6 @@ import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; -import crazypants.render.BoundingBox; public class TileConduitBundle extends TileEntityEio implements IConduitBundle { diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index 1f9e7239..2a8fd51b 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -8,9 +8,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.render.RenderUtil; public class FacadeRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index d40ded82..05ef1b79 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -13,6 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -24,8 +26,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 3b67c676..d1f6feaf 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import crazypants.enderio.conduit.AbstractConduit; @@ -20,7 +21,6 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; -import com.enderio.core.common.util.BlockCoord; public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java index 6e12c2f1..fdf45fa4 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java @@ -7,12 +7,14 @@ import mekanism.api.gas.IGasHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; -import com.enderio.core.common.util.BlockCoord; public abstract class AbstractGasTankConduit extends AbstractGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java index 3c01968e..477ffb2b 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java @@ -10,6 +10,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -18,8 +22,6 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; -import crazypants.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; public class GasConduit extends AbstractGasTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index f7cb524d..236573b7 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -9,9 +9,11 @@ import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.conduit.IConduit; + import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.IConduit; + public class GasConduitNetwork extends AbstractGasTankConduitNetwork { private final ConduitGasTank tank = new ConduitGasTank(0); diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index 109bee41..4726d790 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -1,5 +1,4 @@ package crazypants.enderio.conduit.gas; - import java.util.List; import mekanism.api.gas.GasStack; @@ -8,6 +7,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; @@ -20,10 +21,8 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; -import static crazypants.render.CubeRenderer.addVecWithUV; +import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; public class GasConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java index 70a4f6af..10565f81 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java @@ -1,6 +1,7 @@ package crazypants.enderio.conduit.gas; import net.minecraftforge.common.util.ForgeDirection; + import com.enderio.core.common.util.BlockCoord; public class GasOutput { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index 56476711..cdab812d 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -4,11 +4,13 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; -import com.enderio.core.common.util.BlockCoord; public final class GasUtil { diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 21db567b..af29b51e 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; @@ -14,7 +15,6 @@ import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java index f8ae63c4..e967f8e8 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java +++ b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java @@ -1,8 +1,10 @@ package crazypants.enderio.conduit.geom; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.render.BoundingBox; + import crazypants.enderio.conduit.IConduit; -import crazypants.render.BoundingBox; public class CollidableComponent { diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java index 74d336fa..76212378 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -6,12 +6,12 @@ import java.util.Map; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; import crazypants.enderio.conduit.IConduit; -import crazypants.render.BoundingBox; public class ConduitGeometryUtil { diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java index 0b46462b..c09eb962 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java @@ -8,16 +8,15 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.client.render.VertexRotation; +import com.enderio.core.client.render.VertexTransform; +import com.enderio.core.client.render.VertexTransformComposite; +import com.enderio.core.client.render.VertexTranslation; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; -import crazypants.render.VertexRotation; -import crazypants.render.VertexTransform; -import crazypants.render.VertexTransformComposite; -import crazypants.render.VertexTranslation; - import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; public class ConnectionModeGeometry { diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 7b67a2da..4f71b79e 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -8,16 +8,17 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.IWidgetIcon; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; -import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; public class BaseSettingsPanel implements ITabPanel { @@ -29,8 +30,8 @@ public class BaseSettingsPanel implements ITabPanel { protected final IConduit con; protected final String typeName; - protected MultiIconButtonEIO leftArrow; - protected MultiIconButtonEIO rightArrow; + protected MultiIconButton leftArrow; + protected MultiIconButton rightArrow; protected String modeLabel; protected int left = 0; @@ -54,10 +55,10 @@ public class BaseSettingsPanel implements ITabPanel { int x = gap * 3 + fr.getStringWidth(modeLabel); int y = 8;// + fr.FONT_HEIGHT; - leftArrow = MultiIconButtonEIO.createLeftArrowButton(gui, PREV_MODE_B, x, y); + leftArrow = MultiIconButton.createLeftArrowButton(gui, PREV_MODE_B, x, y); x += leftArrow.getWidth() + gap + getLongestModeStringWidth() + gap; - rightArrow = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_MODE_B, x, y); + rightArrow = MultiIconButton.createRightArrowButton(gui, NEXT_MODE_B, x, y); customTop = top + gap * 5 + fr.FONT_HEIGHT * 2; customTop -= 16; @@ -100,7 +101,7 @@ public class BaseSettingsPanel implements ITabPanel { } @Override - public IconEIO getIcon() { + public IWidgetIcon getIcon() { return icon; } @@ -139,8 +140,9 @@ public class BaseSettingsPanel implements ITabPanel { x += gap + leftArrow.getWidth() + fr.getStringWidth(modeLabel) + gap; GL11.glColor3f(1, 1, 1); - IconEIO icon = new IconEIO(10, 48, 64, 16); - icon.renderIcon(x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true); + // TODO figure out what this should be +// IconEIO icon = new IconEIO(10, 48, 64, 16); +// icon.getMap().render(icon, x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true); int move = (getLongestModeStringWidth() - fr.getStringWidth(modeString)) / 2; x += move; diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index 036b47e9..397454e5 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -6,6 +6,9 @@ import mekanism.api.gas.Gas; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.IIcon; +import com.enderio.core.client.gui.button.ColorButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.Lang; @@ -13,14 +16,11 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; -import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GasSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 82534063..1deeee83 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -15,6 +15,11 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.render.IWidgetIcon; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.common.Optional; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -24,10 +29,7 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; -import crazypants.gui.GuiContainerBase; -import crazypants.render.RenderUtil; public class GuiExternalConnection extends GuiContainerBase { @@ -174,9 +176,9 @@ public class GuiExternalConnection extends GuiContainerBase { for (int i = 0; i < tabs.size(); i++) { if(i != activeTab) { RenderUtil.bindTexture(IconEIO.TEXTURE); - IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); - IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); + IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); + IWidgetIcon icon = tabs.get(i).getIcon(); + icon.getMap().render(icon, tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -187,11 +189,11 @@ public class GuiExternalConnection extends GuiContainerBase { RenderUtil.bindTexture(IconEIO.TEXTURE); tes.startDrawingQuads(); - IconEIO.ACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); + IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); if(tabs.size() > 0) { - IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); + IWidgetIcon icon = tabs.get(activeTab).getIcon(); + icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 14472a59..231df154 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -11,14 +11,16 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; -import com.enderio.core.common.util.BlockCoord; public class GuiExternalConnectionSelector extends GuiScreen { diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index e7e2b863..b43f4dde 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -14,6 +14,12 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.ColorButton; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.Lang; @@ -23,17 +29,11 @@ import crazypants.enderio.conduit.liquid.EnderLiquidConduit; import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; -import crazypants.enderio.gui.ColorButton; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class LiquidSettings extends BaseSettingsPanel { @@ -60,8 +60,8 @@ public class LiquidSettings extends BaseSettingsPanel { private GuiToolTip[] filterToolTips; private boolean inOutShowIn = true; - private MultiIconButtonEIO inOutNextB; - private IconButtonEIO whiteListB; + private MultiIconButton inOutNextB; + private IconButton whiteListB; protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { super(IconEIO.WRENCH_OVERLAY_FLUID, Lang.localize("itemLiquidConduit.name"), gui, con); @@ -74,12 +74,12 @@ public class LiquidSettings extends BaseSettingsPanel { int x = gui.getXSize() - 20; int y = customTop; - inOutNextB = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); + inOutNextB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); x = filterX - 20; y = filterY + 1; - whiteListB = new IconButtonEIO(gui, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); + whiteListB = new IconButton(gui, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); whiteListB.setToolTip(Lang.localize("gui.conduit.fluid.whitelist")); } else { isEnder = false; diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index f03c1859..e321640c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -2,13 +2,13 @@ package crazypants.enderio.conduit.gui; import net.minecraft.client.gui.GuiButton; +import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.power.IPowerConduit; -import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index e7202305..b8a80ed1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -4,6 +4,9 @@ import java.awt.Color; import net.minecraft.client.gui.GuiButton; +import com.enderio.core.client.gui.button.CheckBox; +import com.enderio.core.client.gui.button.ColorButton; +import com.enderio.core.client.render.ColorUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.Lang; @@ -11,11 +14,8 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; -import crazypants.enderio.gui.CheckBoxEIO; -import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; public class RedstoneSettings extends BaseSettingsPanel { @@ -23,7 +23,7 @@ public class RedstoneSettings extends BaseSettingsPanel { private static final int ID_STRONG_BUTTON = GuiExternalConnection.nextButtonId(); private ColorButton cb; - private CheckBoxEIO strongCB; + private CheckBox strongCB; private String signalColorStr = Lang.localize("gui.conduit.redstone.color"); private String signalStringthStr = Lang.localize("gui.conduit.redstone.signalStrengh"); @@ -53,7 +53,7 @@ public class RedstoneSettings extends BaseSettingsPanel { } stongLabelX = x; x += gap + gui.getFontRenderer().getStringWidth(signalStringthStr) + gap + 3; - strongCB = new CheckBoxEIO(gui, ID_STRONG_BUTTON, x, y); + strongCB = new CheckBox(gui, ID_STRONG_BUTTON, x, y); strongCB.setToolTip(Lang.localize("gui.conduit.redstone.signalStrengh.tooltip")); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java index 02199f40..fc52f9ad 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java +++ b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.gui; +import com.enderio.core.client.gui.ITabPanel; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.gui.item.ItemSettings; @@ -8,7 +10,6 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import crazypants.enderio.gui.ITabPanel; public class TabFactory { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index cace4994..23279852 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -4,15 +4,15 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; -import crazypants.gui.GuiContainerBase; -import crazypants.render.RenderUtil; public class BasicItemFilterGui implements IItemFilterGui { @@ -24,11 +24,11 @@ public class BasicItemFilterGui implements IItemFilterGui { private final GuiContainerBase gui; - private final ToggleButtonEIO useMetaB; - private final ToggleButtonEIO useNbtB; - private final IconButtonEIO whiteListB; - private final ToggleButtonEIO useOreDictB; - private final ToggleButtonEIO stickyB; + private final ToggleButton useMetaB; + private final ToggleButton useNbtB; + private final IconButton whiteListB; + private final ToggleButton useOreDictB; + private final ToggleButton stickyB; final boolean isAdvanced; final boolean isStickyModeAvailable; @@ -61,17 +61,17 @@ public class BasicItemFilterGui implements IItemFilterGui { int butLeft = xOffset + 92; int x = butLeft; int y = yOffset + 1; - whiteListB = new IconButtonEIO(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); + whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); whiteListB.setToolTip(Lang.localize("gui.conduit.item.whitelist")); x += 20; - useMetaB = new ToggleButtonEIO(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); x += 20; - stickyB = new ToggleButtonEIO(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); @@ -81,13 +81,13 @@ public class BasicItemFilterGui implements IItemFilterGui { x = butLeft; x += 20; - useNbtB = new ToggleButtonEIO(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT")); useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT")); useNbtB.setPaintSelectedBorder(false); x = butLeft; - useOreDictB = new ToggleButtonEIO(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled")); useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 9ac03640..0d9c9703 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -11,6 +11,10 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.IGuiOverlay; +import com.enderio.core.client.gui.IGuiScreen; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.Vector4f; @@ -18,12 +22,8 @@ import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ExistingItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; -import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.IGuiScreen; -import crazypants.render.RenderUtil; public class ExistingItemFilterGui implements IItemFilterGui { @@ -41,10 +41,10 @@ public class ExistingItemFilterGui implements IItemFilterGui { private IItemConduit itemConduit; private GuiExternalConnection gui; - private ToggleButtonEIO useMetaB; - private ToggleButtonEIO useNbtB; - private ToggleButtonEIO useOreDictB; - private ToggleButtonEIO stickyB; + private ToggleButton useMetaB; + private ToggleButton useNbtB; + private ToggleButton useOreDictB; + private ToggleButton stickyB; private GuiButton snapshotB; private GuiButton clearB; @@ -71,13 +71,13 @@ public class ExistingItemFilterGui implements IItemFilterGui { int x = butLeft; int y = 68; - useMetaB = new ToggleButtonEIO(gui, ID_META, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB = new ToggleButton(gui, ID_META, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); x += 20; - stickyB = new ToggleButtonEIO(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); @@ -87,13 +87,13 @@ public class ExistingItemFilterGui implements IItemFilterGui { x = butLeft; x += 20; - useNbtB = new ToggleButtonEIO(gui, ID_NBT, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB = new ToggleButton(gui, ID_NBT, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT")); useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT")); useNbtB.setPaintSelectedBorder(false); x = butLeft; - useOreDictB = new ToggleButtonEIO(gui, ID_ORE_DICT, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB = new ToggleButton(gui, ID_ORE_DICT, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled")); useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 3931bbf8..f3a3b224 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -9,6 +9,13 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.ColorButton; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.Lang; @@ -26,18 +33,12 @@ import crazypants.enderio.conduit.item.filter.ModItemFilter; import crazypants.enderio.conduit.item.filter.PowerItemFilter; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; -import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class ItemSettings extends BaseSettingsPanel { @@ -58,13 +59,13 @@ public class ItemSettings extends BaseSettingsPanel { private String inputHeading; private String outputHeading; - private final MultiIconButtonEIO nextFilterB; + private final MultiIconButton nextFilterB; - private final ToggleButtonEIO loopB; - private final ToggleButtonEIO roundRobinB; + private final ToggleButton loopB; + private final ToggleButton roundRobinB; - private final MultiIconButtonEIO priUpB; - private final MultiIconButtonEIO priDownB; + private final MultiIconButton priUpB; + private final MultiIconButton priDownB; private final RedstoneModeButton rsB; private final ColorButton colorB; @@ -95,7 +96,7 @@ public class ItemSettings extends BaseSettingsPanel { int x = 52; int y = customTop; - nextFilterB = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); + nextFilterB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); x = 66; channelB = new ColorButton(gui, ID_CHANNEL, x, y); @@ -154,13 +155,13 @@ public class ItemSettings extends BaseSettingsPanel { colorB.setToolTipHeading(Lang.localize("gui.conduit.item.sigCol")); x += 4 + colorB.getWidth(); - roundRobinB = new ToggleButtonEIO(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); + roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); roundRobinB.setSelectedToolTip(Lang.localize("gui.conduit.item.roundRobinEnabled")); roundRobinB.setUnselectedToolTip(Lang.localize("gui.conduit.item.roundRobinDisabled")); roundRobinB.setPaintSelectedBorder(false); x += 4 + roundRobinB.getWidth(); - loopB = new ToggleButtonEIO(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP); + loopB = new ToggleButton(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP); loopB.setSelectedToolTip(Lang.localize("gui.conduit.item.selfFeedEnabled")); loopB.setUnselectedToolTip(Lang.localize("gui.conduit.item.selfFeedDisabled")); loopB.setPaintSelectedBorder(false); @@ -168,10 +169,10 @@ public class ItemSettings extends BaseSettingsPanel { priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), Lang.localize("gui.conduit.item.priority")); x = priLeft + priWidth + 9; - priUpB = MultiIconButtonEIO.createAddButton(gui, ID_PRIORITY_UP, x, y); + priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y); y += 8; - priDownB = MultiIconButtonEIO.createMinusButton(gui, ID_PRIORITY_DOWN, x, y); + priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y); gui.getContainer().addFilterListener(new FilterChangeListener() { @Override @@ -400,7 +401,7 @@ public class ItemSettings extends BaseSettingsPanel { boolean outputActive = (mode == ConnectionMode.IN_OUT && !inOutShowIn) || (mode == ConnectionMode.OUTPUT); if(outputActive) { GL11.glColor3f(1, 1, 1); - IconEIO.BUTTON_DOWN.renderIcon(left + priLeft, top - 5, priWidth, 16, 0, true); + IconEIO.map.render(EnderWidget.BUTTON_DOWN, left + priLeft, top - 5, priWidth, 16, 0, true); String str = itemConduit.getOutputPriority(gui.getDir()) + ""; int sw = fr.getStringWidth(str); fr.drawString(str, left + priLeft + priWidth - sw - gap, top, ColorUtil.getRGB(Color.black)); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index 23638fa2..af8860c4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -10,14 +10,15 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ModItemFilter; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class ModItemFilterGui implements IItemFilterGui { @@ -32,7 +33,7 @@ public class ModItemFilterGui implements IItemFilterGui { private final Rectangle[] inputBounds; - private final IconButtonEIO[] deleteButs; + private final IconButton[] deleteButs; private final int inputOffsetX; private final int tfWidth; @@ -66,10 +67,10 @@ public class ModItemFilterGui implements IItemFilterGui { new Rectangle(inputOffsetX,89,16,16) }; - deleteButs = new IconButtonEIO[inputBounds.length]; + deleteButs = new IconButton[inputBounds.length]; for(int i=0; i < deleteButs.length; i++) { Rectangle r = inputBounds[i]; - IconButtonEIO but = new IconButtonEIO(gui, GuiExternalConnection.nextButtonId(), r.x + 19, r.y, IconEIO.MINUS); + IconButton but = new IconButton(gui, GuiExternalConnection.nextButtonId(), r.x + 19, r.y, IconEIO.MINUS); deleteButs[i] = but; } @@ -77,14 +78,14 @@ public class ModItemFilterGui implements IItemFilterGui { @Override public void deactivate() { - for(IconButtonEIO but : deleteButs) { + for(IconButton but : deleteButs) { but.detach(); } } @Override public void updateButtons() { - for(IconButtonEIO but : deleteButs) { + for(IconButton but : deleteButs) { but.onGuiInit(); } } @@ -92,7 +93,7 @@ public class ModItemFilterGui implements IItemFilterGui { @Override public void actionPerformed(GuiButton guiButton) { for(int i=0; i < deleteButs.length; i++) { - IconButtonEIO but = deleteButs[i]; + IconButton but = deleteButs[i]; if(but.id == guiButton.id) { setMod(i, null); return; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java index 53d8f3b4..4f5c9ca1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -2,6 +2,7 @@ package crazypants.enderio.conduit.gui.item; import net.minecraft.client.gui.GuiButton; +import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.gui.GuiExternalConnection; @@ -9,7 +10,6 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.PowerItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; public class PowerItemFilterGui implements IItemFilterGui { @@ -22,7 +22,7 @@ public class PowerItemFilterGui implements IItemFilterGui { private final IItemConduit itemConduit; private final GuiExternalConnection gui; - private final ToggleButtonEIO stickyB; + private final ToggleButton stickyB; private final GuiButton modeB; private final GuiButton levelB; @@ -47,7 +47,7 @@ public class PowerItemFilterGui implements IItemFilterGui { int y = 68; x += 20; - stickyB = new ToggleButtonEIO(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index ddf2dd0a..65d47e86 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -19,6 +19,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.inventory.IInventoryConnection; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import crazypants.enderio.EnderIO; @@ -35,8 +37,6 @@ import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.item.PacketConduitProbe; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; public class ItemConduit extends AbstractConduit implements IItemConduit { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index fef45f6d..b89db575 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -10,13 +10,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory.Target; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; -import com.enderio.core.common.util.BlockCoord; public class ItemConduitNetwork extends AbstractConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 852f0ca6..b3daca89 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -2,6 +2,8 @@ package crazypants.enderio.conduit.item; import java.util.List; +import com.enderio.core.client.gui.IResourceTooltipProvider; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -13,7 +15,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java index b1614d92..aed22550 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java @@ -2,6 +2,8 @@ package crazypants.enderio.conduit.item; import java.util.List; +import com.enderio.core.client.gui.IResourceTooltipProvider; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -13,7 +15,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; public class ItemFunctionUpgrade extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index aa288408..90a1ce75 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -14,6 +14,7 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.InventoryWrapper; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.RoundRobinIterator; @@ -22,7 +23,6 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.config.Config; import crazypants.enderio.machine.invpanel.TileInventoryPanel; -import com.enderio.core.common.util.BlockCoord; public class NetworkedInventory { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index dc525bb4..e5a2e15f 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -11,9 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; + +import com.enderio.core.client.gui.widget.GhostSlot; + import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; -import crazypants.gui.GhostSlot; public class ExistingItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index 3580d410..99ca61fb 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -6,8 +6,10 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.client.gui.widget.GhostSlot; + import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.gui.GhostSlot; public interface IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java index bc75f13b..282b43ee 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java @@ -12,6 +12,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; @@ -21,7 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index 810a238e..62e0f0a6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -13,9 +13,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; + +import com.enderio.core.client.gui.widget.GhostSlot; + import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; -import crazypants.gui.GhostSlot; public class ItemFilter implements IInventory, IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java index d5e6316c..dfaa437a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java @@ -8,6 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; @@ -16,7 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java index d1fc9c62..23604669 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java @@ -3,12 +3,14 @@ package crazypants.enderio.conduit.item.filter; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; /** * diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java index bc6e10c1..8d600e29 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java @@ -6,11 +6,13 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.client.gui.widget.GhostSlot; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; -import crazypants.gui.GhostSlot; public class ModItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index 28aea462..e0ad9cc2 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -7,9 +7,11 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.client.gui.widget.GhostSlot; + import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; -import crazypants.gui.GhostSlot; /** * diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 59280942..2580343b 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; @@ -31,8 +32,13 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I protected final Map externalRedstoneSignals = new HashMap(); protected boolean redstoneStateDirty = true; + public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) { + IFluidHandler con = FluidUtil.getFluidHandler(world, bc); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; + } + public IFluidHandler getExternalHandler(ForgeDirection direction) { - IFluidHandler con = FluidUtil.getExternalFluidHandler(getBundle().getWorld(), getLocation().getLocation(direction)); + IFluidHandler con = getExternalFluidHandler(getBundle().getWorld(), getLocation().getLocation(direction)); return (con != null && !(con instanceof IConduitBundle)) ? con : null; } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java index 4b867476..a2b53f0c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java @@ -13,6 +13,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -20,7 +21,6 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; -import com.enderio.core.common.util.BlockCoord; public abstract class AbstractTankConduit extends AbstractLiquidConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java index 7bda153e..ff38157a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java @@ -12,6 +12,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; + +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -21,8 +25,6 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; public class AdvancedLiquidConduit extends AbstractTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 076dc96c..cf0f3bbf 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -10,10 +10,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; import crazypants.enderio.conduit.IConduit; -import com.enderio.core.common.util.BlockCoord; public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index fea8dad2..f0062e21 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -8,6 +8,8 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; @@ -20,10 +22,8 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; -import static crazypants.render.CubeRenderer.addVecWithUV; +import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { @@ -37,18 +37,18 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { float worldLight, RenderBlocks rb) { super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - if(!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { + if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { return; } AdvancedLiquidConduit pc = (AdvancedLiquidConduit) conduit; for (ForgeDirection dir : conduit.getExternalConnections()) { IIcon tex = null; - if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { tex = pc.getTextureForInputMode(); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { tex = pc.getTextureForOutputMode(); } - if(tex != null) { + if (tex != null) { Offset offset = te.getOffset(ILiquidConduit.class, dir); ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); } @@ -59,19 +59,19 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { super.renderConduit(tex, conduit, component, brightness); - if(isNSEWUD(component.dir)) { + if (isNSEWUD(component.dir)) { AdvancedLiquidConduit lc = (AdvancedLiquidConduit) conduit; FluidStack fluid = lc.getFluidType(); IIcon texture = null; - if(fluid != null) { + if (fluid != null) { texture = fluid.getFluid().getStillIcon(); - if(texture == null) { + if (texture == null) { texture = fluid.getFluid().getIcon(); } } - if(texture == null) { + if (texture == null) { texture = lc.getNotSetEdgeTexture(); } @@ -84,12 +84,12 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { BoundingBox bb = cube.scale(xLen, yLen, zLen); for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - if(d != component.dir && d != component.dir.getOpposite()) { + if (d != component.dir && d != component.dir.getOpposite()) { ForgeDirection vDir = RenderUtil.getVDirForFace(d); - if(component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { + if (component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { vDir = RenderUtil.getUDirForFace(d); - } else if((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) && d.offsetY != 0) { + } else if ((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) && d.offsetY != 0) { vDir = RenderUtil.getUDirForFace(d); } @@ -119,7 +119,7 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { } } - if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; @@ -159,8 +159,8 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { int index = 0; for (Vertex v : vertices) { double val = get(v.xyz, edge); - if(highest ? val >= minMax : val <= minMax) { - if(val != minMax) { + if (highest ? val >= minMax : val <= minMax) { + if (val != minMax) { res[0] = index; } else { res[1] = index; @@ -173,10 +173,10 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { } private double get(Vector3d xyz, ForgeDirection edge) { - if(edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { + if (edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { return xyz.x; } - if(edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { + if (edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { return xyz.y; } return xyz.z; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java index 7a9df8dd..234ce983 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java @@ -16,6 +16,10 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; + +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -27,8 +31,6 @@ import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; public class EnderLiquidConduit extends AbstractLiquidConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 886c83cf..e8c224aa 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -10,13 +10,12 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.RoundRobinIterator; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.config.Config; -import com.enderio.core.common.util.BlockCoord; public class EnderLiquidConduitNetwork extends AbstractConduitNetwork { @@ -215,7 +214,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork { public LiquidConduitNetwork() { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 1d3c9a5e..eb4f368a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -9,6 +9,8 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector3d; @@ -22,10 +24,8 @@ import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; -import static crazypants.render.CubeRenderer.*; +import static com.enderio.core.client.render.CubeRenderer.*; public class LiquidConduitRenderer extends DefaultConduitRenderer { @@ -37,7 +37,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { @Override public boolean isRendererForConduit(IConduit conduit) { - if(conduit instanceof LiquidConduit) { + if (conduit instanceof LiquidConduit) { return true; } return false; @@ -52,10 +52,10 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { @Override protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - if(isNSEWUD(component.dir)) { + if (isNSEWUD(component.dir)) { LiquidConduit lc = (LiquidConduit) conduit; FluidStack fluid = lc.getFluidType(); - if(fluid != null) { + if (fluid != null) { renderFluidOutline(component, fluid); } BoundingBox[] cubes = toCubes(component.bound); @@ -67,7 +67,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); } - if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; @@ -89,15 +89,15 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { public static void renderFluidOutline(CollidableComponent component, FluidStack fluid, double scaleFactor, float outlineWidth) { //TODO: Should cache these vertices as relatively heavy weight to calc each frame IIcon texture = fluid.getFluid().getStillIcon(); - if(texture == null) { + if (texture == null) { texture = fluid.getFluid().getIcon(); - if(texture == null) { + if (texture == null) { return; } } BoundingBox bbb; - if(scaleFactor == 1) { + if (scaleFactor == 1) { bbb = component.bound; } else { double xScale = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; @@ -107,7 +107,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { } for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(face != component.dir && face != component.dir.getOpposite()) { + if (face != component.dir && face != component.dir.getOpposite()) { Tessellator tes = Tessellator.instance; tes.setNormal(face.offsetX, face.offsetY, face.offsetZ); @@ -116,7 +116,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { Vector2f uv = new Vector2f(); List edges = RenderUtil.getEdgesForFace(face); for (ForgeDirection edge : edges) { - if(edge != component.dir && edge != component.dir.getOpposite()) { + if (edge != component.dir && edge != component.dir.getOpposite()) { float xLen = 1 - Math.abs(edge.offsetX) * outlineWidth; float yLen = 1 - Math.abs(edge.offsetY) * outlineWidth; float zLen = 1 - Math.abs(edge.offsetZ) * outlineWidth; @@ -159,7 +159,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, float worldLight) { - if(((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) { + if (((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) { return; } @@ -171,10 +171,9 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { IIcon tex; for (CollidableComponent component : components) { - if(renderComponent(component)) { + if (renderComponent(component)) { float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(component)); - if(isNSEWUD(component.dir) && - conduit.getTransmitionTextureForState(component) != null) { + if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) { tessellator.setColorOpaque_F(1, 1, 1); tex = conduit.getTransmitionTextureForState(component); @@ -210,30 +209,30 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { int totalAmount = tank.getFluidAmount(); int upCapacity = 0; - if(conduit.containsConduitConnection(ForgeDirection.UP) || conduit.containsExternalConnection(ForgeDirection.UP)) { + if (conduit.containsConduitConnection(ForgeDirection.UP) || conduit.containsExternalConnection(ForgeDirection.UP)) { upCapacity = LiquidConduit.VOLUME_PER_CONNECTION; } int downCapacity = 0; - if(conduit.containsConduitConnection(ForgeDirection.DOWN) || conduit.containsExternalConnection(ForgeDirection.DOWN)) { + if (conduit.containsConduitConnection(ForgeDirection.DOWN) || conduit.containsExternalConnection(ForgeDirection.DOWN)) { downCapacity = LiquidConduit.VOLUME_PER_CONNECTION; } int flatCapacity = tank.getCapacity() - upCapacity - downCapacity; int usedCapacity = 0; - if(downCapacity > 0) { + if (downCapacity > 0) { int inDown = Math.min(totalAmount, downCapacity); usedCapacity += inDown; downRatio = (float) inDown / downCapacity; } - if(flatCapacity > 0 && usedCapacity < totalAmount) { + 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) { + if (upCapacity > 0 && usedCapacity < totalAmount) { int inUp = Math.min(upCapacity, totalAmount - usedCapacity); upRatio = (float) inUp / upCapacity; } else { @@ -243,10 +242,10 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { } private float getRatioForConnection(ForgeDirection id) { - if(id == ForgeDirection.UP) { + if (id == ForgeDirection.UP) { return upRatio; } - if(id == ForgeDirection.DOWN) { + if (id == ForgeDirection.DOWN) { return downRatio; } return flatRatio; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java index 50556db7..1da66cfc 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java @@ -1,6 +1,7 @@ package crazypants.enderio.conduit.liquid; import net.minecraftforge.common.util.ForgeDirection; + import com.enderio.core.common.util.BlockCoord; public class LiquidOutput { diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index 0b588c0b..8c13e5a3 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -1,8 +1,8 @@ package crazypants.enderio.conduit.me; -import appeng.api.AEApi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import appeng.api.AEApi; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index 22abfacc..5742d735 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -17,6 +17,10 @@ import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; + +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; @@ -29,8 +33,6 @@ import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; public class MEConduit extends AbstractConduit implements IMEConduit { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 5e8754e9..41ddb226 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -19,6 +19,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.vecmath.Vector3d; @@ -41,8 +43,6 @@ import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.BoundingBox; -import crazypants.render.IconUtil; public class PowerConduit extends AbstractConduit implements IPowerConduit { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java index 51e3f937..7be0b6c0 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java @@ -5,6 +5,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; @@ -17,8 +19,6 @@ import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; public class PowerConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 887058b2..7fee6aa5 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -22,6 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.tileentity.IRedstoneControl; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; @@ -38,8 +40,6 @@ import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.tool.ToolUtil; -import crazypants.render.BoundingBox; -import crazypants.render.IconUtil; public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsulatedRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java index 883cea0a..9921484a 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java @@ -2,10 +2,12 @@ package crazypants.enderio.conduit.redstone; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.CubeRenderer; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.render.CubeRenderer; public class InsulatedRedstoneConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index 54109a8d..1fc57b6d 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; +import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; @@ -31,7 +32,6 @@ import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.render.IconUtil; import dan200.computercraft.api.ComputerCraftAPI; public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java index 54bc3e8c..5a83b440 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java @@ -11,6 +11,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.vecmath.Vector3d; @@ -22,8 +24,6 @@ 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; public class RedstoneSwitch extends RedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java index 72809ae5..077fc50f 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java @@ -1,11 +1,11 @@ package crazypants.enderio.conduit.redstone; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.VertexRotation; +import com.enderio.core.client.render.VertexTransform; import com.enderio.core.common.vecmath.Vector3d; import crazypants.enderio.config.Config; -import crazypants.render.BoundingBox; -import crazypants.render.VertexRotation; -import crazypants.render.VertexTransform; public class RedstoneSwitchBounds { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index 13d5dd1d..c9dbe0ea 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -5,6 +5,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.VertexTransform; import com.enderio.core.common.vecmath.Vector3d; import crazypants.enderio.EnderIO; @@ -15,9 +18,6 @@ import crazypants.enderio.conduit.geom.ConduitConnectorType; 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.VertexTransform; public class RedstoneSwitchRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 67ceb2bb..cce1c00f 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -22,6 +22,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.IBlockAccessWrapper; import com.google.common.collect.Lists; @@ -44,10 +48,6 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.config.Config; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index 850bfe96..0a9c1b26 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -8,6 +8,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vertex; import crazypants.enderio.EnderIO; @@ -15,10 +17,8 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; -import static crazypants.render.CubeRenderer.*; +import static com.enderio.core.client.render.CubeRenderer.*; import static net.minecraftforge.common.util.ForgeDirection.*; public class DefaultConduitRenderer implements ConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java index 2081813f..3d9cf032 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java @@ -7,8 +7,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; public class ItemConduitRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java index fe1bdf85..a92919cc 100644 --- a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.vecmath.Matrix4d; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector3d; @@ -14,7 +15,6 @@ import com.enderio.core.common.vecmath.Vertex; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.geom.Offsets; import crazypants.enderio.conduit.geom.Offsets.Axis; -import crazypants.render.BoundingBox; import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; import static net.minecraftforge.common.util.ForgeDirection.SOUTH; diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index fbfd2620..16f76cf8 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -8,6 +8,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +21,6 @@ import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.enderface.te.MeProxy; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; diff --git a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java index bc914526..8369f162 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java @@ -12,16 +12,17 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; -import com.enderio.core.common.vecmath.Matrix4d; -import com.enderio.core.common.vecmath.VecmathUtil; -import com.enderio.core.common.vecmath.Vector3d; @SideOnly(Side.CLIENT) public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index d22dff7d..f57bd11c 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -28,17 +28,18 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.TravelController; -import crazypants.render.RenderUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Camera; import com.enderio.core.common.vecmath.Matrix4d; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.TravelController; + public class GuiEnderface extends GuiScreen { protected static final RenderBlocks RB = new RenderBlocks(); diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index 4c20a59d..e4b80a25 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -14,11 +14,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import org.apache.commons.lang3.StringUtils; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; public class ItemBucketEio extends ItemBucket implements IAdvancedTooltipProvider{ diff --git a/src/main/java/crazypants/enderio/gui/CheckBoxEIO.java b/src/main/java/crazypants/enderio/gui/CheckBoxEIO.java deleted file mode 100644 index 00e3be2a..00000000 --- a/src/main/java/crazypants/enderio/gui/CheckBoxEIO.java +++ /dev/null @@ -1,11 +0,0 @@ -package crazypants.enderio.gui; - -import crazypants.gui.IGuiScreen; - -public class CheckBoxEIO extends ToggleButtonEIO { - - public CheckBoxEIO(IGuiScreen gui, int id, int x, int y) { - super(gui, id, x, y, IconEIO.BUTTON, IconEIO.CHECKED_BUTTON); - } - -} diff --git a/src/main/java/crazypants/enderio/gui/ColorButton.java b/src/main/java/crazypants/enderio/gui/ColorButton.java deleted file mode 100644 index 450eba12..00000000 --- a/src/main/java/crazypants/enderio/gui/ColorButton.java +++ /dev/null @@ -1,109 +0,0 @@ -package crazypants.enderio.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemDye; -import net.minecraft.util.MathHelper; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.common.util.DyeColor; - -import crazypants.gui.IGuiScreen; - -public class ColorButton extends IconButtonEIO { - - private int colorIndex = 0; - - private String tooltipPrefix = ""; - - public ColorButton(IGuiScreen gui, int id, int x, int y) { - super(gui, id, x, y, null); - } - - @Override - public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - boolean result = super.mousePressed(par1Minecraft, par2, par3); - if(result) { - nextColor(); - } - return result; - } - - @Override - public boolean mousePressedButton(Minecraft mc, int x, int y, int button) { - boolean result = button == 1 && super.checkMousePress(mc, x, y); - if(result) { - prevColor(); - } - return result; - } - - public String getTooltipPrefix() { - return tooltipPrefix; - } - - public void setToolTipHeading(String tooltipPrefix) { - if(tooltipPrefix == null) { - this.tooltipPrefix = ""; - } else { - this.tooltipPrefix = tooltipPrefix; - } - } - - private void nextColor() { - colorIndex++; - if(colorIndex >= ItemDye.field_150923_a.length) { - colorIndex = 0; - } - setColorIndex(colorIndex); - } - - private void prevColor() { - colorIndex--; - if(colorIndex < 0) { - colorIndex = ItemDye.field_150923_a.length - 1; - } - setColorIndex(colorIndex); - } - - public int getColorIndex() { - return colorIndex; - } - - public void setColorIndex(int colorIndex) { - this.colorIndex = MathHelper.clamp_int(colorIndex, 0, ItemDye.field_150923_a.length - 1); - String colStr = DyeColor.values()[colorIndex].getLocalisedName(); - if(tooltipPrefix != null && tooltipPrefix.length() > 0) { - setToolTip(tooltipPrefix, colStr); - } else { - setToolTip(colStr); - } - } - - @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY) { - super.drawButton(mc, mouseX, mouseY); - if(visible) { - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - - int x = xPosition + 2; - int y = yPosition + 2; - - GL11.glDisable(GL11.GL_TEXTURE_2D); - - int col = ItemDye.field_150922_c[colorIndex]; - tes.setColorOpaque_I(col); - tes.addVertex(x, y + height - 4, zLevel); - tes.addVertex(x + width - 4, y + height - 4, zLevel); - tes.addVertex(x + width - 4, y + 0, zLevel); - tes.addVertex(x, y + 0, zLevel); - - tes.draw(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - - } - } -} diff --git a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java deleted file mode 100644 index b18ae29d..00000000 --- a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java +++ /dev/null @@ -1,17 +0,0 @@ -package crazypants.enderio.gui; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -public interface IAdvancedTooltipProvider { - - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - - -} diff --git a/src/main/java/crazypants/enderio/gui/IGuiOverlay.java b/src/main/java/crazypants/enderio/gui/IGuiOverlay.java deleted file mode 100644 index 2f6ccb38..00000000 --- a/src/main/java/crazypants/enderio/gui/IGuiOverlay.java +++ /dev/null @@ -1,31 +0,0 @@ -package crazypants.enderio.gui; - -import java.awt.Rectangle; - -import crazypants.gui.IGuiScreen; - -public interface IGuiOverlay { - - void init(IGuiScreen screen); - - - Rectangle getBounds(); - - void draw(int mouseX, int mouseY, float partialTick); - - // //consume event? - // boolean mouseClicked(int par1, int par2, int par3); - // - // boolean mouseClickMove(int par1, int par2, int par3, long p_146273_4_); - // - // boolean mouseMovedOrUp(int par1, int par2, int par3); - - void setVisible(boolean visible); - - boolean isVisible(); - - boolean handleMouseInput(int x, int y, int b); - - boolean isMouseInBounds(int mouseX, int mouseY); - -} diff --git a/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java deleted file mode 100644 index 62ce2714..00000000 --- a/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java +++ /dev/null @@ -1,9 +0,0 @@ -package crazypants.enderio.gui; - -import net.minecraft.item.ItemStack; - -public interface IResourceTooltipProvider { - - String getUnlocalizedNameForTooltip(ItemStack itemStack); - -} diff --git a/src/main/java/crazypants/enderio/gui/ITabPanel.java b/src/main/java/crazypants/enderio/gui/ITabPanel.java deleted file mode 100644 index 6ae23e04..00000000 --- a/src/main/java/crazypants/enderio/gui/ITabPanel.java +++ /dev/null @@ -1,23 +0,0 @@ -package crazypants.enderio.gui; - -import net.minecraft.client.gui.GuiButton; - -public interface ITabPanel { - - void onGuiInit(int x, int y, int width, int height); - - void deactivate(); - - IconEIO getIcon(); - - void render(float par1, int par2, int par3); - - void actionPerformed(GuiButton guiButton); - - void mouseClicked(int x, int y, int par3); - - void keyTyped(char par1, int par2); - - void updateScreen(); - -} diff --git a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java deleted file mode 100644 index e92d2a5a..00000000 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ /dev/null @@ -1,185 +0,0 @@ -package crazypants.enderio.gui; - -import java.awt.Rectangle; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import crazypants.gui.GuiToolTip; -import crazypants.gui.IGuiScreen; -import crazypants.render.RenderUtil; - -public class IconButtonEIO extends GuiButton { - - public static final int DEFAULT_WIDTH = 16; - public static final int DEFAULT_HEIGHT = 16; - - protected IconEIO icon; - protected ResourceLocation texture; - private int xOrigin; - private int yOrigin; - - protected IGuiScreen gui; - - private GuiToolTip toolTip; - private int marginY = 0; - private int marginX = 0; - - public IconButtonEIO(IGuiScreen gui, int id, int x, int y, IconEIO icon) { - super(id, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); - this.gui = gui; - this.icon = icon; - texture = IconEIO.TEXTURE; - this.xOrigin = x; - this.yOrigin = y; - - } - - public void setToolTip(String... tooltipText) { - if(toolTip == null) { - toolTip = new GuiToolTip(getBounds(), tooltipText); - //gui.addToolTip(toolTip); - } else { - toolTip.setToolTipText(tooltipText); - } - } - - public final Rectangle getBounds() { - return new Rectangle(xOrigin, yOrigin, getWidth(), getHeight()); - } - - public void onGuiInit() { - gui.addButton(this); - if(toolTip != null) { - gui.addToolTip(toolTip); - } - xPosition = xOrigin + gui.getGuiLeft(); - yPosition = yOrigin + gui.getGuiTop(); - } - - public void detach() { - gui.removeToolTip(toolTip); - gui.removeButton(this); - } - - public void setSize(int width, int height) { - this.width = width; - this.height = height; - updateTooltipBounds(); - } - - public IconButtonEIO setPosition(int x, int y) { - this.xOrigin = x; - this.yOrigin = y; - updateTooltipBounds(); - return this; - } - - private void updateTooltipBounds() { - if(toolTip != null) { - toolTip.setBounds(new Rectangle(xOrigin, yOrigin, width, height)); - } - } - - public IconButtonEIO setIconMargin(int x, int y) { - marginX = x; - marginY = y; - return this; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public IconEIO getIcon() { - return icon; - } - - public void setIcon(IconEIO icon) { - this.icon = icon; - } - - public GuiToolTip getToolTip() { - return toolTip; - } - - /** - * Override this to handle mouse clicks with other buttons than the left - * @param mc The MC instance - * @param x X coordinate of mouse click - * @param y Y coordinate of mouse click - * @param button the mouse button - only called for button >= 1 - * @return true if the mouse click is handled - */ - public boolean mousePressedButton(Minecraft mc, int x, int y, int button) { - return false; - } - - protected boolean checkMousePress(Minecraft mc, int x, int y) { - // call super here so that we only get the area check - return super.mousePressed(mc, x, y); - } - - /** - * Draws this button to the screen. - */ - @SuppressWarnings("synthetic-access") - @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY) { - if(toolTip != null) { - toolTip.setVisible(visible); - } - if(visible) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + width - && mouseY < this.yPosition + height; - int hoverState = getHoverState(this.field_146123_n); - mouseDragged(mc, mouseX, mouseY); - - IconEIO background = getIconForHoverState(hoverState); - - RenderUtil.bindTexture(texture); - GL11.glColor3f(1, 1, 1); - - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - - int x = xPosition; - int y = yPosition; - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - background.renderIcon(x, y, width, height, 0, false); - if(icon != null) { - icon.renderIcon(x + marginX, y + marginY, width - (2 * marginX), height - (2 * marginY), 0, false); - } - - tes.draw(); - - GL11.glPopAttrib(); - - } - } - - protected IconEIO getIconForHoverState(int hoverState) { - if(hoverState == 0) { - return IconEIO.BUTTON_DISABLED; - } - if(hoverState == 2) { - return IconEIO.BUTTON_HIGHLIGHT; - } - return IconEIO.BUTTON; - } - -} diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 4eac5285..d11797d2 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -1,245 +1,151 @@ package crazypants.enderio.gui; -import net.minecraft.client.renderer.Tessellator; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.IWidgetIcon; +import com.enderio.core.client.render.IWidgetMap; -import crazypants.render.RenderUtil; +@AllArgsConstructor +@Getter +public enum IconEIO implements IWidgetIcon { -public final class IconEIO { + TICK(0, 192), + MINUS(16, 192), + LOCK_UNLOCKED(32, 192), + LOCK_LOCKED(48, 192), + CROSS(64, 192), + PLUS(80, 192), + ARROWS(176, 192), + ADD(112, 240), + SUBTRACT(96, 240), - public static final IconEIO TICK = new IconEIO(0, 192); - public static final IconEIO MINUS = new IconEIO(16, 192); - public static final IconEIO LOCK_UNLOCKED = new IconEIO(32, 192); - public static final IconEIO LOCK_LOCKED = new IconEIO(48, 192); - public static final IconEIO CROSS = new IconEIO(64, 192); - public static final IconEIO PLUS = new IconEIO(80, 192); - public static final IconEIO ARROWS = new IconEIO(176, 192); - public static final IconEIO ADD = new IconEIO(112, 240); - public static final IconEIO SUBTRACT = new IconEIO(96, 240); + WRENCH_OVERLAY_POWER(0, 112), + WRENCH_OVERLAY_POWER_OFF(0 + 48, 112), - public static final IconEIO BUTTON = new IconEIO(0, 208); - public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 208); - public static final IconEIO BUTTON_DISABLED = new IconEIO(32, 208); - public static final IconEIO BUTTON_DOWN = new IconEIO(48, 208); - public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 208); - public static final IconEIO CHECKED_BUTTON = new IconEIO(112, 208); + WRENCH_OVERLAY_REDSTONE(16, 112), + WRENCH_OVERLAY_REDSTONE_OFF(16 + 48, 112), - public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 112); - public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(0 + 48, 112); + WRENCH_OVERLAY_FLUID(0, 128), + WRENCH_OVERLAY_FLUID_OFF(0 + 48, 128), - public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(16, 112); - public static final IconEIO WRENCH_OVERLAY_REDSTONE_OFF = new IconEIO(16 + 48, 112); + WRENCH_OVERLAY_ITEM(16, 128), + WRENCH_OVERLAY_ITEM_OFF(16 + 48, 128), - public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 128); - public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(0 + 48, 128); + WRENCH_OVERLAY_GAS(32, 112), + WRENCH_OVERLAY_GAS_OFF(32 + 48, 112), - public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(16, 128); - public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(16 + 48, 128); + WRENCH_OVERLAY_ME(32, 128), + WRENCH_OVERLAY_ME_OFF(32 + 48, 128), - public static final IconEIO WRENCH_OVERLAY_GAS = new IconEIO(32, 112); - public static final IconEIO WRENCH_OVERLAY_GAS_OFF = new IconEIO(32 + 48, 112); + PROBE_OVERLAY_PROBE(112, 192, 16, 16), + PROBE_OVERLAY_COPY(128, 192, 16, 16), + PROBE_OVERLAY_PROBE_OFF(144, 192, 16, 16), + PROBE_OVERLAY_COPY_OFF(160, 192, 16, 16), - public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(32, 128); - public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(32 + 48, 128); + ACTIVE_TAB(205, 0, 19, 24), + INACTIVE_TAB(237, 0, 19, 24), - public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 192, 16, 16); - public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(128, 192, 16, 16); - public static final IconEIO PROBE_OVERLAY_PROBE_OFF = new IconEIO(144, 192, 16, 16); - public static final IconEIO PROBE_OVERLAY_COPY_OFF = new IconEIO(160, 192, 16, 16); - - public static final IconEIO ACTIVE_TAB = new IconEIO(205, 0, 19, 24); - public static final IconEIO INACTIVE_TAB = new IconEIO(237, 0, 19, 24); + REDSTONE_MODE_WITHOUT_SIGNAL(64, 224), + REDSTONE_MODE_WITH_SIGNAL(80, 224), + REDSTONE_MODE_ALWAYS(96, 224), + REDSTONE_MODE_NEVER(112, 224), - public static final IconEIO LEFT_ARROW = new IconEIO(224, 32, 8, 16); - public static final IconEIO LEFT_ARROW_PRESSED = new IconEIO(240, 32, 8, 16); - public static final IconEIO LEFT_ARROW_HOVER = new IconEIO(224, 48, 8, 16); - public static final IconEIO LEFT_ARROW_HOVER_PRESSED = new IconEIO(240, 48, 8, 16); + FILTER_META(160, 224), + FILTER_NBT(176, 224), + FILTER_ORE_DICT(192, 224), + FILTER_WHITELIST(0, 224), + FILTER_BLACKLIST(0, 240), + FILTER_STICKY(16, 240), + FILTER_STICKY_OFF(32, 240), - public static final IconEIO RIGHT_ARROW = new IconEIO(232, 32, 8, 16); - public static final IconEIO RIGHT_ARROW_PRESSED = new IconEIO(248, 32, 8, 16); - public static final IconEIO RIGHT_ARROW_HOVER = new IconEIO(232, 48, 8, 16); - public static final IconEIO RIGHT_ARROW_HOVER_PRESSED = new IconEIO(248, 48, 8, 16); - - public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(64, 224); - public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(80, 224); - public static final IconEIO REDSTONE_MODE_ALWAYS = new IconEIO(96, 224); - public static final IconEIO REDSTONE_MODE_NEVER = new IconEIO(112, 224); - - public static final IconEIO FILTER_META = new IconEIO(160, 224); - public static final IconEIO FILTER_NBT = new IconEIO(176, 224); - public static final IconEIO FILTER_ORE_DICT = new IconEIO(192, 224); - public static final IconEIO FILTER_WHITELIST = new IconEIO(0, 224); - public static final IconEIO FILTER_BLACKLIST = new IconEIO(0, 240); - public static final IconEIO FILTER_STICKY = new IconEIO(16, 240); - public static final IconEIO FILTER_STICKY_OFF = new IconEIO(32, 240); - - public static final IconEIO FILTER_META_OFF = new IconEIO(208, 224); - public static final IconEIO FILTER_NBT_OFF = new IconEIO(224, 224); - public static final IconEIO FILTER_ORE_DICT_OFF = new IconEIO(240, 224); + FILTER_META_OFF(208, 224), + FILTER_NBT_OFF(224, 224), + FILTER_ORE_DICT_OFF(240, 224), @Deprecated - public static final IconEIO INPUT_OLD = new IconEIO(128, 197 + 32, 30, 14); + INPUT_OLD(128, 197 + 32, 30, 14), @Deprecated - public static final IconEIO OUTPUT_OLD = new IconEIO(128, 180 + 32, 30, 14); + OUTPUT_OLD(128, 180 + 32, 30, 14), - public static final IconEIO INPUT = new IconEIO(32, 176, 16, 8); - public static final IconEIO OUTPUT = new IconEIO(48, 176, 16, 8); - public static final IconEIO INPUT_OUTPUT = new IconEIO(32, 176, 32, 8); - public static final IconEIO DISABLED = new IconEIO(64, 176); - public static final IconEIO LOOP = new IconEIO(80, 176); - public static final IconEIO LOOP_OFF = new IconEIO(96, 176); + INPUT(32, 176, 16, 8), + OUTPUT(48, 176, 16, 8), + INPUT_OUTPUT(32, 176, 32, 8), + DISABLED(64, 176), + LOOP(80, 176), + LOOP_OFF(96, 176), - public static final IconEIO ROUND_ROBIN = new IconEIO(64, 240); - public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(80, 240); + ROUND_ROBIN(64, 240), + ROUND_ROBIN_OFF(80, 240), - public static final IconEIO IO_CONFIG_UP = new IconEIO(16, 224); - public static final IconEIO IO_CONFIG_DOWN = new IconEIO(32, 224); - public static final IconEIO IO_WHATSIT = new IconEIO(128, 208); + IO_CONFIG_UP(16, 224), + IO_CONFIG_DOWN(32, 224), + IO_WHATSIT(128, 208), - public static final IconEIO RECIPE = new IconEIO(0, 224); - public static final IconEIO RECIPE_BUTTON = new IconEIO(80, 208); + RECIPE(0, 224), + RECIPE_BUTTON(80, 208), - public static final IconEIO ADD_BUT = new IconEIO(208, 32, 8, 8); - public static final IconEIO ADD_BUT_PRESSED = new IconEIO(216, 32, 8, 8); - public static final IconEIO ADD_BUT_HOVER = new IconEIO(208, 48, 8, 8); - public static final IconEIO ADD_BUT_HOVER_PRESSED = new IconEIO(216, 48, 8, 8); + SOUND(176, 208), - public static final IconEIO MINUS_BUT = new IconEIO(208, 40, 8, 8); - public static final IconEIO MINUS_BUT_PRESSED = new IconEIO(216, 40, 8, 8); - public static final IconEIO MINUS_BUT_HOVER = new IconEIO(208, 56, 8, 8); - public static final IconEIO MINUS_BUT_HOVER_PRESSED = new IconEIO(216, 56, 8, 8); + XP(128, 224), + XP_PLUS(144, 224), - public static final IconEIO X_BUT = new IconEIO(200, 32, 8, 8); - public static final IconEIO X_BUT_PRESSED = new IconEIO(200, 40, 8, 8); - public static final IconEIO X_BUT_HOVER = new IconEIO(200, 48, 8, 8); - public static final IconEIO X_BUT_HOVER_PRESSED = new IconEIO(200, 56, 8, 8); + SINGLE_PLUS(240, 192), + DOUBLE_PLUS(224, 192), + TRIPLE_PLUS(208, 192), + SINGLE_MINUS(240, 208), + DOUBLE_MINUS(224, 208), + TRIPLE_MINUS(208, 208), - public static final IconEIO UP_ARROW_OFF = new IconEIO(212, 64, 11, 8); - public static final IconEIO UP_ARROW_ON = new IconEIO(223, 64, 11, 8); - public static final IconEIO UP_ARROW_HOVER_OFF = new IconEIO(234, 64, 11, 8); - public static final IconEIO UP_ARROW_HOVER_ON = new IconEIO(245, 64, 11, 8); - public static final IconEIO DOWN_ARROW_OFF = new IconEIO(212, 72, 11, 8); - public static final IconEIO DOWN_ARROW_ON = new IconEIO(223, 72, 11, 8); - public static final IconEIO DOWN_ARROW_HOVER_OFF = new IconEIO(234, 72, 11, 8); - public static final IconEIO DOWN_ARROW_HOVER_ON = new IconEIO(245, 72, 11, 8); - - public static final IconEIO VSCROLL_THUMB_OFF = new IconEIO(234, 80, 11, 8); - public static final IconEIO VSCROLL_THUMB_HOVER_OFF = new IconEIO(234, 88, 11, 8); - public static final IconEIO VSCROLL_THUMB_ON = new IconEIO(245, 80, 11, 8); - public static final IconEIO VSCROLL_THUMB_HOVER_ON = new IconEIO(245, 88, 11, 8); + ENDER_RAIL(192, 208), - public static final IconEIO SOUND = new IconEIO(176, 208); + FILTER(192, 192), - public static final IconEIO XP = new IconEIO(128, 224); - public static final IconEIO XP_PLUS = new IconEIO(144, 224); + ITEM_STACK(144, 208), + ITEM_SINGLE(160, 208), - public static final IconEIO SINGLE_PLUS = new IconEIO(240, 192); - public static final IconEIO DOUBLE_PLUS = new IconEIO(224, 192); - public static final IconEIO TRIPLE_PLUS = new IconEIO(208, 192); - public static final IconEIO SINGLE_MINUS = new IconEIO(240, 208); - public static final IconEIO DOUBLE_MINUS = new IconEIO(224, 208); - public static final IconEIO TRIPLE_MINUS = new IconEIO(208, 208); + SUN(160, 240), + RAIN(176, 240), + THUNDER(192, 240), - public static final IconEIO ENDER_RAIL = new IconEIO(192, 208); + SORT_DIR_DOWN(0, 176), + SORT_DIR_UP(16, 176), - public static final IconEIO FILTER = new IconEIO(192, 192); - - public static final IconEIO ITEM_STACK = new IconEIO(144, 208); - public static final IconEIO ITEM_SINGLE = new IconEIO(160, 208); - - public static final IconEIO SUN = new IconEIO(160, 240); - public static final IconEIO RAIN = new IconEIO(176, 240); - public static final IconEIO THUNDER = new IconEIO(192, 240); - - public static final IconEIO SORT_DIR_DOWN = new IconEIO( 0, 176); - public static final IconEIO SORT_DIR_UP = new IconEIO(16, 176); - - public static final IconEIO SORT_NAME_DOWN = new IconEIO(208, 240, SORT_DIR_DOWN); - public static final IconEIO SORT_NAME_UP = new IconEIO(208, 240, SORT_DIR_UP); - public static final IconEIO SORT_SIZE_DOWN = new IconEIO(224, 240, SORT_DIR_DOWN); - public static final IconEIO SORT_SIZE_UP = new IconEIO(224, 240, SORT_DIR_UP); - public static final IconEIO SORT_MOD_DOWN = new IconEIO(240, 240, SORT_DIR_DOWN); - public static final IconEIO SORT_MOD_UP = new IconEIO(240, 240, SORT_DIR_UP); + SORT_NAME_DOWN(208, 240, SORT_DIR_DOWN), + SORT_NAME_UP(208, 240, SORT_DIR_UP), + SORT_SIZE_DOWN(224, 240, SORT_DIR_DOWN), + SORT_SIZE_UP(224, 240, SORT_DIR_UP), + SORT_MOD_DOWN(240, 240, SORT_DIR_DOWN), + SORT_MOD_UP(240, 240, SORT_DIR_UP); // Texture size is actually 512 but everything is aligned to a 256 grid private static final int TEX_SIZE = 256; - private static final double PIX_SIZE = 1d / TEX_SIZE; - public final double minU; - public final double maxU; - public final double minV; - public final double maxV; - public final double width; - public final double height; + public final int x; + public final int y; + public final int width; + public final int height; public final IconEIO overlay; public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); - public IconEIO(int x, int y) { + public static final IWidgetMap map = new IWidgetMap.WidgetMapImpl(TEX_SIZE, TEXTURE); + + IconEIO(int x, int y) { this(x, y, null); } - public IconEIO(int x, int y, IconEIO overlay) { + IconEIO(int x, int y, IconEIO overlay) { this(x, y, 16, 16, overlay); } - public IconEIO(int x, int y, int width, int height) { + IconEIO(int x, int y, int width, int height) { this(x, y, width, height, null); } - public IconEIO(int x, int y, int width, int height, IconEIO overlay) { - this(width, height, (float) (PIX_SIZE * x), (float) (PIX_SIZE * (x + width)), (float) (PIX_SIZE * y), (float) (PIX_SIZE * (y + height)), overlay); + @Override + public IWidgetMap getMap() { + return map; } - - public IconEIO(double width, double height, double minU, double maxU, double minV, double maxV, IconEIO overlay) { - this.width = width; - this.height = height; - this.minU = minU; - this.maxU = maxU; - this.minV = minV; - this.maxV = maxV; - this.overlay = overlay; - } - - public void renderIcon(double x, double y) { - renderIcon(x, y, width, height, 0, false); - } - - public void renderIcon(double x, double y, boolean doDraw) { - renderIcon(x, y, width, height, 0, doDraw); - } - - public void renderIcon(double x, double y, double width, double height, double zLevel, boolean doDraw) { - renderIcon(x, y, width, height, zLevel, doDraw, false); - } - - public void renderIcon(double x, double y, double width, double height, double zLevel, boolean doDraw, boolean flipY) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - Tessellator tessellator = Tessellator.instance; - if(doDraw) { - RenderUtil.bindTexture(TEXTURE); - tessellator.startDrawingQuads(); - } - if(flipY) { - tessellator.addVertexWithUV(x, y + height, zLevel, minU, minV); - tessellator.addVertexWithUV(x + width, y + height, zLevel, maxU, minV); - tessellator.addVertexWithUV(x + width, y + 0, zLevel, maxU, maxV); - tessellator.addVertexWithUV(x, y + 0, zLevel, minU, maxV); - } else { - tessellator.addVertexWithUV(x, y + height, zLevel, minU, maxV); - tessellator.addVertexWithUV(x + width, y + height, zLevel, maxU, maxV); - tessellator.addVertexWithUV(x + width, y + 0, zLevel, maxU, minV); - tessellator.addVertexWithUV(x, y + 0, zLevel, minU, minV); - } - if(overlay != null) { - overlay.renderIcon(x, y, width, height, zLevel, false, flipY); - } - if(doDraw) { - tessellator.draw(); - } - } - } diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index e6fd4693..2e962d92 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -29,6 +29,9 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.IBlockAccessWrapper; import com.enderio.core.common.vecmath.Camera; @@ -46,9 +49,6 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.PacketIoMode; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.TravelController; -import crazypants.render.BoundingBox; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class IoConfigRenderer { @@ -300,7 +300,7 @@ public class IoConfigRenderer { } GL11.glColor3f(1, 1, 1); - IconEIO.IO_WHATSIT.renderIcon(x, y, true); + IconEIO.map.render(IconEIO.IO_WHATSIT, x, y, true); if(selection != null) { IconEIO ioIcon = null; @@ -325,7 +325,7 @@ public class IoConfigRenderer { xd /=2; xd += 4; xd /= scaledresolution.getScaleFactor(); - ioIcon.renderIcon(xd, y - mc.fontRenderer.FONT_HEIGHT - 2,true); + ioIcon.getMap().render(ioIcon, xd, y - mc.fontRenderer.FONT_HEIGHT - 2,true); } } } diff --git a/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java b/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java deleted file mode 100644 index e0a89183..00000000 --- a/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java +++ /dev/null @@ -1,45 +0,0 @@ -package crazypants.enderio.gui; - -import crazypants.gui.IGuiScreen; - -public class MultiIconButtonEIO extends IconButtonEIO { - - private final IconEIO unpressed; - private final IconEIO pressed; - private final IconEIO hover; - - public MultiIconButtonEIO(IGuiScreen gui, int id, int x, int y, IconEIO unpressed, IconEIO pressed, IconEIO hover) { - super(gui, id, x, y, null); - this.unpressed = unpressed; - this.pressed = pressed; - this.hover = hover; - setSize((int)unpressed.width, (int)unpressed.height); - } - - @Override - protected IconEIO getIconForHoverState(int hoverState) { - if(hoverState == 0) { - return pressed; - } - if(hoverState == 2) { - return hover; - } - return unpressed; - } - - public static MultiIconButtonEIO createRightArrowButton(IGuiScreen gui, int id, int x, int y) { - return new MultiIconButtonEIO(gui, id, x, y, IconEIO.RIGHT_ARROW, IconEIO.RIGHT_ARROW_PRESSED, IconEIO.RIGHT_ARROW_HOVER); - } - - public static MultiIconButtonEIO createLeftArrowButton(IGuiScreen gui, int id, int x, int y) { - return new MultiIconButtonEIO(gui, id, x, y, IconEIO.LEFT_ARROW, IconEIO.LEFT_ARROW_PRESSED, IconEIO.LEFT_ARROW_HOVER); - } - - public static MultiIconButtonEIO createAddButton(IGuiScreen gui, int id, int x, int y) { - return new MultiIconButtonEIO(gui, id, x, y, IconEIO.ADD_BUT, IconEIO.ADD_BUT_PRESSED, IconEIO.ADD_BUT_HOVER); - } - - public static MultiIconButtonEIO createMinusButton(IGuiScreen gui, int id, int x, int y) { - return new MultiIconButtonEIO(gui, id, x, y, IconEIO.MINUS_BUT, IconEIO.MINUS_BUT_PRESSED, IconEIO.MINUS_BUT_HOVER); - } -} diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index 943d42ad..8c4b51b8 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -2,6 +2,8 @@ package crazypants.enderio.gui; import net.minecraft.client.Minecraft; +import com.enderio.core.client.gui.IGuiScreen; +import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; @@ -9,9 +11,8 @@ import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.IGuiScreen; -public class RedstoneModeButton extends IconButtonEIO { +public class RedstoneModeButton extends IconButton { private static IconEIO[] ICONS = new IconEIO[] { IconEIO.REDSTONE_MODE_ALWAYS, IconEIO.REDSTONE_MODE_WITH_SIGNAL, IconEIO.REDSTONE_MODE_WITHOUT_SIGNAL, IconEIO.REDSTONE_MODE_NEVER }; diff --git a/src/main/java/crazypants/enderio/gui/TextFieldEIO.java b/src/main/java/crazypants/enderio/gui/TextFieldEIO.java deleted file mode 100644 index 67709529..00000000 --- a/src/main/java/crazypants/enderio/gui/TextFieldEIO.java +++ /dev/null @@ -1,101 +0,0 @@ -package crazypants.enderio.gui; - -import java.lang.reflect.Field; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiTextField; - -import com.google.common.base.Strings; - -import cpw.mods.fml.relauncher.ReflectionHelper; -import crazypants.gui.IGuiScreen; - -public class TextFieldEIO extends GuiTextField { - - public interface ICharFilter { - - boolean passesFilter(TextFieldEIO tf, char c); - } - - public static final ICharFilter FILTER_NUMERIC = new ICharFilter() { - @Override - public boolean passesFilter(TextFieldEIO tf, char c) { - return Character.isDigit(c) || (c == '-' && Strings.isNullOrEmpty(tf.getText())); - } - }; - - public static ICharFilter FILTER_ALPHABETICAL = new ICharFilter() { - @Override - public boolean passesFilter(TextFieldEIO tf, char c) { - return Character.isLetter(c); - } - }; - - public static ICharFilter FILTER_ALPHANUMERIC = new ICharFilter() { - @Override - public boolean passesFilter(TextFieldEIO tf, char c) { - return FILTER_NUMERIC.passesFilter(tf, c) || FILTER_ALPHABETICAL.passesFilter(tf, c); - } - }; - - private final int xOrigin; - private final int yOrigin; - private ICharFilter filter; - - private static Field canLoseFocus; - - static { - try { - canLoseFocus = ReflectionHelper.findField(GuiTextField.class, "canLoseFocus", "field_146212_n", "n"); - canLoseFocus.setAccessible(true); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public TextFieldEIO(FontRenderer fnt, int x, int y, int width, int height) { - this(fnt, x, y, width, height, null); - } - - public TextFieldEIO(FontRenderer fnt, int x, int y, int width, int height, ICharFilter charFilter) { - super(fnt, x, y, width, height); - this.xOrigin = x; - this.yOrigin = y; - this.filter = charFilter; - } - - public void init(IGuiScreen gui) { - this.xPosition = xOrigin + gui.getGuiLeft(); - this.yPosition = yOrigin + gui.getGuiTop(); - } - - public TextFieldEIO setCharFilter(ICharFilter filter) { - this.filter = filter; - return this; - } - - @Override - public boolean textboxKeyTyped(char c, int key) { - if(filter == null || filter.passesFilter(this, c) || isSpecialChar(c, key)) { - return super.textboxKeyTyped(c, key); - } - return false; - } - - public static boolean isSpecialChar(char c, int key) { - // taken from the giant switch statement in GuiTextField - return c == 1 || c == 3 || c == 22 || c == 24 || key == 14 || key == 199 || key == 203 || key == 205 || key == 207 || key == 211; - } - - public boolean getCanLoseFocus() { - try { - return canLoseFocus.getBoolean(this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public boolean contains(int x, int y) { - return x >= this.xPosition && x < this.xPosition + this.width && y >= this.yPosition && y < this.yPosition + this.height; - } -} diff --git a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java deleted file mode 100644 index 9b37fca7..00000000 --- a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java +++ /dev/null @@ -1,80 +0,0 @@ -package crazypants.enderio.gui; - -import net.minecraft.client.Minecraft; -import crazypants.gui.IGuiScreen; - -public class ToggleButtonEIO extends IconButtonEIO { - - private boolean selected; - private final IconEIO unselectedIcon; - private final IconEIO selectedIcon; - - private String[] selectedTooltip; - private String[] unselectedTooltip; - private boolean paintSelectionBorder; - - public ToggleButtonEIO(IGuiScreen gui, int id, int x, int y, IconEIO unselectedIcon, IconEIO selectedIcon) { - super(gui, id, x, y, unselectedIcon); - this.unselectedIcon = unselectedIcon; - this.selectedIcon = selectedIcon; - selected = false; - paintSelectionBorder = true; - } - - public boolean isSelected() { - return selected; - } - - public ToggleButtonEIO setSelected(boolean selected) { - this.selected = selected; - icon = selected ? selectedIcon : unselectedIcon; - if(selected && selectedTooltip != null) { - setToolTip(selectedTooltip); - } else if(!selected && unselectedTooltip != null) { - setToolTip(unselectedTooltip); - } - return this; - } - - @Override - protected IconEIO getIconForHoverState(int hoverState) { - if(!selected || !paintSelectionBorder) { - return super.getIconForHoverState(hoverState); - } - if(hoverState == 0) { - return IconEIO.BUTTON_DISABLED; - } - if(hoverState == 2) { - return IconEIO.BUTTON_DOWN_HIGHLIGHT; - } - return IconEIO.BUTTON_DOWN; - } - - @Override - public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - if(super.mousePressed(par1Minecraft, par2, par3)) { - return toggleSelected(); - } - return false; - } - - protected boolean toggleSelected() { - setSelected(!selected); - return true; - } - - public void setSelectedToolTip(String... tt) { - this.selectedTooltip = tt; - setSelected(selected); - } - - public void setUnselectedToolTip(String... tt) { - this.unselectedTooltip = tt; - setSelected(selected); - } - - public void setPaintSelectedBorder(boolean b) { - this.paintSelectionBorder = b; - } - -} diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 21eccf3a..220b1406 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -24,6 +24,8 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.input.Keyboard; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; diff --git a/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java b/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java deleted file mode 100644 index 4af77799..00000000 --- a/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java +++ /dev/null @@ -1,191 +0,0 @@ -package crazypants.enderio.gui; - -import java.awt.Rectangle; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; - -import org.lwjgl.opengl.GL11; - -import crazypants.gui.IGuiScreen; -import crazypants.render.RenderUtil; - -public class VScrollbarEIO { - - protected final IGuiScreen gui; - - protected int xOrigin; - protected int yOrigin; - protected int height; - - protected int xPosition; - protected int yPosition; - protected Rectangle wholeArea; - protected Rectangle btnUp; - protected Rectangle btnDown; - protected Rectangle thumbArea; - - protected int scrollPos; - protected int scrollMax; - - protected boolean pressedUp; - protected boolean pressedDown; - protected boolean pressedThumb; - protected int scrollDir; - protected long timeNextScroll; - - public VScrollbarEIO(IGuiScreen gui, int xOrigin, int yOrigin, int height) { - this.gui = gui; - this.xOrigin = xOrigin; - this.yOrigin = yOrigin; - this.height = height; - } - - public void adjustPosition() { - xPosition = xOrigin + gui.getGuiLeft(); - yPosition = yOrigin + gui.getGuiTop(); - wholeArea = new Rectangle(xPosition, yPosition, - (int)IconEIO.VSCROLL_THUMB_OFF.width, height); - btnUp = new Rectangle(xPosition, yPosition, - (int)IconEIO.UP_ARROW_OFF.width, (int)IconEIO.UP_ARROW_OFF.height); - btnDown = new Rectangle(xPosition, yPosition + Math.max(0, height - (int)IconEIO.DOWN_ARROW_OFF.height), - (int)IconEIO.DOWN_ARROW_OFF.width, (int)IconEIO.DOWN_ARROW_OFF.height); - thumbArea = new Rectangle(xPosition, yPosition + btnUp.height, - (int)IconEIO.VSCROLL_THUMB_OFF.width, Math.max(0, height - (btnUp.height + btnDown.height))); - } - - public int getScrollPos() { - return scrollPos; - } - - public void setScrollPos(int scrollPos) { - this.scrollPos = limitPos(scrollPos); - } - - public void scrollBy(int amount) { - setScrollPos(scrollPos + amount); - } - - public int getScrollMax() { - return scrollMax; - } - - public void setScrollMax(int scrollMax) { - this.scrollMax = scrollMax; - setScrollPos(scrollPos); - } - - public void drawScrollbar(int mouseX, int mouseY) { - boolean hoverUp = btnUp.contains(mouseX, mouseY); - boolean hoverDown = btnDown.contains(mouseX, mouseY); - - IconEIO iconUp; - if(pressedUp) { - iconUp = hoverUp ? IconEIO.UP_ARROW_HOVER_ON : IconEIO.UP_ARROW_ON; - } else { - iconUp = hoverUp ? IconEIO.UP_ARROW_HOVER_OFF : IconEIO.UP_ARROW_OFF; - } - - IconEIO iconDown; - if(pressedDown) { - iconDown = hoverDown ? IconEIO.DOWN_ARROW_HOVER_ON : IconEIO.DOWN_ARROW_ON; - } else { - iconDown = hoverDown ? IconEIO.DOWN_ARROW_HOVER_OFF : IconEIO.DOWN_ARROW_OFF; - } - - if(scrollDir != 0) { - long time = Minecraft.getSystemTime(); - if((timeNextScroll - time) <= 0) { - timeNextScroll = time + 100; - scrollBy(scrollDir); - } - } - - RenderUtil.bindTexture(IconEIO.TEXTURE); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor3f(1, 1, 1); - - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - - iconUp.renderIcon(btnUp.x, btnUp.y, false); - iconDown.renderIcon(btnDown.x, btnDown.y, false); - - if(scrollMax > 0) { - int thumbPos = getThumbPosition(); - boolean hoverThumb = thumbArea.contains(mouseX, mouseY) && mouseY >= thumbPos && mouseY < thumbPos + (int) IconEIO.VSCROLL_THUMB_OFF.height; - - IconEIO iconThumb; - if(pressedThumb) { - iconThumb = IconEIO.VSCROLL_THUMB_HOVER_ON; - } else { - iconThumb = hoverThumb ? IconEIO.VSCROLL_THUMB_HOVER_OFF : IconEIO.VSCROLL_THUMB_OFF; - } - iconThumb.renderIcon(thumbArea.x, thumbPos, false); - } - - tes.draw(); - GL11.glPopAttrib(); - } - - public boolean mouseClicked(int x, int y, int button) { - if(button == 0) { - if(scrollMax > 0 && thumbArea.contains(x, y)) { - int thumbPos = getThumbPosition(); - pressedUp = y < thumbPos; - pressedDown = y >= thumbPos + (int)IconEIO.VSCROLL_THUMB_OFF.height; - pressedThumb = !pressedUp && !pressedDown; - } else { - pressedUp = btnUp.contains(x, y); - pressedDown = btnDown.contains(x, y); - pressedThumb = false; - } - - scrollDir = (pressedDown ? 1 : 0) - (pressedUp ? 1 : 0); - if(scrollDir != 0) { - timeNextScroll = Minecraft.getSystemTime() + 200; - scrollBy(scrollDir); - } - } - return isDragActive(); - } - - public boolean mouseClickMove(int x, int y, int button, long time) { - if(pressedThumb) { - int pos = y - (thumbArea.y + (int)IconEIO.VSCROLL_THUMB_OFF.height/2); - int len = thumbArea.height - (int)IconEIO.VSCROLL_THUMB_OFF.height; - if(len > 0) { - setScrollPos(Math.round(pos * (float)scrollMax / (float)len)); - } - return true; - } - return false; - } - - public void mouseMovedOrUp(int x, int y, int button) { - pressedUp = false; - pressedDown = false; - pressedThumb = false; - scrollDir = 0; - } - - public void mouseWheel(int x, int y, int delta) { - if(!isDragActive() && wholeArea.contains(x, y)) { - scrollBy(-Integer.signum(delta)); - } - } - - public boolean isDragActive() { - return pressedUp || pressedDown || pressedThumb; - } - - protected int getThumbPosition() { - return thumbArea.y + (thumbArea.height - (int)IconEIO.VSCROLL_THUMB_OFF.height) * scrollPos / scrollMax; - } - - protected int limitPos(int pos) { - return Math.max(0, Math.min(pos, scrollMax)); - } -} diff --git a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java index 91e132cf..149cc34b 100644 --- a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java @@ -51,8 +51,8 @@ public class ConduitProbeOverlayRenderer { double offsetX = res.getScaledWidth() - 48; double offsetY = res.getScaledHeight() - 16; GL11.glColor4f(1, 1, 1, 0.75f); - icon1.renderIcon(offsetX - 32, offsetY - 32, 32, 32, 0, true); - icon2.renderIcon(offsetX, offsetY - 32, 32, 32, 0, true); + icon1.getMap().render(icon1, offsetX - 32, offsetY - 32, 32, 32, 0, true); + icon2.getMap().render(icon2, offsetX, offsetY - 32, 32, 32, 0, true); } } diff --git a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java index d85aba1d..a92503e9 100644 --- a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java @@ -12,6 +12,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,7 +23,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; public class ItemConduitProbe extends Item implements IResourceTooltipProvider, IHideFacades { diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 782e0e19..2dc8a45e 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -15,6 +15,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cofh.api.energy.ItemEnergyContainer; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ItemUtil; import cpw.mods.fml.common.FMLCommonHandler; @@ -27,7 +28,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.util.BaublesUtil; diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 49c14619..f8bf9892 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -27,6 +27,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.EntityUtil; import com.enderio.core.common.util.Lang; @@ -38,7 +39,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; public class ItemSoulVessel extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index fc8322e4..ac3a29f7 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -19,6 +19,9 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import org.lwjgl.input.Keyboard; import cofh.api.block.IDismantleable; + +import com.enderio.core.client.gui.IAdvancedTooltipProvider; + import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -30,7 +33,6 @@ import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index 47efd2f0..8d6f894a 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -70,14 +70,14 @@ public class YetaWrenchOverlayRenderer { GL11.glColor4f(1, 1, 1, 0.75f); int index = indices.get(mode); Point p = iconOffsets[index]; - onIcons[index].renderIcon(offsetX + p.x, offsetY + p.y, 16, 16, 0, true); + onIcons[index].getMap().render(onIcons[index], offsetX + p.x, offsetY + p.y, 16, 16, 0, true); } } private void renderAll(IconEIO[] icons, double offsetX, double offsetY) { int i = 0; for (Point p : iconOffsets) { - icons[i].renderIcon(offsetX + p.x, offsetY + p.y, 16, 16, 0, true); + icons[i].getMap().render(icons[i], offsetX + p.x, offsetY + p.y, 16, 16, 0, true); i++; } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelUpgrade.java index 4424a18e..3bded47a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelUpgrade.java @@ -1,7 +1,8 @@ package crazypants.enderio.item.darksteel; import net.minecraft.item.ItemStack; -import crazypants.enderio.gui.IAdvancedTooltipProvider; + +import com.enderio.core.client.gui.IAdvancedTooltipProvider; public interface IDarkSteelUpgrade extends IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 25ca3acd..8c364a73 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -21,6 +21,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; @@ -33,7 +34,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 49f77d0e..e8dc6db2 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -22,6 +22,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.oredict.OreDictionary; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; @@ -32,7 +33,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index e95241b9..d0dcc195 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -19,6 +19,7 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; import com.google.common.collect.Sets; @@ -31,7 +32,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.teleport.TravelController; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index 7633e56e..2d64ce30 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -21,6 +21,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; @@ -31,7 +32,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 78318658..796d38ad 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -25,6 +25,7 @@ import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -39,7 +40,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.teleport.TravelController; public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java index c467bcab..3ab47310 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java @@ -8,12 +8,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index e0a0b45d..e89a8f5e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -12,11 +12,10 @@ import org.lwjgl.opengl.GL11; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; - public class PoweredItemRenderer implements IItemRenderer { private RenderItem ri = new RenderItem(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java index 9b9d9856..b5ac6217 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java @@ -42,7 +42,7 @@ public class SoundRenderer extends RenderEntity { double size = 0.5 * se.lifeSpan / 20f; - IconEIO.SOUND.renderIcon(-size/2, -size/2, size,size,0,true,true); + IconEIO.map.render(IconEIO.SOUND, -size/2, -size/2, size,size,0,true,true); GL11.glPopAttrib(); GL11.glPopMatrix(); diff --git a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java index de3da076..e62dd004 100644 --- a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java +++ b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java @@ -1,36 +1,26 @@ package crazypants.enderio.item.skull; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; -import crazypants.render.VertexRotation; -import com.enderio.core.common.vecmath.Vector3d; import net.minecraft.block.Block; -import net.minecraft.client.model.ModelEnderman; -import net.minecraft.client.model.ModelSkeletonHead; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderEnderman; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.client.render.VertexRotation; +import com.enderio.core.common.vecmath.Vector3d; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; + public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { public EndermanSkullRenderer() { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index d26afe1d..ee898cbc 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -16,6 +16,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -26,7 +29,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.waila.IWailaInfoProvider; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index b4f16c7b..d3eaa23f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -12,18 +12,18 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vertex; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PaintedBlockRenderer; import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java index f48cdfc6..9211f59c 100644 --- a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java +++ b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java @@ -8,16 +8,15 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.IRenderFace; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IRenderFace; -import crazypants.render.RenderUtil; - public class OverlayRenderer implements IRenderFace { private static final CustomCubeRenderer ccr = CustomCubeRenderer.instance; diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index b1318b92..464dbf8d 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -5,13 +5,14 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.TechneModelRenderer; +import com.enderio.core.client.render.VertexRotationFacing; +import com.enderio.core.client.render.VertexTransform; +import com.enderio.core.client.render.VertexTransformComposite; import com.google.common.collect.ObjectArrays; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.TechneModelRenderer; -import crazypants.render.VertexRotationFacing; -import crazypants.render.VertexTransform; -import crazypants.render.VertexTransformComposite; +import crazypants.enderio.EnderIO; public class TechneMachineRenderer extends TechneModelRenderer { @@ -19,7 +20,7 @@ public class TechneMachineRenderer extends Tech private OverlayRenderer overlay = new OverlayRenderer(); public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { - super(modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); + super(EnderIO.MODID, modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } public TechneMachineRenderer addTransform(VertexTransform vt) { diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index 9d88f601..2c90d2bf 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -7,9 +7,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.stats.AchievementList; -import crazypants.enderio.machine.gui.AbstractMachineContainer; + import com.enderio.core.common.util.Util; +import crazypants.enderio.machine.gui.AbstractMachineContainer; + public class ContainerAlloySmelter extends AbstractMachineContainer { private final EntityPlayer thePlayer; diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 76a453bc..c4811e41 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.alloy; import java.awt.Rectangle; -import java.text.MessageFormat; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; @@ -9,19 +8,20 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IIconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.vecmath.Vector4f; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.alloy.TileAlloySmelter.Mode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiToolTip; -import crazypants.gui.IconButton; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; -import com.enderio.core.common.vecmath.Vector4f; public class GuiAlloySmelter extends GuiPoweredMachineBase { - private final IconButton vanillaFurnaceButton; + private final IIconButton vanillaFurnaceButton; private final GuiToolTip vanillaFurnaceTooltip; protected static final int SMELT_MODE_BUTTON_ID = 76; @@ -29,7 +29,7 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory)); - vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); + vanillaFurnaceButton = new IIconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); vanillaFurnaceTooltip = new GuiToolTip(new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE), (String[])null); diff --git a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java index 9acf50a1..a33e2ea3 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java @@ -15,9 +15,9 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.Recipe; +import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; -import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.material.OreDictionaryPreferences; public class VanillaSmeltingRecipe implements IMachineRecipe { diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index b6423d42..4a075adf 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -7,21 +7,22 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; -import crazypants.enderio.gui.TextFieldEIO; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; public class GuiBuffer extends GuiPoweredMachineBase { private static final String TEXTURE_SIMPLE = "enderio:textures/gui/buffer.png"; private static final String TEXTURE_FULL = "enderio:textures/gui/buffer_full.png"; - private TextFieldEIO maxInput; - private TextFieldEIO maxOutput; + private TextFieldEnder maxInput; + private TextFieldEnder maxOutput; private int lastInput, lastOutput; @@ -36,9 +37,9 @@ public class GuiBuffer extends GuiPoweredMachineBase { int x = (isFull() ? 20 : 58); int y = guiTop + 27; - maxInput = new TextFieldEIO(getFontRenderer(), x, y, 60, 12); + maxInput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); y += 28; - maxOutput = new TextFieldEIO(getFontRenderer(), x, y, 60, 12); + maxOutput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); textFields.add(maxInput); textFields.add(maxOutput); diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index f20602f3..80a405df 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -5,6 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.IoMode; @@ -13,7 +16,6 @@ import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; -import com.enderio.core.common.util.BlockCoord; public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintableTileEntity, IInternalPowerHandler { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 0bd4d15b..9e05b2c1 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -23,6 +23,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -37,7 +38,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 43b5b17f..8743e0c2 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -13,13 +13,16 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.VecmathUtil; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; @@ -31,9 +34,6 @@ import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiCapBank extends GuiContainerBase { @@ -63,8 +63,8 @@ public class GuiCapBank extends GuiContainerBase { private RedstoneModeButton inputRsButton; private RedstoneModeButton outputRsButton; - private TextFieldEIO maxInputTF; - private TextFieldEIO maxOutputTF; + private TextFieldEnder maxInputTF; + private TextFieldEnder maxOutputTF; private final GuiOverlayIoConfig configOverlay; private final GuiButtonIoConfig configB; @@ -172,15 +172,15 @@ public class GuiCapBank extends GuiContainerBase { x = inputX - 24; y = inputY; - maxInputTF = new TextFieldEIO(fontRenderer, x, y, 68, 16); + maxInputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); maxInputTF.setMaxStringLength(10); - maxInputTF.setCharFilter(TextFieldEIO.FILTER_NUMERIC); + maxInputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); x = outputX - 24; y = outputY; - maxOutputTF = new TextFieldEIO(fontRenderer, x, y, 68, 16); + maxOutputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); maxOutputTF.setMaxStringLength(10); - maxOutputTF.setCharFilter(TextFieldEIO.FILTER_NUMERIC); + maxOutputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); textFields.add(maxInputTF); textFields.add(maxOutputTF); diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index e238e8aa..77e53bd3 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -17,6 +17,11 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.ConnectedTextureRenderer; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,10 +34,6 @@ import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.render.FillGauge.GaugeInfo; import crazypants.enderio.machine.capbank.render.FillGauge.GaugeKey; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.CubeRenderer; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index 0f749290..33bc3dd5 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -13,6 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; @@ -24,8 +26,6 @@ import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index 3ddacd99..77f4f41b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -11,14 +11,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class IoDisplay implements IInfoRenderer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java index a2c03fb7..dc91def4 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java @@ -7,9 +7,11 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.widget.GhostSlot; + import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GhostSlot; public class ContainerCrafter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 5e8d7d1c..55b492f7 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -9,21 +9,21 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.PacketItemBuffer; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GhostSlot; -import crazypants.render.RenderUtil; public class GuiCrafter extends GuiPoweredMachineBase { - private final ToggleButtonEIO bufferSizeB; + private final ToggleButton bufferSizeB; public GuiCrafter(InventoryPlayer par1InventoryPlayer, TileCrafter te) { super(te, new ContainerCrafter(par1InventoryPlayer, te)); @@ -31,7 +31,7 @@ public class GuiCrafter extends GuiPoweredMachineBase { int x = getXSize() - 5 - 16; int y = 43; - bufferSizeB = new ToggleButtonEIO(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); + bufferSizeB = new ToggleButton(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(te.isBufferStacks()); diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index efdfd47c..5a5d994c 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -8,6 +8,9 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; + +import com.enderio.core.common.util.Util; + import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -15,12 +18,11 @@ import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.Recipe; +import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; -import crazypants.enderio.machine.recipe.RecipeBonusType; -import com.enderio.core.common.util.Util; public class CrusherRecipeManager { diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index f23db816..1299a7ae 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -6,9 +6,10 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiCrusher extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 7a5e428f..74779612 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -4,22 +4,20 @@ import java.util.Random; import net.minecraft.block.Block; 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.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; + +import com.enderio.core.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.network.IGuiHandler; import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.api.tool.ITool; -import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.tool.ToolUtil; -import com.enderio.core.common.util.Util; public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java index f4615570..04854c6e 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java @@ -12,9 +12,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class EnchanterModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java index 69c78dca..e005954b 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java @@ -1,20 +1,18 @@ package crazypants.enderio.machine.enchanter; -import java.awt.Color; - -import org.lwjgl.opengl.GL11; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.vacuum.ContainerVacuumChest; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; + +import com.enderio.core.client.render.RenderUtil; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.gui.IconEIO; + public class GuiEnchanter extends GuiContainer { private TileEnchanter te; @@ -35,7 +33,7 @@ public class GuiEnchanter extends GuiContainer { drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); if(EnderIO.proxy.isNeiInstalled()) { - IconEIO.RECIPE.renderIcon(sx + 155, sy + 8, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true); } int curCost = te.getCurrentEnchantmentCost(); diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index 5adf2841..f3d19c56 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -7,10 +7,12 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.TechneMachineRenderer; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; public class FarmingStationRenderer extends TechneMachineRenderer { diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java index eb068db2..3fcd35f0 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java @@ -3,12 +3,12 @@ package crazypants.enderio.machine.farm; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3f; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; -import crazypants.render.RenderUtil; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 6b3ac771..1f60a837 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -8,15 +8,15 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.Vector4f; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiFarmStation extends GuiPoweredMachineBase { @@ -40,8 +40,8 @@ public class GuiFarmStation extends GuiPoweredMachineBase { buttonList.add(createLockButton(TileFarmStation.minSupSlot + 3, x + 52, y + 20)); } - private IconButtonEIO createLockButton(int slot, int x, int y) { - return new ToggleButtonEIO(this, LOCK_ID + slot, x, y, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED).setSelected(getTileEntity().isSlotLocked(slot)); + private IconButton createLockButton(int slot, int x, int y) { + return new ToggleButton(this, LOCK_ID + slot, x, y, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED).setSelected(getTileEntity().isSlotLocked(slot)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java index 109b7da0..57b0b748 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java @@ -12,9 +12,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) @Deprecated diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index db3fe85b..7b71bd2e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -8,15 +8,15 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiCombustionGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index 86782504..11b2cec7 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -8,17 +8,16 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.IRenderFace; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.client.render.VertexTransform; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4f; import com.enderio.core.common.vecmath.Vertex; -import crazypants.render.BoundingBox; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IRenderFace; -import crazypants.render.RenderUtil; -import crazypants.render.VertexTransform; - public class TranslatedCubeRenderer { public static TranslatedCubeRenderer instance = new TranslatedCubeRenderer(); diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index 593c7282..1d8601ca 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -11,6 +11,9 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; @@ -18,9 +21,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.Capacitors; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class GuiStirlingGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 75eb3dca..e6aab417 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -8,15 +8,15 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiZombieGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 48cfaa37..619ca0d3 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -14,14 +14,14 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java index 46c21ecb..4353acc3 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -4,17 +4,17 @@ import java.util.ArrayList; import org.lwjgl.input.Keyboard; +import com.enderio.core.client.gui.IGuiScreen; +import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.common.util.Lang; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.PacketIoMode; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.IGuiScreen; -public class GuiButtonIoConfig extends ToggleButtonEIO { +public class GuiButtonIoConfig extends ToggleButton { private final IIoConfigurable config; private final GuiOverlayIoConfig configOverlay; diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index fb3ad635..cebe3220 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -11,6 +11,10 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.IProgressTile; import com.enderio.core.common.util.Lang; @@ -18,16 +22,12 @@ import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector4f; import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public abstract class GuiMachineBase extends GuiContainerBase { @@ -46,7 +46,7 @@ public abstract class GuiMachineBase extends Gu protected final GuiButtonIoConfig configB; - protected IconButtonEIO recipeButton; + protected IconButton recipeButton; protected List progressTooltips; protected int lastProgressTooltipValue = -1; @@ -68,7 +68,7 @@ public abstract class GuiMachineBase extends Gu configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); y += 19; - recipeButton = new IconButtonEIO(this, RECIPE_ID, x, y, IconEIO.RECIPE); + recipeButton = new IconButton(this, RECIPE_ID, x, y, IconEIO.RECIPE); recipeButton.visible = false; recipeButton.setIconMargin(3, 3); } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index e04597d1..b0abd1df 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -9,22 +9,22 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import com.enderio.core.client.gui.IGuiOverlay; +import com.enderio.core.client.gui.IGuiScreen; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; -import crazypants.gui.IGuiScreen; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiOverlayIoConfig implements IGuiOverlay { private boolean visible = false; - private ToggleButtonEIO configB; + private ToggleButton configB; private IGuiScreen screen; @@ -43,7 +43,7 @@ public class GuiOverlayIoConfig implements IGuiOverlay { coords.addAll(bc); } - public void setConfigB(ToggleButtonEIO configB) { + public void setConfigB(ToggleButton configB) { this.configB = configB; } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 80f5367a..99cf7173 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -8,9 +8,10 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; + import crazypants.enderio.machine.AbstractPoweredMachineEntity; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.gui.GuiToolTip; public abstract class GuiPoweredMachineBase extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index b0acaee5..2633df03 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.PlayerUtil; import com.enderio.core.common.util.Util; @@ -30,7 +31,6 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.network.PacketHandler; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java index e6fecb54..ac8fa358 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java @@ -7,8 +7,9 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import crazypants.gui.GuiScrollableList; -import crazypants.render.ColorUtil; + +import com.enderio.core.client.gui.widget.GuiScrollableList; +import com.enderio.core.client.render.ColorUtil; public class GuiChannelList extends GuiScrollableList { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 52a583cc..1dd493cc 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -10,26 +10,26 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.IGuiOverlay; +import com.enderio.core.client.gui.ListSelectionListener; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiScrollableList; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.PlayerUtil; -import crazypants.enderio.gui.IGuiOverlay; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.TextFieldEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiScrollableList; -import crazypants.gui.GuiToolTip; -import crazypants.gui.ListSelectionListener; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiHyperCube extends GuiContainerBase { @@ -56,24 +56,24 @@ public class GuiHyperCube extends GuiContainerBase { private final TileHyperCube cube; - private IconButtonEIO addButton; - private ToggleButtonEIO privateButton; + private IconButton addButton; + private ToggleButton privateButton; - private TextFieldEIO newChannelTF; + private TextFieldEnder newChannelTF; private GuiChannelList publicChannelList; private GuiChannelList privateChannelList; private ListSelectionListener selectionListener; - private IconButtonEIO selectPublicB; - private IconButtonEIO deletePublicB; + private IconButton selectPublicB; + private IconButton deletePublicB; - private IconButtonEIO selectPrivateB; - private IconButtonEIO deletePrivateB; + private IconButton selectPrivateB; + private IconButton deletePrivateB; - private IconButtonEIO powerB; - private IconButtonEIO fluidB; - private IconButtonEIO itemB; + private IconButton powerB; + private IconButton fluidB; + private IconButton itemB; private RedstoneModeButton rsB; @@ -95,35 +95,35 @@ public class GuiHyperCube extends GuiContainerBase { }); - addButton = new IconButtonEIO(this, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); + addButton = new IconButton(this, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); addButton.setToolTip(Lang.localize("gui.trans.addChannel")); addButton.enabled = false; - privateButton = new ToggleButtonEIO(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); + privateButton = new ToggleButton(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); - deletePublicB = new IconButtonEIO(this, DELETE_PUBLIC_BUTTON_ID, 74, 117, IconEIO.MINUS); + deletePublicB = new IconButton(this, DELETE_PUBLIC_BUTTON_ID, 74, 117, IconEIO.MINUS); deletePublicB.setToolTip(Lang.localize("gui.trans.deleteChannel")); - selectPublicB = new IconButtonEIO(this, SELECT_PUBLIC_BUTTON_ID, 95, 117, IconEIO.TICK); + selectPublicB = new IconButton(this, SELECT_PUBLIC_BUTTON_ID, 95, 117, IconEIO.TICK); selectPublicB.setToolTip(Lang.localize("gui.trans.activateChannel")); - deletePrivateB = new IconButtonEIO(this, DELETE_PRIVATE_BUTTON_ID, 183, 117, IconEIO.MINUS); + deletePrivateB = new IconButton(this, DELETE_PRIVATE_BUTTON_ID, 183, 117, IconEIO.MINUS); deletePrivateB.setToolTip(Lang.localize("gui.trans.deleteChannel")); - selectPrivateB = new IconButtonEIO(this, SELECT_PRIVATE_BUTTON_ID, 204, 117, IconEIO.TICK); + selectPrivateB = new IconButton(this, SELECT_PRIVATE_BUTTON_ID, 204, 117, IconEIO.TICK); selectPrivateB.setToolTip(Lang.localize("gui.trans.activateChannel")); int x = 163; int y = 12; - itemB = new IconButtonEIO(this, ITEM_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_ITEM); + itemB = new IconButton(this, ITEM_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_ITEM); itemB.setIconMargin(3, 3); x += 18; - powerB = new IconButtonEIO(this, POWER_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_POWER); + powerB = new IconButton(this, POWER_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_POWER); powerB.setIconMargin(3, 3); x += 18; - fluidB = new IconButtonEIO(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); + fluidB = new IconButton(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); fluidB.setIconMargin(3, 3); x += 24; @@ -168,7 +168,7 @@ public class GuiHyperCube extends GuiContainerBase { y = 12; x = 8; - newChannelTF = new TextFieldEIO(Minecraft.getMinecraft().fontRenderer, x, y, 103, 16); + newChannelTF = new TextFieldEnder(Minecraft.getMinecraft().fontRenderer, x, y, 103, 16); newChannelTF.setCanLoseFocus(false); newChannelTF.setMaxStringLength(32); newChannelTF.setFocused(true); @@ -377,28 +377,28 @@ public class GuiHyperCube extends GuiContainerBase { x = 163; if(itemMode.isRecieveEnabled()) { - IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x += 18; if(powerMode.isRecieveEnabled()) { - IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x += 18; if(fluidMode.isRecieveEnabled()) { - IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x = 163; if(itemMode.isSendEnabled()) { - IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); } x += 18; if(powerMode.isSendEnabled()) { - IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); } x += 18; if(fluidMode.isSendEnabled()) { - IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java index 5248b98b..714e1ab4 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java @@ -7,7 +7,7 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -import crazypants.render.RenderUtil; +import com.enderio.core.client.render.RenderUtil; public class HyperCubeModel extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java index c6e709a8..03dada65 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import org.lwjgl.opengl.GL11; -import crazypants.render.RenderUtil; +import com.enderio.core.client.render.RenderUtil; public class HyperCubeModel2 extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java index 0a825d77..4f19f419 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java @@ -11,13 +11,14 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 2d46b96e..3a2d3d94 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -15,18 +15,22 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.gui.widget.VScrollbar; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; -import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.gui.TooltipAddera; -import crazypants.enderio.gui.VScrollbarEIO; import crazypants.enderio.machine.generator.zombie.NutrientTank; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.machine.invpanel.client.DatabaseView; @@ -35,9 +39,6 @@ import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.client.ItemEntry; import crazypants.enderio.machine.invpanel.client.SortOrder; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GhostSlot; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class GuiInventoryPanel extends GuiMachineBase { @@ -53,11 +54,11 @@ public class GuiInventoryPanel extends GuiMachineBase { private static final int GHOST_ROWS = 5; private final DatabaseView view; - private final TextFieldEIO tfFilter; - private final IconButtonEIO btnSort; + private final TextFieldEnder tfFilter; + private final IconButton btnSort; private final GuiToolTip ttRefill; - private final VScrollbarEIO scrollbar; - private final MultiIconButtonEIO btnClear; + private final VScrollbar scrollbar; + private final MultiIconButton btnClear; private int scrollPos; @@ -84,9 +85,9 @@ public class GuiInventoryPanel extends GuiMachineBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - tfFilter = new TextFieldEIO(fr, 108, 11, 106, 10); + tfFilter = new TextFieldEnder(fr, 108, 11, 106, 10); tfFilter.setEnableBackgroundDrawing(false); - btnSort = new IconButtonEIO(this, ID_SORT, 233, 27, getSortOrderIcon()) { + btnSort = new IconButton(this, ID_SORT, 233, 27, getSortOrderIcon()) { @Override public boolean mousePressed(Minecraft mc, int x, int y) { return mousePressedButton(mc, x, y, 0); @@ -101,8 +102,8 @@ public class GuiInventoryPanel extends GuiMachineBase { return false; } }; - scrollbar = new VScrollbarEIO(this, 215, 27, 90); - btnClear = new MultiIconButtonEIO(this, ID_CLEAR, 65, 60, IconEIO.X_BUT, IconEIO.X_BUT_PRESSED, IconEIO.X_BUT_HOVER); + scrollbar = new VScrollbar(this, 215, 27, 90); + btnClear = new MultiIconButton(this, ID_CLEAR, 65, 60, EnderWidget.X_BUT, EnderWidget.X_BUT_PRESSED, EnderWidget.X_BUT_HOVER); textFields.add(tfFilter); diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index 9cba5682..e0d426a6 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -7,27 +7,27 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.SoundUtil; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketGivePlayerXP; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiKillerJoe extends GuiMachineBase { private static final int XP_ID = 3489; private static final int XP10_ID = 34892; - private IconButtonEIO xpB; - private IconButtonEIO xp10B; + private IconButton xpB; + private IconButton xp10B; public GuiKillerJoe(InventoryPlayer inventory, final TileKillerJoe tileEntity) { super(tileEntity, new ContainerKillerJoe(inventory, tileEntity)); @@ -47,10 +47,10 @@ public class GuiKillerJoe extends GuiMachineBase { }); - xpB = new IconButtonEIO(this, XP_ID, 128, 56, IconEIO.XP); + xpB = new IconButton(this, XP_ID, 128, 56, IconEIO.XP); xpB.setToolTip(Lang.localize("killerJoe.giveXp.tooltip")); - xp10B = new IconButtonEIO(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); + xp10B = new IconButton(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); xp10B.setToolTip(Lang.localize("killerJoe.giveXp10.tooltip")); } diff --git a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java index c8208e2b..bbfdf536 100644 --- a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java @@ -17,15 +17,15 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.generator.zombie.ModelZombieJar; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 34231921..99f839f2 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -26,6 +26,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; @@ -47,7 +48,6 @@ import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; -import crazypants.render.BoundingBox; public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { diff --git a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java index 7f05b1a0..f5757460 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java @@ -12,10 +12,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.gui.IResourceTooltipProvider; public class BlockItemElectricLight extends ItemBlockWithMetadata implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index c8508057..3b7eebc1 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -5,10 +5,12 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 6fbd2bcc..63f1e4d7 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -10,17 +10,16 @@ import net.minecraft.client.gui.GuiTextField; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.CheckBox; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; -import crazypants.enderio.gui.CheckBoxEIO; -import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; - import static crazypants.enderio.machine.power.PowerDisplayUtil.*; public class GuiPowerMonitor extends GuiContainerBase { @@ -46,10 +45,10 @@ public class GuiPowerMonitor extends GuiContainerBase { private boolean isRedstoneMode = false; - private CheckBoxEIO enabledB; + private CheckBox enabledB; - private TextFieldEIO startTF; - private TextFieldEIO endTF; + private TextFieldEnder startTF; + private TextFieldEnder endTF; private String titleStr; @@ -99,7 +98,7 @@ public class GuiPowerMonitor extends GuiContainerBase { int x = MARGIN + Minecraft.getMinecraft().fontRenderer.getStringWidth(titleStr) + SPACING; - enabledB = new CheckBoxEIO(this, 21267, x, 8); + enabledB = new CheckBox(this, 21267, x, 8); enabledB.setSelectedToolTip(Lang.localize("gui.enabled")); enabledB.setUnselectedToolTip(Lang.localize("gui.disabled")); enabledB.setSelected(te.engineControlEnabled); @@ -107,7 +106,7 @@ public class GuiPowerMonitor extends GuiContainerBase { x = MARGIN + getFontRenderer().getStringWidth(engineTxt2) + 4; int y = MARGIN + ICON_SIZE + ICON_SIZE + getFontRenderer().FONT_HEIGHT; - startTF = new TextFieldEIO(getFontRenderer(), x, y, 28, 14); + startTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); startTF.setCanLoseFocus(true); startTF.setMaxStringLength(3); startTF.setFocused(true); @@ -116,7 +115,7 @@ public class GuiPowerMonitor extends GuiContainerBase { y = y + getFontRenderer().FONT_HEIGHT + ICON_SIZE + ICON_SIZE + 4; x = 5 + MARGIN + getFontRenderer().getStringWidth(engineTxt5); - endTF = new TextFieldEIO(getFontRenderer(), x, y, 28, 14); + endTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); endTF.setCanLoseFocus(true); endTF.setMaxStringLength(3); endTF.setFocused(false); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java index 9b413309..5e938870 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java @@ -8,15 +8,15 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.VertexTransform; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector3f; import com.enderio.core.common.vecmath.Vertex; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.VertexTransform; public class ObeliskRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java index 816e68d1..eb1747f7 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java @@ -18,10 +18,11 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; -import crazypants.render.RenderUtil; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index abf61893..aa66f449 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -8,27 +8,27 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; import com.google.common.collect.Lists; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; public class GuiAttractor extends GuiPoweredMachineBase { private static final int RANGE_ID = 8738924; - private final ToggleButtonEIO showRangeB; + private final ToggleButton showRangeB; public GuiAttractor(InventoryPlayer par1InventoryPlayer, TileAttractor te) { super(te, new ContainerAttractor(par1InventoryPlayer, te)); int x = getXSize() - 5 - BUTTON_SIZE; - showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); + showRangeB = new ToggleButton(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { @Override diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index 96dbf078..07c7a394 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -27,6 +27,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3d; import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; @@ -39,9 +42,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.ranged.IRanged; import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.power.BasicCapacitor; -import crazypants.render.BoundingBox; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector3d; public class TileAttractor extends AbstractPowerConsumerEntity implements IRanged { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java index 0f2bed87..15fd172f 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java @@ -8,10 +8,12 @@ import net.minecraft.entity.passive.EntitySquid; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.config.Config; -import com.enderio.core.common.util.BlockCoord; public class AversionObeliskController { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index 5ebc2253..5bff079b 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -8,19 +8,19 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; import com.google.common.collect.Lists; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; public class GuiAversionObelisk extends GuiPoweredMachineBase { - ToggleButtonEIO showRangeB; + ToggleButton showRangeB; private static final int RANGE_ID = 8738924; @@ -28,7 +28,7 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index 5592e6ac..23f37784 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -12,9 +12,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.common.util.Lang; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; @@ -38,13 +38,13 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase int x = (xSize / 2) - (BUTTON_SIZE / 2); int y = 8; - addButton(new IconButtonEIO(this, 0, x - 30, y, IconEIO.SUN), WeatherTask.CLEAR); - addButton(new IconButtonEIO(this, 1, x, y, IconEIO.RAIN), WeatherTask.RAIN); - addButton(new IconButtonEIO(this, 2, x + 30, y, IconEIO.THUNDER), WeatherTask.STORM); + addButton(new IconButton(this, 0, x - 30, y, IconEIO.SUN), WeatherTask.CLEAR); + addButton(new IconButton(this, 1, x, y, IconEIO.RAIN), WeatherTask.RAIN); + addButton(new IconButton(this, 2, x + 30, y, IconEIO.THUNDER), WeatherTask.STORM); refreshButtons(); } - private void addButton(IconButtonEIO button, WeatherTask task) { + private void addButton(IconButton button, WeatherTask task) { String tt1 = EnumChatFormatting.WHITE + Lang.localize("gui.weather.task." + task.name().toLowerCase(Locale.ENGLISH)); String tt2 = EnumChatFormatting.AQUA + String.format(Lang.localize("gui.weather.requireditem"), EnumChatFormatting.WHITE + task.requiredItem().getDisplayName()); String tt3 = String.format("%s%s %s%s", EnumChatFormatting.GREEN, fmt.format(task.power), EnumChatFormatting.WHITE, Lang.localize("power.rf")); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java index 3f83a849..cc47d21d 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java @@ -7,26 +7,26 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; -import crazypants.render.RenderUtil; public class GuiExperienceObelisk extends GuiMachineBase { - private IconButtonEIO p; - private IconButtonEIO pp; - private IconButtonEIO ppp; + private IconButton p; + private IconButton pp; + private IconButton ppp; - private IconButtonEIO m; - private IconButtonEIO mm; - private IconButtonEIO mmm; + private IconButton m; + private IconButton mm; + private IconButton mmm; public GuiExperienceObelisk(InventoryPlayer par1InventoryPlayer, TileExperienceOblisk te) { super(te, new ContainerExperienceObelisk()); @@ -41,38 +41,38 @@ public class GuiExperienceObelisk extends GuiMachineBase { x = startX; y = 20; - p = new IconButtonEIO(this, 800, x, y, IconEIO.SINGLE_PLUS); + p = new IconButton(this, 800, x, y, IconEIO.SINGLE_PLUS); p.setSize(bw, bw); p.setIconMargin(2, 2); p.setToolTip(Lang.localize("gui.machine.button.storelevel"), Lang.localize("gui.machine.tooltip.storelevel")); x += spacing + bw; - pp = new IconButtonEIO(this, 801, x, y, IconEIO.DOUBLE_PLUS); + pp = new IconButton(this, 801, x, y, IconEIO.DOUBLE_PLUS); pp.setSize(bw, bw); pp.setIconMargin(2, 2); pp.setToolTip(Lang.localize("gui.machine.button.storelevels"), Lang.localize("gui.machine.tooltip.storelevels")); x += spacing + bw; - ppp = new IconButtonEIO(this, 802, x, y, IconEIO.TRIPLE_PLUS); + ppp = new IconButton(this, 802, x, y, IconEIO.TRIPLE_PLUS); ppp.setSize(bw, bw); ppp.setIconMargin(2, 2); ppp.setToolTip(Lang.localize("gui.machine.button.storeall"), Lang.localize("gui.machine.tooltip.storeall")); x = startX; y = 75; - m = new IconButtonEIO(this, 803, x, y, IconEIO.SINGLE_MINUS); + m = new IconButton(this, 803, x, y, IconEIO.SINGLE_MINUS); m.setSize(bw, bw); m.setIconMargin(2, 2); m.setToolTip(Lang.localize("gui.machine.button.retrievelevel"), Lang.localize("gui.machine.tooltip.retrievelevel")); x += spacing + bw; - mm = new IconButtonEIO(this, 804, x, y, IconEIO.DOUBLE_MINUS); + mm = new IconButton(this, 804, x, y, IconEIO.DOUBLE_MINUS); mm.setSize(bw, bw); mm.setIconMargin(2, 2); mm.setToolTip(Lang.localize("gui.machine.button.retrievelevels"), Lang.localize("gui.machine.tooltip.retrievelevels")); x += spacing + bw; - mmm = new IconButtonEIO(this, 805, x, y, IconEIO.TRIPLE_MINUS); + mmm = new IconButton(this, 805, x, y, IconEIO.TRIPLE_MINUS); mmm.setSize(bw, bw); mmm.setIconMargin(2, 2); mmm.setToolTip(Lang.localize("gui.machine.button.retrieveall")); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java index 4c1f1c32..e7d7dfef 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java @@ -11,6 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -21,7 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.XpUtil; diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index 4fc253c6..8337e66f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -4,12 +4,12 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class GuiPainter extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java index d31b904d..ac7b934f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java @@ -6,9 +6,11 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java index ad7a3851..a2a981b1 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java @@ -9,8 +9,9 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.EnderIO; -import crazypants.render.RenderUtil; public class PaintedItemRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 5897b853..1104cfff 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -20,6 +20,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -33,7 +34,6 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; diff --git a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java index 6cea2a56..e786581b 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java +++ b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java @@ -11,6 +11,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.ConnectedTextureRenderer; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.IRenderFace; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector2f; @@ -22,12 +28,6 @@ import com.enderio.core.common.vecmath.Vertex; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.power.GaugeBounds.VPos; -import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IRenderFace; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; public class CapBankRenderer2 implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java index c722a894..7ba16f3c 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java @@ -15,6 +15,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector4d; @@ -24,10 +28,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java index 978f9149..6eae95ff 100644 --- a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java +++ b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java @@ -6,13 +6,12 @@ import java.util.List; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector4d; -import crazypants.render.BoundingBox; -import crazypants.render.RenderUtil; - class GaugeBounds { private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 8f73bc7b..30c2d43f 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -14,10 +14,13 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; @@ -26,9 +29,6 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiCapacitorBank extends GuiContainerBase { @@ -60,7 +60,7 @@ public class GuiCapacitorBank extends GuiContainerBase { private GuiTextField maxOutputTF; private GuiOverlayIoConfig configOverlay; - private IconButtonEIO configB; + private IconButton configB; public GuiCapacitorBank(Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { super(new ContainerCapacitorBank(player, playerInv, te)); @@ -113,7 +113,7 @@ public class GuiCapacitorBank extends GuiContainerBase { outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); y += 20; - configB = new IconButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); + configB = new IconButton(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); List coords = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java b/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java index b3931ec4..d93f74c5 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java @@ -6,12 +6,13 @@ import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class RangeRenerer extends RenderEntity { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 5b153af7..cb18b338 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -12,6 +12,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Vector3d; @@ -19,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; import crazypants.enderio.tool.ToolUtil; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index 6f1a5468..13f3e55c 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -13,14 +13,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector3f; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class ReservoirRenderer extends TileEntitySpecialRenderer implements IResourceManagerReloadListener { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index d52aabcd..41eb67b8 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -13,13 +13,13 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ITankAccess; import com.enderio.core.common.vecmath.Vector3f; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; -import crazypants.render.BoundingBox; import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index 2ddd6a75..437d5a46 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -4,8 +4,9 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.render.RenderUtil; public class GuiSliceAndSplice extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 462b03c5..1c780c10 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -9,6 +9,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; @@ -16,8 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.power.PowerDisplayUtil; diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index cc7ce5fd..c872764a 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -15,6 +15,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; @@ -23,7 +24,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.waila.IWailaInfoProvider; public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider { diff --git a/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java b/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java index c5cb33ac..2042e77a 100644 --- a/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java @@ -12,14 +12,15 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.ConnectedTextureRenderer; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.CubeRenderer; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; public class SolarPanelRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index b47118e1..f2722b1f 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -6,26 +6,26 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.SoundUtil; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.XpUtil; -import crazypants.render.RenderUtil; public class GuiSoulBinder extends GuiPoweredMachineBase { private static final int PLAYER_XP_ID = 985162394; - private final IconButtonEIO usePlayerXP; + private final IconButton usePlayerXP; public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, TileSoulBinder te) { super(te, new ContainerSoulBinder(par1InventoryPlayer, te)); - usePlayerXP = new IconButtonEIO(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); + usePlayerXP = new IconButton(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); usePlayerXP.visible = false; usePlayerXP.setToolTip("Use Player XP"); diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 730959ef..36e4c88e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -10,14 +10,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index f0ee8c35..a832efa4 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -25,6 +25,7 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -42,7 +43,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.MachineRecipeRegistry; diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 3ba5aec6..c0dccc44 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -8,22 +8,22 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiPoweredSpawner extends GuiPoweredMachineBase { - private final MultiIconButtonEIO modeB; + private final MultiIconButton modeB; public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te)); - modeB = MultiIconButtonEIO.createRightArrowButton(this, 8888, 115, 10); + modeB = MultiIconButton.createRightArrowButton(this, 8888, 115, 10); modeB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java index 645aa952..064791d5 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java @@ -8,11 +8,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.IAdvancedTooltipProvider; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.gui.IAdvancedTooltipProvider; public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index b20fa0a3..09b7686f 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -17,6 +17,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; @@ -26,7 +27,6 @@ import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 04e584a8..88b81830 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -6,12 +6,12 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.gui.GuiMachineBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiTank extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java index 7449d782..65a60047 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java @@ -7,11 +7,12 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class TankFluidRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java index 900cac04..6b8e2ef6 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java @@ -10,10 +10,11 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; public class TankItemRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 80a3e13c..57d93255 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -6,13 +6,16 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.gui.ListSelectionListener; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiScrollableList; +import com.enderio.core.client.render.ColorUtil; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.PlayerUtil; -import crazypants.enderio.gui.ITabPanel; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.transceiver.Channel; import crazypants.enderio.machine.transceiver.ChannelType; import crazypants.enderio.machine.transceiver.ClientChannelRegister; @@ -20,9 +23,6 @@ import crazypants.enderio.machine.transceiver.PacketAddRemoveChannel; import crazypants.enderio.machine.transceiver.PacketSendRecieveChannel; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiScrollableList; -import crazypants.gui.ListSelectionListener; -import crazypants.render.ColorUtil; public class ChannelTab implements ITabPanel { @@ -36,8 +36,8 @@ public class ChannelTab implements ITabPanel { ChannelType type; GuiTransceiver parent; - IconButtonEIO addButton; - ToggleButtonEIO privateButton; + IconButton addButton; + ToggleButton privateButton; GuiTextField newChannelTF; GuiChannelList channelList; @@ -45,9 +45,9 @@ public class ChannelTab implements ITabPanel { GuiChannelList sendChannels; GuiChannelList recieveChannels; - IconButtonEIO deleteChannelB; - IconButtonEIO sendB; - IconButtonEIO recieveB; + IconButton deleteChannelB; + IconButton sendB; + IconButton recieveB; ListSelectionListener selectionListener; TileTransceiver transceiver; @@ -58,11 +58,11 @@ public class ChannelTab implements ITabPanel { transceiver = guiTransceiver.getTransciever(); newChannelTF = new GuiTextField(parent.getFontRenderer(), 7, 12, 103, 16); - addButton = new IconButtonEIO(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); + addButton = new IconButton(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); addButton.setToolTip(Lang.localize("gui.trans.addChannel")); addButton.enabled = false; - privateButton = new ToggleButtonEIO(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); + privateButton = new ToggleButton(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); @@ -75,7 +75,7 @@ public class ChannelTab implements ITabPanel { channelList.setShowSelectionBox(true); channelList.setScrollButtonIds(100, 101); - deleteChannelB = new IconButtonEIO(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); + deleteChannelB = new IconButton(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); deleteChannelB.setToolTip(Lang.localize("gui.trans.deleteChannel")); @@ -86,7 +86,7 @@ public class ChannelTab implements ITabPanel { sendChannels.setShowSelectionBox(true); sendChannels.setScrollButtonIds(200, 201); - sendB = new IconButtonEIO(parent,SEND_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); + sendB = new IconButton(parent,SEND_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); y += h + 20; recieveChannels = new GuiChannelList(parent, w, h, x, y); @@ -94,7 +94,7 @@ public class ChannelTab implements ITabPanel { recieveChannels.setShowSelectionBox(true); recieveChannels.setScrollButtonIds(300, 301); - recieveB = new IconButtonEIO(parent,RECIEVE_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); + recieveB = new IconButton(parent,RECIEVE_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); selectionListener = new ListSelectionListener() { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index e3a63757..3652ad9e 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -8,18 +8,19 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterContainer; import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.machine.transceiver.PacketItemFilter; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; public class FilterTab implements ITabPanel { @@ -28,7 +29,7 @@ public class FilterTab implements ITabPanel { private final BasicItemFilterGui sendGui; private final BasicItemFilterGui recGui; - private final MultiIconButtonEIO sendRecB; + private final MultiIconButton sendRecB; boolean showSend = true; @@ -40,7 +41,7 @@ public class FilterTab implements ITabPanel { recGui = new BasicItemFilterGui(parent, new FilterContainer(parent.getTransciever(), false), false, container.getFilterOffset().x, container.getFilterOffset().y, 20); - sendRecB = MultiIconButtonEIO.createRightArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20); + sendRecB = MultiIconButton.createRightArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20); sendRecB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 6299d554..5b47f833 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -10,17 +10,18 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.config.Config; -import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.PacketItemBuffer; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; -import com.enderio.core.common.util.Lang; public class GeneralTab implements ITabPanel { @@ -29,7 +30,7 @@ public class GeneralTab implements ITabPanel { GuiTransceiver parent; GuiToolTip sendPowerBarTT; - ToggleButtonEIO bufferSizeB; + ToggleButton bufferSizeB; public GeneralTab(GuiTransceiver guiTransceiver) { parent = guiTransceiver; @@ -37,7 +38,7 @@ public class GeneralTab implements ITabPanel { int x = parent.getXSize() - 5 - 16; int y = 43; - bufferSizeB = new ToggleButtonEIO(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); + bufferSizeB = new ToggleButton(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java index caa95829..9f5c728c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java @@ -7,12 +7,12 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import net.minecraftforge.event.terraingen.BiomeEvent.GetWaterColor; + +import com.enderio.core.client.gui.widget.GuiScrollableList; +import com.enderio.core.client.render.ColorUtil; + import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.hypercube.GuiHyperCube; import crazypants.enderio.machine.transceiver.Channel; -import crazypants.gui.GuiScrollableList; -import crazypants.render.ColorUtil; public class GuiChannelList extends GuiScrollableList { @@ -68,7 +68,7 @@ public class GuiChannelList extends GuiScrollableList { int col = ColorUtil.getRGB(Color.white); parent.drawString(parent.getFontRenderer(), c.getName(), xPosition + margin, yPosition + margin / 2, col); if(!c.isPublic()) { - IconEIO.LOCK_LOCKED.renderIcon(xPosition + width - 18, yPosition - 3, 16, 15, 0, true); + IconEIO.map.render(IconEIO.LOCK_LOCKED, xPosition + width - 18, yPosition - 3, 16, 15, 0, true); } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 5b1dfb39..a1c3d568 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -10,16 +10,17 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.Optional; +import com.enderio.core.client.gui.IGuiOverlay; +import com.enderio.core.client.gui.ITabPanel; +import com.enderio.core.client.render.IWidgetIcon; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.common.Optional; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IGuiOverlay; -import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.transceiver.ChannelType; import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.render.RenderUtil; public class GuiTransceiver extends GuiPoweredMachineBase { @@ -202,9 +203,9 @@ public class GuiTransceiver extends GuiPoweredMachineBase { for (int i = 0; i < tabs.size(); i++) { if(i != activeTab) { RenderUtil.bindTexture(IconEIO.TEXTURE); - IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); - IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); + IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); + IWidgetIcon icon = tabs.get(i).getIcon(); + icon.getMap().render(icon, tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -217,11 +218,11 @@ public class GuiTransceiver extends GuiPoweredMachineBase { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture(IconEIO.TEXTURE); tes.startDrawingQuads(); - IconEIO.ACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); + IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); if(tabs.size() > 0) { - IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); + IWidgetIcon icon = tabs.get(activeTab).getIcon(); + icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java index 6fa13786..fca4eca1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java @@ -7,8 +7,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.render.RenderUtil; public class TransceiverModel extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java index a3adfdad..c26701c1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java @@ -5,8 +5,9 @@ import net.minecraft.client.model.ModelRenderer; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.render.RenderUtil; public class TransceiverModelAlt extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index 12a04286..1d98df40 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -13,16 +13,17 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index eff0430e..fe64c249 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -8,6 +8,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.BlockEio; @@ -16,7 +19,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResourceTooltipProvider, IRedstoneConnectable { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index d193e2d3..2384af47 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -11,20 +11,21 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GhostSlot; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiVacuumChest extends GuiContainerBase { @@ -44,10 +45,10 @@ public class GuiVacuumChest extends GuiContainerBase { private final TileVacuumChest te; private final GuiToolTip rangeTooltip; - private final MultiIconButtonEIO rangeUpB; - private final MultiIconButtonEIO rangeDownB; - private final ToggleButtonEIO whiteListB; - private final ToggleButtonEIO useMetaB; + private final MultiIconButton rangeUpB; + private final MultiIconButton rangeDownB; + private final ToggleButton whiteListB; + private final ToggleButton useMetaB; private final RedstoneModeButton rsB; private final String headerChest; private final String headerFilter; @@ -66,10 +67,10 @@ public class GuiVacuumChest extends GuiContainerBase { rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), Lang.localize("gui.vacuum.range")); x += RANGE_WIDTH; - rangeUpB = MultiIconButtonEIO.createAddButton(this, ID_RANGE_UP, x, y); + rangeUpB = MultiIconButton.createAddButton(this, ID_RANGE_UP, x, y); y += 8; - rangeDownB = MultiIconButtonEIO.createMinusButton(this, ID_RANGE_DOWN, x, y); + rangeDownB = MultiIconButton.createMinusButton(this, ID_RANGE_DOWN, x, y); x = xSize - 16 - 7; y = 104; @@ -77,13 +78,13 @@ public class GuiVacuumChest extends GuiContainerBase { x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS*18 + 2; y = 86; - whiteListB = new ToggleButtonEIO(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); + whiteListB = new ToggleButton(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); whiteListB.setUnselectedToolTip(Lang.localize("gui.conduit.item.whitelist")); whiteListB.setSelectedToolTip(Lang.localize("gui.conduit.item.blacklist")); whiteListB.setPaintSelectedBorder(false); y += 18; - useMetaB = new ToggleButtonEIO(this, ID_MATCHMETA, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB = new ToggleButton(this, ID_MATCHMETA, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); @@ -190,7 +191,7 @@ public class GuiVacuumChest extends GuiContainerBase { fr.drawString(headerRange, sx+xSize-7-fr.getStringWidth(headerRange), sy+74, headerColor); fr.drawString(headerInventory, sx+7, sy+111, headerColor); - IconEIO.BUTTON_DOWN.renderIcon(sx + RANGE_LEFT, sy + RANGE_TOP, RANGE_WIDTH, 16, 0, true); + IconEIO.map.render(EnderWidget.BUTTON_DOWN, sx + RANGE_LEFT, sy + RANGE_TOP, RANGE_WIDTH, 16, 0, true); String str = Integer.toString(te.getRange()); int sw = fr.getStringWidth(str); fr.drawString(str, sx + RANGE_LEFT + RANGE_WIDTH - sw - 5, sy + RANGE_TOP + 5, ColorUtil.getRGB(Color.black)); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 2afab5d8..a6080684 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -14,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; +import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.ItemUtil; import crazypants.enderio.EnderIO; @@ -25,7 +26,6 @@ import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.render.BoundingBox; public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory, IRedstoneModeControlable { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java index 2cfd7bf3..c0a569bf 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java @@ -8,10 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; public class VacuumChestRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java index 66a35ba5..eaf211ef 100644 --- a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -10,6 +10,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.VertexRotation; import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; @@ -20,7 +21,6 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; -import crazypants.render.VertexRotation; public class BlockVat extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index 4b0c15a9..f5424ba1 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -11,23 +11,23 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiVat extends GuiPoweredMachineBase { private static final String GUI_TEXTURE = "enderio:textures/gui/vat.png"; - private final IconButtonEIO dump1, dump2; + private final IconButton dump1, dump2; public GuiVat(InventoryPlayer inventory, TileVat te) { super(te, new ContainerVat(inventory, te)); @@ -62,9 +62,9 @@ public class GuiVat extends GuiPoweredMachineBase { }); - dump1 = new IconButtonEIO(this, 1, 29, 62, IconEIO.REDSTONE_MODE_NEVER); + dump1 = new IconButton(this, 1, 29, 62, IconEIO.REDSTONE_MODE_NEVER); dump1.setToolTip(Lang.localize("gui.machine.vat.dump.1")); - dump2 = new IconButtonEIO(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); + dump2 = new IconButton(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); dump2.setToolTip(Lang.localize("gui.machine.vat.dump.2")); addProgressTooltip(81, 63, 14, 14); diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 50f83cc3..afe18b5a 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -8,12 +8,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */{ diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java index 708dae4e..af798116 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java @@ -6,16 +6,16 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.VertexRotation; +import com.enderio.core.client.render.VertexTransform; +import com.enderio.core.client.render.VertexTransformComposite; +import com.enderio.core.client.render.VertexTranslation; import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.VertexRotation; -import crazypants.render.VertexTransform; -import crazypants.render.VertexTransformComposite; -import crazypants.render.VertexTranslation; public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index fb26ed1d..f9e05e3f 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -12,6 +12,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; @@ -19,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IAdvancedTooltipProvider; public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index 492ae4f3..acd70307 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -9,16 +9,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.render.ConnectedTextureRenderer; +import com.enderio.core.client.render.ConnectedTextureRenderer.DefaultTextureCallback; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.render.ConduitBundleRenderer.FacadeAccessWrapper; import crazypants.enderio.config.Config; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; -import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.ConnectedTextureRenderer.DefaultTextureCallback; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.RenderUtil; public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 66592298..5a4ea921 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -17,23 +17,23 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; +import static com.enderio.core.common.util.OreDictionaryHelper.*; import static crazypants.enderio.EnderIO.itemBasicCapacitor; - public class MaterialRecipes { public static void registerDependantOresInDictionary() { - if(hasCopper()) { + if (hasCopper()) { OreDictionary.registerOre("dustCopper", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal())); } - if(hasTin()) { + if (hasTin()) { OreDictionary.registerOre("dustTin", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal())); } - if(hasEnderPearlDust()) { + if (hasEnderPearlDust()) { OreDictionary.registerOre("dustEnderPearl", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal())); } //Enderium Base - if(OreDictionaryHelper.hasEnderium()) { + if (OreDictionaryHelper.hasEnderium()) { OreDictionary.registerOre("ingotEnderiumBase", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.INGOT_ENDERIUM_BASE.ordinal())); } } @@ -44,7 +44,7 @@ public class MaterialRecipes { OreDictionary.registerOre("dustIron", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal())); OreDictionary.registerOre("dustGold", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal())); OreDictionary.registerOre("dustObsidian", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_OBSIDIAN.ordinal())); - + OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); @@ -101,7 +101,7 @@ public class MaterialRecipes { //Conduit Binder ItemStack cbc = binderComposite.copy(); cbc.stackSize = 8; - if(Config.useAlternateBinderRecipe) { + if (Config.useAlternateBinderRecipe) { GameRegistry.addShapedRecipe(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', Blocks.sand, 'c', Items.clay_ball); } else { GameRegistry.addShapedRecipe(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', Blocks.sand, 'c', Items.clay_ball); @@ -157,7 +157,7 @@ public class MaterialRecipes { ArrayList steelIngots = OreDictionary.getOres("ingotSteel"); - if(Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty()) { + if (Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty()) { GameRegistry.addRecipe(new ShapedOreRecipe(machineChassi, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', "ingotSteel", 'c', capacitor)); } else { GameRegistry.addShapedRecipe(machineChassi, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Items.iron_ingot, 'c', capacitor); @@ -170,7 +170,7 @@ public class MaterialRecipes { //Ender Capacitor ItemStack enderCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 2); ItemStack activatedCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 1); - if(Config.useHardRecipes) { + if (Config.useHardRecipes) { GameRegistry.addShapedRecipe(enderCapacitor, "eee", "cgc", "eee", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } else { GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); @@ -181,23 +181,18 @@ public class MaterialRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()), main, WeatherTask.CLEAR .requiredItem(), WeatherTask.RAIN.requiredItem(), WeatherTask.STORM.requiredItem())); - if(Config.reinforcedObsidianEnabled) { + if (Config.reinforcedObsidianEnabled) { ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); ItemStack corners = darkSteel; - if(Config.reinforcedObsidianUseDarkSteelBlocks) { + if (Config.reinforcedObsidianUseDarkSteelBlocks) { corners = new ItemStack(EnderIO.blockIngotStorage, 1, Alloy.DARK_STEEL.ordinal()); } GameRegistry.addShapedRecipe(reinfObs, "dbd", "bob", "dbd", 'd', corners, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); } - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.blockDarkSteelAnvil, - "bbb", - " i ", - "iii", + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", - 'b', "blockDarkSteel", - 'i', "ingotDarkSteel" - )); + 'b', "blockDarkSteel", 'i', "ingotDarkSteel")); GameRegistry.addRecipe(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars); @@ -216,12 +211,12 @@ public class MaterialRecipes { } public static void addOreDictionaryRecipes() { - if(OreDictionaryHelper.hasCopper()) { + if (OreDictionaryHelper.hasCopper()) { ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); ItemStack ingotCopper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); GameRegistry.addSmelting(dustCopper, ingotCopper, 0); } - if(hasTin()) { + if (hasTin()) { ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); GameRegistry.addSmelting(dustTin, ingotTin, 0); @@ -230,22 +225,21 @@ public class MaterialRecipes { ItemStack capacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 0); ArrayList copperIngots = OreDictionary.getOres("ingotCopper"); Item gold; - if(Config.useHardRecipes) { + if (Config.useHardRecipes) { gold = Items.gold_ingot; } else { gold = Items.gold_nugget; } - if(copperIngots != null && !copperIngots.isEmpty() && Config.useModMetals) { + if (copperIngots != null && !copperIngots.isEmpty() && Config.useModMetals) { GameRegistry.addRecipe(new ShapedOreRecipe(capacitor, " gr", "gcg", "rg ", 'r', Items.redstone, 'g', gold, 'c', "ingotCopper")); } else { - GameRegistry. - addShapedRecipe(capacitor, " gr", "gig", "rg ", 'r', Items.redstone, 'g', gold, 'i', Items.iron_ingot); + GameRegistry.addShapedRecipe(capacitor, " gr", "gig", "rg ", 'r', Items.redstone, 'g', gold, 'i', Items.iron_ingot); } int dustCoal = OreDictionary.getOreID("dustCoal"); ItemStack activatedCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 1); ItemStack energeticAlloy = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ENERGETIC_ALLOY.ordinal()); - if(Config.useHardRecipes) { + if (Config.useHardRecipes) { GameRegistry.addRecipe(new ShapedOreRecipe(activatedCapacitor, "eee", "cCc", "eee", 'e', energeticAlloy, 'c', capacitor, 'C', "dustCoal")); } else { GameRegistry.addRecipe(new ShapedOreRecipe(activatedCapacitor, " e ", "cCc", " e ", 'e', energeticAlloy, 'c', capacitor, 'C', "dustCoal")); diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index 668f6fbb..9b6892d0 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -1,6 +1,6 @@ package crazypants.enderio.material; - +import static com.enderio.core.common.util.OreDictionaryHelper.*; public enum PowderIngot { @@ -34,7 +34,7 @@ public enum PowderIngot { } public boolean isDependancyMet() { - if(oreDictDependancy == null) { + if (oreDictDependancy == null) { return true; } return isRegistered(oreDictDependancy); diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 343bb241..142079fd 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -110,7 +110,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); GuiDraw.drawString(energyString, 100, 52, 0x808080, false); - IconEIO.RECIPE_BUTTON.renderIcon(149, 32, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, 32, 16, 16, 0, true); } public List getInputs(RecipeInput input) { diff --git a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java index 38ed0275..a888b514 100644 --- a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java @@ -125,7 +125,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler { GuiDraw.drawStringC(s, 83, 46, 0x80FF20); } - IconEIO.RECIPE_BUTTON.renderIcon(149, -3, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, -3, 16, 16, 0, true); } public List getInputs(RecipeInput input) { diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index 9c3d6cc1..7db27c83 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -117,7 +117,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); GuiDraw.drawString(energyString, 96, 33, 0x808080, false); - IconEIO.RECIPE_BUTTON.renderIcon(149, 32, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, 32, 16, 16, 0, true); } @Override diff --git a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java index 5d5c864d..d2dd1d2a 100644 --- a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java @@ -108,7 +108,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); GuiDraw.drawString(energyString, 100, 57, 0x808080, false); - IconEIO.RECIPE_BUTTON.renderIcon(149, 32, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, 32, 16, 16, 0, true); } public List getInputs(RecipeInput input) { diff --git a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java index 6ed27f27..ef613025 100644 --- a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java @@ -134,7 +134,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler { GuiDraw.drawStringC(s, 83, 55, 0x80FF20); } - IconEIO.RECIPE_BUTTON.renderIcon(149, 32, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, 32, 16, 16, 0, true); } private static final ArrayList EMPTY_VIAL_OUTPUT = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 865880bd..e12286b9 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -20,6 +20,7 @@ import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.FluidUtil; import crazypants.enderio.gui.IconEIO; @@ -28,7 +29,6 @@ import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.vat.GuiVat; import crazypants.enderio.machine.vat.VatRecipeManager; -import crazypants.render.RenderUtil; public class VatRecipeHandler extends TemplateRecipeHandler { @@ -171,7 +171,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false); } - IconEIO.RECIPE_BUTTON.renderIcon(149, 32, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE_BUTTON, 149, 32, 16, 16, 0, true); } @Override diff --git a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java index 9f703c22..4e3c2e5a 100644 --- a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java +++ b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java @@ -17,6 +17,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.MetadataUtil; import com.enderio.core.common.util.RoundRobinIterator; @@ -28,7 +29,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.transceiver.Channel; import crazypants.enderio.machine.transceiver.ChannelType; import crazypants.enderio.machine.transceiver.ServerChannelRegister; diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java index af0b0de1..9e5ffbee 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java @@ -7,8 +7,10 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.enderio.core.client.gui.widget.TemplateSlot; + import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.gui.TemplateSlot; import crazypants.util.ArrayInventory; public class ContainerTravelAccessable extends Container { diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java index 509c668f..0f44271e 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java @@ -5,7 +5,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.gui.TemplateSlot; + +import com.enderio.core.client.gui.widget.TemplateSlot; + import crazypants.util.ArrayInventory; public class ContainerTravelAuth extends Container { diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index b1ee3015..3ac55f3b 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -10,19 +10,19 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.button.CheckBox; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; -import crazypants.enderio.gui.CheckBoxEIO; -import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketLabel; -import crazypants.gui.GuiContainerBase; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiTravelAccessable extends GuiContainerBase { @@ -30,11 +30,11 @@ public class GuiTravelAccessable extends GuiContainerBase { private static final int ID_PRIVATE = 1; private static final int ID_PROTECTED = 2; - private CheckBoxEIO publicCB; - private CheckBoxEIO privateCB; - private CheckBoxEIO protectedCB; + private CheckBox publicCB; + private CheckBox privateCB; + private CheckBox protectedCB; - private TextFieldEIO tf; + private TextFieldEnder tf; private String publicStr; private String privateStr; @@ -62,7 +62,7 @@ public class GuiTravelAccessable extends GuiContainerBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - tf = new TextFieldEIO(fr, 28, 10, 90, 16); + tf = new TextFieldEnder(fr, 28, 10, 90, 16); col1x = 88; col0x = (col1x - fr.getStringWidth(protectedStr) / 2) / 2; @@ -73,15 +73,15 @@ public class GuiTravelAccessable extends GuiContainerBase { int y = 50; x = col0x - 8; - privateCB = new CheckBoxEIO(this, ID_PRIVATE, x, y); + privateCB = new CheckBox(this, ID_PRIVATE, x, y); privateCB.setSelected(te.getAccessMode() == AccessMode.PRIVATE); x = col1x - 8; - protectedCB = new CheckBoxEIO(this, ID_PROTECTED, x, y); + protectedCB = new CheckBox(this, ID_PROTECTED, x, y); protectedCB.setSelected(te.getAccessMode() == AccessMode.PROTECTED); x = col2x - 8; - publicCB = new CheckBoxEIO(this, ID_PUBLIC, x, y); + publicCB = new CheckBox(this, ID_PUBLIC, x, y); publicCB.setSelected(te.getAccessMode() == AccessMode.PUBLIC); ySize = 185; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 058a51e0..ad77006c 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -10,14 +10,14 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.Lang; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class GuiTravelAuth extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index 6c8ff787..443d054a 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -10,6 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import cofh.api.energy.ItemEnergyContainer; + +import com.enderio.core.client.gui.IResourceTooltipProvider; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,7 +22,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index b2efbc52..d742acc1 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -17,6 +17,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.FMLCommonHandler; @@ -30,7 +31,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.config.Config; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index eb655895..bc25aafa 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -16,6 +16,9 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -28,9 +31,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.teleport.TravelController; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; @SideOnly(Side.CLIENT) public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 268cd8ee..19e36da8 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -13,6 +13,10 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.gui.GuiContainerBase; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -22,12 +26,8 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; -import crazypants.render.RenderUtil; public class GuiTelePad extends GuiContainerBase implements IToggleableGui { @@ -40,7 +40,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { private World world; private TileTelePad te; - private TextFieldEIO xTF, yTF, zTF, dimTF; + private TextFieldEnder xTF, yTF, zTF, dimTF; private int powerX = 8; private int powerY = 9; @@ -78,10 +78,10 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { int x = 42; int y = 8; - xTF = new TextFieldEIO(fr, x, y, xSize - x * 2, 12, TextFieldEIO.FILTER_NUMERIC); - yTF = new TextFieldEIO(fr, x, y + xTF.height + 2, xSize - x * 2, 12, TextFieldEIO.FILTER_NUMERIC); - zTF = new TextFieldEIO(fr, x, y + (xTF.height * 2) + 4, xSize - x * 2, 12, TextFieldEIO.FILTER_NUMERIC); - dimTF = new TextFieldEIO(fr, x, y + (xTF.height * 3) + 6, xSize - x * 2, 12, TextFieldEIO.FILTER_NUMERIC); + xTF = new TextFieldEnder(fr, x, y, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + yTF = new TextFieldEnder(fr, x, y + xTF.height + 2, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + zTF = new TextFieldEnder(fr, x, y + (xTF.height * 2) + 4, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + dimTF = new TextFieldEnder(fr, x, y + (xTF.height * 3) + 6, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); xTF.setText(Integer.toString(te.getX())); yTF.setText(Integer.toString(te.getY())); @@ -151,7 +151,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { } } - private int getIntFromTextBox(TextFieldEIO tf) { + private int getIntFromTextBox(TextFieldEnder tf) { String text = tf.getText(); if("".equals(text) || "-".equals(text)) { return 0; @@ -177,10 +177,10 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { String[] text = { "X", "Y", "Z", "DIM" }; for (int i = 0; i < text.length; i++) { - TextFieldEIO f = textFields.get(i); + TextFieldEnder f = textFields.get(i); fnt.drawString(text[i], f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 10, f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2) + 1, 0x000000); if(!f.getCanLoseFocus()) { - IconEIO.LOCK_LOCKED.renderIcon(f.xPosition + f.width - 2, f.yPosition - 2, true); + IconEIO.map.render(IconEIO.LOCK_LOCKED, f.xPosition + f.width - 2, f.yPosition - 2, true); } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java b/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java index fc582b8f..8bc7c99c 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java @@ -1,6 +1,6 @@ package crazypants.enderio.teleport.telepad; -import crazypants.gui.IGuiScreen; +import com.enderio.core.client.gui.IGuiScreen; public interface IToggleableGui extends IGuiScreen { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java index 40f02c98..bb4b2c38 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java @@ -17,6 +17,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; @@ -27,7 +28,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.ITelePad; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; public class ItemCoordSelector extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index eb74aca1..162572cb 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -10,15 +10,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.TechneModelRenderer; +import com.enderio.core.client.render.TechneUtil; import com.google.common.collect.Lists; -import crazypants.render.CubeRenderer; -import crazypants.render.TechneModelRenderer; -import crazypants.render.TechneUtil; +import crazypants.enderio.EnderIO; public class TelePadRenderer extends TechneModelRenderer { - public static final Map all = TechneUtil.getModel("models/telePad"); + public static final Map all = TechneUtil.getModel(EnderIO.MODID, "models/telePad"); public TelePadRenderer() { super(getModel(), BlockTelePad.renderId); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java index 4b805a9e..7917fc60 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java @@ -10,10 +10,9 @@ import net.minecraftforge.client.model.obj.GroupObject; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.TechneUtil; import com.google.common.collect.Lists; -import crazypants.render.TechneUtil; - public class TelePadSpecialRenderer extends TileEntitySpecialRenderer { private static GroupObject blade1 = TelePadRenderer.all.get("blade1"); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java index 07f32e7b..65296411 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java @@ -8,8 +8,9 @@ import net.minecraftforge.client.event.RenderLivingEvent; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.render.RenderUtil; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index b0f17d1d..4651c060 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -343,7 +343,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int calculateTeleportPower() { if (worldObj.provider.dimensionId == targetDim) { - this.maxPower = new BlockCoord(this).distance(target) * 1000; + this.maxPower = new BlockCoord(this).getDist(target) * 1000; } else { this.maxPower = 100000; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java index 6a7b1620..c3a2fb64 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java @@ -1,10 +1,12 @@ package crazypants.enderio.teleport.telepad; import net.minecraft.client.Minecraft; -import crazypants.enderio.gui.IconButtonEIO; + +import com.enderio.core.client.gui.button.IconButton; + import crazypants.enderio.gui.IconEIO; -public class ToggleTravelButton extends IconButtonEIO { +public class ToggleTravelButton extends IconButton { IToggleableGui gui; diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index a20e24d4..bf476648 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -2,9 +2,10 @@ package crazypants.enderio.waila; import java.util.List; +import com.enderio.core.client.gui.IAdvancedTooltipProvider; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import crazypants.enderio.gui.IAdvancedTooltipProvider; public interface IWailaInfoProvider { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 5b999f10..0839e738 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -34,8 +34,6 @@ import crazypants.enderio.conduit.liquid.AbstractTankConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; @@ -43,7 +41,11 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; + +import com.enderio.core.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.Lang; + import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index bbdf64f9..e1a7646a 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -6,9 +6,10 @@ import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.gui.IconEIO; -import crazypants.render.ColorUtil; -import crazypants.render.RenderUtil; public class ExperienceBarRenderer { diff --git a/src/main/java/crazypants/enderio/xp/ExperienceContainer.java b/src/main/java/crazypants/enderio/xp/ExperienceContainer.java index 8ac17591..5e03f9af 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceContainer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceContainer.java @@ -1,8 +1,9 @@ package crazypants.enderio.xp; +import io.netty.buffer.ByteBuf; + import java.security.InvalidParameterException; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/crazypants/gui/FakeEmptySlot.java b/src/main/java/crazypants/gui/FakeEmptySlot.java deleted file mode 100644 index 9b9ae294..00000000 --- a/src/main/java/crazypants/gui/FakeEmptySlot.java +++ /dev/null @@ -1,42 +0,0 @@ -package crazypants.gui; - -import net.minecraft.client.gui.GuiScreen; - -import org.lwjgl.opengl.GL11; - -import crazypants.render.RenderUtil; - -class FakeEmptySlot { - - 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 FakeEmptySlot(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/src/main/java/crazypants/gui/GhostSlot.java b/src/main/java/crazypants/gui/GhostSlot.java deleted file mode 100644 index b3f6426c..00000000 --- a/src/main/java/crazypants/gui/GhostSlot.java +++ /dev/null @@ -1,26 +0,0 @@ -package crazypants.gui; - -import net.minecraft.item.ItemStack; - -public class GhostSlot { - - public int x; - public int y; - public boolean visible = true; - public ItemStack stack; - - public boolean isMouseOver(int mx, int my) { - return mx >= x && mx < (x+16) && my >= y && my < (y+16); - } - - public boolean isVisible() { - return visible; - } - - public ItemStack getStack() { - return stack; - } - - public void putStack(ItemStack stack) { - } -} diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java deleted file mode 100644 index e8f13cad..00000000 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ /dev/null @@ -1,636 +0,0 @@ -package crazypants.gui; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Timer; - -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; - -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.Optional; -import crazypants.enderio.gui.IGuiOverlay; -import crazypants.enderio.gui.IconButtonEIO; -import crazypants.enderio.gui.TextFieldEIO; -import crazypants.enderio.gui.VScrollbarEIO; -import crazypants.gui.ToolTipManager.ToolTipRenderer; -import crazypants.render.RenderUtil; - -@Optional.InterfaceList({ - @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -}) -public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer, IGuiScreen, INEIGuiHandler { - - protected ToolTipManager ttMan = new ToolTipManager(); - protected List overlays = new ArrayList(); - protected List textFields = Lists.newArrayList(); - protected List scrollbars = new ArrayList(); - protected List ghostSlots = new ArrayList(); - - protected GhostSlot hoverGhostSlot; - protected VScrollbarEIO draggingScrollbar; - - protected GuiContainerBase(Container par1Container) { - super(par1Container); - } - - @Override - public void initGui() { - super.initGui(); - fixupGuiPosition(); - for (IGuiOverlay overlay : overlays) { - overlay.init(this); - } - for (TextFieldEIO f : textFields) { - f.init(this); - } - } - - protected void fixupGuiPosition() { - } - - @Override - protected void keyTyped(char c, int key) { - GuiTextField focused = null; - for (GuiTextField f : textFields) { - if (f.isFocused()) { - focused = f; - } - } - - // If esc is pressed - if(key == 1) { - // If there is a focused text field unfocus it - if(focused != null && key == 1) { - focused.setFocused(false); - focused = null; - return; - } else if(!hideOverlays()) { // Otherwise close overlays/GUI - this.mc.thePlayer.closeScreen(); - return; - } - } - - // If the user pressed tab, switch to the next text field, or unfocus if there are none - if(c == '\t') { - for (int i = 0; i < textFields.size(); i++) { - TextFieldEIO f = textFields.get(i); - if (f.isFocused()) { - textFields.get((i + 1) % textFields.size()).setFocused(true); - f.setFocused(false); - return; - } - } - } - - // If there is a focused text field, attempt to type into it - if(focused != null) { - if(focused.textboxKeyTyped(c, key)) { - return; - } - } - - // More NEI behavior, f key focuses first text field - if(c == 'f' && focused == null && !textFields.isEmpty()) { - focused = textFields.get(0); - focused.setFocused(true); - } - - // Finally if 'e' was pressed but not captured by a text field, close the overlays/GUI - if(key == this.mc.gameSettings.keyBindInventory.getKeyCode()) { - if(!hideOverlays()) { - this.mc.thePlayer.closeScreen(); - } - return; - } - - // If the key was not captured, let NEI do its thing - super.keyTyped(c, key); - } - - public boolean hideOverlays() { - for (IGuiOverlay overlay : overlays) { - if(overlay.isVisible()) { - overlay.setVisible(false); - return true; - } - } - return false; - } - - @Override - public void addToolTip(GuiToolTip toolTip) { - ttMan.addToolTip(toolTip); - } - - @Override - public void updateScreen() { - super.updateScreen(); - - for (GuiTextField f : textFields) { - f.updateCursorCounter(); - } - } - - @Override - public void handleMouseInput() { - int x = Mouse.getEventX() * this.width / this.mc.displayWidth; - int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - int b = Mouse.getEventButton(); - for (IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible() && overlay.handleMouseInput(x, y, b)) { - return; - } - } - int delta = Mouse.getEventDWheel(); - if(delta != 0) { - mouseWheel(x, y, delta); - } - super.handleMouseInput(); - } - - @Override - protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) { - int x = Mouse.getEventX() * this.width / this.mc.displayWidth; - int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - for (IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible() && overlay.isMouseInBounds(x, y)) { - return false; - } - } - return super.func_146978_c(p_146978_1_, p_146978_2_, p_146978_3_, p_146978_4_, p_146978_5_, p_146978_6_); - } - - @Override - public List getGhostSlots() { - return ghostSlots; - } - - protected void ghostSlotClicked(GhostSlot slot, int x, int y, int button) { - ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); - slot.putStack(st); - } - - @Override - protected void mouseClicked(int x, int y, int button) { - for (GuiTextField f : textFields) { - f.mouseClicked(x, y, button); - } - if(!scrollbars.isEmpty()) { - if(draggingScrollbar != null) { - draggingScrollbar.mouseClicked(x, y, button); - return; - } - for(VScrollbarEIO vs : scrollbars) { - if(vs.mouseClicked(x, y, button)) { - draggingScrollbar = vs; - return; - } - } - } - if(!ghostSlots.isEmpty()) { - GhostSlot slot = getGhostSlot(x, y); - if(slot != null) { - ghostSlotClicked(slot, x, y, button); - return; - } - } - // Right click field clearing - if(button == 1) { - for (TextFieldEIO tf : textFields) { - if(tf.contains(x, y)) { - tf.setText(""); - } - } - } - // Button events for non-left-clicks - if(button >= 1) { - for(Object obj : buttonList) { - if(obj instanceof IconButtonEIO) { - IconButtonEIO btn = (IconButtonEIO) obj; - if(btn.mousePressedButton(mc, x, y, button)) { - btn.func_146113_a(this.mc.getSoundHandler()); - actionPerformedButton(btn, button); - } - } - } - } - super.mouseClicked(x, y, button); - } - - @Override - protected void mouseMovedOrUp(int x, int y, int button) { - if(draggingScrollbar != null) { - draggingScrollbar.mouseMovedOrUp(x, y, button); - draggingScrollbar = null; - } - super.mouseMovedOrUp(x, y, button); - } - - @Override - protected void mouseClickMove(int x, int y, int button, long time) { - if(draggingScrollbar != null) { - draggingScrollbar.mouseClickMove(x, y, button, time); - return; - } - super.mouseClickMove(x, y, button, time); - } - - protected void mouseWheel(int x, int y, int delta) { - if(!scrollbars.isEmpty()) { - for(VScrollbarEIO vs : scrollbars) { - vs.mouseWheel(x, y, delta); - } - } - } - - protected void actionPerformedButton(IconButtonEIO btn, int mouseButton) { - actionPerformed(btn); - } - - public void addOverlay(IGuiOverlay overlay) { - overlays.add(overlay); - } - - public void removeOverlay(IGuiOverlay overlay) { - overlays.remove(overlay); - } - - public void addScrollbar(VScrollbarEIO vs) { - scrollbars.add(vs); - vs.adjustPosition(); - } - - public void removeScrollbar(VScrollbarEIO vs) { - scrollbars.remove(vs); - if(draggingScrollbar == vs) { - draggingScrollbar = null; - } - } - - private int realMx, realMy; - - @Override - protected final void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - drawForegroundImpl(mouseX, mouseY); - - Timer t = RenderUtil.getTimer(); - - if(t != null) { - GL11.glPushMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_DEPTH_TEST); - for (IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible()) { - overlay.draw(realMx, realMy, t.renderPartialTicks); - } - } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { - for (GuiTextField f : textFields) { - f.drawTextBox(); - } - if(!scrollbars.isEmpty()) { - for(VScrollbarEIO vs : scrollbars) { - vs.drawScrollbar(mouseX, mouseY); - } - } - drawGhostSlots(mouseX, mouseY); - } - - @Override - public void drawScreen(int par1, int par2, float par3) { - hoverGhostSlot = null; - int mx = realMx = par1; - int my = realMy = par2; - for (IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible() && isMouseInOverlay(par1, par2, overlay)) { - mx = -5000; - my = -5000; - this.drawItemStack(this.mc.thePlayer.inventory.getItemStack(), par1 - this.guiLeft - 8, par2 - this.guiTop - 8, null); - } - } - - super.drawScreen(mx, my, par3); - - if(draggingScrollbar == null) { - if(hoverGhostSlot != null && mc.thePlayer.inventory.getItemStack() == null) { - ItemStack stack = hoverGhostSlot.getStack(); - if(stack != null) { - renderToolTip(stack, par1, par2); - } - } - - ttMan.drawTooltips(this, par1, par2); - } - } - - // copied from super with hate - protected void drawItemStack(ItemStack stack, int mouseX, int mouseY, String str) - { - GL11.glTranslatef(0.0F, 0.0F, 32.0F); - this.zLevel = 200.0F; - itemRender.zLevel = 200.0F; - FontRenderer font = null; - if(stack != null) { - font = stack.getItem().getFontRenderer(stack); - } - if(font == null) { - font = fontRendererObj; - } - itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY); - itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY, str); - this.zLevel = 0.0F; - itemRender.zLevel = 0.0F; - } - - protected void drawFakeItemsStart() { - zLevel = 100.0F; - itemRender.zLevel = 100.0F; - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableGUIStandardItemLighting(); - } - - protected void drawFakeItemStack(int x, int y, ItemStack stack) { - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, stack, x, y); - } - - protected void drawFakeItemHover(int x, int y) { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glColorMask(true, true, true, false); - drawGradientRect(x, y, x + 16, y + 16, 0x80FFFFFF, 0x80FFFFFF); - GL11.glColorMask(true, true, true, true); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_LIGHTING); - } - - protected void drawFakeItemsEnd() { - GL11.glPopAttrib(); - itemRender.zLevel = 0.0F; - zLevel = 0.0F; - } - - protected void drawGhostSlots(int mouseX, int mouseY) { - if(ghostSlots.isEmpty()) { - return; - } - int sx = getGuiLeft(); - int sy = getGuiTop(); - drawFakeItemsStart(); - try { - hoverGhostSlot = null; - for(GhostSlot slot : ghostSlots) { - ItemStack stack = slot.getStack(); - if(slot.isVisible()) { - if(stack != null) { - drawFakeItemStack(slot.x + sx, slot.y + sy, stack); - } - if(slot.isMouseOver(mouseX - sx, mouseY - sy)) { - hoverGhostSlot = slot; - } - } - } - if(hoverGhostSlot != null) { - // draw hover last to prevent it from affecting rendering of other slots ... - drawFakeItemHover(hoverGhostSlot.x + sx, hoverGhostSlot.y + sy); - } - } finally { - drawFakeItemsEnd(); - } - } - - protected GhostSlot getGhostSlot(int mouseX, int mouseY) { - mouseX -= getGuiLeft(); - mouseY -= getGuiTop(); - for(GhostSlot slot : ghostSlots) { - if(slot.isVisible() && slot.isMouseOver(mouseX, mouseY)) { - return slot; - } - } - return null; - } - - private boolean isMouseInOverlay(int mouseX, int mouseY, IGuiOverlay overlay) { - int x = mouseX - getGuiLeft(); - int y = mouseY - getGuiTop(); - return overlay.getBounds().contains(x, y); - } - - @Override - public void removeToolTip(GuiToolTip toolTip) { - ttMan.removeToolTip(toolTip); - } - - protected void drawForegroundImpl(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - copyOfdrawHoveringText(par1List, par2, par3, font); - GL11.glPopAttrib(); - GL11.glPopAttrib(); - } - - //This is a copy of the super class method due to 'Method not found' errors - // reported with some mods installed. - protected void copyOfdrawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - if(!par1List.isEmpty()) - { - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - int k = 0; - Iterator iterator = par1List.iterator(); - - while (iterator.hasNext()) - { - String s = (String) iterator.next(); - int l = font.getStringWidth(s); - - if(l > k) - { - k = l; - } - } - - int i1 = par2 + 12; - int j1 = par3 - 12; - int k1 = 8; - - if(par1List.size() > 1) - { - k1 += 2 + (par1List.size() - 1) * 10; - } - - if(i1 + k > this.width) - { - i1 -= 28 + k; - } - - if(j1 + k1 + 6 > this.height) - { - j1 = this.height - k1 - 6; - } - - this.zLevel = 300.0F; - //itemRenderer.zLevel = 300.0F; - int l1 = -267386864; - this.drawGradientRect(i1 - 3, j1 - 4, i1 + k + 3, j1 - 3, l1, l1); - this.drawGradientRect(i1 - 3, j1 + k1 + 3, i1 + k + 3, j1 + k1 + 4, l1, l1); - this.drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 + k1 + 3, l1, l1); - this.drawGradientRect(i1 - 4, j1 - 3, i1 - 3, j1 + k1 + 3, l1, l1); - this.drawGradientRect(i1 + k + 3, j1 - 3, i1 + k + 4, j1 + k1 + 3, l1, l1); - int i2 = 1347420415; - int j2 = (i2 & 16711422) >> 1 | i2 & -16777216; - this.drawGradientRect(i1 - 3, j1 - 3 + 1, i1 - 3 + 1, j1 + k1 + 3 - 1, i2, j2); - this.drawGradientRect(i1 + k + 2, j1 - 3 + 1, i1 + k + 3, j1 + k1 + 3 - 1, i2, j2); - this.drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 - 3 + 1, i2, i2); - this.drawGradientRect(i1 - 3, j1 + k1 + 2, i1 + k + 3, j1 + k1 + 3, j2, j2); - - for (int k2 = 0; k2 < par1List.size(); ++k2) - { - String s1 = (String) par1List.get(k2); - font.drawStringWithShadow(s1, i1, j1, -1); - - if(k2 == 0) - { - j1 += 2; - } - - j1 += 10; - } - - this.zLevel = 0.0F; - //itemRenderer.zLevel = 0.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - } - } - - @Override - public int getGuiLeft() { - return guiLeft; - } - - @Override - public int getGuiTop() { - return guiTop; - } - - @Override - public int getXSize() { - return xSize; - } - - @Override - public int getYSize() { - return ySize; - } - - public void setGuiLeft(int i) { - guiLeft = i; - } - - public void setGuiTop(int i) { - guiTop = i; - } - - public void setXSize(int i) { - xSize = i; - } - - public void setYSize(int i) { - ySize = i; - } - - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } - - @SuppressWarnings("unchecked") - @Override - public void addButton(GuiButton button) { - if(!buttonList.contains(button)) { - buttonList.add(button); - } - } - - @Override - public void removeButton(GuiButton button) { - buttonList.remove(button); - } - - @Override - public int getOverlayOffsetX() { - return 0; - } - - @Override - public void doActionPerformed(GuiButton guiButton) { - actionPerformed(guiButton); - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public VisiblityData modifyVisiblity(GuiContainer gc, VisiblityData vd) { - return vd; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public Iterable getItemSpawnSlots(GuiContainer gc, ItemStack is) { - return null; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public List getInventoryAreas(GuiContainer gc) { - return Collections.emptyList(); - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean handleDragNDrop(GuiContainer gc, int i, int i1, ItemStack is, int i2) { - return false; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { - return false; - } -} diff --git a/src/main/java/crazypants/gui/GuiIconRenderer.java b/src/main/java/crazypants/gui/GuiIconRenderer.java deleted file mode 100644 index d73ed7c4..00000000 --- a/src/main/java/crazypants/gui/GuiIconRenderer.java +++ /dev/null @@ -1,101 +0,0 @@ -package crazypants.gui; - -import net.minecraft.client.gui.Gui; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import crazypants.render.IconUtil; -import crazypants.render.RenderUtil; - -public class GuiIconRenderer extends Gui { - - 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 = HWIDTH; - protected int hheight = HHEIGHT; - protected int width = DEFAULT_WIDTH; - protected int height = DEFAULT_HEIGHT; - - protected IIcon icon; - protected ResourceLocation texture; - - private int yPosition; - private int xPosition; - - private float alpha = 1.0f; - - public GuiIconRenderer(int x, int y, int itemId, int itemMeta) { - xPosition = x; - yPosition = y; - icon = IconUtil.getIconForItem(itemId, itemMeta); - texture = RenderUtil.ITEM_TEX; - } - - public GuiIconRenderer(int x, int y, IIcon icon, ResourceLocation texture) { - xPosition = x; - yPosition = y; - 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 int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public IIcon getIcon() { - return icon; - } - - public float getAlpha() { - return alpha; - } - - public void setAlpha(float alpha) { - this.alpha = alpha; - } - - public void setIcon(IIcon icon) { - this.icon = icon; - } - - public ResourceLocation getTexture() { - return texture; - } - - public void setTexture(ResourceLocation textureName) { - this.texture = textureName; - } - - public void draw() { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, alpha); - - 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); - drawTexturedModelRectFromIcon(xPosition, yPosition, icon, width, height); - - GL11.glPopAttrib(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - -} diff --git a/src/main/java/crazypants/gui/GuiScreenBase.java b/src/main/java/crazypants/gui/GuiScreenBase.java deleted file mode 100644 index 941fa352..00000000 --- a/src/main/java/crazypants/gui/GuiScreenBase.java +++ /dev/null @@ -1,230 +0,0 @@ -package crazypants.gui; - -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderHelper; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import crazypants.gui.ToolTipManager.ToolTipRenderer; - -public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer, IGuiScreen { - - protected ToolTipManager ttMan = new ToolTipManager(); - - /** The X size of the inventory window in pixels. */ - protected int xSize = 176; - - /** The Y size of the inventory window in pixels. */ - protected int ySize = 166; - - /** - * Starting X position for the Gui. Inconsistent use for Gui backgrounds. - */ - protected int guiLeft; - - /** - * Starting Y position for the Gui. Inconsistent use for Gui backgrounds. - */ - protected int guiTop; - - protected boolean drawButtons = true; - - protected GuiScreenBase(int xSize, int ySize) { - this.xSize = xSize; - this.ySize = ySize; - } - - @Override - public void addToolTip(GuiToolTip toolTip) { - ttMan.addToolTip(toolTip); - } - - @Override - public void removeToolTip(GuiToolTip toolTip) { - ttMan.removeToolTip(toolTip); - } - - @Override - public void initGui() { - super.initGui(); - guiLeft = (this.width - this.xSize) / 2; - guiTop = (this.height - this.ySize) / 2; - } - - @Override - public void drawScreen(int par1, int par2, float par3) { - drawDefaultBackground(); - - drawBackgroundLayer(par3, par1, par2); - - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - if(drawButtons) { - RenderHelper.enableGUIStandardItemLighting(); - super.drawScreen(par1, par2, par3); - } - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - GL11.glPushMatrix(); - GL11.glTranslatef(guiLeft, guiTop, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - GL11.glDisable(GL11.GL_LIGHTING); - drawForegroundLayer(par1, par2); - GL11.glEnable(GL11.GL_LIGHTING); - - GL11.glPopMatrix(); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableStandardItemLighting(); - } - - protected abstract void drawBackgroundLayer(float par3, int par1, int par2); - - protected final void drawForegroundLayer(int mouseX, int mouseY) { - drawForegroundImpl(mouseX, mouseY); - ttMan.drawTooltips(this, mouseX, mouseY); - } - - protected void drawForegroundImpl(int mouseX, int mouseY) { - } - - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - - if(!par1List.isEmpty()) { - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - int k = 0; - Iterator iterator = par1List.iterator(); - - while (iterator.hasNext()) - { - String s = (String) iterator.next(); - int l = font.getStringWidth(s); - - if(l > k) - { - k = l; - } - } - - int i1 = par2 + 12; - int j1 = par3 - 12; - int k1 = 8; - - if(par1List.size() > 1) - { - k1 += 2 + (par1List.size() - 1) * 10; - } - - if(i1 + k > this.width) - { - i1 -= 28 + k; - } - - if(j1 + k1 + 6 > this.height) - { - j1 = this.height - k1 - 6; - } - - this.zLevel = 300.0F; - - int l1 = -267386864; - this.drawGradientRect(i1 - 3, j1 - 4, i1 + k + 3, j1 - 3, l1, l1); - this.drawGradientRect(i1 - 3, j1 + k1 + 3, i1 + k + 3, j1 + k1 + 4, l1, l1); - this.drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 + k1 + 3, l1, l1); - this.drawGradientRect(i1 - 4, j1 - 3, i1 - 3, j1 + k1 + 3, l1, l1); - this.drawGradientRect(i1 + k + 3, j1 - 3, i1 + k + 4, j1 + k1 + 3, l1, l1); - int i2 = 1347420415; - int j2 = (i2 & 16711422) >> 1 | i2 & -16777216; - this.drawGradientRect(i1 - 3, j1 - 3 + 1, i1 - 3 + 1, j1 + k1 + 3 - 1, i2, j2); - this.drawGradientRect(i1 + k + 2, j1 - 3 + 1, i1 + k + 3, j1 + k1 + 3 - 1, i2, j2); - this.drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 - 3 + 1, i2, i2); - this.drawGradientRect(i1 - 3, j1 + k1 + 2, i1 + k + 3, j1 + k1 + 3, j2, j2); - - for (int k2 = 0; k2 < par1List.size(); ++k2) - { - String s1 = (String) par1List.get(k2); - font.drawStringWithShadow(s1, i1, j1, -1); - - if(k2 == 0) - { - j1 += 2; - } - - j1 += 10; - } - - this.zLevel = 0.0F; - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - GL11.glPopAttrib(); - GL11.glPopAttrib(); - - } - } - - @Override - public int getGuiLeft() { - return guiLeft; - } - - @Override - public int getGuiTop() { - return guiTop; - } - - @Override - public int getXSize() { - return xSize; - } - - @Override - public int getYSize() { - return xSize; - } - - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } - - @Override - public void addButton(GuiButton button) { - if(!buttonList.contains(button)) { - buttonList.add(button); - } - } - - @Override - public void removeButton(GuiButton button) { - buttonList.remove(button); - } - - @Override - public void doActionPerformed(GuiButton guiButton) { - actionPerformed(guiButton); - } - -} diff --git a/src/main/java/crazypants/gui/GuiScrollableList.java b/src/main/java/crazypants/gui/GuiScrollableList.java deleted file mode 100644 index 0ad6fdaa..00000000 --- a/src/main/java/crazypants/gui/GuiScrollableList.java +++ /dev/null @@ -1,407 +0,0 @@ -package crazypants.gui; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.Tessellator; - -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - -public abstract class GuiScrollableList { - - private final Minecraft mc = Minecraft.getMinecraft(); - - protected int originX; - protected int originY; - protected int width; - protected int height; - protected int minY; - protected int maxY; - protected int minX; - protected int maxX; - - protected final int slotHeight; - - private int scrollUpButtonID; - - private int scrollDownButtonID; - - protected int mouseX; - - protected int mouseY; - - private float initialClickY = -2.0F; - - private float scrollMultiplier; - - private float amountScrolled; - - protected int selectedIndex = -1; - - private long lastClickedTime; - - private boolean showSelectionBox = true; - - protected int margin = 4; - - protected List> listeners = new CopyOnWriteArrayList>(); - - public GuiScrollableList(int width, int height, int originX, int originY, int slotHeight) { - this.width = width; - this.height = height; - this.originX = originX; - this.originY = originY; - this.slotHeight = slotHeight; - - minY = originY; - maxY = minY + height; - minX = originX; - maxX = minX + width; - } - - public void onGuiInit(IGuiScreen gui) { - minY = originY + gui.getGuiTop(); - maxY = minY + height; - minX = originX + gui.getGuiLeft(); - maxX = minX + width; - } - - public void addSelectionListener(ListSelectionListener listener) { - listeners.add(listener); - } - - public void removeSelectionListener(ListSelectionListener listener) { - listeners.remove(listener); - } - - public T getSelectedElement() { - return getElementAt(selectedIndex); - } - - public void setSelection(T selection) { - setSelection(getIndexOf(selection)); - } - - public void setSelection(int index) { - if(index == selectedIndex) { - return; - } - selectedIndex = index; - for (ListSelectionListener listener : listeners) { - listener.selectionChanged(this, selectedIndex); - } - } - - public int getIndexOf(T element) { - if(element == null) { - return -1; - } - for (int i = 0; i < getNumElements(); i++) { - if(element.equals(getElementAt(i))) { - return i; - } - } - return -1; - } - - public abstract T getElementAt(int index); - - public abstract int getNumElements(); - - protected abstract void drawElement(int elementIndex, int x, int y, int height, Tessellator tessellator); - - protected boolean elementClicked(int elementIndex, boolean doubleClick) { - return true; - } - - public void setShowSelectionBox(boolean val) { - showSelectionBox = val; - } - - protected int getContentHeight() { - return getNumElements() * slotHeight; - } - - public void setScrollButtonIds(int scrollUpButtonID, int scrollDownButtonID) { - this.scrollUpButtonID = scrollUpButtonID; - this.scrollDownButtonID = scrollDownButtonID; - } - - private void clampScrollToBounds() { - int i = getContentOverhang(); - if(i < 0) { - i *= -1; - } - if(amountScrolled < 0.0F) { - amountScrolled = 0.0F; - } - if(amountScrolled > i) { - amountScrolled = i; - } - } - - public int getContentOverhang() { - return getContentHeight() - (height - margin); - } - - public void actionPerformed(GuiButton b) { - if(b.enabled) { - if(b.id == scrollUpButtonID) { - amountScrolled -= slotHeight * 2 / 3; - initialClickY = -2.0F; - clampScrollToBounds(); - } else if(b.id == scrollDownButtonID) { - amountScrolled += slotHeight * 2 / 3; - initialClickY = -2.0F; - clampScrollToBounds(); - } - } - } - - /** - * draws the slot to the screen, pass in mouse's current x and y and partial - * ticks - */ - public void drawScreen(int mX, int mY, float partialTick) { - this.mouseX = mX; - this.mouseY = mY; - - processMouseEvents(); - - clampScrollToBounds(); - - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_FOG); - - ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - int sx = minX * sr.getScaleFactor(); - int sw = width * sr.getScaleFactor(); - int sy = mc.displayHeight - (maxY * sr.getScaleFactor()); - int sh = height * sr.getScaleFactor(); - GL11.glEnable(GL11.GL_SCISSOR_TEST); - GL11.glScissor(sx, sy, sw, sh); - - Tessellator tessellator = Tessellator.instance; - drawContainerBackground(tessellator); - - int contentYOffset = this.minY + margin - (int) this.amountScrolled; - - for (int i = 0; i < getNumElements(); ++i) { - - int elementY = contentYOffset + i * this.slotHeight; - int slotHeight = this.slotHeight - margin; - - if(elementY <= maxY && elementY + slotHeight >= minY) { - - if(showSelectionBox && i == selectedIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_I(8421504); - tessellator.addVertexWithUV(minX, elementY + slotHeight + 2, 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(maxX, elementY + slotHeight + 2, 0.0D, 1.0D, 1.0D); - tessellator.addVertexWithUV(maxX, elementY - 2, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(minX, elementY - 2, 0.0D, 0.0D, 0.0D); - tessellator.setColorOpaque_I(0); - tessellator.addVertexWithUV(minX + 1, elementY + slotHeight + 1, 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(maxX - 1, elementY + slotHeight + 1, 0.0D, 1.0D, 1.0D); - tessellator.addVertexWithUV(maxX - 1, elementY - 1, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(minX + 1, elementY - 1, 0.0D, 0.0D, 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - drawElement(i, minX, elementY, slotHeight, tessellator); - } - } - - GL11.glDisable(GL11.GL_SCISSOR_TEST); - - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glDisable(GL11.GL_TEXTURE_2D); - - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_I(0, 0); - tessellator.addVertexWithUV(this.minX, this.minY + margin, 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(this.maxX, this.minY + margin, 0.0D, 1.0D, 1.0D); - tessellator.setColorRGBA_I(0, 255); - tessellator.addVertexWithUV(this.maxX, this.minY, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(this.minX, this.minY, 0.0D, 0.0D, 0.0D); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_I(0, 255); - tessellator.addVertexWithUV(this.minX, this.maxY, 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(this.maxX, this.maxY, 0.0D, 1.0D, 1.0D); - tessellator.setColorRGBA_I(0, 0); - tessellator.addVertexWithUV(this.maxX, this.maxY - margin, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(this.minX, this.maxY - margin, 0.0D, 0.0D, 0.0D); - tessellator.draw(); - - renderScrollBar(tessellator); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - } - - protected void renderScrollBar(Tessellator tessellator) { - - int contentHeightOverBounds = getContentOverhang(); - if(contentHeightOverBounds > 0) { - - int clear = (maxY - minY) * (maxY - minY) / getContentHeight(); - - if(clear < 32) { - clear = 32; - } - - if(clear > maxY - minY - 8) { - clear = maxY - minY - 8; - } - - int y = (int) this.amountScrolled * (maxY - minY - clear) / contentHeightOverBounds + minY; - if(y < minY) { - y = minY; - } - - GL11.glDisable(GL11.GL_TEXTURE_2D); - int scrollBarMinX = getScrollBarX(); - int scrollBarMaxX = scrollBarMinX + 6; - tessellator.startDrawingQuads(); - - tessellator.setColorRGBA_I(0, 255); - tessellator.addVertexWithUV(scrollBarMinX, maxY, 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(scrollBarMaxX, maxY, 0.0D, 1.0D, 1.0D); - tessellator.addVertexWithUV(scrollBarMaxX, minY, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(scrollBarMinX, minY, 0.0D, 0.0D, 0.0D); - - tessellator.setColorRGBA_F(0.3f, 0.3f, 0.3f, 1); - tessellator.addVertexWithUV(scrollBarMinX, (y + clear), 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV(scrollBarMaxX, (y + clear), 0.0D, 1.0D, 1.0D); - tessellator.addVertexWithUV(scrollBarMaxX, y, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(scrollBarMinX, y, 0.0D, 0.0D, 0.0D); - - tessellator.setColorRGBA_F(0.7f, 0.7f, 0.7f, 1); - tessellator.addVertexWithUV(scrollBarMinX, (y + clear - 1), 0.0D, 0.0D, 1.0D); - tessellator.addVertexWithUV((scrollBarMaxX - 1), (y + clear - 1), 0.0D, 1.0D, 1.0D); - tessellator.addVertexWithUV((scrollBarMaxX - 1), y, 0.0D, 1.0D, 0.0D); - tessellator.addVertexWithUV(scrollBarMinX, y, 0.0D, 0.0D, 0.0D); - - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - } - - private void processMouseEvents() { - if(Mouse.isButtonDown(0)) { - processMouseBown(); - } else { - while (!mc.gameSettings.touchscreen && Mouse.next()) { - - int mouseWheelDelta = Mouse.getEventDWheel(); - - if(mouseWheelDelta != 0) { - if(mouseWheelDelta > 0) { - mouseWheelDelta = -1; - } else if(mouseWheelDelta < 0) { - mouseWheelDelta = 1; - } - amountScrolled += mouseWheelDelta * slotHeight / 2; - } - } - initialClickY = -1.0F; - } - } - - private void processMouseBown() { - int contentHeightOverBounds; - if(initialClickY == -1.0F) { - - if(mouseY >= minY && mouseY <= maxY && mouseX >= minX && mouseX <= maxX + 6) { - - boolean clickInBounds = true; - - int y = mouseY - minY + (int) amountScrolled - margin; - int mouseOverElement = y / slotHeight; - - if(mouseX >= minX && mouseX <= maxX && mouseOverElement >= 0 && y >= 0 && mouseOverElement < getNumElements()) { - boolean doubleClick = mouseOverElement == selectedIndex && Minecraft.getSystemTime() - lastClickedTime < 250L; - if(elementClicked(mouseOverElement, doubleClick)) { - setSelection(mouseOverElement); - } - lastClickedTime = Minecraft.getSystemTime(); - - } else if(mouseX >= minX && mouseX <= maxX && y < 0) { - clickInBounds = false; - } - - int scrollBarMinX = getScrollBarX(); - int scrollBarMaxX = scrollBarMinX + 6; - if(mouseX >= scrollBarMinX && mouseX <= scrollBarMaxX) { - - scrollMultiplier = -1.0F; - contentHeightOverBounds = getContentOverhang(); - - if(contentHeightOverBounds < 1) { - contentHeightOverBounds = 1; - } - - int empty = (int) ((float) ((maxY - minY) * (maxY - minY)) / (float) getContentHeight()); - if(empty < 32) { - empty = 32; - } - if(empty > maxY - minY - 8) { - empty = maxY - minY - 8; - } - scrollMultiplier /= (float) (maxY - minY - empty) / (float) contentHeightOverBounds; - - } else { - scrollMultiplier = 1.0F; - } - - if(clickInBounds) { - initialClickY = mouseY; - } else { - initialClickY = -2.0F; - } - - } else { - initialClickY = -2.0F; - } - - } else if(initialClickY >= 0.0F) { - // Scrolling - amountScrolled -= (mouseY - initialClickY) * scrollMultiplier; - initialClickY = mouseY; - } - } - - protected int getScrollBarX() { - return minX + width; - } - - protected void drawContainerBackground(Tessellator tess) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); - tess.startDrawingQuads(); - tess.setColorOpaque_I(2105376); - tess.addVertex(minX, maxY, 0.0D); - tess.addVertex(maxX, maxY, 0.0D); - tess.addVertex(maxX, minY, 0.0D); - tess.addVertex(minX, minY, 0.0D); - tess.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - - } - -} diff --git a/src/main/java/crazypants/gui/GuiToolTip.java b/src/main/java/crazypants/gui/GuiToolTip.java deleted file mode 100644 index 216871b6..00000000 --- a/src/main/java/crazypants/gui/GuiToolTip.java +++ /dev/null @@ -1,105 +0,0 @@ -package crazypants.gui; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -public class GuiToolTip { - - private static final long DELAY = 0; - - protected Rectangle bounds; - - private long mouseOverStart; - - protected final List text; - - private int lastMouseX = -1; - - private int lastMouseY = -1; - - private boolean visible = true; - - 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 boolean isVisible() { - return visible; - } - - public void setVisible(boolean visible) { - this.visible = visible; - } - - public Rectangle getBounds() { - return bounds; - } - - public void setBounds(Rectangle bounds) { - this.bounds = bounds; - } - - 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() { - if(!visible) { - return false; - } - updateText(); - if(mouseOverStart == 0) { - return false; - } - return System.currentTimeMillis() - mouseOverStart >= DELAY; - } - - protected void updateText() { - } - - public void setToolTipText(String... txt) { - text.clear(); - if(txt != null) { - for (String line : txt) { - text.add(line); - } - } - } - - public List getToolTipText() { - return text; - } - -} diff --git a/src/main/java/crazypants/gui/IGuiScreen.java b/src/main/java/crazypants/gui/IGuiScreen.java deleted file mode 100644 index fdff6f91..00000000 --- a/src/main/java/crazypants/gui/IGuiScreen.java +++ /dev/null @@ -1,30 +0,0 @@ -package crazypants.gui; - -import java.util.List; -import net.minecraft.client.gui.GuiButton; - -public interface IGuiScreen { - - void addToolTip(GuiToolTip toolTip); - - void removeToolTip(GuiToolTip toolTip); - - int getGuiLeft(); - - int getGuiTop(); - - int getXSize(); - - int getYSize(); - - void addButton(GuiButton button); - - void removeButton(GuiButton button); - - int getOverlayOffsetX(); - - void doActionPerformed(GuiButton but); - - List getGhostSlots(); - -} diff --git a/src/main/java/crazypants/gui/IconButton.java b/src/main/java/crazypants/gui/IconButton.java deleted file mode 100644 index bb9fc62f..00000000 --- a/src/main/java/crazypants/gui/IconButton.java +++ /dev/null @@ -1,98 +0,0 @@ -package crazypants.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import crazypants.render.RenderUtil; - -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 IIcon icon; - protected ResourceLocation texture; - - public IconButton(FontRenderer fr, int id, int x, int y, IIcon 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 IIcon getIcon() { - return icon; - } - - public void setIcon(IIcon 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(visible) { - - RenderUtil.bindTexture("textures/gui/widgets.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + width - && par3 < this.yPosition + height; - int hoverState = getHoverState(this.field_146123_n); - - // 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); - - if(icon != null && texture != null) { - 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/src/main/java/crazypants/gui/IconToggleButton.java b/src/main/java/crazypants/gui/IconToggleButton.java deleted file mode 100644 index c2df61f0..00000000 --- a/src/main/java/crazypants/gui/IconToggleButton.java +++ /dev/null @@ -1,33 +0,0 @@ -package crazypants.gui; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -public class IconToggleButton extends IconButton { - - private boolean selected = false; - - public IconToggleButton(FontRenderer fr, int id, int x, int y, IIcon icon, ResourceLocation texture) { - super(fr, id, x, y, icon, texture); - } - - public boolean isSelected() { - return selected; - } - - public void setSelected(boolean selected) { - this.selected = selected; - } - - @Override - public int getHoverState(boolean par1) { - int result = 1; - if(!enabled || selected) { - result = 0; - } else if(par1) { - result = 2; - } - return result; - } -} diff --git a/src/main/java/crazypants/gui/ItemButton.java b/src/main/java/crazypants/gui/ItemButton.java deleted file mode 100644 index 13c41910..00000000 --- a/src/main/java/crazypants/gui/ItemButton.java +++ /dev/null @@ -1,85 +0,0 @@ -package crazypants.gui; - -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.Item; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import crazypants.render.RenderUtil; - -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, Item item) { - super(id, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); - this.fr = fr; - this.item = new ItemStack(item, 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(visible) { - - RenderUtil.bindTexture("textures/gui/widgets.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + width - && par3 < this.yPosition + height; - int hoverState = this.getHoverState(this.field_146123_n); - - // 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_146123_n) { - 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/src/main/java/crazypants/gui/ListSelectionListener.java b/src/main/java/crazypants/gui/ListSelectionListener.java deleted file mode 100644 index 2a9c988a..00000000 --- a/src/main/java/crazypants/gui/ListSelectionListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package crazypants.gui; - -public interface ListSelectionListener { - - void selectionChanged(GuiScrollableList list, int selectedIndex); - -} diff --git a/src/main/java/crazypants/gui/TemplateSlot.java b/src/main/java/crazypants/gui/TemplateSlot.java deleted file mode 100644 index 90f4173e..00000000 --- a/src/main/java/crazypants/gui/TemplateSlot.java +++ /dev/null @@ -1,41 +0,0 @@ -package crazypants.gui; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class TemplateSlot extends Slot { - - protected int slotIndex; - - public TemplateSlot(IInventory inventory, int slotIndex, int x, int y) { - super(inventory, slotIndex, x, y); - this.slotIndex = slotIndex; - } - - @Override - public boolean canTakeStack(EntityPlayer player) { - return true; - } - - @Override - public ItemStack decrStackSize(int par1) { - return null; - } - - @Override - public boolean isItemValid(ItemStack stack) { - return true; - } - - @Override - public void putStack(ItemStack par1ItemStack) { - if(par1ItemStack != null) { - par1ItemStack.stackSize = 0; - } - inventory.setInventorySlotContents(slotIndex, par1ItemStack); - onSlotChanged(); - } - -} diff --git a/src/main/java/crazypants/gui/ToolTipManager.java b/src/main/java/crazypants/gui/ToolTipManager.java deleted file mode 100644 index ba19321e..00000000 --- a/src/main/java/crazypants/gui/ToolTipManager.java +++ /dev/null @@ -1,74 +0,0 @@ -package crazypants.gui; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.gui.FontRenderer; - -public class ToolTipManager { - - public static interface ToolTipRenderer { - int getGuiLeft(); - - int getGuiTop(); - - int getXSize(); - - FontRenderer getFontRenderer(); - - void drawHoveringText(List par1List, int par2, int par3, FontRenderer font); - } - - private List toolTips = new ArrayList(); - - public void addToolTip(GuiToolTip toolTip) { - if(!toolTips.contains(toolTip)) { - toolTips.add(toolTip); - } - } - - public void removeToolTip(GuiToolTip toolTip) { - toolTips.remove(toolTip); - } - - protected final void drawTooltips(ToolTipRenderer renderer, int mouseX, int mouseY) { - for (GuiToolTip toolTip : toolTips) { - toolTip.onTick(mouseX - renderer.getGuiLeft(), mouseY - renderer.getGuiTop()); - if(toolTip.shouldDraw()) { - drawTooltip(toolTip, mouseX, mouseY, renderer); - } - } - } - - protected void drawTooltip(GuiToolTip toolTip, int mouseX, int mouseY, ToolTipRenderer renderer) { - List list = toolTip.getToolTipText(); - if(list == null) { - return; - } - - List formatted = new ArrayList(list.size()); - for (int i = 0; i < list.size(); i++) { - if(i == 0) { - formatted.add("\u00a7f" + list.get(i)); - } else { - formatted.add("\u00a77" + list.get(i)); - } - } - - if(mouseX > renderer.getGuiLeft() + renderer.getXSize() / 2) { - int maxWidth = 0; - Iterator iterator = formatted.iterator(); - while (iterator.hasNext()) { - String s = (String) iterator.next(); - int w = renderer.getFontRenderer().getStringWidth(s); - if(w > maxWidth) { - maxWidth = w; - } - } - mouseX -= (maxWidth + 18); - } - renderer.drawHoveringText(formatted, mouseX, mouseY, renderer.getFontRenderer()); - } - -} diff --git a/src/main/java/crazypants/render/BoundingBox.java b/src/main/java/crazypants/render/BoundingBox.java deleted file mode 100644 index e6c3312d..00000000 --- a/src/main/java/crazypants/render/BoundingBox.java +++ /dev/null @@ -1,384 +0,0 @@ -package crazypants.render; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -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(AxisAlignedBB bb) { - this(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.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(Block block) { - this(block.getBlockBoundsMinX(), block.getBlockBoundsMinY(), block.getBlockBoundsMinZ(), block.getBlockBoundsMaxX(), block.getBlockBoundsMaxY(), block.getBlockBoundsMaxZ()); - } - - 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 contains(BoundingBox other) { - return minX >= other.minX && minY <= other.minY && minZ <= other.minZ && maxX >= other.maxX && maxY <= other.maxY && maxZ <= other.maxZ; - } - - public boolean intersects(BoundingBox other) { - return other.maxX > this.minX && other.minX < this.maxX ? (other.maxY > this.minY && other.minY < this.maxY ? other.maxZ > this.minZ - && other.minZ < this.maxZ : false) : false; - } - - public boolean isValid() { - return minX < maxX && minY < maxY && minZ < maxZ; - } - - public BoundingBox scale(double x, double y, double z) { - return scale((float) x, (float) y, (float) z); - } - - 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 translate(Vector3f vec) { - return translate(vec.x, vec.y, vec.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)); - - } - - /** - * Returns the vertices of the corners for the specified face in counter - * clockwise order. - * - * @param face - * @return - */ - public List getCornersWithUvForFace(ForgeDirection face) { - return getCornersWithUvForFace(face, 0, 1, 0, 1); - } - - public List getCornersWithUvForFace(ForgeDirection face, float minU, float maxU, float minV, float maxV) { - List result = new ArrayList(4); - switch (face) { - case NORTH: - result.add(new Vertex(new Vector3d(maxX, minY, minZ), new Vector3f(0, 0, -1), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(minX, minY, minZ), new Vector3f(0, 0, -1), new Vector2f(maxU, minV))); - result.add(new Vertex(new Vector3d(minX, maxY, minZ), new Vector3f(0, 0, -1), new Vector2f(maxU, maxV))); - result.add(new Vertex(new Vector3d(maxX, maxY, minZ), new Vector3f(0, 0, -1), new Vector2f(minU, maxV))); - break; - case SOUTH: - result.add(new Vertex(new Vector3d(minX, minY, maxZ), new Vector3f(0, 0, 1), new Vector2f(maxU, minV))); - result.add(new Vertex(new Vector3d(maxX, minY, maxZ), new Vector3f(0, 0, 1), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(maxX, maxY, maxZ), new Vector3f(0, 0, 1), new Vector2f(minU, maxV))); - result.add(new Vertex(new Vector3d(minX, maxY, maxZ), new Vector3f(0, 0, 1), new Vector2f(maxU, maxV))); - break; - case EAST: - result.add(new Vertex(new Vector3d(maxX, maxY, minZ), new Vector3f(1, 0, 0), new Vector2f(maxU, maxV))); - result.add(new Vertex(new Vector3d(maxX, maxY, maxZ), new Vector3f(1, 0, 0), new Vector2f(minU, maxV))); - result.add(new Vertex(new Vector3d(maxX, minY, maxZ), new Vector3f(1, 0, 0), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(maxX, minY, minZ), new Vector3f(1, 0, 0), new Vector2f(maxU, minV))); - break; - case WEST: - result.add(new Vertex(new Vector3d(minX, minY, minZ), new Vector3f(-1, 0, 0), new Vector2f(maxU, minV))); - result.add(new Vertex(new Vector3d(minX, minY, maxZ), new Vector3f(-1, 0, 0), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(minX, maxY, maxZ), new Vector3f(-1, 0, 0), new Vector2f(minU, maxV))); - result.add(new Vertex(new Vector3d(minX, maxY, minZ), new Vector3f(-1, 0, 0), new Vector2f(maxU, maxV))); - break; - case UP: - result.add(new Vertex(new Vector3d(maxX, maxY, maxZ), new Vector3f(0, 1, 0), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(maxX, maxY, minZ), new Vector3f(0, 1, 0), new Vector2f(minU, maxV))); - result.add(new Vertex(new Vector3d(minX, maxY, minZ), new Vector3f(0, 1, 0), new Vector2f(maxU, maxV))); - result.add(new Vertex(new Vector3d(minX, maxY, maxZ), new Vector3f(0, 1, 0), new Vector2f(maxU, minV))); - break; - case DOWN: // - case UNKNOWN: - default: - result.add(new Vertex(new Vector3d(minX, minY, minZ), new Vector3f(0, -1, 0), new Vector2f(maxU, maxV))); - result.add(new Vertex(new Vector3d(maxX, minY, minZ), new Vector3f(0, -1, 0), new Vector2f(minU, maxV))); - result.add(new Vertex(new Vector3d(maxX, minY, maxZ), new Vector3f(0, -1, 0), new Vector2f(minU, minV))); - result.add(new Vertex(new Vector3d(minX, minY, maxZ), new Vector3f(0, -1, 0), new Vector2f(maxU, minV))); - break; - } - return result; - } - - /** - * Returns the vertices of the corners for the specified face in counter - * clockwise order, starting with the top left. - * - * @param face - * @return - */ - public List getCornersForFace(ForgeDirection face) { - List result = new ArrayList(4); - switch (face) { - case NORTH: - result.add(new Vector3f(minX, maxY, minZ)); - result.add(new Vector3f(maxX, maxY, minZ)); - result.add(new Vector3f(maxX, minY, minZ)); - result.add(new Vector3f(minX, minY, minZ)); - break; - case SOUTH: - result.add(new Vector3f(minX, maxY, maxZ)); - result.add(new Vector3f(minX, minY, maxZ)); - result.add(new Vector3f(maxX, minY, maxZ)); - result.add(new Vector3f(maxX, maxY, maxZ)); - break; - case EAST: - result.add(new Vector3f(maxX, minY, maxZ)); - result.add(new Vector3f(maxX, minY, minZ)); - result.add(new Vector3f(maxX, maxY, minZ)); - result.add(new Vector3f(maxX, maxY, maxZ)); - break; - case WEST: - result.add(new Vector3f(minX, maxY, maxZ)); - result.add(new Vector3f(minX, maxY, minZ)); - result.add(new Vector3f(minX, minY, minZ)); - result.add(new Vector3f(minX, minY, maxZ)); - break; - case UP: - result.add(new Vector3f(maxX, maxY, maxZ)); - result.add(new Vector3f(maxX, maxY, minZ)); - result.add(new Vector3f(minX, maxY, minZ)); - result.add(new Vector3f(minX, maxY, maxZ)); - break; - case DOWN: - case UNKNOWN: - default: - result.add(new Vector3f(minX, minY, maxZ)); - result.add(new Vector3f(minX, minY, minZ)); - result.add(new Vector3f(maxX, minY, minZ)); - result.add(new Vector3f(maxX, minY, maxZ)); - break; - } - return result; - } - - /** - * Returns the vertices of the corners for the specified face in counter - * clockwise order, starting with the top left. - * - * @param face - * @return - */ - public List getCornersForFaceD(ForgeDirection face) { - List result = new ArrayList(4); - switch (face) { - case NORTH: - result.add(new Vector3d(minX, maxY, minZ)); - result.add(new Vector3d(maxX, maxY, minZ)); - result.add(new Vector3d(maxX, minY, minZ)); - result.add(new Vector3d(minX, minY, minZ)); - break; - case SOUTH: - result.add(new Vector3d(minX, maxY, maxZ)); - result.add(new Vector3d(minX, minY, maxZ)); - result.add(new Vector3d(maxX, minY, maxZ)); - result.add(new Vector3d(maxX, maxY, maxZ)); - break; - case EAST: - result.add(new Vector3d(maxX, minY, maxZ)); - result.add(new Vector3d(maxX, minY, minZ)); - result.add(new Vector3d(maxX, maxY, minZ)); - result.add(new Vector3d(maxX, maxY, maxZ)); - break; - case WEST: - result.add(new Vector3d(minX, maxY, maxZ)); - result.add(new Vector3d(minX, maxY, minZ)); - result.add(new Vector3d(minX, minY, minZ)); - result.add(new Vector3d(minX, minY, maxZ)); - break; - case UP: - result.add(new Vector3d(maxX, maxY, maxZ)); - result.add(new Vector3d(maxX, maxY, minZ)); - result.add(new Vector3d(minX, maxY, minZ)); - result.add(new Vector3d(minX, maxY, maxZ)); - break; - case DOWN: - case UNKNOWN: - default: - result.add(new Vector3d(minX, minY, maxZ)); - result.add(new Vector3d(minX, minY, minZ)); - result.add(new Vector3d(maxX, minY, minZ)); - result.add(new Vector3d(maxX, minY, maxZ)); - break; - } - return result; - } - - 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); - } - - public float getArea() { - return sizeX() * sizeY() * sizeZ(); - } - - @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); - } - - public AxisAlignedBB getAxisAlignedBB() { - return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + Float.floatToIntBits(maxX); - result = prime * result + Float.floatToIntBits(maxY); - result = prime * result + Float.floatToIntBits(maxZ); - result = prime * result + Float.floatToIntBits(minX); - result = prime * result + Float.floatToIntBits(minY); - result = prime * result + Float.floatToIntBits(minZ); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - BoundingBox other = (BoundingBox) obj; - if(Float.floatToIntBits(maxX) != Float.floatToIntBits(other.maxX)) - return false; - if(Float.floatToIntBits(maxY) != Float.floatToIntBits(other.maxY)) - return false; - if(Float.floatToIntBits(maxZ) != Float.floatToIntBits(other.maxZ)) - return false; - if(Float.floatToIntBits(minX) != Float.floatToIntBits(other.minX)) - return false; - if(Float.floatToIntBits(minY) != Float.floatToIntBits(other.minY)) - return false; - if(Float.floatToIntBits(minZ) != Float.floatToIntBits(other.minZ)) - return false; - return true; - } -} diff --git a/src/main/java/crazypants/render/ColorUtil.java b/src/main/java/crazypants/render/ColorUtil.java deleted file mode 100644 index d0d6831e..00000000 --- a/src/main/java/crazypants/render/ColorUtil.java +++ /dev/null @@ -1,69 +0,0 @@ -package crazypants.render; - -import java.awt.Color; - -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vector4f; - -public final class ColorUtil { - - public static Vector4f toFloat(Color color) { - float[] rgba = color.getComponents(null); - return new Vector4f(rgba[0], rgba[1], rgba[2], rgba[3]); - } - - public static Vector3f toFloat(int rgb) { - int r = rgb >> 16 & 255; - int g = rgb >> 8 & 255; - int b = rgb & 255; - return new Vector3f(r / 255F, g / 255F, b / 255F); - } - - public static int getRGB(Color color) { - return getRGB(color.getRed(), color.getGreen(), color.getBlue()); - } - - public static int getRGBA(Color color) { - return getRGBA(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()); - } - - public static int getARGB(Color color) { - return getRGBA(color.getAlpha(), color.getRed(), color.getGreen(), color.getBlue()); - } - - public static int getRGB(Vector3f rgb) { - return getRGB(rgb.x, rgb.y, rgb.z); - } - - public static int getRGB(float r, float g, float b) { - return getRGB((int) (r * 255), (int) (g * 255), (int) (b * 255)); - } - - public static int getRGBA(Vector4f col) { - return getRGBA(col.x, col.y,col.z,col.w); - } - - public static int getRGBA(float r, float g, float b, float a) { - return getRGBA((int) (r * 255), (int) (g * 255), (int) (b * 255), (int) (a * 255)); - } - - public static int getARGB(float r, float g, float b, float a) { - return getARGB((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); - } - - public static int getRGB(int r, int g, int b) { - return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); - } - - public static int getARGB(int r, int g, int b, int a) { - return (a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); - } - - public static int getRGBA(int r, int g, int b, int a) { - return (r & 0xFF) << 24 | (g & 0xFF) << 16 | (b & 0xFF) << 8 | (a & 0xFF); - } - - private ColorUtil() { - } - -} diff --git a/src/main/java/crazypants/render/ConnectedTextureRenderer.java b/src/main/java/crazypants/render/ConnectedTextureRenderer.java deleted file mode 100644 index 5939b7d5..00000000 --- a/src/main/java/crazypants/render/ConnectedTextureRenderer.java +++ /dev/null @@ -1,338 +0,0 @@ -package crazypants.render; - -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector4f; -import com.enderio.core.common.vecmath.Vertex; - -import com.enderio.core.common.util.BlockCoord; - -public class ConnectedTextureRenderer implements IRenderFace, IConnectedTextureRenderer { - - public static interface TextureCallback { - public IIcon getTextureForFace(ForgeDirection dir); - } - - public static class DefaultTextureCallback implements TextureCallback { - - private final IIcon tex; - - private final Block block; - private final int meta; - - public DefaultTextureCallback(IIcon borderTex) { - this.tex = borderTex; - block = null; - meta = 0; - } - - public DefaultTextureCallback(Block block, int meta) { - tex = null; - this.block = block; - this.meta = meta; - } - - @Override - public IIcon getTextureForFace(ForgeDirection dir) { - if(tex != null) { - return tex; - } - if(block != null) { - return block.getIcon(dir.ordinal(), meta); - } - return null; - } - - } - - private boolean forceAllEdges = false; - - private TextureCallback edgeTexureCallback; - - private boolean matchMetaData; - - private EnumSet sidesToRender = EnumSet.allOf(ForgeDirection.class); - - public boolean isForceAllEdges() { - return forceAllEdges; - } - - public void setForceAllEdges(boolean forceAllEdges) { - this.forceAllEdges = forceAllEdges; - } - - public TextureCallback getEdgeTexureCallback() { - return edgeTexureCallback; - } - - public void setEdgeTexureCallback(TextureCallback edgeTexureCallback) { - this.edgeTexureCallback = edgeTexureCallback; - } - - public void setEdgeTexture(IIcon texture) { - if(texture == null) { - edgeTexureCallback = null; - return; - } - edgeTexureCallback = new DefaultTextureCallback(texture); - } - - public void setMatchMeta(boolean matchMetaData) { - this.matchMetaData = matchMetaData; - } - - public void setSidesToRender(EnumSet sides) { - sidesToRender = sides.clone(); - } - - @Override - public boolean matchesMetadata(int meta1, int meta2) { - return !this.matchMetaData || meta1 == meta2; - } - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXYZ) { - - if (!sidesToRender.contains(face)) { - return; - } - - List finalVerts = new ArrayList(); - finalVerts.addAll(refVertices); - - IIcon borderTex = edgeTexureCallback == null ? null : edgeTexureCallback.getTextureForFace(face); - if(borderTex != null) { - - texture = borderTex; - List edges; - if(forceAllEdges) { - edges = RenderUtil.getEdgesForFace(face); - } else { - edges = RenderUtil.getNonConectedEdgesForFace(rb.blockAccess, (int) x, (int) y, (int) z, face, this); - } - - List allEdges = RenderUtil.getEdgesForFace(face); - - float scaleFactor = 15f / 16f; - Vector2f uv = new Vector2f(); - - //for each that needs a border, add a geom for the border and move in the 'centre' of the face - //so there is no overlap - for (ForgeDirection edge : edges) { - - //We need to move the 'centre' of the face so it doesn't overlap with the border - moveCorners(refVertices, edge, 1 - scaleFactor); - - //Now create the geometry for this edge of the border - float xLen = 1 - Math.abs(edge.offsetX) * scaleFactor; - float yLen = 1 - Math.abs(edge.offsetY) * scaleFactor; - float zLen = 1 - Math.abs(edge.offsetZ) * scaleFactor; - - xLen -= 2* (1 - par1Block.getBlockBoundsMaxX()) - par1Block.getBlockBoundsMinX(); - yLen -= 2* (1 - par1Block.getBlockBoundsMaxY()) - par1Block.getBlockBoundsMinY(); - zLen -= 2* (1 - par1Block.getBlockBoundsMaxZ()) - par1Block.getBlockBoundsMinZ(); - - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(xLen, yLen, zLen); - - List corners = bb.getCornersForFaceD(face); - for (Vector3d corner : corners) { - if(translateToXYZ) { - corner.x += x; - corner.y += y; - corner.z += z; - } - corner.x += (float) (edge.offsetX * 0.5) - Math.signum(edge.offsetX) * xLen / 2f; - corner.y += (float) (edge.offsetY * 0.5) - Math.signum(edge.offsetY) * yLen / 2f; - corner.z += (float) (edge.offsetZ * 0.5) - Math.signum(edge.offsetZ) * zLen / 2f; - } - - int[] indices = new int[] { 0, 1, 2, 3 }; - for (int index : indices) { - Vector3d corner = corners.get(index); - if(translateToXYZ) { - RenderUtil.getUvForCorner(uv, corner, (int) x, (int) y, (int) z, face, texture); - } else { - RenderUtil.getUvForCorner(uv, corner, 0, 0, 0, face, texture); - } - Vertex vertex = new Vertex(); - vertex.xyz.set(corner); - //vertex.xyz.add(ForgeDirectionOffsets.offsetScaled(face, 0.00005)); - vertex.uv = new Vector2f(uv); - applyLighting(vertex, corner, refVertices); - finalVerts.add(vertex); - } - } - - for (int i = 0; i < allEdges.size(); i++) { - ForgeDirection dir = allEdges.get(i); - ForgeDirection dir2 = i + 1 < allEdges.size() ? allEdges.get(i + 1) : allEdges.get(0); - if(needsCorner(dir, dir2, edges, face, par1Block, x, y, z, rb.blockAccess)) { - - Vertex v = new Vertex(); - v.uv = new Vector2f(); - v.xyz.set(ForgeDirectionOffsets.forDir(dir)); - v.xyz.add(ForgeDirectionOffsets.forDir(dir2)); - //TODO: dodgy hack to just move the corner forward a bit - v.xyz.add(ForgeDirectionOffsets.offsetScaled(face, 0.001f)); - v.xyz.x = Math.max(-0.001, v.xyz.x); - v.xyz.y = Math.max(-0.001, v.xyz.y); - v.xyz.z = Math.max(-0.001, v.xyz.z); - - v.xyz.x -= (1 - par1Block.getBlockBoundsMaxX()) - par1Block.getBlockBoundsMinX(); - v.xyz.y -= (1 - par1Block.getBlockBoundsMaxY()) - par1Block.getBlockBoundsMinY(); - v.xyz.z -= (1 - par1Block.getBlockBoundsMaxZ()) - par1Block.getBlockBoundsMinZ(); - - if(ForgeDirectionOffsets.isPositiveOffset(face)) { - v.xyz.add(ForgeDirectionOffsets.forDir(face)); - } - - if(translateToXYZ) { - v.xyz.x += x; - v.xyz.y += y; - v.xyz.z += z; - RenderUtil.getUvForCorner(v.uv, v.xyz, (int) x, (int) y, (int) z, face, texture); - } else { - RenderUtil.getUvForCorner(v.uv, v.xyz, 0, 0, 0, face, texture); - } - applyLighting(v, v.xyz, refVertices); - - finalVerts.add(v); - - Vector3d corner = new Vector3d(v.xyz); - if(ForgeDirectionOffsets.isPositiveOffset(face)) { - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir2, null, corner); - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir, dir2, corner); - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir, null, corner); - } else { - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir, null, corner); - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir, dir2, corner); - addVertexForCorner(face, x, y, z, texture, translateToXYZ, finalVerts, dir2, null, corner); - } - } - } - } - - RenderUtil.addVerticesToTessellator(finalVerts, Tessellator.instance); - } - - private Vertex getClosestVertex(List vertices, Vector3d corner) { - Vertex result = null; - double d2 = Double.MAX_VALUE; - for (Vertex v : vertices) { - double tmp = corner.distanceSquared(v.xyz); - if(tmp <= d2) { - result = v; - d2 = tmp; - } - } - return result; - } - - private void addVertexForCorner(ForgeDirection face, double x, double y, double z, IIcon texture, boolean translateToXYZ, List vertices, - ForgeDirection dir, ForgeDirection dir2, Vector3d corner) { - float scale = 1 / 16f; - Vertex vert = new Vertex(); - vert.uv = new Vector2f(); - vert.xyz.set(corner); - vert.xyz.sub(ForgeDirectionOffsets.offsetScaled(dir, scale)); - if(dir2 != null) { - vert.xyz.sub(ForgeDirectionOffsets.offsetScaled(dir2, scale)); - } - if(translateToXYZ) { - RenderUtil.getUvForCorner(vert.uv, vert.xyz, (int) x, (int) y, (int) z, face, texture); - } else { - RenderUtil.getUvForCorner(vert.uv, vert.xyz, 0, 0, 0, face, texture); - } - applyLighting(vert, corner, vertices); - vertices.add(vert); - } - - private void applyLighting(Vertex vert, Vector3d samplePoint, List litVertices) { - Vertex closest = getClosestVertex(litVertices, samplePoint); - if(closest == null) { - return; - } - vert.setBrightness(closest.brightness); - Vector4f col = closest.getColor(); - if(col != null) { - vert.setColor(col); - } - } - - private boolean needsCorner(ForgeDirection dir, ForgeDirection dir2, List edges, ForgeDirection face, - Block par1Block, double x, double y, - double z, IBlockAccess blockAccess) { - - if(edges.contains(dir) || edges.contains(dir2)) { - return false; - } - - BlockCoord bc = new BlockCoord((int) x, (int) y, (int) z); - BlockCoord testLoc = bc.getLocation(dir); - if(RenderUtil.getNonConectedEdgesForFace(blockAccess, testLoc.x, testLoc.y, testLoc.z, face, this).contains(dir2)) { - return true; - } - testLoc = bc.getLocation(dir2); - if(RenderUtil.getNonConectedEdgesForFace(blockAccess, testLoc.x, testLoc.y, testLoc.z, face, this).contains(dir)) { - return true; - } - return false; - } - - private void moveCorners(List vertices, ForgeDirection edge, float scaleFactor) { - int[] indices = getClosest(edge, vertices); - if(indices[0] < 0) { - return; - } - vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[1]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[0]).xyz.z -= scaleFactor * edge.offsetZ; - vertices.get(indices[1]).xyz.z -= scaleFactor * edge.offsetZ; - } - - private int[] getClosest(ForgeDirection edge, List vertices) { - int[] res = new int[] { -1, -1 }; - boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0; - double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE; - int index = 0; - for (Vertex v : vertices) { - double val = get(v.xyz, edge); - if(highest ? val >= minMax : val <= minMax) { - if(val != minMax) { - res[0] = index; - } else { - res[1] = index; - } - minMax = val; - } - index++; - } - return res; - } - - private double get(Vector3d xyz, ForgeDirection edge) { - if(edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { - return xyz.x; - } - if(edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { - return xyz.y; - } - return xyz.z; - } - - -} diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java deleted file mode 100644 index 3df3ce73..00000000 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ /dev/null @@ -1,340 +0,0 @@ -package crazypants.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.common.vecmath.Vector3d; - -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(Block block, int meta) { - render(block, meta, null); - } - - public static void render(Block block, int meta, VertexTransform xForm) { - IIcon[] icons = new IIcon[6]; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - icons[dir.ordinal()] = block.getIcon(dir.ordinal(), meta); - } - render(BoundingBox.UNIT_CUBE.translate(0, -0.1f, 0), icons, xForm, true); - } - - public static void render(BoundingBox bb, IIcon tex) { - render(bb, tex, null, false); - } - - public static void render(BoundingBox bb, IIcon tex, boolean tintSides) { - render(bb, tex, null, tintSides); - } - - public static void render(BoundingBox bb, IIcon tex, VertexTransform xForm) { - render(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), xForm, false); - } - - public static void render(BoundingBox bb, IIcon tex, VertexTransform xForm, float[] brightnessPerSide, boolean tintSides) { - float minU = 0; - float minV = 0; - float maxU = 1; - float maxV = 1; - if(tex != null) { - minU = tex.getMinU(); - minV = tex.getMinV(); - maxU = tex.getMaxU(); - maxV = tex.getMaxV(); - } - render(bb, minU, maxU, minV, maxV, xForm, brightnessPerSide, tintSides); - } - - public static void render(BoundingBox bb, IIcon tex, VertexTransform xForm, boolean tintSides) { - float minU = 0; - float minV = 0; - float maxU = 1; - float maxV = 1; - if(tex != null) { - minU = tex.getMinU(); - minV = tex.getMinV(); - maxU = tex.getMaxU(); - maxV = tex.getMaxV(); - } - render(bb, minU, maxU, minV, maxV, xForm, tintSides); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, boolean tintSides) { - render(bb, minU, maxU, minV, maxV, null, tintSides); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV) { - render(bb, minU, maxU, minV, maxV, null, false); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, VertexTransform xForm) { - render(bb, minU, maxU, minV, maxV, xForm, false); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, VertexTransform xForm, boolean tintSides) { - float[] brightnessPerSide = null; - if(tintSides) { - brightnessPerSide = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = RenderUtil.getColorMultiplierForFace(dir); - } - } - render(bb, minU, maxU, minV, maxV, xForm, brightnessPerSide); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, VertexTransform xForm, float[] brightnessPerSide, boolean tintSides) { - - if(tintSides) { - if(brightnessPerSide == null || brightnessPerSide.length != 6) { - brightnessPerSide = new float[] { 1, 1, 1, 1, 1, 1 }; - } - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = brightnessPerSide[dir.ordinal()] * RenderUtil.getColorMultiplierForFace(dir); - } - - } - render(bb, minU, maxU, minV, maxV, xForm, brightnessPerSide); - } - - public static void render(BoundingBox bb, float minU, float maxU, float minV, float maxV, VertexTransform xForm, float[] brightnessPerSide) { - - if(brightnessPerSide != null && brightnessPerSide.length != 6) { - brightnessPerSide = null; - } - - setupVertices(bb, xForm); - - float tmp = minV; - minV = maxV; - maxV = tmp; - - Tessellator tessellator = Tessellator.instance; - - tessellator.setNormal(0, 0, -1); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.NORTH.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.SOUTH.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.DOWN.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.EAST.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.WEST.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - 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, IIcon[] icons, boolean tintSides) { - float[] brightnessPerSide = null; - if(tintSides) { - brightnessPerSide = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = RenderUtil.getColorMultiplierForFace(dir); - } - } - render(bb, icons, null, brightnessPerSide); - - } - - public static void render(BoundingBox bb, IIcon[] icons, VertexTransform xForm, boolean tintSides) { - float[] brightnessPerSide = null; - if(tintSides) { - brightnessPerSide = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = RenderUtil.getColorMultiplierForFace(dir); - } - } - render(bb, icons, xForm, brightnessPerSide); - } - - public static void render(BoundingBox bb, IIcon[] faceTextures, VertexTransform xForm, float[] brightnessPerSide) { - setupVertices(bb, xForm); - float minU; - float maxU; - float minV; - float maxV; - IIcon tex; - - Tessellator tessellator = Tessellator.instance; - - tessellator.setNormal(0, 0, -1); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.NORTH.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - - tex = faceTextures[ForgeDirection.NORTH.ordinal()]; - minU = tex.getMinU(); - maxU = tex.getMaxU(); - minV = tex.getMinV(); - maxV = tex.getMaxV(); - addVecWithUV(verts[1], minU, maxV); - addVecWithUV(verts[0], maxU, maxV); - addVecWithUV(verts[3], maxU, minV); - addVecWithUV(verts[2], minU, minV); - - tessellator.setNormal(0, 0, 1); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.SOUTH.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - tex = faceTextures[ForgeDirection.SOUTH.ordinal()]; - minU = tex.getMinU(); - maxU = tex.getMaxU(); - minV = tex.getMinV(); - maxV = tex.getMaxV(); - addVecWithUV(verts[4], minU, maxV); - addVecWithUV(verts[5], maxU, maxV); - addVecWithUV(verts[6], maxU, minV); - addVecWithUV(verts[7], minU, minV); - - tessellator.setNormal(0, 1, 0); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - tex = faceTextures[ForgeDirection.UP.ordinal()]; - 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); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.DOWN.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - tex = faceTextures[ForgeDirection.DOWN.ordinal()]; - 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); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.EAST.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - tex = faceTextures[ForgeDirection.EAST.ordinal()]; - minU = tex.getMinU(); - maxU = tex.getMaxU(); - minV = tex.getMinV(); - maxV = tex.getMaxV(); - addVecWithUV(verts[2], minU, minV); - addVecWithUV(verts[6], maxU, minV); - addVecWithUV(verts[5], maxU, maxV); - addVecWithUV(verts[1], minU, maxV); - - tessellator.setNormal(-1, 0, 0); - if(brightnessPerSide != null) { - float cm = brightnessPerSide[ForgeDirection.WEST.ordinal()]; - tessellator.setColorOpaque_F(cm, cm, cm); - } - tex = faceTextures[ForgeDirection.WEST.ordinal()]; - minU = tex.getMinU(); - maxU = tex.getMaxU(); - minV = tex.getMinV(); - maxV = tex.getMaxV(); - addVecWithUV(verts[0], minU, maxV); - addVecWithUV(verts[4], maxU, maxV); - addVecWithUV(verts[7], maxU, minV); - addVecWithUV(verts[3], minU, minV); - } - - 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/src/main/java/crazypants/render/CustomCubeRenderer.java b/src/main/java/crazypants/render/CustomCubeRenderer.java deleted file mode 100644 index c6c2dcfb..00000000 --- a/src/main/java/crazypants/render/CustomCubeRenderer.java +++ /dev/null @@ -1,58 +0,0 @@ -package crazypants.render; - -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -public class CustomCubeRenderer { - - public static final CustomCubeRenderer instance = new CustomCubeRenderer(); - - private CustomRenderBlocks rb = null; - - private IIcon overrideTexture; - - public void renderBlock(IBlockAccess ba, Block par1Block, int par2, int par3, int par4) { - renderBlock(ba, par1Block, par2, par3, par4, (IRenderFace) null); - } - - public void renderBlock(IBlockAccess ba, Block par1Block, int par2, int par3, int par4, IRenderFace renderer) { - if(rb == null) { - rb = new CustomRenderBlocks(ba); - } - rb.blockAccess = ba; - rb.setOverrideTexture(getOverrideTexture()); - rb.setFaceRenderers(null); - if(renderer != null) { - rb.addFaceRenderer(renderer); - } - rb.setRenderBoundsFromBlock(par1Block); - rb.renderStandardBlock(par1Block, par2, par3, par4); - } - - public void renderBlock(IBlockAccess ba, Block par1Block, int par2, int par3, int par4, Collection renderers) { - - rb.blockAccess = ba; - rb.setOverrideTexture(getOverrideTexture()); - rb.setFaceRenderers(renderers); - rb.setRenderBoundsFromBlock(par1Block); - rb.renderStandardBlock(par1Block, par2, par3, par4); - } - - public IIcon getOverrideTexture() { - return overrideTexture; - } - - public void setOverrideTexture(IIcon overrideTexture) { - this.overrideTexture = overrideTexture; - } - - public CustomRenderBlocks getCustomRenderBlocks() { - if (rb == null) { - rb = new CustomRenderBlocks(); - } - return rb; - } -} diff --git a/src/main/java/crazypants/render/CustomRenderBlocks.java b/src/main/java/crazypants/render/CustomRenderBlocks.java deleted file mode 100644 index 0723f17e..00000000 --- a/src/main/java/crazypants/render/CustomRenderBlocks.java +++ /dev/null @@ -1,709 +0,0 @@ -package crazypants.render; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.vecmath.Vertex; - -public class CustomRenderBlocks extends RenderBlocks { - - boolean translateToXYZ = true; - boolean shouldRenderBaseTexture = true; - - private final List renderFaceCallbacks = new ArrayList(); - private IIcon overrideTexture; - - public CustomRenderBlocks() { - super(); - } - - public CustomRenderBlocks(IBlockAccess par1iBlockAccess) { - super(par1iBlockAccess); - } - - public void addFaceRenderer(IRenderFace renderer) { - renderFaceCallbacks.add(renderer); - } - - public void setFaceRenderers(Collection renderers) { - renderFaceCallbacks.clear(); - if(renderers != null) { - renderFaceCallbacks.addAll(renderers); - } - } - - public void removeFaceRenderer(IRenderFace renderer) { - renderFaceCallbacks.remove(renderer); - } - - public boolean isTranslateToXYZ() { - return translateToXYZ; - } - - public void setTranslateToXYZ(boolean translateToXYZ) { - this.translateToXYZ = translateToXYZ; - } - - public IIcon getOverrideTexture() { - return overrideTexture; - } - - public void setOverrideTexture(IIcon overrideTexture) { - this.overrideTexture = overrideTexture; - } - - public void setShouldRenderBaseTexture(boolean val) { - shouldRenderBaseTexture = val; - } - - private void renderFace(ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture) { - if(renderFaceCallbacks.isEmpty()) { - doDefaultRenderFace(face, par1Block, x, y, z, overrideTexture == null ? texture : overrideTexture); - } else { - List faceVertices = createVerticesForFace(face, par1Block, x, y, z, overrideTexture == null ? texture : overrideTexture); - for (IRenderFace rf : renderFaceCallbacks) { - rf.renderFace(this, face, par1Block, x, y, z, overrideTexture == null ? texture : overrideTexture, faceVertices, translateToXYZ); - } - } - } - - public List createVerticesForFace(ForgeDirection face, Block par1Block, double x, double y, double z, IIcon icon) { - switch (face) { - case DOWN: - return calcFaceYNeg(par1Block, x, y, z, icon); - case EAST: - return calcFaceXPos(par1Block, x, y, z, icon); - case NORTH: - return calcFaceZNeg(par1Block, x, y, z, icon); - case SOUTH: - return calcFaceZPos(par1Block, x, y, z, icon); - case UP: - return calcFaceYPos(par1Block, x, y, z, icon); - case WEST: - return calcFaceXNeg(par1Block, x, y, z, icon); - case UNKNOWN: - default: - break; - } - return Collections.emptyList(); - } - - public void doDefaultRenderFace(ForgeDirection face, Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - switch (face) { - case DOWN: - super.renderFaceYNeg(par1Block, par2, par4, par6, par8Icon); - break; - case EAST: - super.renderFaceXPos(par1Block, par2, par4, par6, par8Icon); - break; - case NORTH: - super.renderFaceZNeg(par1Block, par2, par4, par6, par8Icon); - break; - case SOUTH: - super.renderFaceZPos(par1Block, par2, par4, par6, par8Icon); - break; - case UP: - super.renderFaceYPos(par1Block, par2, par4, par6, par8Icon); - break; - case WEST: - super.renderFaceXNeg(par1Block, par2, par4, par6, par8Icon); - break; - case UNKNOWN: - default: - break; - } - } - - @Override - public void renderFaceYNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.DOWN, par1Block, par2, par4, par6, par8Icon); - } - - @Override - public void renderFaceYPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.UP, par1Block, par2, par4, par6, par8Icon); - } - - @Override - public void renderFaceZNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.NORTH, par1Block, par2, par4, par6, par8Icon); - } - - @Override - public void renderFaceZPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.SOUTH, par1Block, par2, par4, par6, par8Icon); - } - - @Override - public void renderFaceXNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.WEST, par1Block, par2, par4, par6, par8Icon); - } - - @Override - public void renderFaceXPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - renderFace(ForgeDirection.EAST, par1Block, par2, par4, par6, par8Icon); - } - - private List calcFaceXNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - - if(hasOverrideBlockTexture()) { - par8Icon = this.overrideBlockTexture; - } - - double d3 = par8Icon.getInterpolatedU(this.renderMinZ * 16.0D); - double d4 = par8Icon.getInterpolatedU(this.renderMaxZ * 16.0D); - double d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxY * 16.0D); - double d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinY * 16.0D); - double d7; - - if(this.flipTexture) { - d7 = d3; - d3 = d4; - d4 = d7; - } - - if(this.renderMinZ < 0.0D || this.renderMaxZ > 1.0D) { - d3 = par8Icon.getMinU(); - d4 = par8Icon.getMaxU(); - } - - if(this.renderMinY < 0.0D || this.renderMaxY > 1.0D) { - d5 = par8Icon.getMinV(); - d6 = par8Icon.getMaxV(); - } - - d7 = d4; - double d8 = d3; - double d9 = d5; - double d10 = d6; - - if(this.uvRotateNorth == 1) { - d3 = par8Icon.getInterpolatedU(this.renderMinY * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxZ * 16.0D); - d4 = par8Icon.getInterpolatedU(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinZ * 16.0D); - d9 = d5; - d10 = d6; - d7 = d3; - d8 = d4; - d5 = d6; - d6 = d9; - } else if(this.uvRotateNorth == 2) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMaxY * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMinZ * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMinY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMaxZ * 16.0D); - d7 = d4; - d8 = d3; - d3 = d4; - d4 = d8; - d9 = d6; - d10 = d5; - } else if(this.uvRotateNorth == 3) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMinZ * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMaxZ * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinY * 16.0D); - d7 = d4; - d8 = d3; - d9 = d5; - d10 = d6; - } - - double d11 = par2 + this.renderMinX; - double d12 = par4 + this.renderMinY; - double d13 = par4 + this.renderMaxY; - double d14 = par6 + this.renderMinZ; - double d15 = par6 + this.renderMaxZ; - - List result = new ArrayList(4); - Vertex v; - if(enableAO) { - result.add(new Vertex(d11, d13, d15, d7, d9, brightnessTopLeft, colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, 1)); - result.add(new Vertex(d11, d13, d14, d3, d5, brightnessBottomLeft, colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, 1)); - result.add(new Vertex(d11, d12, d14, d8, d10, brightnessBottomRight, colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, 1)); - result.add(new Vertex(d11, d12, d15, d4, d6, brightnessTopRight, colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, 1)); - } else { - result.add(new Vertex(d11, d13, d15, d7, d9)); - result.add(new Vertex(d11, d13, d14, d3, d5)); - result.add(new Vertex(d11, d12, d14, d8, d10)); - result.add(new Vertex(d11, d12, d15, d4, d6)); - } - return result; - } - - private List calcFaceYPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - - if(this.hasOverrideBlockTexture()) { - par8Icon = this.overrideBlockTexture; - } - - double d3 = par8Icon.getInterpolatedU(this.renderMinX * 16.0D); - double d4 = par8Icon.getInterpolatedU(this.renderMaxX * 16.0D); - double d5 = par8Icon.getInterpolatedV(this.renderMinZ * 16.0D); - double d6 = par8Icon.getInterpolatedV(this.renderMaxZ * 16.0D); - - if(this.renderMinX < 0.0D || this.renderMaxX > 1.0D) { - d3 = par8Icon.getMinU(); - d4 = par8Icon.getMaxU(); - } - - if(this.renderMinZ < 0.0D || this.renderMaxZ > 1.0D) { - d5 = par8Icon.getMinV(); - d6 = par8Icon.getMaxV(); - } - - double d7 = d4; - double d8 = d3; - double d9 = d5; - double d10 = d6; - - if(this.uvRotateTop == 1) { - d3 = par8Icon.getInterpolatedU(this.renderMinZ * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxX * 16.0D); - d4 = par8Icon.getInterpolatedU(this.renderMaxZ * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinX * 16.0D); - d9 = d5; - d10 = d6; - d7 = d3; - d8 = d4; - d5 = d6; - d6 = d9; - } else if(this.uvRotateTop == 2) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMaxZ * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMinZ * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMaxX * 16.0D); - d7 = d4; - d8 = d3; - d3 = d4; - d4 = d8; - d9 = d6; - d10 = d5; - } else if(this.uvRotateTop == 3) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMaxX * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMinZ * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMaxZ * 16.0D); - d7 = d4; - d8 = d3; - d9 = d5; - d10 = d6; - } - - double d11 = par2 + this.renderMinX; - double d12 = par2 + this.renderMaxX; - double d13 = par4 + this.renderMaxY; - double d14 = par6 + this.renderMinZ; - double d15 = par6 + this.renderMaxZ; - - List result = new ArrayList(4); - Vertex v; - if(enableAO) { - v = new Vertex(d12, d13, d15, d4, d6, brightnessTopLeft, colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, 1); - result.add(v); - v = new Vertex(d12, d13, d14, d7, d9, brightnessBottomLeft, colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, 1); - result.add(v); - v = new Vertex(d11, d13, d14, d3, d5, brightnessBottomRight, colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, 1); - result.add(v); - v = new Vertex(d11, d13, d15, d8, d10, brightnessTopRight, colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, 1); - result.add(v); - } else { - v = new Vertex(d12, d13, d15, d4, d6); - result.add(v); - v = new Vertex(d12, d13, d14, d7, d9); - result.add(v); - v = new Vertex(d11, d13, d14, d3, d5); - result.add(v); - v = new Vertex(d11, d13, d15, d8, d10); - result.add(v); - } - return result; - } - - private List calcFaceZPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) - { - Tessellator tessellator = Tessellator.instance; - - if(this.hasOverrideBlockTexture()) - { - par8Icon = this.overrideBlockTexture; - } - - double d3 = par8Icon.getInterpolatedU(this.renderMinX * 16.0D); - double d4 = par8Icon.getInterpolatedU(this.renderMaxX * 16.0D); - double d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxY * 16.0D); - double d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinY * 16.0D); - double d7; - - if(this.flipTexture) - { - d7 = d3; - d3 = d4; - d4 = d7; - } - - if(this.renderMinX < 0.0D || this.renderMaxX > 1.0D) - { - d3 = par8Icon.getMinU(); - d4 = par8Icon.getMaxU(); - } - - if(this.renderMinY < 0.0D || this.renderMaxY > 1.0D) - { - d5 = par8Icon.getMinV(); - d6 = par8Icon.getMaxV(); - } - - d7 = d4; - double d8 = d3; - double d9 = d5; - double d10 = d6; - - if(this.uvRotateWest == 1) - { - d3 = par8Icon.getInterpolatedU(this.renderMinY * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(this.renderMaxY * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxX * 16.0D); - d9 = d5; - d10 = d6; - d7 = d3; - d8 = d4; - d5 = d6; - d6 = d9; - } - else if(this.uvRotateWest == 2) - { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMaxY * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMinY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMaxX * 16.0D); - d7 = d4; - d8 = d3; - d3 = d4; - d4 = d8; - d9 = d6; - d10 = d5; - } - else if(this.uvRotateWest == 3) - { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMaxX * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinY * 16.0D); - d7 = d4; - d8 = d3; - d9 = d5; - d10 = d6; - } - - double d11 = par2 + this.renderMinX; - double d12 = par2 + this.renderMaxX; - double d13 = par4 + this.renderMinY; - double d14 = par4 + this.renderMaxY; - double d15 = par6 + this.renderMaxZ; - - List result = new ArrayList(); - Vertex v; - if(enableAO) { - result.add(new Vertex(d11, d14, d15, d3, d5, brightnessTopLeft, colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, 1)); - result.add(new Vertex(d11, d13, d15, d8, d10, brightnessBottomLeft, this.colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, 1)); - result.add(new Vertex(d12, d13, d15, d4, d6, brightnessBottomRight, colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, 1)); - result.add(new Vertex(d12, d14, d15, d7, d9, brightnessTopRight, colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, 1)); - } else { - result.add(new Vertex(d11, d14, d15, d3, d5)); - result.add(new Vertex(d11, d13, d15, d8, d10)); - result.add(new Vertex(d12, d13, d15, d4, d6)); - result.add(new Vertex(d12, d14, d15, d7, d9)); - } - return result; - } - - private List calcFaceZNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) { - - if(this.hasOverrideBlockTexture()) - { - par8Icon = this.overrideBlockTexture; - } - - double d3 = par8Icon.getInterpolatedU(this.renderMinX * 16.0D); - double d4 = par8Icon.getInterpolatedU(this.renderMaxX * 16.0D); - double d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxY * 16.0D); - double d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinY * 16.0D); - double d7; - - if(this.flipTexture) { - d7 = d3; - d3 = d4; - d4 = d7; - } - - if(this.renderMinX < 0.0D || this.renderMaxX > 1.0D) { - d3 = par8Icon.getMinU(); - d4 = par8Icon.getMaxU(); - } - - if(this.renderMinY < 0.0D || this.renderMaxY > 1.0D) { - d5 = par8Icon.getMinV(); - d6 = par8Icon.getMaxV(); - } - - d7 = d4; - double d8 = d3; - double d9 = d5; - double d10 = d6; - - if(this.uvRotateEast == 2) { - d3 = par8Icon.getInterpolatedU(this.renderMinY * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMaxX * 16.0D); - d9 = d5; - d10 = d6; - d7 = d3; - d8 = d4; - d5 = d6; - d6 = d9; - } else if(this.uvRotateEast == 1) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMaxY * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMinY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinX * 16.0D); - d7 = d4; - d8 = d3; - d3 = d4; - d4 = d8; - d9 = d6; - d10 = d5; - } else if(this.uvRotateEast == 3) { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMinX * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMaxX * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinY * 16.0D); - d7 = d4; - d8 = d3; - d9 = d5; - d10 = d6; - } - - double d11 = par2 + this.renderMinX; - double d12 = par2 + this.renderMaxX; - double d13 = par4 + this.renderMinY; - double d14 = par4 + this.renderMaxY; - double d15 = par6 + this.renderMinZ; - - List result = new ArrayList(); - Vertex v; - if(enableAO) { - result.add(new Vertex(d11, d14, d15, d7, d9, brightnessTopLeft, colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, 1)); - result.add(new Vertex(d12, d14, d15, d3, d5, brightnessBottomLeft, colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, 1)); - result.add(new Vertex(d12, d13, d15, d8, d10, brightnessBottomRight, colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, 1)); - result.add(new Vertex(d11, d13, d15, d4, d6, brightnessTopRight, colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, 1)); - } else { - result.add(new Vertex(d11, d14, d15, d7, d9)); - result.add(new Vertex(d12, d14, d15, d3, d5)); - result.add(new Vertex(d12, d13, d15, d8, d10)); - result.add(new Vertex(d11, d13, d15, d4, d6)); - } - return result; - } - - private List calcFaceXPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon) - { - Tessellator tessellator = Tessellator.instance; - - if(this.hasOverrideBlockTexture()) - { - par8Icon = this.overrideBlockTexture; - } - - double d3 = par8Icon.getInterpolatedU(this.renderMinZ * 16.0D); - double d4 = par8Icon.getInterpolatedU(this.renderMaxZ * 16.0D); - double d5 = par8Icon.getInterpolatedV(16.0D - this.renderMaxY * 16.0D); - double d6 = par8Icon.getInterpolatedV(16.0D - this.renderMinY * 16.0D); - double d7; - - if(this.flipTexture) - { - d7 = d3; - d3 = d4; - d4 = d7; - } - - if(this.renderMinZ < 0.0D || this.renderMaxZ > 1.0D) - { - d3 = par8Icon.getMinU(); - d4 = par8Icon.getMaxU(); - } - - if(this.renderMinY < 0.0D || this.renderMaxY > 1.0D) - { - d5 = par8Icon.getMinV(); - d6 = par8Icon.getMaxV(); - } - - d7 = d4; - double d8 = d3; - double d9 = d5; - double d10 = d6; - - if(this.uvRotateSouth == 2) - { - d3 = par8Icon.getInterpolatedU(this.renderMinY * 16.0D); - d5 = par8Icon.getInterpolatedV(16.0D - this.renderMinZ * 16.0D); - d4 = par8Icon.getInterpolatedU(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(16.0D - this.renderMaxZ * 16.0D); - d9 = d5; - d10 = d6; - d7 = d3; - d8 = d4; - d5 = d6; - d6 = d9; - } - else if(this.uvRotateSouth == 1) - { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMaxY * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxZ * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMinY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinZ * 16.0D); - d7 = d4; - d8 = d3; - d3 = d4; - d4 = d8; - d9 = d6; - d10 = d5; - } - else if(this.uvRotateSouth == 3) - { - d3 = par8Icon.getInterpolatedU(16.0D - this.renderMinZ * 16.0D); - d4 = par8Icon.getInterpolatedU(16.0D - this.renderMaxZ * 16.0D); - d5 = par8Icon.getInterpolatedV(this.renderMaxY * 16.0D); - d6 = par8Icon.getInterpolatedV(this.renderMinY * 16.0D); - d7 = d4; - d8 = d3; - d9 = d5; - d10 = d6; - } - - double d11 = par2 + this.renderMaxX; - double d12 = par4 + this.renderMinY; - double d13 = par4 + this.renderMaxY; - double d14 = par6 + this.renderMinZ; - double d15 = par6 + this.renderMaxZ; - - List result = new ArrayList(4); - Vertex v; - if(enableAO) { - result.add(new Vertex(d11, d12, d15, d8, d10, brightnessTopLeft, colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, 1)); - result.add(new Vertex(d11, d12, d14, d4, d6, brightnessBottomLeft, colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, 1)); - result.add(new Vertex(d11, d13, d14, d7, d9, brightnessBottomRight, colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, 1)); - result.add(new Vertex(d11, d13, d15, d3, d5, brightnessTopRight, colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, 1)); - } else { - result.add(new Vertex(d11, d12, d15, d8, d10)); - result.add(new Vertex(d11, d12, d14, d4, d6)); - result.add(new Vertex(d11, d13, d14, d7, d9)); - result.add(new Vertex(d11, d13, d15, d3, d5)); - } - return result; - } - - private List calcFaceYNeg(Block par1Block, double x, double y, double z, IIcon icon) { - - if(hasOverrideBlockTexture()) { - icon = this.overrideBlockTexture; - } - - double minU = icon.getInterpolatedU(this.renderMinX * 16.0D); - double maxU = icon.getInterpolatedU(this.renderMaxX * 16.0D); - double minV = icon.getInterpolatedV(this.renderMinZ * 16.0D); - double maxV = icon.getInterpolatedV(this.renderMaxZ * 16.0D); - - if(renderMinX < 0.0D || renderMaxX > 1.0D) { - minU = icon.getMinU(); - maxU = icon.getMaxU(); - } - - if(this.renderMinZ < 0.0D || this.renderMaxZ > 1.0D) { - minV = icon.getMinV(); - maxV = icon.getMaxV(); - } - - double d7 = maxU; - double d8 = minU; - double d9 = minV; - double d10 = maxV; - - if(uvRotateBottom == 2) { - minU = icon.getInterpolatedU(this.renderMinZ * 16.0D); - minV = icon.getInterpolatedV(16.0D - this.renderMaxX * 16.0D); - maxU = icon.getInterpolatedU(this.renderMaxZ * 16.0D); - maxV = icon.getInterpolatedV(16.0D - this.renderMinX * 16.0D); - d9 = minV; - d10 = maxV; - d7 = minU; - d8 = maxU; - minV = maxV; - maxV = d9; - } else if(uvRotateBottom == 1) { - - minU = icon.getInterpolatedU(16.0D - this.renderMaxZ * 16.0D); - minV = icon.getInterpolatedV(this.renderMinX * 16.0D); - maxU = icon.getInterpolatedU(16.0D - this.renderMinZ * 16.0D); - maxV = icon.getInterpolatedV(this.renderMaxX * 16.0D); - d7 = maxU; - d8 = minU; - minU = maxU; - maxU = d8; - d9 = maxV; - d10 = minV; - } else if(uvRotateBottom == 3) { - minU = icon.getInterpolatedU(16.0D - this.renderMinX * 16.0D); - maxU = icon.getInterpolatedU(16.0D - this.renderMaxX * 16.0D); - minV = icon.getInterpolatedV(16.0D - this.renderMinZ * 16.0D); - maxV = icon.getInterpolatedV(16.0D - this.renderMaxZ * 16.0D); - d7 = maxU; - d8 = minU; - d9 = minV; - d10 = maxV; - } - - double minX = x + this.renderMinX; - double maxX = x + this.renderMaxX; - double minY = y + this.renderMinY; - double minZ = z + this.renderMinZ; - double maxZ = z + this.renderMaxZ; - - List result = new ArrayList(4); - Vertex v; - if(this.enableAO) { - v = new Vertex(minX, minY, maxZ, d8, d10, brightnessTopLeft, colorRedTopLeft, colorGreenTopLeft, colorBlueTopLeft, 1f); - result.add(v); - v = new Vertex(minX, minY, minZ, minU, minV, brightnessBottomLeft, colorRedBottomLeft, colorGreenBottomLeft, colorBlueBottomLeft, 1f); - result.add(v); - v = new Vertex(maxX, minY, minZ, d7, d9, brightnessBottomRight, colorRedBottomRight, colorGreenBottomRight, colorBlueBottomRight, 1f); - result.add(v); - v = new Vertex(maxX, minY, maxZ, maxU, maxV, brightnessTopRight, colorRedTopRight, colorGreenTopRight, colorBlueTopRight, 1f); - result.add(v); - } else { - v = new Vertex(minX, minY, maxZ, d8, d10); - result.add(v); - v = new Vertex(minX, minY, minZ, minU, minV); - result.add(v); - v = new Vertex(maxX, minY, minZ, d7, d9); - result.add(v); - v = new Vertex(maxX, minY, maxZ, maxU, maxV); - result.add(v); - } - return result; - } - -} \ No newline at end of file diff --git a/src/main/java/crazypants/render/IConnectedTextureRenderer.java b/src/main/java/crazypants/render/IConnectedTextureRenderer.java deleted file mode 100644 index ab316322..00000000 --- a/src/main/java/crazypants/render/IConnectedTextureRenderer.java +++ /dev/null @@ -1,7 +0,0 @@ -package crazypants.render; - -public interface IConnectedTextureRenderer { - - boolean matchesMetadata(int meta1, int meta2); - -} diff --git a/src/main/java/crazypants/render/IRenderFace.java b/src/main/java/crazypants/render/IRenderFace.java deleted file mode 100644 index 54e43ea7..00000000 --- a/src/main/java/crazypants/render/IRenderFace.java +++ /dev/null @@ -1,15 +0,0 @@ -package crazypants.render; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.vecmath.Vertex; - -public interface IRenderFace { - - void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz); - -} diff --git a/src/main/java/crazypants/render/IconUtil.java b/src/main/java/crazypants/render/IconUtil.java deleted file mode 100644 index 3a9c7e22..00000000 --- a/src/main/java/crazypants/render/IconUtil.java +++ /dev/null @@ -1,69 +0,0 @@ -package crazypants.render; - -import java.util.ArrayList; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.util.IIcon; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class IconUtil { - - public static interface IIconProvider { - - public void registerIcons(IIconRegister register); - - /** 0 = terrain.png, 1 = items.png */ - public int getTextureType(); - } - - private static ArrayList iconProviders = new ArrayList(); - - public static IIcon whiteTexture; - public static IIcon blankTexture; - public static IIcon errorTexture; - - static { - MinecraftForge.EVENT_BUS.register(new IconUtil()); - addIconProvider(new IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - whiteTexture = register.registerIcon("enderio:white"); - errorTexture = register.registerIcon("enderio:error"); - blankTexture = register.registerIcon("enderio:blank"); - } - - @Override - public int getTextureType() { - return 0; - } - }); - } - - public static void addIconProvider(IIconProvider registrar) { - iconProviders.add(registrar); - } - - @Mod.EventHandler - @SubscribeEvent - public void onIconLoad(TextureStitchEvent.Pre event) { - for (IIconProvider reg : iconProviders) { - if(reg.getTextureType() == event.map.getTextureType()) { - reg.registerIcons(event.map); - } - } - } - - public static IIcon getIconForItem(int itemId, int meta) { - Item item = Item.getItemById(itemId); - if(item == null) { - return null; - } - return item.getIconFromDamage(meta); - } - -} diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java deleted file mode 100644 index 62744cb8..00000000 --- a/src/main/java/crazypants/render/RenderUtil.java +++ /dev/null @@ -1,679 +0,0 @@ -package crazypants.render; - -import java.lang.reflect.Field; -import java.nio.FloatBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Timer; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.ReflectionHelper; -import crazypants.enderio.Log; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Matrix4d; -import com.enderio.core.common.vecmath.VecmathUtil; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vector4d; -import com.enderio.core.common.vecmath.Vector4f; -import com.enderio.core.common.vecmath.Vertex; -import static net.minecraftforge.common.util.ForgeDirection.*; -import static org.lwjgl.opengl.GL11.*; - -public class RenderUtil { - - public static final Vector4f DEFAULT_TEXT_SHADOW_COL = new Vector4f(0.33f, 0.33f, 0.33f, 0.33f); - - public static final Vector4f DEFAULT_TXT_COL = new Vector4f(1, 1, 1, 1); - - public static final Vector4f DEFAULT_TEXT_BG_COL = new Vector4f(0.275f, 0.08f, 0.4f, 0.75f); - - 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 final ResourceLocation BLOCK_TEX = TextureMap.locationBlocksTexture; - - public static final ResourceLocation ITEM_TEX = TextureMap.locationItemsTexture; - - public static final ResourceLocation GLINT_TEX = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - - public static int BRIGHTNESS_MAX = 15 << 20 | 15 << 4; - - 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); - } - - private static Field timerField = initTimer(); - - /** - * Non-thread-safe holder for the current render pass. You must update this in - * your block's canRenderInPass method for it to work properly! - */ - public static volatile int theRenderPass = 0; - - private static Field initTimer() { - Field f = null; - try { - f = ReflectionHelper.findField(Minecraft.class, "field_71428_T", "timer", "Q"); - f.setAccessible(true); - } catch (Exception e) { - Log.error("Failed to initialize timer reflection for IO config."); - e.printStackTrace(); - } - return f; - } - - @Nullable - public static Timer getTimer() { - if(timerField == null) { - return null; - } - try { - return (Timer) timerField.get(Minecraft.getMinecraft()); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - public static TextureManager engine() { - return Minecraft.getMinecraft().renderEngine; - } - - public static void bindItemTexture(ItemStack stack) { - engine().bindTexture(stack.getItemSpriteNumber() == 0 ? BLOCK_TEX : ITEM_TEX); - } - - public static void bindItemTexture() { - engine().bindTexture(ITEM_TEX); - } - - public static void bindBlockTexture() { - engine().bindTexture(BLOCK_TEX); - } - - public static void bindGlintTexture() { - engine().bindTexture(BLOCK_TEX); - } - - public static void bindTexture(String string) { - engine().bindTexture(new ResourceLocation(string)); - } - - public static void bindTexture(ResourceLocation tex) { - engine().bindTexture(tex); - } - - public static FontRenderer fontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } - - public static float[] getDefaultPerSideBrightness() { - float[] brightnessPerSide = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = RenderUtil.getColorMultiplierForFace(dir); - } - return brightnessPerSide; - } - - public static IIcon[] getBlockTextures(Block block, int meta) { - IIcon[] icons = new IIcon[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - icons[i] = block.getIcon(dir.ordinal(), meta); - i++; - } - return icons; - } - - public static IIcon[] getBlockTextures(IBlockAccess world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - IIcon[] icons = new IIcon[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - icons[i] = block.getIcon(world, x, y, z, dir.ordinal()); - i++; - } - return icons; - } - - public static float claculateTotalBrightnessForLocation(World worldObj, int xCoord, int yCoord, int zCoord) { - int i = worldObj.getLightBrightnessForSkyBlocks(xCoord, yCoord, zCoord, 0); - int j = i % 65536; - int k = i / 65536; - - float minLight = 0; - //0.2 - 1 - float sunBrightness = worldObj.getSunBrightness(1); - - float percentRecievedFromSun = k / 255f; - - //Highest value recieved from a light - float fromLights = j / 255f; - - // 0 - 1 for sun only, 0 - 0.6 for light only - float recievedPercent = worldObj.getLightBrightness(xCoord, yCoord, zCoord); - float highestValue = Math.max(fromLights, percentRecievedFromSun * sunBrightness); - return Math.max(0.2f, highestValue); - } - - 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 = world.getBlock(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; - } - - public static void renderQuad2D(double x, double y, double z, double width, double height, int colorRGB) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_I(colorRGB); - tessellator.addVertex(x, y + height, z); - tessellator.addVertex(x + width, y + height, z); - tessellator.addVertex(x + width, y, z); - tessellator.addVertex(x, y, z); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - public static void renderQuad2D(double x, double y, double z, double width, double height, Vector4f colorRGBA) { - GL11.glColor4f(colorRGBA.x, colorRGBA.y, colorRGBA.z, colorRGBA.w); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(x, y + height, z); - tessellator.addVertex(x + width, y + height, z); - tessellator.addVertex(x + width, y, z); - tessellator.addVertex(x, y, z); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - public static Matrix4d createBillboardMatrix(TileEntity te, EntityLivingBase entityPlayer) { - return createBillboardMatrix(new Vector3d(te.xCoord + 0.5, te.yCoord + 0.5, te.zCoord + 0.5), entityPlayer); - } - - public static Matrix4d createBillboardMatrix(Vector3d lookAt, EntityLivingBase entityPlayer) { - Vector3d playerEye = new Vector3d(entityPlayer.posX, entityPlayer.posY + 1.62 - entityPlayer.yOffset, entityPlayer.posZ); - Vector3d blockOrigin = new Vector3d(lookAt.x, lookAt.y, lookAt.z); - Matrix4d lookMat = VecmathUtil.createMatrixAsLookAt(blockOrigin, playerEye, RenderUtil.UP_V); - lookMat.setTranslation(new Vector3d()); - lookMat.invert(); - return lookMat; - } - - public static 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(); - } - - /** - * left, bottom, right, top - * - * @param face - * @return - */ - public static List getEdgesForFace(ForgeDirection face) { - List result = new ArrayList(4); - if(face.offsetY != 0) { - result.add(NORTH); - result.add(EAST); - result.add(SOUTH); - result.add(WEST); - - } else if(face.offsetX != 0) { - result.add(DOWN); - result.add(SOUTH); - result.add(UP); - result.add(NORTH); - } else { - result.add(DOWN); - result.add(WEST); - result.add(UP); - result.add(EAST); - } - return result; - } - - public static void addVerticesToTesselator(List vertices) { - addVerticesToTessellator(vertices, Tessellator.instance); - } - - public static void addVerticesToTessellator(List vertices, Tessellator tes) { - for (Vertex v : vertices) { - if(v.brightness != -1) { - tes.setBrightness(v.brightness); - } - if(v.color != null) { - tes.setColorRGBA_F(v.r(), v.g(), v.b(), v.a()); - } - if(v.uv != null) { - tes.setTextureUV(v.u(), v.v()); - } - if(v.normal != null) { - tes.setNormal(v.nx(), v.ny(), v.nz()); - } - tes.addVertex(v.x(), v.y(), v.z()); - } - } - - public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, - boolean forceAllEdges) { - renderConnectedTextureFace(blockAccess, block, x, y, z, face, texture, forceAllEdges, true, true); - } - - public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, - boolean forceAllEdges, boolean translateToXYZ, boolean applyFaceShading) { - - if((blockAccess == null && !forceAllEdges) || face == null || texture == null) { - return; - } - - if(!forceAllEdges) { - Block check = blockAccess.getBlock(x, y, z); - if(check == null) { - return; - } - if(!check.shouldSideBeRendered(blockAccess, x + face.offsetX, y + face.offsetY, z + face.offsetZ, face.ordinal())) { - return; - } - } - - BlockCoord bc = new BlockCoord(x, y, z); - - List edges; - if(forceAllEdges) { - edges = RenderUtil.getEdgesForFace(face); - } else { - edges = RenderUtil.getNonConectedEdgesForFace(blockAccess, x, y, z, face); - } - - Tessellator tes = Tessellator.instance; - tes.setNormal(face.offsetX, face.offsetY, face.offsetZ); - if(applyFaceShading) { - float cm = RenderUtil.getColorMultiplierForFace(face); - tes.setColorOpaque_F(cm, cm, cm); - } - - float scaleFactor = 15f / 16f; - Vector2f uv = new Vector2f(); - for (ForgeDirection edge : edges) { - - float xLen = 1 - Math.abs(edge.offsetX) * scaleFactor; - float yLen = 1 - Math.abs(edge.offsetY) * scaleFactor; - float zLen = 1 - Math.abs(edge.offsetZ) * scaleFactor; - - xLen -= 2 * (1 - block.getBlockBoundsMaxX()) - block.getBlockBoundsMinX(); - yLen -= 2 * (1 - block.getBlockBoundsMaxY()) - block.getBlockBoundsMinY(); - zLen -= 2 * (1 - block.getBlockBoundsMaxZ()) - block.getBlockBoundsMinZ(); - - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(xLen, yLen, zLen); - - List corners = bb.getCornersForFace(face); - - for (Vector3f unitCorn : corners) { - Vector3d corner = new Vector3d(unitCorn); - if(translateToXYZ) { - corner.x += x; - corner.y += y; - corner.z += z; - } - - corner.x += (float) (edge.offsetX * 0.5) - Math.signum(edge.offsetX) * xLen / 2f; - corner.y += (float) (edge.offsetY * 0.5) - Math.signum(edge.offsetY) * yLen / 2f; - corner.z += (float) (edge.offsetZ * 0.5) - Math.signum(edge.offsetZ) * zLen / 2f; - - if(translateToXYZ) { - RenderUtil.getUvForCorner(uv, corner, x, y, z, face, texture); - } else { - RenderUtil.getUvForCorner(uv, corner, 0, 0, 0, face, texture); - } - tes.addVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y); - } - - } - - } - - public static List getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face) { - return getNonConectedEdgesForFace(blockAccess, x, y, z, face, null); - } - - public static List getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face, - IConnectedTextureRenderer render) { - - Block block = blockAccess.getBlock(x, y, z); - if(block == null) { - return Collections.emptyList(); - } - if(!block.shouldSideBeRendered(blockAccess, x + face.offsetX, y + face.offsetY, z + face.offsetZ, face.ordinal())) { - return Collections.emptyList(); - } - BlockCoord bc = new BlockCoord(x, y, z); - - List edges = new ArrayList(4); - for (ForgeDirection dir : getEdgesForFace(face)) { - edges.add(new EdgeNeighbour(bc, dir)); - } - List result = new ArrayList(4); - for (EdgeNeighbour edge : edges) { - boolean matchingNeighbour = blockAccess.getBlock(edge.bc.x, edge.bc.y, edge.bc.z) == block; - if(matchingNeighbour && render != null) { - matchingNeighbour = render.matchesMetadata(blockAccess.getBlockMetadata(x, y, z), blockAccess.getBlockMetadata(edge.bc.x, edge.bc.y, edge.bc.z)); - } - if(!matchingNeighbour) { - result.add(edge.dir); - } - - } - return result; - } - - public static void getUvForCorner(Vector2f uv, Vector3d corner, int x, int y, int z, ForgeDirection face, IIcon icon) { - if(icon == null) { - return; - } - - Vector3d p = new Vector3d(corner); - p.x -= x; - p.y -= y; - p.z -= z; - - float uWidth = 1; - float vWidth = 1; - if(icon != null) { - uWidth = icon.getMaxU() - icon.getMinU(); - vWidth = icon.getMaxV() - icon.getMinV(); - } - - uv.x = (float) VecmathUtil.distanceFromPointToPlane(getUPlaneForFace(face), p); - uv.y = (float) VecmathUtil.distanceFromPointToPlane(getVPlaneForFace(face), p); - - if(icon != null) { - uv.x = icon.getMinU() + (uv.x * uWidth); - uv.y = icon.getMinV() + (uv.y * vWidth); - } - - } - - public static 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; - } - - public static 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; - } - - public static ForgeDirection getVDirForFace(ForgeDirection face) { - switch (face) { - case DOWN: - case UP: - return SOUTH; - case EAST: - case WEST: - case NORTH: - case SOUTH: - return ForgeDirection.UP; - case UNKNOWN: - default: - break; - } - return null; - } - - public static ForgeDirection getUDirForFace(ForgeDirection face) { - switch (face) { - case DOWN: - case UP: - return ForgeDirection.EAST; - case EAST: - return NORTH; - case WEST: - return SOUTH; - case NORTH: - return WEST; - case SOUTH: - return ForgeDirection.EAST; - case UNKNOWN: - default: - break; - } - return null; - } - - public static void renderGuiTank(FluidTank tank, double x, double y, double zLevel, double width, double height) { - renderGuiTank(tank.getFluid(), tank.getCapacity(), tank.getFluidAmount(), x, y, zLevel, width, height); - } - - public static void renderGuiTank(FluidStack fluid, int capacity, int amount, double x, double y, double zLevel, double width, double height) { - if(fluid == null || fluid.getFluid() == null || fluid.amount <= 0) { - return; - } - - IIcon icon = fluid.getFluid().getStillIcon(); - if(icon == null) { - icon = fluid.getFluid().getIcon(); - if(icon == null) { - return; - } - } - - int renderAmount = (int) Math.max(Math.min(height, amount * height / capacity), 1); - int posY = (int) (y + height - renderAmount); - - RenderUtil.bindBlockTexture(); - int color = fluid.getFluid().getColor(fluid); - GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); - - GL11.glEnable(GL11.GL_BLEND); - for (int i = 0; i < width; i += 16) { - for (int j = 0; j < renderAmount; j += 16) { - int drawWidth = (int) Math.min(width - i, 16); - int drawHeight = Math.min(renderAmount - j, 16); - - int drawX = (int) (x + i); - int drawY = posY + j; - - double minU = icon.getMinU(); - double maxU = icon.getMaxU(); - double minV = icon.getMinV(); - double maxV = icon.getMaxV(); - - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY + drawHeight, 0, minU + (maxU - minU) * drawWidth / 16F, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY, 0, minU + (maxU - minU) * drawWidth / 16F, minV); - tessellator.addVertexWithUV(drawX, drawY, 0, minU, minV); - tessellator.draw(); - } - } - GL11.glDisable(GL11.GL_BLEND); - } - - public static void drawBillboardedText(Vector3f pos, String text, float size) { - drawBillboardedText(pos, text, size, DEFAULT_TXT_COL, true, DEFAULT_TEXT_SHADOW_COL, true, DEFAULT_TEXT_BG_COL); - } - - public static void drawBillboardedText(Vector3f pos, String text, float size, Vector4f bgCol) { - drawBillboardedText(pos, text, size, DEFAULT_TXT_COL, true, DEFAULT_TEXT_SHADOW_COL, true, bgCol); - } - - public static void drawBillboardedText(Vector3f pos, String text, float size, Vector4f txtCol, boolean drawShadow, Vector4f shadowCol, - boolean drawBackground, Vector4f bgCol) { - GL11.glPushMatrix(); - GL11.glTranslatef(pos.x, pos.y, pos.z); - glRotatef(180, 1, 0, 0); - - FontRenderer fnt = Minecraft.getMinecraft().fontRenderer; - float scale = size / fnt.FONT_HEIGHT; - GL11.glScalef(scale, scale, scale); - glRotatef(RenderManager.instance.playerViewY + 180, 0.0F, 1.0F, 0.0F); - glRotatef(-RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); - - glTranslatef(-fnt.getStringWidth(text) / 2, 0, 0); - if(drawBackground) { - renderBackground(fnt, text, bgCol); - } - fnt.drawString(text, 0, 0, ColorUtil.getRGBA(txtCol)); - if(drawShadow) { - glTranslatef(0.5f, 0.5f, 0.1f); - fnt.drawString(text, 0, 0, ColorUtil.getRGBA(shadowCol)); - } - GL11.glPopMatrix(); - - RenderUtil.bindBlockTexture(); - } - - public static void renderBackground(FontRenderer fnt, String toRender, Vector4f color) { - glPushAttrib(GL_ALL_ATTRIB_BITS); - glDisable(GL_TEXTURE_2D); - glEnable(GL_BLEND); - glShadeModel(GL_SMOOTH); - glDisable(GL_ALPHA_TEST); - glDisable(GL_CULL_FACE); - glDepthMask(false); - RenderHelper.disableStandardItemLighting(); - OpenGlHelper.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); // stop random disappearing - - float width = fnt.getStringWidth(toRender); - float height = fnt.FONT_HEIGHT; - float padding = 2f; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(color.x, color.y, color.z, color.w); - tessellator.addVertex(-padding, -padding, 0); - tessellator.addVertex(-padding, height + padding, 0); - tessellator.addVertex(width + padding, height + padding, 0); - tessellator.addVertex(width + padding, -padding, 0); - tessellator.draw(); - - glPopAttrib(); - } - - private static class EdgeNeighbour { - final ForgeDirection dir; - final BlockCoord bc; - - public EdgeNeighbour(BlockCoord bc, ForgeDirection dir) { - this.dir = dir; - this.bc = bc.getLocation(dir); - } - - } - - public static void registerReloadListener(IResourceManagerReloadListener obj) { - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(obj); - } -} diff --git a/src/main/java/crazypants/render/TechneModelRenderer.java b/src/main/java/crazypants/render/TechneModelRenderer.java deleted file mode 100644 index 9dbdfc54..00000000 --- a/src/main/java/crazypants/render/TechneModelRenderer.java +++ /dev/null @@ -1,57 +0,0 @@ -package crazypants.render; - -import java.util.Collection; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.GroupObject; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -public class TechneModelRenderer implements ISimpleBlockRenderingHandler { - - private Collection model; - private int renderId; - - protected VertexTransform vt; - - public TechneModelRenderer(String modelPath, int renderId) { - this(modelPath, renderId, null); - } - - public TechneModelRenderer(String modelPath, int renderId, VertexTransform vt) { - this(TechneUtil.getModelAll(modelPath), renderId, vt); - } - - public TechneModelRenderer(Collection model, int renderId) { - this(model, renderId, null); - } - - public TechneModelRenderer(Collection model, int renderId, VertexTransform vt) { - this.model = model; - this.renderId = renderId; - this.vt = vt; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - TechneUtil.vt = this.vt; - TechneUtil.renderInventoryBlock(model, block, metadata, renderer); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - TechneUtil.vt = this.vt; - return TechneUtil.renderWorldBlock(model, world, x, y, z, block, renderer); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return renderId; - } -} diff --git a/src/main/java/crazypants/render/TechneUtil.java b/src/main/java/crazypants/render/TechneUtil.java deleted file mode 100644 index d5617dbe..00000000 --- a/src/main/java/crazypants/render/TechneUtil.java +++ /dev/null @@ -1,369 +0,0 @@ -/* - -Copyright © 2014 RainWarrior - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 4. This notice may not be removed or altered from any source - distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - */ - -package crazypants.render; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.client.model.ModelBox; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.model.PositionTextureVertex; -import net.minecraft.client.model.TexturedQuad; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.Face; -import net.minecraftforge.client.model.obj.GroupObject; -import net.minecraftforge.client.model.obj.TextureCoordinate; -import net.minecraftforge.client.model.obj.Vertex; -import net.minecraftforge.client.model.techne.TechneModel; -import net.minecraftforge.client.model.techne.TechneModelLoader; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.vector.Matrix4f; -import org.lwjgl.util.vector.Vector3f; -import org.lwjgl.util.vector.Vector4f; - -import com.google.common.collect.Maps; - -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.AbstractMachineBlock; -import com.enderio.core.common.vecmath.Vector3d; - -/** - * Slightly modified to fit the EnderIO source. - * - * @author Based on RainWarrior's code here. - */ -public class TechneUtil { - - public static VertexTransform vt = null; - - private static final TechneModelLoader modelLoader = new TechneModelLoader(); - - private static final Tessellator tes = Tessellator.instance; - - public static List bakeModel(ModelRenderer model) { - return bakeModel(model, 1); - } - - public static List bakeModel(ModelRenderer model, float scale) { - return bakeModel(model, scale, new Matrix4f()); - } - - public static List bakeModel(ModelRenderer model, float scale, Matrix4f matrix) { - return bakeModel(model, scale, matrix, false); - } - - /** - * Convert ModelRenderer to a list of GroupObjects, for ease of use in ISBRH - * and other static contexts. - * - * @param scale - * the scale factor, usually last argument to rendering methods - * @param matrix - * initial transformation matrix (replaces calling - * glTranslate/glRotate/e.t.c. before rendering) - * @param rotateYFirst - * true, of the order of rotations be like in - * ModelRenderer.renderWithRotation, false if like in - * ModelRenderer.render - */ - @SuppressWarnings("unchecked") - public static List bakeModel(ModelRenderer model, float scale, Matrix4f matrix, boolean rotateYFirst) { - Matrix4f m = new Matrix4f(matrix); - - m.translate(new Vector3f(model.offsetX + model.rotationPointX * scale, model.offsetY + model.rotationPointY * scale, model.offsetZ + model.rotationPointZ - * scale)); - - if(!rotateYFirst) { - m.rotate(model.rotateAngleZ, new Vector3f(0, 0, 1)); - } - m.rotate(model.rotateAngleY, new Vector3f(0, 1, 0)); - m.rotate(model.rotateAngleX, new Vector3f(1, 0, 0)); - - if(rotateYFirst) { - m.rotate(model.rotateAngleZ, new Vector3f(0, 0, 1)); - } - - Vector4f vec = new Vector4f(); - List res = new ArrayList(); - - for (ModelBox box : (List) model.cubeList) { - GroupObject obj = new GroupObject("", GL11.GL_QUADS); - TexturedQuad[] quads = (TexturedQuad[]) ObfuscationReflectionHelper.getPrivateValue(ModelBox.class, box, "quadList", "field_78254_i"); - for (int i = 0; i < quads.length; i++) { - Face face = new Face(); - face.vertices = new Vertex[4]; - face.textureCoordinates = new TextureCoordinate[4]; - for (int j = 0; j < 4; j++) { - PositionTextureVertex pv = quads[i].vertexPositions[j]; - - vec.x = (float) pv.vector3D.xCoord * scale; - vec.y = (float) pv.vector3D.yCoord * scale; - vec.z = (float) pv.vector3D.zCoord * scale; - vec.w = 1; - - Matrix4f.transform(m, vec, vec); - - face.vertices[j] = new Vertex(vec.x / vec.w, vec.y / vec.w, vec.z / vec.w); - - // Increase the interpolation scale by multiples of 2 - while (pv.texturePositionX > uMult) { - uMult *= 2; - } - while (pv.texturePositionY > vMult) { - vMult *= 2; - } - - face.textureCoordinates[j] = new TextureCoordinate(pv.texturePositionX, pv.texturePositionY); - } - face.faceNormal = face.calculateFaceNormal(); - obj.faces.add(face); - } - res.add(obj); - } - - return res; - } - - public static Map bakeModel(TechneModel model) { - return bakeModel(model, 1); - } - - public static Map bakeModel(TechneModel model, float scale) { - return bakeModel(model, scale, new Matrix4f()); - } - - public static Map bakeModel(TechneModel model, float scale, Matrix4f m) { - return bakeModel(model, scale, m, false); - } - - // Used in the second pass of baking to adjust UVs to the proper interpolation - private static int uMult = 1, vMult = 1; - - /** - * Use this to convert TechneModel to it's static representation - */ - @SuppressWarnings("unchecked") - public static Map bakeModel(TechneModel model, float scale, Matrix4f m, boolean rotateYFirst) { - Map parts = (Map) ObfuscationReflectionHelper.getPrivateValue(TechneModel.class, model, "parts"); - Map res = Maps.newHashMap(); - - for (Map.Entry e : parts.entrySet()) { - GroupObject obj = bakeModel(e.getValue(), scale, m, rotateYFirst).get(0); - res.put(e.getKey(), obj); - } - - // Second pass, adjust the UVs to be on a 0-1 interpolation scale - if(uMult + vMult != 2) { - for (GroupObject go : res.values()) { - for (Face f : go.faces) { - for (TextureCoordinate tc : f.textureCoordinates) { - tc.u /= uMult; - tc.v /= vMult; - } - } - } - } - - uMult = vMult = 1; - - return res; - } - - public static Map getModel(String modelPath) { - TechneModel tm = (TechneModel) modelLoader.loadInstance(new ResourceLocation(EnderIO.MODID.toLowerCase(), modelPath + ".tcn")); - return TechneUtil.bakeModel(tm, 1f / 16, new Matrix4f().scale(new Vector3f(-1, -1, 1))); - } - - public static Collection getModelAll(String modelPath) { - TechneModel tm = (TechneModel) modelLoader.loadInstance(new ResourceLocation(EnderIO.MODID.toLowerCase(), modelPath + ".tcn")); - return TechneUtil.bakeModel(tm, 1f / 16, new Matrix4f().scale(new Vector3f(-1, -1, 1))).values(); - } - - public static void renderWithIcon(Collection model, IIcon icon, IIcon override, Tessellator tes) { - renderWithIcon(model, icon, override, tes, null); - } - - public static void renderWithIcon(Collection model, IIcon icon, IIcon override, Tessellator tes, VertexTransform vt) { - renderWithIcon(model, icon, override, tes, null, 0, 0, 0, vt); - } - - public static void renderWithIcon(Collection model, IIcon icon, IIcon override, Tessellator tes, IBlockAccess world, int x, int y, int z) { - renderWithIcon(model, icon, override, tes, world, x, y, z, null); - } - - public static void renderWithIcon(Collection model, IIcon icon, IIcon override, Tessellator tes, IBlockAccess world, int x, int y, int z, - VertexTransform vt) { - renderWithIcon(model, icon, override, tes, world, x, y, z, vt, true); - } - - public static void renderWithIcon(Collection model, IIcon icon, IIcon override, Tessellator tes, IBlockAccess world, int x, int y, int z, - VertexTransform vt, boolean isbrh) { - for (GroupObject go : model) { - renderWithIcon(go, icon, override, tes, world, x, y, z, vt, isbrh); - } - } - - public static void renderWithIcon(GroupObject go, IIcon icon, IIcon override, Tessellator tes, IBlockAccess world, int x, int y, int z, VertexTransform vt, - boolean isbrh) { - for (Face f : go.faces) { - Vertex n = f.faceNormal; - tes.setNormal(n.x, n.y, n.z); - ForgeDirection normal = getNormalFor(n); - ForgeDirection right = normal.getRotation(ForgeDirection.DOWN); - if(normal == right) { - right = ForgeDirection.EAST; - } - ForgeDirection down = normal.getRotation(right.getOpposite()); - - if(isbrh && world != null && world.getBlock(x, y, z).getLightOpacity() > 0) { - int bx = x + normal.offsetX; - int by = y + normal.offsetY; - int bz = z + normal.offsetZ; - tes.setBrightness(world.getBlock(bx, by, bz).getMixedBrightnessForBlock(world, bx, by, bz)); - } - - for (int i = 0; i < f.vertices.length; i++) { - Vertex vert = f.vertices[i]; - Vector3d v = new Vector3d(vert); - Vector3d tv = new Vector3d(v); - tv.add(0.5, 0, 0.5); - if(vt != null) { - vt.apply(v); - } - - if(isbrh) { - float factor = normal.offsetX != 0 ? 0.8f : normal.offsetZ != 0 ? 0.6f : normal.offsetY < 0 ? 0.5f : 1; - int c = (int) (0xFF * factor); - - tes.setColorOpaque(c, c, c); - } - - if(override != null) { - - double interpX = Math.abs(tv.x * right.offsetX + tv.y * right.offsetY + tv.z * right.offsetZ); - double interpY = Math.abs(tv.x * down.offsetX + tv.y * down.offsetY + tv.z * down.offsetZ); - - // Handles verts outside block bounds. Modulo fails at 1.0. - while (interpX > 1) { - interpX--; - } - while (interpY > 1) { - interpY--; - } - - if(normal == ForgeDirection.SOUTH || normal == ForgeDirection.WEST) { - interpX = 1 - interpX; - } - if(normal != ForgeDirection.UP && normal != ForgeDirection.DOWN) { - interpY = 1 - interpY; - } - tes.addVertexWithUV(v.x, v.y, v.z, override.getInterpolatedU(interpX * 16), override.getInterpolatedV(interpY * 16)); - } else { - TextureCoordinate t = f.textureCoordinates[i]; - tes.addVertexWithUV(v.x, v.y, v.z, icon.getInterpolatedU(t.u * 16), icon.getInterpolatedV(t.v * 16)); - } - } - } - } - - private static ForgeDirection getNormalFor(Vertex n) { - if(n.x != 0) { - return n.x > 0 ? ForgeDirection.EAST : ForgeDirection.WEST; - } else if(n.y != 0) { - return n.y > 0 ? ForgeDirection.UP : ForgeDirection.DOWN; - } else { - return n.z > 0 ? ForgeDirection.SOUTH : ForgeDirection.NORTH; - } - } - - public static void renderInventoryBlock(Collection model, Block block, int metadata, RenderBlocks rb) { - renderInventoryBlock(model, getIconFor(block, metadata), block, metadata, rb); - } - - public static void renderInventoryBlock(Collection model, IIcon icon, Block block, int metadata, RenderBlocks rb) { - tes.startDrawingQuads(); - tes.setColorOpaque_F(1, 1, 1); - tes.addTranslation(0, -0.47f, 0); - renderWithIcon(model, icon, rb.overrideBlockTexture, tes, vt); - tes.addTranslation(0, 0.47f, 0); - tes.draw(); - resetVT(); - } - - public static boolean renderWorldBlock(Collection model, IBlockAccess world, int x, int y, int z, Block block, RenderBlocks rb) { - IIcon icon = getIconFor(block, world, x, y, z); - return renderWorldBlock(model, icon, world, x, y, z, block, rb); - } - - public static boolean renderWorldBlock(Collection model, IIcon icon, IBlockAccess world, int x, int y, int z, Block block, RenderBlocks rb) { - tes.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); - tes.setColorOpaque_F(1, 1, 1); - tes.addTranslation(x + .5F, y + 0.0375f, z + .5F); - renderWithIcon(model, icon, rb.overrideBlockTexture, tes, world, x, y, z, vt); - tes.addTranslation(-x - .5F, -y - 0.0375f, -z - .5F); - resetVT(); - return true; - } - - private static void resetVT() { - vt = null; - } - - private static IIcon getIconFor(Block block, IBlockAccess world, int x, int y, int z) { - if(block instanceof AbstractMachineBlock) { - return ((AbstractMachineBlock) block).getModelIcon(world, x, y, z); - } - return block.getIcon(world, x, y, z, 0); - } - - private static IIcon getIconFor(Block block, int metadata) { - if(block instanceof AbstractMachineBlock) { - return ((AbstractMachineBlock) block).getModelIcon(); - } - return block.getIcon(0, metadata); - } -} diff --git a/src/main/java/crazypants/render/VertexRotation.java b/src/main/java/crazypants/render/VertexRotation.java deleted file mode 100644 index 88f08f2d..00000000 --- a/src/main/java/crazypants/render/VertexRotation.java +++ /dev/null @@ -1,57 +0,0 @@ -package crazypants.render; - -import com.enderio.core.common.vecmath.Quat4d; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -public class VertexRotation implements VertexTransform { - - private final Vector3d center; - private Quat4d quat; - private double angle; - private final Vector3d axis; - - public VertexRotation(double angle, Vector3d axis, Vector3d center) { - this.center = new Vector3d(center); - this.axis = new Vector3d(axis); - this.angle = angle; - quat = Quat4d.makeRotate(angle, axis); - } - - @Override - public void apply(Vertex vertex) { - apply(vertex.xyz); - } - - @Override - public void apply(Vector3d vec) { - vec.sub(center); - quat.rotate(vec); - vec.add(center); - } - - public void setAngle(double angle) { - this.angle = angle; - quat = Quat4d.makeRotate(angle, axis); - } - - public double getAngle() { - return angle; - } - - public void setAxis(Vector3d axis) { - this.axis.set(axis); - quat = Quat4d.makeRotate(angle, axis); - } - - public void setCenter(Vector3d cen) { - center.set(cen); - } - - @Override - public void applyToNormal(Vector3f vec) { - quat.rotate(vec); - } - -} diff --git a/src/main/java/crazypants/render/VertexRotationFacing.java b/src/main/java/crazypants/render/VertexRotationFacing.java deleted file mode 100644 index ce1c15c3..00000000 --- a/src/main/java/crazypants/render/VertexRotationFacing.java +++ /dev/null @@ -1,28 +0,0 @@ -package crazypants.render; - -import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.vecmath.Vector3d; - -public class VertexRotationFacing extends VertexRotation { - - private static final double ROTATION_AMOUNT = Math.PI / 2; - - private ForgeDirection defaultDir; - - public VertexRotationFacing(ForgeDirection defaultDir) { - super(0, new Vector3d(0, 0.5, 0), new Vector3d(0, 0, 0)); - this.defaultDir = defaultDir; - } - - public void setRotation(ForgeDirection dir) { - if(dir == defaultDir) { - setAngle(0); - } else if(dir == defaultDir.getOpposite()) { - setAngle(ROTATION_AMOUNT * 2); - } else if(dir == defaultDir.getRotation(ForgeDirection.DOWN)) { - setAngle(ROTATION_AMOUNT); - } else { - setAngle(ROTATION_AMOUNT * 3); - } - } -} diff --git a/src/main/java/crazypants/render/VertexTransform.java b/src/main/java/crazypants/render/VertexTransform.java deleted file mode 100644 index c4c12c02..00000000 --- a/src/main/java/crazypants/render/VertexTransform.java +++ /dev/null @@ -1,15 +0,0 @@ -package crazypants.render; - -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -public interface VertexTransform { - - public abstract void apply(Vertex vertex); - - public abstract void apply(Vector3d vec); - - public abstract void applyToNormal(Vector3f vec); - -} diff --git a/src/main/java/crazypants/render/VertexTransformComposite.java b/src/main/java/crazypants/render/VertexTransformComposite.java deleted file mode 100644 index bee2bdd4..00000000 --- a/src/main/java/crazypants/render/VertexTransformComposite.java +++ /dev/null @@ -1,47 +0,0 @@ -package crazypants.render; - -import java.util.Collection; - -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -public class VertexTransformComposite implements VertexTransform { - - public final VertexTransform[] xforms; - - public VertexTransformComposite(VertexTransform... xforms) { - this.xforms = xforms; - } - - VertexTransformComposite(Collection xformsIn) { - xforms = new VertexTransform[xformsIn.size()]; - int i = 0; - for (VertexTransform xform : xformsIn) { - xforms[i] = xform; - i++; - } - } - - @Override - public void apply(Vertex vertex) { - for (VertexTransform xform : xforms) { - xform.apply(vertex); - } - } - - @Override - public void apply(Vector3d vec) { - for (VertexTransform xform : xforms) { - xform.apply(vec); - } - } - - @Override - public void applyToNormal(Vector3f vec) { - for (VertexTransform xform : xforms) { - xform.applyToNormal(vec); - } - } - -} diff --git a/src/main/java/crazypants/render/VertexTranslation.java b/src/main/java/crazypants/render/VertexTranslation.java deleted file mode 100644 index 61da9558..00000000 --- a/src/main/java/crazypants/render/VertexTranslation.java +++ /dev/null @@ -1,60 +0,0 @@ -package crazypants.render; - -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -public class VertexTranslation implements VertexTransform { - - private double x; - private double y; - private double z; - - public VertexTranslation(double x, double y, double z) { - this.x = x; - this.y = y; - this.z = z; - } - - public VertexTranslation(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - } - - public VertexTranslation(Vector3d trans) { - this(trans.x, trans.y, trans.z); - } - - public VertexTranslation(Vector3f trans) { - this(trans.x, trans.y, trans.z); - } - - @Override - public void apply(Vertex vertex) { - apply(vertex.xyz); - } - - @Override - public void apply(Vector3d vec) { - vec.x += x; - vec.y += y; - vec.z += z; - } - - public void set(double x, double y, double z) { - this.x = x; - this.y = y; - this.z = z; - } - - public void set(Vector3d trans) { - set(trans.x, trans.y, trans.z); - } - - @Override - public void applyToNormal(Vector3f vec) { - - } - -}