From 8591baf4204c4ded5266ff1b481adb31b689b725 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 29 May 2021 13:35:01 +0100 Subject: [PATCH] Apply some lost changes to RC --- RebornCore/src/main/java/reborncore/RebornCore.java | 2 +- RebornCore/src/main/java/reborncore/RebornCoreClient.java | 2 +- .../src/main/java/reborncore/client/StackToolTipHandler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index a73b897fe..49a1b02de 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -109,7 +109,7 @@ public class RebornCore implements ModInitializer { RebornCoreTags.WATER_EXPLOSION_ITEM.toString(); /* register UnloadHandler */ - ServerBlockEntityEvents.BLOCK_ENTITY_LOAD.register((blockEntity, world) -> { + ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register((blockEntity, world) -> { if (blockEntity instanceof UnloadHandler) ((UnloadHandler) blockEntity).onUnload(); }); diff --git a/RebornCore/src/main/java/reborncore/RebornCoreClient.java b/RebornCore/src/main/java/reborncore/RebornCoreClient.java index b6541fe6e..0315c9250 100644 --- a/RebornCore/src/main/java/reborncore/RebornCoreClient.java +++ b/RebornCore/src/main/java/reborncore/RebornCoreClient.java @@ -50,7 +50,7 @@ public class RebornCoreClient implements ClientModInitializer { ItemTooltipCallback.EVENT.register(new StackToolTipHandler()); /* register UnloadHandler */ - ClientBlockEntityEvents.BLOCK_ENTITY_LOAD.register((blockEntity, world) -> { + ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register((blockEntity, world) -> { if (blockEntity instanceof UnloadHandler) ((UnloadHandler) blockEntity).onUnload(); }); } diff --git a/RebornCore/src/main/java/reborncore/client/StackToolTipHandler.java b/RebornCore/src/main/java/reborncore/client/StackToolTipHandler.java index ae08143a0..b1c5466a8 100644 --- a/RebornCore/src/main/java/reborncore/client/StackToolTipHandler.java +++ b/RebornCore/src/main/java/reborncore/client/StackToolTipHandler.java @@ -71,7 +71,7 @@ public class StackToolTipHandler implements ItemTooltipCallback { tooltipLines.add(1, line1); if (Screen.hasShiftDown()) { - int percentage = percentage(Energy.of(itemStack).getMaxStored(), Energy.of(itemStack).getEnergy()); + int percentage = percentage(Energy.of(itemStack).getEnergy(), Energy.of(itemStack).getMaxStored()); MutableText line2 = StringUtils.getPercentageText(percentage); line2.append(" "); line2.formatted(Formatting.GRAY);