Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the display of IC2 electric jetpack and some RF items #8

Merged
merged 6 commits into from
Aug 4, 2023
Merged

Fix the display of IC2 electric jetpack and some RF items #8

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7367380
Swap the order of handlers
ghostflyby Aug 3, 2023
28a09cd
Move RF handler to the fourth
ghostflyby Aug 3, 2023
b65e59d
Move EU HANDLER to the front of RF
ghostflyby Aug 4, 2023
468446b
Remove RF tag check
ghostflyby Aug 4, 2023
81a43ad
Resolve Warnings
ghostflyby Aug 4, 2023
e9055fe
Fix "cannot find symbol `Optional::isEmpty`"
ghostflyby Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/main/java/com/caedis/duradisplay/render/DurabilityRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ interface ItemHandler {
itemHandlers.put(IDarkSteelItem.class, DurabilityRenderer::handleDarkSteelItems);
itemHandlers.put(AmmoItem.class, (is -> null));
itemHandlers.put(ToolCore.class, DurabilityRenderer::handleToolCore);
itemHandlers.put(ItemArmorFluidTank.class, DurabilityRenderer::handleItemArmorFluidTank);
itemHandlers.put(IElectricItem.class, DurabilityRenderer::handleIElectricItem);
itemHandlers.put(ICustomDamageItem.class, DurabilityRenderer::handleICustomDamageItem);
itemHandlers.put(ItemArmorFluidTank.class, DurabilityRenderer::handleItemArmorFluidTank);
itemHandlers.put(IEnergyContainerItem.class, DurabilityRenderer::handleEnergyContainer);
itemHandlers.put(ICustomDamageItem.class, DurabilityRenderer::handleICustomDamageItem);
itemHandlers.put(ItemBrewBase.class, DurabilityRenderer::handleBotaniaBrew);
itemHandlers.put(Item.class, DurabilityRenderer::handleDefault);
}
Expand Down Expand Up @@ -230,7 +230,7 @@ private static List<ItemStackOverlay> handleIElectricItem(@NotNull ItemStack sta
List<ItemStackOverlay> overlays = new ArrayList<>();

ItemStackOverlay chargeOverlay = new ItemStackOverlay.ChargeOverlay();
double charge = ((double) ElectricItem.manager.getCharge(stack) / bei.getMaxCharge(stack)) * 100;
double charge = (ElectricItem.manager.getCharge(stack) / bei.getMaxCharge(stack)) * 100;
if (Double.isNaN(charge)) return null;
chargeOverlay.isFull = charge == 100.0;
chargeOverlay.value = nf.format(charge) + "%";
Expand All @@ -247,7 +247,7 @@ private static List<ItemStackOverlay> handleItemArmorFluidTank(@NotNull ItemStac
List<ItemStackOverlay> overlays = new ArrayList<>();

ItemStackOverlay overlay = new ItemStackOverlay.DurabilityOverlay();
double charge = ((double) bei.getCharge(stack) / bei.getMaxCharge(stack));
double charge = (bei.getCharge(stack) / bei.getMaxCharge(stack));
if (Double.isNaN(charge)) return null;
overlay.color = getRGBDurabilityForDisplay(charge);
charge *= 100;
Expand Down Expand Up @@ -301,8 +301,7 @@ private static List<ItemStackOverlay> handleEnergyContainer(@NotNull ItemStack s
overlays.addAll(defaultOverlays);
}

if (!DuraDisplayConfig.ChargeConfig.Enabled || !(stack.hasTagCompound() && stack.getTagCompound()
.hasKey("Energy"))) return overlays;
if (!DuraDisplayConfig.ChargeConfig.Enabled) return overlays;
IEnergyContainerItem eci = ((IEnergyContainerItem) stack.getItem());
assert eci != null;

Expand Down