mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-21 20:52:40 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82a993708c | ||
|
|
a386ccf1c8 | ||
|
|
3604bc53cb | ||
|
|
d5669e3000 | ||
|
|
f998f9ebfe | ||
|
|
6d0f162453 |
No files matched your search
@@ -3,9 +3,9 @@ name: Build and test
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ master, main ]
|
||||
branches: [ master, main, release/** ]
|
||||
push:
|
||||
branches: [ master, main ]
|
||||
branches: [ master, main, release/** ]
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
|
||||
+2
-1
@@ -6,6 +6,7 @@ dependencies {
|
||||
shadowImplementation('au.com.bytecode:opencsv:2.4')
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.463:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Dashboard:1.0.2:api")
|
||||
|
||||
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev") {
|
||||
exclude group: 'com.github.GTNewHorizons', module: 'waila'
|
||||
@@ -20,5 +21,5 @@ dependencies {
|
||||
runtimeOnlyNonPublishable(deobfCurse('thermal-expansion-69163:2388759'))
|
||||
runtimeOnlyNonPublishable(deobfCurse('thermal-dynamics-227443:2388756'))
|
||||
implementation(deobfCurse('cofh-core-69162:2388751'))
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.9.54:dev")
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.11.37:dev")
|
||||
}
|
||||
@@ -29,17 +29,19 @@ import mcp.mobius.waila.client.KeyEvent;
|
||||
import mcp.mobius.waila.commands.CommandDumpHandlers;
|
||||
import mcp.mobius.waila.network.NetworkHandler;
|
||||
import mcp.mobius.waila.network.WailaPacketHandler;
|
||||
import mcp.mobius.waila.overlay.DashboardHud;
|
||||
import mcp.mobius.waila.overlay.DecoratorRenderer;
|
||||
import mcp.mobius.waila.overlay.OverlayConfig;
|
||||
import mcp.mobius.waila.overlay.WailaTickHandler;
|
||||
import mcp.mobius.waila.server.ProxyServer;
|
||||
import mcp.mobius.waila.utils.LoadedMods;
|
||||
import mcp.mobius.waila.utils.ModIdentification;
|
||||
|
||||
@Mod(
|
||||
modid = "Waila",
|
||||
name = "Waila",
|
||||
version = Tags.GRADLETOKEN_VERSION,
|
||||
dependencies = "after:NotEnoughItems@[1.0.4.0,)",
|
||||
dependencies = "after:NotEnoughItems@[1.0.4.0,);after:dashboard@[1.0.2,)",
|
||||
acceptableRemoteVersions = "*",
|
||||
guiFactory = "mcp.mobius.waila.client.WailaGuiFactory")
|
||||
public class Waila {
|
||||
@@ -68,7 +70,10 @@ public class Waila {
|
||||
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
|
||||
MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
|
||||
FMLCommonHandler.instance().bus().register(new KeyEvent());
|
||||
FMLCommonHandler.instance().bus().register(new WailaTickHandler());
|
||||
WailaTickHandler tickHandler = new WailaTickHandler();
|
||||
FMLCommonHandler.instance().bus().register(tickHandler);
|
||||
MinecraftForge.EVENT_BUS.register(tickHandler);
|
||||
if (LoadedMods.DASHBOARD) DashboardHud.register();
|
||||
}
|
||||
FMLCommonHandler.instance().bus().register(new NetworkHandler());
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderBar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack;
|
||||
import mcp.mobius.waila.utils.ColorUtils;
|
||||
|
||||
public class HUDHandlerFurnace implements IWailaDataProvider {
|
||||
|
||||
@@ -69,8 +70,8 @@ public class HUDHandlerFurnace implements IWailaDataProvider {
|
||||
if (fuelProgress > 0) {
|
||||
String fuelBar = TTRenderBar.create(
|
||||
String.format("Fuel %ds / %ds", (maxFuelTime - fuelTime) / 20, maxFuelTime / 20),
|
||||
0xFFFF0000,
|
||||
0xFFCC0000,
|
||||
ColorUtils.fuelFurnaceBarTop.getColor(),
|
||||
ColorUtils.fuelFurnaceBarBottom.getColor(),
|
||||
1.0 - fuelProgress);
|
||||
currenttip.add(fuelBar);
|
||||
}
|
||||
@@ -78,8 +79,8 @@ public class HUDHandlerFurnace implements IWailaDataProvider {
|
||||
if (smeltProgress > 0) {
|
||||
String cookBar = TTRenderBar.create(
|
||||
String.format("Smelt %ds / %ds", smeltTime / 20, 200 / 20),
|
||||
0xFFFF8800,
|
||||
0xFFFFCC00,
|
||||
ColorUtils.progressBarTop.getColor(),
|
||||
ColorUtils.progressBarBottom.getColor(),
|
||||
smeltProgress);
|
||||
currenttip.add(cookBar);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import mcp.mobius.waila.handlers.HUDHandlerBlocks;
|
||||
import mcp.mobius.waila.handlers.HUDHandlerEntities;
|
||||
import mcp.mobius.waila.handlers.VanillaTooltipHandler;
|
||||
import mcp.mobius.waila.handlers.nei.NEIHandler;
|
||||
import mcp.mobius.waila.overlay.EntityIconRenderer;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderAspectString;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderBar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderFluidBar;
|
||||
@@ -53,6 +54,7 @@ public class ProxyClient extends ProxyServer {
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showents");
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showhp");
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showcrop");
|
||||
ModuleRegistrar.instance().addConfig("General", EntityIconRenderer.CFG_SHOW, true);
|
||||
|
||||
ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth());
|
||||
ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack());
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
package mcp.mobius.waila.overlay;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import com.gtnewhorizons.dashboard.api.HudBounds;
|
||||
import com.gtnewhorizons.dashboard.api.HudElement;
|
||||
import com.gtnewhorizons.dashboard.api.HudRegistry;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* Lets players move, resize and hide the info box in Dashboard's HUD editor. The only class using Dashboard, so only
|
||||
* call it while Dashboard is loaded.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public final class DashboardHud {
|
||||
|
||||
private static final long SAMPLE_REUSE_MILLIS = 1000;
|
||||
|
||||
private static final HudElement INFO_BOX = new HudElement("waila:info_box", DashboardHud::getBounds)
|
||||
.setOwnSettings("dashboard.element.waila.info_box.own_settings", "waila.keybind.wailaconfig");
|
||||
|
||||
private static Tooltip sample;
|
||||
private static long lastSampleTime;
|
||||
|
||||
/** The box drawn last, before scaling, so the element follows its size and Waila's position setting. */
|
||||
private static boolean boxDrawn;
|
||||
private static int boxX;
|
||||
private static int boxY;
|
||||
private static int boxWidth;
|
||||
private static int boxHeight;
|
||||
|
||||
private DashboardHud() {}
|
||||
|
||||
public static void register() {
|
||||
INFO_BOX.setPreview((screenWidth, screenHeight) -> OverlayRenderer.drawPreview(getSample()));
|
||||
HudRegistry.register(INFO_BOX);
|
||||
}
|
||||
|
||||
/** The mod that drew the box, if not Waila, is shown next to Waila's name in the editor. */
|
||||
static boolean beginBox(String drawnBy, int x, int y, int width, int height) {
|
||||
INFO_BOX.setModNameAddon(drawnBy);
|
||||
boxDrawn = true;
|
||||
boxX = x;
|
||||
boxY = y;
|
||||
boxWidth = width;
|
||||
boxHeight = height;
|
||||
return HudRegistry.beginRender(INFO_BOX);
|
||||
}
|
||||
|
||||
static void endBox() {
|
||||
HudRegistry.endRender();
|
||||
}
|
||||
|
||||
/**
|
||||
* The same sample is kept while the editor is open, since a box drawn by another mod may start over for every new
|
||||
* one. A new one is made after a break, so it follows changed Waila settings.
|
||||
*/
|
||||
private static Tooltip getSample() {
|
||||
long now = System.currentTimeMillis();
|
||||
if (sample == null || now - lastSampleTime > SAMPLE_REUSE_MILLIS) {
|
||||
sample = createSample();
|
||||
}
|
||||
lastSampleTime = now;
|
||||
return sample;
|
||||
}
|
||||
|
||||
/** Stone, like looking at a block. */
|
||||
private static Tooltip createSample() {
|
||||
ItemStack stone = new ItemStack(Blocks.stone);
|
||||
return new Tooltip(
|
||||
Arrays.asList(
|
||||
EnumChatFormatting.WHITE + stone.getDisplayName(),
|
||||
EnumChatFormatting.BLUE.toString() + EnumChatFormatting.ITALIC + "Minecraft"),
|
||||
stone);
|
||||
}
|
||||
|
||||
/** Before the first box is drawn, the sample's place and size. */
|
||||
private static HudBounds getBounds(int screenWidth, int screenHeight) {
|
||||
if (!boxDrawn) {
|
||||
if (sample == null) {
|
||||
sample = createSample();
|
||||
}
|
||||
return getBounds(sample.x, sample.y, sample.w + 1, sample.h + 1);
|
||||
}
|
||||
return getBounds(boxX, boxY, boxWidth, boxHeight);
|
||||
}
|
||||
|
||||
private static HudBounds getBounds(int x, int y, int width, int height) {
|
||||
float scale = OverlayConfig.scale;
|
||||
return new HudBounds(
|
||||
Math.round(x * scale),
|
||||
Math.round(y * scale),
|
||||
Math.round(width * scale),
|
||||
Math.round(height * scale));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
package mcp.mobius.waila.overlay;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.ActiveRenderInfo;
|
||||
import net.minecraft.client.renderer.GLAllocation;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.utils.WailaExceptionHandler;
|
||||
|
||||
/**
|
||||
* Draws a small turning 3D model of an entity as the tooltip icon. Based on {@code GuiInventory.func_147046_a} and the
|
||||
* entity icon of WDMla (https://github.com/GTNewHorizons/WDMla).
|
||||
*/
|
||||
public final class EntityIconRenderer {
|
||||
|
||||
public static final String CFG_SHOW = "general.showentityicon";
|
||||
|
||||
/** Degrees per second */
|
||||
private static final float TURN_SPEED = 45f;
|
||||
|
||||
private static final Set<Class<?>> failedClasses = new HashSet<>();
|
||||
private static final FloatBuffer modelview = GLAllocation.createDirectFloatBuffer(16);
|
||||
|
||||
private EntityIconRenderer() {}
|
||||
|
||||
public static boolean isEnabled() {
|
||||
return ConfigHandler.instance().getConfig(CFG_SHOW, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draws the entity in the square with the top left corner (x, y) and the side length size.
|
||||
*/
|
||||
public static void render(int x, int y, int size, Entity entity) {
|
||||
if (entity == null || failedClasses.contains(entity.getClass())) return;
|
||||
|
||||
final Minecraft mc = Minecraft.getMinecraft();
|
||||
// The body of most mobs is longer than the bounding box is wide, and the model turns
|
||||
float extent = Math.max(Math.max(entity.height, entity.width * 1.5f), 0.1f);
|
||||
float scale = size / extent;
|
||||
float angle = (Minecraft.getSystemTime() % 360000L) / 1000f * TURN_SPEED;
|
||||
|
||||
float yaw = entity.rotationYaw;
|
||||
float prevYaw = entity.prevRotationYaw;
|
||||
float pitch = entity.rotationPitch;
|
||||
float prevPitch = entity.prevRotationPitch;
|
||||
float bodyYaw = 0, prevBodyYaw = 0, headYaw = 0, prevHeadYaw = 0;
|
||||
EntityLivingBase living = entity instanceof EntityLivingBase l ? l : null;
|
||||
if (living != null) {
|
||||
bodyYaw = living.renderYawOffset;
|
||||
prevBodyYaw = living.prevRenderYawOffset;
|
||||
headYaw = living.rotationYawHead;
|
||||
prevHeadYaw = living.prevRotationYawHead;
|
||||
}
|
||||
float playerViewY = RenderManager.instance.playerViewY;
|
||||
float infoX = ActiveRenderInfo.rotationX, infoZ = ActiveRenderInfo.rotationZ;
|
||||
float infoYZ = ActiveRenderInfo.rotationYZ, infoXZ = ActiveRenderInfo.rotationXZ,
|
||||
infoXY = ActiveRenderInfo.rotationXY;
|
||||
boolean hideGui = mc.gameSettings.hideGUI;
|
||||
|
||||
// Entity renderers change blend, depth, alpha and lighting state (so save all of it)
|
||||
int matrixDepth = GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH);
|
||||
int attribDepth = GL11.glGetInteger(GL11.GL_ATTRIB_STACK_DEPTH);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
|
||||
try {
|
||||
// Models can be larger than their bounding box, do not draw over the text
|
||||
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
float factor = res.getScaleFactor() * OverlayConfig.scale;
|
||||
int margin = 3;
|
||||
GL11.glEnable(GL11.GL_SCISSOR_TEST);
|
||||
GL11.glScissor(
|
||||
(int) ((x - margin) * factor),
|
||||
(int) (mc.displayHeight - (y + size + margin) * factor),
|
||||
(int) ((size + 2 * margin) * factor),
|
||||
(int) ((size + 2 * margin) * factor));
|
||||
|
||||
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
|
||||
GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glColor4f(1f, 1f, 1f, 1f);
|
||||
|
||||
GL11.glTranslatef(x + size / 2f, y + size / 2f + entity.height * scale / 2f, 100f);
|
||||
GL11.glScalef(-scale, scale, scale);
|
||||
GL11.glRotatef(180f, 0f, 0f, 1f);
|
||||
GL11.glRotatef(-15f, 1f, 0f, 0f);
|
||||
GL11.glRotatef(135f, 0f, 1f, 0f);
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
GL11.glRotatef(-135f + angle, 0f, 1f, 0f);
|
||||
GL11.glTranslatef(0f, entity.yOffset, 0f);
|
||||
|
||||
entity.rotationYaw = entity.prevRotationYaw = 0f;
|
||||
entity.rotationPitch = entity.prevRotationPitch = 0f;
|
||||
if (living != null) {
|
||||
living.renderYawOffset = living.prevRenderYawOffset = 0f;
|
||||
living.rotationYawHead = living.prevRotationYawHead = 0f;
|
||||
}
|
||||
RenderManager.instance.playerViewY = 180f;
|
||||
setBillboardAxes();
|
||||
// Hide name tags
|
||||
mc.gameSettings.hideGUI = true;
|
||||
|
||||
RenderManager.instance.renderEntityWithPosYaw(entity, 0d, 0d, 0d, 0f, 1f);
|
||||
} catch (Exception e) {
|
||||
failedClasses.add(entity.getClass());
|
||||
WailaExceptionHandler.handleErr(e, "EntityIconRenderer | " + entity.getClass().getName(), null);
|
||||
} finally {
|
||||
mc.gameSettings.hideGUI = hideGui;
|
||||
RenderManager.instance.playerViewY = playerViewY;
|
||||
ActiveRenderInfo.rotationX = infoX;
|
||||
ActiveRenderInfo.rotationZ = infoZ;
|
||||
ActiveRenderInfo.rotationYZ = infoYZ;
|
||||
ActiveRenderInfo.rotationXZ = infoXZ;
|
||||
ActiveRenderInfo.rotationXY = infoXY;
|
||||
entity.rotationYaw = yaw;
|
||||
entity.prevRotationYaw = prevYaw;
|
||||
entity.rotationPitch = pitch;
|
||||
entity.prevRotationPitch = prevPitch;
|
||||
if (living != null) {
|
||||
living.renderYawOffset = bodyYaw;
|
||||
living.prevRenderYawOffset = prevBodyYaw;
|
||||
living.rotationYawHead = headYaw;
|
||||
living.prevRotationYawHead = prevHeadYaw;
|
||||
}
|
||||
|
||||
// A renderer can leave unbalanced pushes behind, but should never pop the caller's. Query each
|
||||
// stack once and pop down to where it started.
|
||||
for (int i = GL11.glGetInteger(GL11.GL_ATTRIB_STACK_DEPTH) - attribDepth; i > 0; i--) GL11.glPopAttrib();
|
||||
for (int i = GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH) - matrixDepth; i > 0; i--) GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Billboards (like Thaumcraft wisps) face the camera with the axes in {@link ActiveRenderInfo}, which belong to the
|
||||
* world view. Point them at the screen of the icon instead.
|
||||
*/
|
||||
private static void setBillboardAxes() {
|
||||
modelview.clear();
|
||||
GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, modelview);
|
||||
// The rows of the rotation are the screen right and down axes in model space, all with the same length
|
||||
float len = (float) Math.sqrt(
|
||||
modelview.get(0) * modelview.get(0) + modelview.get(4) * modelview.get(4)
|
||||
+ modelview.get(8) * modelview.get(8));
|
||||
// Vanilla stores the left axis in rotationX/Z and the up axis in rotationYZ/XZ/XY
|
||||
ActiveRenderInfo.rotationX = -modelview.get(0) / len;
|
||||
ActiveRenderInfo.rotationZ = -modelview.get(8) / len;
|
||||
ActiveRenderInfo.rotationYZ = -modelview.get(1) / len;
|
||||
ActiveRenderInfo.rotationXZ = -modelview.get(5) / len;
|
||||
ActiveRenderInfo.rotationXY = -modelview.get(9) / len;
|
||||
}
|
||||
}
|
||||
@@ -2,17 +2,17 @@ package mcp.mobius.waila.overlay;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.utils.LoadedMods;
|
||||
|
||||
public class OverlayRenderer {
|
||||
|
||||
private static boolean hasBlending;
|
||||
private static boolean hasDepthTest;
|
||||
private static int boundTexIndex;
|
||||
|
||||
public static boolean isOverlayVisible() {
|
||||
@@ -37,7 +37,32 @@ public class OverlayRenderer {
|
||||
}
|
||||
}
|
||||
|
||||
/** Draws a sample box, for previews like a HUD editor's. */
|
||||
static void drawPreview(Tooltip tooltip) {
|
||||
doRenderOverlay(tooltip);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call right before drawing the info box, with its place and size before scaling, also when another mod draws the
|
||||
* box. Lets a HUD editor move, resize or hide it. False means the box is hidden, so skip drawing it and do not call
|
||||
* {@link #endBox()}.
|
||||
*/
|
||||
public static boolean beginBox(int x, int y, int width, int height) {
|
||||
return beginBox(null, x, y, width, height);
|
||||
}
|
||||
|
||||
/** Like {@link #beginBox(int, int, int, int)}, for a mod that draws the box itself, so a HUD editor can name it. */
|
||||
public static boolean beginBox(String drawnBy, int x, int y, int width, int height) {
|
||||
return !LoadedMods.DASHBOARD || DashboardHud.beginBox(drawnBy, x, y, width, height);
|
||||
}
|
||||
|
||||
/** Call right after drawing the info box, only if {@link #beginBox} returned true. */
|
||||
public static void endBox() {
|
||||
if (LoadedMods.DASHBOARD) DashboardHud.endBox();
|
||||
}
|
||||
|
||||
private static void doRenderOverlay(Tooltip tooltip) {
|
||||
if (!beginBox(tooltip.x, tooltip.y, tooltip.w + 1, tooltip.h + 1)) return;
|
||||
|
||||
GL11.glPushMatrix();
|
||||
saveGLState();
|
||||
@@ -69,26 +94,24 @@ public class OverlayRenderer {
|
||||
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
Entity entity = tooltip.entity;
|
||||
if (tooltip.hasIcon && tooltip.stack != null && tooltip.stack.getItem() != null)
|
||||
DisplayUtil.renderStack(tooltip.x + 5, tooltip.y + tooltip.h / 2 - 8, tooltip.stack);
|
||||
else if (tooltip.hasIcon && entity != null)
|
||||
EntityIconRenderer.render(tooltip.x + 5, tooltip.y + tooltip.h / 2 - 8, 16, entity);
|
||||
|
||||
loadGLState();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
endBox();
|
||||
}
|
||||
|
||||
private static void saveGLState() {
|
||||
hasBlending = GL11.glGetBoolean(GL11.GL_BLEND);
|
||||
hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
|
||||
boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
|
||||
GL11.glPushAttrib(GL11.GL_CURRENT_BIT);
|
||||
// Icons turn on lighting, lights, color material and rescale normal
|
||||
GL11.glPushAttrib(GL11.GL_CURRENT_BIT | GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT | GL11.GL_COLOR_BUFFER_BIT);
|
||||
}
|
||||
|
||||
private static void loadGLState() {
|
||||
if (hasBlending) GL11.glEnable(GL11.GL_BLEND);
|
||||
else GL11.glDisable(GL11.GL_BLEND);
|
||||
if (hasDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
else GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex);
|
||||
GL11.glPopAttrib();
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
@@ -49,6 +50,7 @@ public class Tooltip {
|
||||
Point pos;
|
||||
boolean hasIcon = false;
|
||||
ItemStack stack;
|
||||
Entity entity;
|
||||
|
||||
IWailaCommonAccessor accessor = DataAccessorCommon.instance;
|
||||
|
||||
@@ -106,6 +108,11 @@ public class Tooltip {
|
||||
this.stack = stack;
|
||||
}
|
||||
|
||||
public Tooltip(List<String> textData, Entity entity) {
|
||||
this(textData, entity != null && EntityIconRenderer.isEnabled());
|
||||
this.entity = entity;
|
||||
}
|
||||
|
||||
public Tooltip(List<String> textData, boolean hasIcon) {
|
||||
|
||||
if (hasIcon) hasIcon = ConfigHandler.instance().showIcon();
|
||||
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
@@ -23,12 +24,18 @@ import mcp.mobius.waila.utils.Constants;
|
||||
|
||||
public class WailaTickHandler {
|
||||
|
||||
private Tooltip tooltip = null;
|
||||
private static Tooltip tooltip = null;
|
||||
private static World lastWorld = null;
|
||||
private final MetaDataProvider handler = new MetaDataProvider();
|
||||
|
||||
private static void reset() {
|
||||
tooltip = null;
|
||||
RayTracing.instance().clear();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void tickRender(TickEvent.RenderTickEvent event) {
|
||||
if (event.phase == TickEvent.Phase.END) {
|
||||
public void onRenderOverlay(RenderGameOverlayEvent.Post event) {
|
||||
if (event.type == RenderGameOverlayEvent.ElementType.ALL) {
|
||||
OverlayRenderer.renderOverlay(tooltip);
|
||||
}
|
||||
}
|
||||
@@ -37,17 +44,20 @@ public class WailaTickHandler {
|
||||
public void tickClient(TickEvent.ClientTickEvent event) {
|
||||
if (event.phase == TickEvent.Phase.START) return;
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
World world = mc.theWorld;
|
||||
// The tooltip and the ray trace target hold the entity, which holds the world
|
||||
if (world != lastWorld) reset();
|
||||
lastWorld = world;
|
||||
|
||||
if (!OverlayRenderer.isOverlayVisible()) {
|
||||
this.tooltip = null;
|
||||
RayTracing.instance().clear();
|
||||
reset();
|
||||
return;
|
||||
}
|
||||
|
||||
RayTracing.instance().fire();
|
||||
MovingObjectPosition target = RayTracing.instance().getTarget();
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
EntityPlayer player = mc.thePlayer;
|
||||
World world = mc.theWorld;
|
||||
|
||||
List<String> currenttip;
|
||||
List<String> currenttipHead;
|
||||
@@ -96,7 +106,7 @@ public class WailaTickHandler {
|
||||
currenttip.addAll(currenttipBody);
|
||||
currenttip.addAll(currenttipTail);
|
||||
|
||||
this.tooltip = new Tooltip(currenttip, targetStack);
|
||||
tooltip = new Tooltip(currenttip, targetStack);
|
||||
}
|
||||
} else if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) {
|
||||
DataAccessorCommon accessor = DataAccessorCommon.instance;
|
||||
@@ -142,7 +152,7 @@ public class WailaTickHandler {
|
||||
currenttip.addAll(currenttipBody);
|
||||
currenttip.addAll(currenttipTail);
|
||||
|
||||
this.tooltip = new Tooltip(currenttip, false);
|
||||
tooltip = new Tooltip(currenttip, targetEnt);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class TTRenderStack implements IWailaTooltipRenderer {
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glScaled(scale, scale, 1.0f);
|
||||
|
||||
DisplayUtil.renderStack(0, 0, stack);
|
||||
DisplayUtil.renderStack(0, -1, stack);
|
||||
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPopMatrix();
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package mcp.mobius.waila.utils;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.color.ColorResource;
|
||||
|
||||
public class ColorUtils {
|
||||
|
||||
private static final ColorResource.Factory color = new ColorResource.Factory("waila");
|
||||
|
||||
public static final ColorResource
|
||||
// spotless:off
|
||||
fuelFurnaceBarTop = color.argb("fuelFurnaceBarTop", "0xFFFF8800"),
|
||||
fuelFurnaceBarBottom = color.argb("fuelFurnaceBarBottom", "0xFFFFCC00"),
|
||||
progressBarTop = color.argb("progressBarTop", "0xFFFF0000"),
|
||||
progressBarBottom = color.argb("progressBarBottom", "0xFF8B0000");
|
||||
// spotless:on
|
||||
|
||||
}
|
||||
@@ -8,4 +8,5 @@ public class LoadedMods {
|
||||
public static boolean NEI = Loader.isModLoaded("NotEnoughItems");
|
||||
public static boolean GT5U = Loader.isModLoaded("gregtech_nh");
|
||||
public static boolean WAILA_PLUGINS = Loader.isModLoaded("wailaplugins");
|
||||
public static boolean DASHBOARD = Loader.isModLoaded("dashboard");
|
||||
}
|
||||
@@ -153,6 +153,7 @@ option.stevescarts.shifttoggle=Shift toggle
|
||||
option.general.showents=Show entities
|
||||
option.general.showhp=Show entities health
|
||||
option.general.showcrop=Show crop growth
|
||||
option.general.showentityicon=Show entity icon
|
||||
option.thaumcraft.aspects=Show aspects
|
||||
|
||||
nei.options.keys.showenchant=Show enchanting values
|
||||
Reference in new issue
Block a user