Update Forge to 2340, update mappings, remove Tesla integration, remove RS units

2017-06-20 16:18:15 +02:00
parent 867b404ffc
commit 0e7db9c3d5
19 changed files with 36 additions and 305 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Refined Storage Changelog

 ### 1.5.1
- Updated Forge to 2331 (raoulvdberge)
+- Updated Forge to 2340 (raoulvdberge)
 - Re-added MCMultiPart support (raoulvdberge)
+- Removed Tesla integration (raoulvdberge)
+- Removed RS energy units, the entire mod is powered with Forge Energy now (raoulvdberge)
 - Added back crafting recipes (raoulvdberge)
 - Changed Grid recipe (raoulvdberge)
 - Changed Crafting Monitor recipe (raoulvdberge)
 - Fixed Filters not persisting correctly in Wireless Grid and Wireless Crafting Monitor (raoulvdberge)
+- Fixed some recipes not using ore dictionary (raoulvdberge)

 ### 1.5
 - Port to Minecraft 1.12 (raoulvdberge)
--- a/build.gradle
+++ b/build.gradle
@@ -28,19 +28,16 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8

 minecraft {
-    version = "1.12-14.21.0.2331"
+    version = "1.12-14.21.0.2340"
    runDir = "run"
    useDepAts = true
-    mappings = "snapshot_20170615"
+    mappings = "snapshot_20170620"
 }

 repositories {
    maven {
        url "http://dvs1.progwml6.com/files/maven"
    }
-    maven {
-        url "http://maven.epoxide.org"
-    }
    maven {
        url "http://maven.amadornes.com"
    }
@@ -50,9 +47,8 @@ repositories {
 }

 dependencies {
-    deobfCompile "mezz.jei:jei_1.12:4.6.0.61:api"
-    runtime "mezz.jei:jei_1.12:4.6.0.61"
-    deobfCompile "net.darkhax.tesla:Tesla-1.12:1.0.58"
+    deobfCompile "mezz.jei:jei_1.12:4.6.0.63:api"
+    runtime "mezz.jei:jei_1.12:4.6.0.63"
    deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_26"
    // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api"
 }
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -23,7 +23,7 @@ public final class RS {

    public static final String ID = "refinedstorage";
    public static final String VERSION = "1.5.1";
-    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2331,);";
+    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2340,);";
    public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
    public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";

--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/EnergyTesla.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/EnergyTesla.java
@@ -1,28 +0,0 @@
-package com.raoulvdberge.refinedstorage.integration.tesla;
-
-import net.darkhax.tesla.api.ITeslaConsumer;
-import net.darkhax.tesla.api.ITeslaHolder;
-import net.minecraftforge.energy.IEnergyStorage;
-
-public class EnergyTesla implements ITeslaHolder, ITeslaConsumer {
-    private IEnergyStorage energy;
-
-    public EnergyTesla(IEnergyStorage energy) {
-        this.energy = energy;
-    }
-
-    @Override
-    public long givePower(long power, boolean simulated) {
-        return energy.receiveEnergy((int) power, simulated);
-    }
-
-    @Override
-    public long getStoredPower() {
-        return energy.getEnergyStored();
-    }
-
-    @Override
-    public long getCapacity() {
-        return energy.getMaxEnergyStored();
-    }
-}
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/IntegrationTesla.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/IntegrationTesla.java
@@ -1,14 +0,0 @@
-package com.raoulvdberge.refinedstorage.integration.tesla;
-
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import net.minecraftforge.fml.common.Loader;
-
-public final class IntegrationTesla {
-    public static boolean isLoaded() {
-        return Loader.isModLoaded("tesla");
-    }
-
-    public static void register() {
-        API.instance().getReaderWriterHandlerRegistry().add(ReaderWriterHandlerTesla.ID, ReaderWriterHandlerTesla::new);
-    }
-}
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ItemEnergyTesla.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ItemEnergyTesla.java
@@ -1,29 +0,0 @@
-package com.raoulvdberge.refinedstorage.integration.tesla;
-
-import net.darkhax.tesla.api.ITeslaConsumer;
-import net.darkhax.tesla.api.ITeslaHolder;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.energy.CapabilityEnergy;
-
-public class ItemEnergyTesla implements ITeslaHolder, ITeslaConsumer {
-    private ItemStack stack;
-
-    public ItemEnergyTesla(ItemStack stack) {
-        this.stack = stack;
-    }
-
-    @Override
-    public long getStoredPower() {
-        return stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored();
-    }
-
-    @Override
-    public long getCapacity() {
-        return stack.getCapability(CapabilityEnergy.ENERGY, null).getMaxEnergyStored();
-    }
-
-    @Override
-    public long givePower(long power, boolean simulated) {
-        return stack.getCapability(CapabilityEnergy.ENERGY, null).receiveEnergy((int) power, simulated);
-    }
-}
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java
@@ -1,156 +0,0 @@
-package com.raoulvdberge.refinedstorage.integration.tesla;
-
-import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader;
-import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
-import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler;
-import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter;
-import net.darkhax.tesla.api.ITeslaConsumer;
-import net.darkhax.tesla.api.ITeslaHolder;
-import net.darkhax.tesla.api.ITeslaProducer;
-import net.darkhax.tesla.api.implementation.BaseTeslaContainer;
-import net.darkhax.tesla.capability.TeslaCapabilities;
-import net.darkhax.tesla.lib.TeslaUtils;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraftforge.common.capabilities.Capability;
-
-import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.List;
-
-public class ReaderWriterHandlerTesla implements IReaderWriterHandler {
-    public static final String ID = "tesla";
-
-    private static final String NBT_CONTAINER = "Container";
-
-    private BaseTeslaContainer container;
-    private TeslaContainerReader containerReader;
-    private TeslaContainerWriter containerWriter;
-
-    public ReaderWriterHandlerTesla(@Nullable NBTTagCompound tag) {
-        this.container = new BaseTeslaContainer(4000, 4000, 4000);
-        this.containerReader = new TeslaContainerReader(container);
-        this.containerWriter = new TeslaContainerWriter(container);
-
-        if (tag != null && tag.hasKey(NBT_CONTAINER)) {
-            container.deserializeNBT(tag.getCompoundTag(NBT_CONTAINER));
-        }
-    }
-
-    @Override
-    public void update(IReaderWriterChannel channel) {
-    }
-
-    @Override
-    public void onWriterDisabled(IWriter writer) {
-    }
-
-    @Override
-    public boolean hasCapabilityReader(IReader reader, Capability<?> capability) {
-        return capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER;
-    }
-
-    @Override
-    public <T> T getCapabilityReader(IReader reader, Capability<T> capability) {
-        if (capability == TeslaCapabilities.CAPABILITY_HOLDER) {
-            return TeslaCapabilities.CAPABILITY_HOLDER.cast(container);
-        } else if (capability == TeslaCapabilities.CAPABILITY_CONSUMER) {
-            return TeslaCapabilities.CAPABILITY_CONSUMER.cast(containerReader);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean hasCapabilityWriter(IWriter writer, Capability<?> capability) {
-        return capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_PRODUCER;
-    }
-
-    @Override
-    public <T> T getCapabilityWriter(IWriter writer, Capability<T> capability) {
-        if (capability == TeslaCapabilities.CAPABILITY_HOLDER) {
-            return TeslaCapabilities.CAPABILITY_HOLDER.cast(container);
-        } else if (capability == TeslaCapabilities.CAPABILITY_PRODUCER) {
-            return TeslaCapabilities.CAPABILITY_PRODUCER.cast(containerWriter);
-        }
-
-        return null;
-    }
-
-    @Override
-    public NBTTagCompound writeToNBT(NBTTagCompound tag) {
-        tag.setTag(NBT_CONTAINER, container.serializeNBT());
-
-        return tag;
-    }
-
-    @Override
-    public String getId() {
-        return ID;
-    }
-
-    @Override
-    public List<ITextComponent> getStatusReader(IReader reader, IReaderWriterChannel channel) {
-        return getStatus(containerReader);
-    }
-
-    @Override
-    public List<ITextComponent> getStatusWriter(IWriter writer, IReaderWriterChannel channel) {
-        return getStatus(containerWriter);
-    }
-
-    private List<ITextComponent> getStatus(ITeslaHolder holder) {
-        if (holder.getStoredPower() == 0) {
-            return Collections.emptyList();
-        }
-
-        return Collections.singletonList(new TextComponentString(TeslaUtils.getDisplayableTeslaCount(holder.getStoredPower()) + " / " + TeslaUtils.getDisplayableTeslaCount(holder.getCapacity())));
-    }
-
-    private class TeslaContainerReader implements ITeslaHolder, ITeslaConsumer {
-        private BaseTeslaContainer parent;
-
-        public TeslaContainerReader(BaseTeslaContainer parent) {
-            this.parent = parent;
-        }
-
-        @Override
-        public long givePower(long power, boolean simulated) {
-            return parent.givePower(power, simulated);
-        }
-
-        @Override
-        public long getStoredPower() {
-            return parent.getStoredPower();
-        }
-
-        @Override
-        public long getCapacity() {
-            return parent.getCapacity();
-        }
-    }
-
-    private class TeslaContainerWriter implements ITeslaHolder, ITeslaProducer {
-        private BaseTeslaContainer parent;
-
-        public TeslaContainerWriter(BaseTeslaContainer parent) {
-            this.parent = parent;
-        }
-
-        @Override
-        public long takePower(long power, boolean simulated) {
-            return parent.takePower(power, simulated);
-        }
-
-        @Override
-        public long getStoredPower() {
-            return parent.getStoredPower();
-        }
-
-        @Override
-        public long getCapacity() {
-            return parent.getCapacity();
-        }
-    }
-}
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java
@@ -1,9 +1,6 @@
 package com.raoulvdberge.refinedstorage.item;

 import com.raoulvdberge.refinedstorage.integration.forgeenergy.ItemEnergyForge;
-import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
-import com.raoulvdberge.refinedstorage.integration.tesla.ItemEnergyTesla;
-import net.darkhax.tesla.capability.TeslaCapabilities;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
@@ -22,26 +19,11 @@ public class CapabilityProviderEnergy implements ICapabilityProvider {

    @Override
    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
-        return capability == CapabilityEnergy.ENERGY ||
-            (IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER));
+        return capability == CapabilityEnergy.ENERGY;
    }

    @Override
    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
-        if (capability == CapabilityEnergy.ENERGY) {
-            return CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, ItemEnergyItem.CAPACITY));
-        }
-
-        if (IntegrationTesla.isLoaded()) {
-            if (capability == TeslaCapabilities.CAPABILITY_HOLDER) {
-                return TeslaCapabilities.CAPABILITY_HOLDER.cast(new ItemEnergyTesla(stack));
-            }
-
-            if (capability == TeslaCapabilities.CAPABILITY_CONSUMER) {
-                return TeslaCapabilities.CAPABILITY_CONSUMER.cast(new ItemEnergyTesla(stack));
-            }
-        }
-
-        return null;
+        return capability == CapabilityEnergy.ENERGY ? CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, ItemEnergyItem.CAPACITY)) : null;
    }
 }
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
@@ -23,7 +23,6 @@ import com.raoulvdberge.refinedstorage.gui.GuiHandler;
 import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks;
 import com.raoulvdberge.refinedstorage.integration.forgeenergy.ReaderWriterHandlerForgeEnergy;
 import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC;
-import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
 import com.raoulvdberge.refinedstorage.item.ItemFluidStoragePart;
 import com.raoulvdberge.refinedstorage.item.ItemProcessor;
 import com.raoulvdberge.refinedstorage.item.ItemStoragePart;
@@ -87,10 +86,6 @@ public class ProxyCommon {
            IntegrationCraftingTweaks.register();
        }

-        if (IntegrationTesla.isLoaded()) {
-            IntegrationTesla.register();
-        }
-
        int id = 0;

        RS.INSTANCE.network.registerMessage(MessageTileDataParameter.class, MessageTileDataParameter.class, id++, Side.CLIENT);
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11;

 public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRenderer<TileStorageMonitor> {
    @Override
-    public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
+    public void render(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
        setLightmapDisabled(true);

        float disX = 0, disXText = 0;
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -37,8 +37,6 @@ import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor;
 import com.raoulvdberge.refinedstorage.container.ContainerGrid;
 import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter;
 import com.raoulvdberge.refinedstorage.integration.forgeenergy.EnergyForge;
-import com.raoulvdberge.refinedstorage.integration.tesla.EnergyTesla;
-import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
 import com.raoulvdberge.refinedstorage.network.*;
 import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy;
 import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable;
@@ -47,7 +45,6 @@ import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer;
 import com.raoulvdberge.refinedstorage.tile.data.RSSerializers;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import com.raoulvdberge.refinedstorage.tile.grid.IGrid;
-import net.darkhax.tesla.capability.TeslaCapabilities;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -156,7 +153,6 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
    private Map<String, IReaderWriterChannel> readerWriterChannels = new HashMap<>();

    private EnergyForge energy = new EnergyForge(RS.INSTANCE.config.controllerCapacity);
-    private EnergyTesla energyTesla;

    private int lastEnergyDisplay;

@@ -174,10 +170,6 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
        dataManager.addWatchedParameter(ENERGY_STORED);
        dataManager.addParameter(ENERGY_CAPACITY);
        dataManager.addParameter(NODES);
-
-        if (IntegrationTesla.isLoaded()) {
-            this.energyTesla = new EnergyTesla(energy);
-        }
    }

    public EnergyForge getEnergy() {
@@ -742,15 +734,6 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
            return CapabilityEnergy.ENERGY.cast(energy);
        }

-        if (energyTesla != null) {
-            if (capability == TeslaCapabilities.CAPABILITY_HOLDER) {
-                return TeslaCapabilities.CAPABILITY_HOLDER.cast(energyTesla);
-            }
-            if (capability == TeslaCapabilities.CAPABILITY_CONSUMER) {
-                return TeslaCapabilities.CAPABILITY_CONSUMER.cast(energyTesla);
-            }
-        }
-
        if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) {
            return CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY.cast(this);
        }
@@ -761,7 +744,6 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
    @Override
    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
        return capability == CapabilityEnergy.ENERGY
-            || (energyTesla != null && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER))
            || capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY
            || super.hasCapability(capability, facing);
    }
--- a/src/main/resources/assets/refinedstorage/lang/de_de.lang
+++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang
@@ -55,9 +55,9 @@ gui.refinedstorage:crafting_preview.force_start=Drücke STRG + SHIFT zum Überbr
 gui.refinedstorage:reader=Lesegerät
 gui.refinedstorage:writer=Schreibgerät

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Verbrauch: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Verbrauch: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=gespeichert: %s
 misc.refinedstorage:storage.stored_capacity=gespeichert: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/en_us.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang
@@ -77,9 +77,9 @@ gui.refinedstorage:security_manager.permission.5.tooltip=Ability to change secur
 gui.refinedstorage:storage_monitor=Storage Monitor
 gui.refinedstorage:portable_grid=Portable Grid

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Usage: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Usage: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Stored: %s
 misc.refinedstorage:storage.stored_capacity=Stored: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
@@ -55,9 +55,9 @@ gui.refinedstorage:crafting_preview.force_start=Appuyez sur CTRL + SHIFT pour qu
 gui.refinedstorage:reader=Lecteur
 gui.refinedstorage:writer=Imprimeur

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Utilisées: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Utilisées: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Stockés: %s
 misc.refinedstorage:storage.stored_capacity=Stockés: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
@@ -77,9 +77,9 @@ gui.refinedstorage:security_manager.permission.5.tooltip=보안 옵션 조정하
 gui.refinedstorage:storage_monitor=저장 모니터
 gui.refinedstorage:portable_grid=휴대용 그리드

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=사용: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=사용: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=저장량: %s
 misc.refinedstorage:storage.stored_capacity=저쟝량: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang
+++ b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang
@@ -42,9 +42,9 @@ gui.refinedstorage:fluid_interface=Vloeistof Interface
 gui.refinedstorage:fluid_interface.in=In
 gui.refinedstorage:fluid_interface.out=Uit

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Vebruik: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Vebruik: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Opgeslagen: %s
 misc.refinedstorage:storage.stored_capacity=Opgeslagen: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang
+++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang
@@ -28,9 +28,9 @@ gui.refinedstorage:crafter.processing=Processando
 gui.refinedstorage:processing_pattern_encoder=Codificador de Padrão de Processamento
 gui.refinedstorage:processing_pattern_encoder.pattern_create=Criar Padrão

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Usage: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Usage: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Stored: %s
 misc.refinedstorage:storage.stored_capacity=Stored: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
@@ -40,9 +40,9 @@ gui.refinedstorage:fluid_interface=Жидкостный интерфейс
 gui.refinedstorage:fluid_interface.in=В
 gui.refinedstorage:fluid_interface.out=Из

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=Usage: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=Usage: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Запасено: %s
 misc.refinedstorage:storage.stored_capacity=Запасено: %s / %s
--- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
+++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
@@ -42,9 +42,9 @@ gui.refinedstorage:fluid_interface=流体面板
 gui.refinedstorage:fluid_interface.in=输入
 gui.refinedstorage:fluid_interface.out=输出

-misc.refinedstorage:energy_stored=%d / %d RS
-misc.refinedstorage:energy_usage=使用: %d RS/t
-misc.refinedstorage:energy_usage_minimal=%d RS/t
+misc.refinedstorage:energy_stored=%d / %d FE
+misc.refinedstorage:energy_usage=使用: %d FE/t
+misc.refinedstorage:energy_usage_minimal=%d FE/t

 misc.refinedstorage:storage.stored=Stored: %s
 misc.refinedstorage:storage.stored_capacity=已存储: %s / %s