mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Porting more code over, switch to new IWidgetIcon system
This commit is contained in:
1 parent
3f93ab2bde
commit
0dee1ee434
268 files changed
+1010
-7004
No files matched your search
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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<GasConduit> {
|
||||
|
||||
private final ConduitGasTank tank = new ConduitGasTank(0);
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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<IItemConduit, IItemConduit> {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -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<ForgeDirection, Integer> externalRedstoneSignals = new HashMap<ForgeDirection, Integer>();
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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<AdvancedLiquidConduit> {
|
||||
|
||||
|
||||
+19
-19
@@ -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<Vertex> 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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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<ILiquidConduit, EnderLiquidConduit> {
|
||||
|
||||
@@ -215,7 +214,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
|
||||
this.conDir = conDir;
|
||||
conduitLoc = con.getLocation();
|
||||
tankDir = conDir.getOpposite();
|
||||
externalTank = FluidUtil.getExternalFluidHandler(con.getBundle().getWorld(), conduitLoc.getLocation(conDir));
|
||||
externalTank = AbstractLiquidConduit.getExternalFluidHandler(con.getBundle().getWorld(), conduitLoc.getLocation(conDir));
|
||||
acceptsOuput = con.getConnectionMode(conDir).acceptsOutput();
|
||||
}
|
||||
|
||||
|
||||
@@ -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 ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {
|
||||
|
||||
@@ -16,6 +16,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import com.enderio.core.client.render.IconUtil;
|
||||
import com.enderio.core.common.util.BlockCoord;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -27,8 +31,6 @@ import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.geom.CollidableComponent;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.render.IconUtil;
|
||||
import com.enderio.core.common.util.BlockCoord;
|
||||
|
||||
public class LiquidConduit extends AbstractTankConduit {
|
||||
|
||||
|
||||
@@ -8,9 +8,11 @@ import java.util.Set;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import crazypants.enderio.conduit.ConduitUtil;
|
||||
|
||||
import com.enderio.core.common.util.BlockCoord;
|
||||
|
||||
import crazypants.enderio.conduit.ConduitUtil;
|
||||
|
||||
public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidConduit> {
|
||||
|
||||
public LiquidConduitNetwork() {
|
||||
|
||||
@@ -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<Vertex> 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<ForgeDirection> 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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
+3
-1
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package crazypants.enderio.gui;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IResourceTooltipProvider {
|
||||
|
||||
String getUnlocalizedNameForTooltip(ItemStack itemStack);
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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 };
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Loaded 100 of 268 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user