From 6f35d5b5272005c8ca2c060eab325eaf11e975f6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 8 Aug 2019 23:47:58 +0100 Subject: [PATCH] remove euPerFU --- .../blockentity/cable/CableBlockEntity.java | 7 +++---- .../FusionControlComputerBlockEntity.java | 9 ++++----- .../storage/lesu/LapotronicSUBlockEntity.java | 11 +++++------ .../java/techreborn/events/StackToolTipHandler.java | 5 ++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index bf222a42e..18202f011 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -39,12 +39,11 @@ import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.power.EnergyBlockEntity; import reborncore.api.power.EnumPowerTier; -import reborncore.common.RebornCoreConfig; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.StringUtils; import techreborn.blocks.cable.BlockCable; -import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; +import techreborn.init.TRContent; import java.util.ArrayList; import java.util.Collections; @@ -116,7 +115,7 @@ public class CableBlockEntity extends BlockEntity if (cableType == null) { cableType = getCableType(); - transferRate = cableType.transferRate * RebornCoreConfig.euPerFU; + transferRate = cableType.transferRate; } ticksSinceLastChange++; @@ -164,7 +163,7 @@ public class CableBlockEntity extends BlockEntity if (isReal) { info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.transferRate") + ": " + Formatting.GOLD - + PowerSystem.getLocaliszedPowerFormatted(transferRate / RebornCoreConfig.euPerFU) + "/t")); + + PowerSystem.getLocaliszedPowerFormatted(transferRate) + "/t")); info.add(new LiteralText(Formatting.GRAY + StringUtils.t("techreborn.tooltip.tier") + ": " + Formatting.GOLD + StringUtils.toFirstCapitalAllLowercase(cableType.tier.toString()))); } diff --git a/src/main/java/techreborn/blockentity/fusionReactor/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/fusionReactor/FusionControlComputerBlockEntity.java index 5e8d3c6c8..10d9957e2 100644 --- a/src/main/java/techreborn/blockentity/fusionReactor/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/fusionReactor/FusionControlComputerBlockEntity.java @@ -34,21 +34,20 @@ import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; -import reborncore.common.RebornCoreConfig; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.crafting.ingredient.StackIngredient; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; -import reborncore.common.util.RebornInventory; import reborncore.common.util.ItemUtils; +import reborncore.common.util.RebornInventory; import reborncore.common.util.Torus; import techreborn.TechReborn; import techreborn.api.recipe.recipes.FusionReactorRecipe; -import techreborn.init.TRContent; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; +import techreborn.init.TRContent; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -321,7 +320,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity @Override public double getBaseMaxPower() { - return Math.min(maxEnergy * getPowerMultiplier(), Integer.MAX_VALUE / RebornCoreConfig.euPerFU); + return Math.min(maxEnergy * getPowerMultiplier(), Integer.MAX_VALUE); } @Override @@ -339,7 +338,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity if (!hasStartedCrafting) { return 0; } - return Integer.MAX_VALUE / RebornCoreConfig.euPerFU; + return Integer.MAX_VALUE; } @Override diff --git a/src/main/java/techreborn/blockentity/storage/lesu/LapotronicSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/lesu/LapotronicSUBlockEntity.java index 77c2812fb..4d069b138 100644 --- a/src/main/java/techreborn/blockentity/storage/lesu/LapotronicSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/lesu/LapotronicSUBlockEntity.java @@ -33,14 +33,13 @@ import reborncore.api.power.EnumPowerTier; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; -import reborncore.common.RebornCoreConfig; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; -import techreborn.blocks.storage.BlockLapotronicSU; -import techreborn.init.TRContent; -import techreborn.init.TRBlockEntities; import techreborn.blockentity.storage.EnergyStorageBlockEntity; +import techreborn.blocks.storage.BlockLapotronicSU; +import techreborn.init.TRBlockEntities; +import techreborn.init.TRContent; import java.util.ArrayList; @@ -127,8 +126,8 @@ public class LapotronicSUBlockEntity extends EnergyStorageBlockEntity implements public void setMaxStorage(){ maxStorage = (connectedBlocks + 1) * storagePerBlock; - if (maxStorage < 0 || maxStorage > Integer.MAX_VALUE / RebornCoreConfig.euPerFU) { - maxStorage = Integer.MAX_VALUE / RebornCoreConfig.euPerFU; + if (maxStorage < 0 || maxStorage > Integer.MAX_VALUE) { + maxStorage = Integer.MAX_VALUE; } } diff --git a/src/main/java/techreborn/events/StackToolTipHandler.java b/src/main/java/techreborn/events/StackToolTipHandler.java index 9a92b9c17..7af2e6b9b 100644 --- a/src/main/java/techreborn/events/StackToolTipHandler.java +++ b/src/main/java/techreborn/events/StackToolTipHandler.java @@ -42,7 +42,6 @@ import net.minecraft.util.registry.Registry; import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.ItemPowerManager; -import reborncore.common.RebornCoreConfig; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.StringUtils; import techreborn.TechReborn; @@ -62,9 +61,9 @@ public class StackToolTipHandler implements ItemTooltipCallback { ((IListInfoProvider) item).addInfo(components, false, false); } else if (stack.getItem() instanceof IEnergyItemInfo) { ItemPowerManager itemPowerManager = new ItemPowerManager(stack); - LiteralText line1 = new LiteralText(PowerSystem.getLocaliszedPowerFormattedNoSuffix(itemPowerManager.getEnergyStored() / RebornCoreConfig.euPerFU)); + LiteralText line1 = new LiteralText(PowerSystem.getLocaliszedPowerFormattedNoSuffix(itemPowerManager.getEnergyStored())); line1.append("/"); - line1.append(PowerSystem.getLocaliszedPowerFormattedNoSuffix(itemPowerManager.getMaxEnergyStored() / RebornCoreConfig.euPerFU)); + line1.append(PowerSystem.getLocaliszedPowerFormattedNoSuffix(itemPowerManager.getMaxEnergyStored())); line1.append(" "); line1.append(PowerSystem.getDisplayPower().abbreviation); line1.formatted(Formatting.GOLD);