From 3beb2811fa1f901726ba24ad2768b0b6718f4dc4 Mon Sep 17 00:00:00 2001
From: kuba6000 <kuba.123123.6000@gmail.com>
Date: Tue, 20 Sep 2022 18:37:08 +0200
Subject: Prevent the boss bar from rendering
---
src/main/java/kubatech/nei/Mob_Handler.java | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
(limited to 'src/main/java/kubatech/nei')
diff --git a/src/main/java/kubatech/nei/Mob_Handler.java b/src/main/java/kubatech/nei/Mob_Handler.java
index a870c07a24..d893c2ed30 100644
--- a/src/main/java/kubatech/nei/Mob_Handler.java
+++ b/src/main/java/kubatech/nei/Mob_Handler.java
@@ -55,6 +55,7 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.boss.BossStatus;
import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -86,6 +87,7 @@ public class Mob_Handler extends TemplateRecipeHandler {
AVERAGE_REMINDER,
MOD,
MAX_HEALTH,
+ BOSS,
LOOTABLE,
PLAYER_ONLY,
;
@@ -288,6 +290,13 @@ public class Mob_Handler extends TemplateRecipeHandler {
GL11.glPushMatrix();
+ float healthScale = BossStatus.healthScale;
+ int statusBarTime = BossStatus.statusBarTime;
+ String bossName = BossStatus.bossName;
+ boolean hasColorModifier = BossStatus.hasColorModifier;
+
+ BossStatus.statusBarTime = 0;
+
try {
EntityLiving e = currentrecipe.mob;
@@ -299,6 +308,7 @@ public class Mob_Handler extends TemplateRecipeHandler {
int mobx = 30, moby = 50;
e.setPosition(mc.thePlayer.posX + 5, mc.thePlayer.posY, mc.thePlayer.posZ);
+
// ARGS: x, y, scale, rot, rot, entity
GuiInventory.func_147046_a(
mobx, moby, Math.round(scaled), (x + mobx) - mouseX, y + moby - eheight * scaled - mouseZ, e);
@@ -310,6 +320,13 @@ public class Mob_Handler extends TemplateRecipeHandler {
}
}
+ if (BossStatus.statusBarTime > 0 && currentrecipe.isBoss.isEmpty()) currentrecipe.isBoss = BossStatus.bossName;
+
+ BossStatus.healthScale = healthScale;
+ BossStatus.statusBarTime = statusBarTime;
+ BossStatus.bossName = bossName;
+ BossStatus.hasColorModifier = hasColorModifier;
+
GL11.glMatrixMode(GL11.GL_MODELVIEW_MATRIX);
stackdepth -= GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH);
if (stackdepth < 0) for (; stackdepth < 0; stackdepth++) GL11.glPopMatrix();
@@ -347,6 +364,10 @@ public class Mob_Handler extends TemplateRecipeHandler {
GuiDraw.drawString(INFERNAL_ALWAYS.get(), x, y += yshift, 0xFFFF0000, false);
break;
}
+
+ if (!currentrecipe.isBoss.isEmpty())
+ GuiDraw.drawString(EnumChatFormatting.BOLD + "" + BOSS.get(), x, y += yshift, 0xFFD68F00, false);
+
MobRecipeLoader.MobRecipe MBRecipe =
GT_MetaTileEntity_ExtremeExterminationChamber.MobNameToRecipeMap.get(currentrecipe.mobname);
if (MBRecipe != null) {
@@ -525,6 +546,7 @@ public class Mob_Handler extends TemplateRecipeHandler {
public final int rareOutputsCount;
public final int additionalOutputsCount;
public final int infernalOutputsCount;
+ public String isBoss = "";
public MobCachedRecipe(
EntityLiving mob,
--
cgit
From e476c41e8956a61de6e1d962c9bb40948db8c2b5 Mon Sep 17 00:00:00 2001
From: kuba6000 <kuba.123123.6000@gmail.com>
Date: Tue, 20 Sep 2022 22:08:57 +0200
Subject: Shift outputs when needed
---
src/main/java/kubatech/nei/Mob_Handler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/main/java/kubatech/nei')
diff --git a/src/main/java/kubatech/nei/Mob_Handler.java b/src/main/java/kubatech/nei/Mob_Handler.java
index 3031b2ccf8..bdfda0202f 100644
--- a/src/main/java/kubatech/nei/Mob_Handler.java
+++ b/src/main/java/kubatech/nei/Mob_Handler.java
@@ -392,7 +392,7 @@ public class Mob_Handler extends TemplateRecipeHandler {
}
x = 6;
- y = 83;
+ y = Math.max(83, 83 + (y - 67));
yshift = nextRowYShift;
if (currentrecipe.normalOutputsCount > 0) {
GuiDraw.drawString(NORMAL_DROPS.get(), x, y, 0xFF555555, false);
--
cgit