xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2624 from ranch21/better-bars

Browse Source 
Better electric FSB hud bars
This commit is contained in:
HbmMods 2026-01-09 10:07:07 +01:00 committed by GitHub
commit 6a732fadde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 89 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
src/main/java/com/hbm/main/ModEventHandlerClient.java
View File

@ -59,6 +59,7 @@ import com.hbm.tileentity.bomb.TileEntityNukeCustom;
import com.hbm.tileentity.bomb.TileEntityNukeCustom.CustomNukeEntry; import com.hbm.tileentity.bomb.TileEntityNukeCustom.CustomNukeEntry;
import com.hbm.tileentity.bomb.TileEntityNukeCustom.EnumEntryType; import com.hbm.tileentity.bomb.TileEntityNukeCustom.EnumEntryType;
import com.hbm.util.*; import com.hbm.util.*;
import com.hbm.util.Tuple;
import com.hbm.util.ArmorRegistry.HazardClass; import com.hbm.util.ArmorRegistry.HazardClass;
import com.hbm.util.i18n.I18nUtil; import com.hbm.util.i18n.I18nUtil;
import com.hbm.wiaj.GuiWorldInAJar; import com.hbm.wiaj.GuiWorldInAJar;
@ -230,7 +231,7 @@ public class ModEventHandlerClient {
((ILookOverlay) entity).printHook(event, world, 0, 0, 0); ((ILookOverlay) entity).printHook(event, world, 0, 0, 0);
} }
} }
GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glColor4f(1F, 1F, 1F, 1F);
} }
@ -395,6 +396,26 @@ public class ModEventHandlerClient {
} }
} }
private List<Tuple.Pair<Float, Integer>> getBars(ItemStack stack, EntityPlayer player) {
List<Tuple.Pair<Float, Integer>> bars = new ArrayList<>();
if(stack.getItem() instanceof ArmorFSBPowered && ArmorFSBPowered.hasFSBArmorIgnoreCharge(player)) {
float charge = 1F - (float) ((ArmorFSBPowered) stack.getItem()).getDurabilityForDisplay(stack);
bars.add(new Tuple.Pair<Float, Integer>(charge, 0x00FF00));
}
if(stack.getItem() instanceof JetpackFueledBase) {
JetpackFueledBase jetpack = (JetpackFueledBase) stack.getItem();
float fuel = (float) JetpackFueledBase.getFuel(stack) / jetpack.maxFuel;
bars.add(new Tuple.Pair<Float, Integer>(fuel, jetpack.fuel.getColor()));
}
return bars;
}
@SubscribeEvent(receiveCanceled = true, priority = EventPriority.LOW) @SubscribeEvent(receiveCanceled = true, priority = EventPriority.LOW)
public void onHUDRenderBar(RenderGameOverlayEvent.Post event) { public void onHUDRenderBar(RenderGameOverlayEvent.Post event) {
@ -405,6 +426,32 @@ public class ModEventHandlerClient {
if(event.type == event.type.ARMOR) { if(event.type == event.type.ARMOR) {
List<List<Tuple.Pair<Float, Integer>>> barsList = new ArrayList<>();
for (int i = 0; i < 4; i++) {
barsList.add(new ArrayList<>());
ItemStack stack = player.inventory.armorInventory[i];
if(stack == null)
continue;
barsList.get(i).addAll(getBars(stack, player));
if (!(ArmorModHandler.hasMods(stack)))
continue;
for (ItemStack mod : ArmorModHandler.pryMods(stack)) {
if (mod == null) continue;
barsList.get(i).addAll(getBars(mod, player));
}
}
GL11.glDisable(GL11.GL_TEXTURE_2D);
tess.startDrawingQuads();
if(ForgeHooks.getTotalArmorValue(player) == 0) { if(ForgeHooks.getTotalArmorValue(player) == 0) {
GuiIngameForge.left_height -= 10; GuiIngameForge.left_height -= 10;
} }
@ -413,69 +460,55 @@ public class ModEventHandlerClient {
int height = event.resolution.getScaledHeight(); int height = event.resolution.getScaledHeight();
int left = width / 2 - 91; int left = width / 2 - 91;
if(ArmorFSB.hasFSBArmorIgnoreCharge(player)) { for (List<Tuple.Pair<Float, Integer>> bars : barsList) {
ArmorFSB chestplate = (ArmorFSB) player.inventory.armorInventory[2].getItem();
boolean noHelmet = chestplate.noHelmet;
GL11.glDisable(GL11.GL_TEXTURE_2D); if (bars.isEmpty())
tess.startDrawingQuads(); continue;
for(int i = 0; i < (noHelmet ? 3 : 4); i++) { int top = height - GuiIngameForge.left_height + 7;
int top = height - GuiIngameForge.left_height + 7; for (int i = 0; i < bars.size(); i++) {
ItemStack stack = player.inventory.armorInventory[i]; float val = bars.get(i).key;
int hstart, hend;
if(!(stack != null && stack.getItem() instanceof ArmorFSBPowered)) if (i == 0) {
break; hstart = left;
hend = hstart + (bars.size() == 1 ? 81 : 40);
} else {
int bl = (int) Math.ceil(40F / (bars.size() - 1));
// :(
hstart = left + 41 + bl * (i - 1);
hend = i == bars.size() - 1 ? left + 81 : hstart + bl;
float tot = 1F - (float) ((ArmorFSBPowered) stack.getItem()).getDurabilityForDisplay(stack); if (i != 1) hstart += 1;
}
tess.setColorOpaque_F(0.25F, 0.25F, 0.25F); tess.setColorOpaque_F(0.25F, 0.25F, 0.25F);
tess.addVertex(left - 0.5, top - 0.5, 0); tess.addVertex(hstart, top - 1, 0);
tess.addVertex(left - 0.5, top + 1.5, 0); tess.addVertex(hstart, top + 2, 0);
tess.addVertex(left + 81.5, top + 1.5, 0); tess.addVertex(hend, top + 2, 0);
tess.addVertex(left + 81.5, top - 0.5, 0); tess.addVertex(hend, top - 1, 0);
tess.setColorOpaque_F(1F - tot, tot, 0F); float valx = hstart + (hend - hstart - 1) * val;
tess.addVertex(left, top, 0);
tess.addVertex(left, top + 1, 0);
tess.addVertex(left + 81 * tot, top + 1, 0);
tess.addVertex(left + 81 * tot, top, 0);
GuiIngameForge.left_height += 3; int color = bars.get(i).value;
float r = ((color >> 16) & 0xFF) / 255F;
float g = ((color >> 8) & 0xFF) / 255F;
float b = (color & 0xFF) / 255F;
tess.setColorOpaque_F(r, g, b);
tess.addVertex(hstart+1, top, 0);
tess.addVertex(hstart+1, top + 1, 0);
tess.addVertex(valx, top + 1, 0);
tess.addVertex(valx, top, 0);
} }
tess.draw(); GuiIngameForge.left_height += 4;
GL11.glEnable(GL11.GL_TEXTURE_2D);
} else if(player.inventory.armorInventory[2] != null && player.inventory.armorInventory[2].getItem() instanceof JetpackFueledBase) {
ItemStack stack = player.inventory.armorInventory[2];
float tot = (float) ((JetpackFueledBase) stack.getItem()).getFuel(stack) / (float) ((JetpackFueledBase) stack.getItem()).getMaxFill(stack);
int top = height - GuiIngameForge.left_height + 3;
GL11.glDisable(GL11.GL_TEXTURE_2D);
tess.startDrawingQuads();
tess.setColorOpaque_F(0.25F, 0.25F, 0.25F);
tess.addVertex(left - 0.5, top - 0.5, 0);
tess.addVertex(left - 0.5, top + 4.5, 0);
tess.addVertex(left + 81.5, top + 4.5, 0);
tess.addVertex(left + 81.5, top - 0.5, 0);
tess.setColorOpaque_F(1F - tot, tot, 0F);
tess.addVertex(left, top, 0);
tess.addVertex(left, top + 4, 0);
tess.addVertex(left + 81 * tot, top + 4, 0);
tess.addVertex(left + 81 * tot, top, 0);
tess.draw();
GL11.glEnable(GL11.GL_TEXTURE_2D);
} }
tess.draw();
GL11.glEnable(GL11.GL_TEXTURE_2D);
} }
} }
@ -955,7 +988,7 @@ public class ModEventHandlerClient {
ItemDepletedFuel.class, ItemDepletedFuel.class,
ItemFluidDuct.class ItemFluidDuct.class
); );
String prefix = "Gun "; String prefix = "Gun ";
//int gunScale = 16; //int gunScale = 16;
//int defaultScale = 1; //int defaultScale = 1;
@ -1069,11 +1102,11 @@ public class ModEventHandlerClient {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent(priority = EventPriority.LOWEST) @SubscribeEvent(priority = EventPriority.LOWEST)
public void onClientTickLast(ClientTickEvent event) { public void onClientTickLast(ClientTickEvent event) {
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
long millis = Clock.get_ms(); long millis = Clock.get_ms();
if(millis == 0) millis = System.currentTimeMillis(); if(millis == 0) millis = System.currentTimeMillis();
if(GeneralConfig.enableLoadScreenReplacement && loadingScreenReplacementRetry < 25 && !(mc.loadingScreen instanceof LoadingScreenRendererNT) && millis > lastLoadScreenReplacement + 5_000) { if(GeneralConfig.enableLoadScreenReplacement && loadingScreenReplacementRetry < 25 && !(mc.loadingScreen instanceof LoadingScreenRendererNT) && millis > lastLoadScreenReplacement + 5_000) {
mc.loadingScreen = new LoadingScreenRendererNT(mc); mc.loadingScreen = new LoadingScreenRendererNT(mc);
lastLoadScreenReplacement = millis; lastLoadScreenReplacement = millis;
@ -1171,7 +1204,7 @@ public class ModEventHandlerClient {
public void onRenderWorldLastEvent(RenderWorldLastEvent event) { public void onRenderWorldLastEvent(RenderWorldLastEvent event) {
Clock.update(); Clock.update();
BlockRebar.renderRebar(Minecraft.getMinecraft().theWorld.loadedTileEntityList, event.partialTicks); BlockRebar.renderRebar(Minecraft.getMinecraft().theWorld.loadedTileEntityList, event.partialTicks);
GL11.glPushMatrix(); GL11.glPushMatrix();
@ -1262,7 +1295,7 @@ public class ModEventHandlerClient {
if(chestplate.thermal) thermalSights = true; if(chestplate.thermal) thermalSights = true;
} }
if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof ItemGunBaseNT && ItemGunBaseNT.aimingProgress == 1) { if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof ItemGunBaseNT && ItemGunBaseNT.aimingProgress == 1) {
ItemGunBaseNT gun = (ItemGunBaseNT) player.getHeldItem().getItem(); ItemGunBaseNT gun = (ItemGunBaseNT) player.getHeldItem().getItem();
for(int i = 0; i < gun.getConfigCount(); i++) if(gun.getConfig(player.getHeldItem(), i).hasThermalSights(player.getHeldItem())) thermalSights = true; for(int i = 0; i < gun.getConfigCount(); i++) if(gun.getConfig(player.getHeldItem(), i).hasThermalSights(player.getHeldItem())) thermalSights = true;