From 9863c27b1560cdf4e14776ff479e2f6eb1afb1d5 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 2 Jul 2016 21:21:41 +0200 Subject: [PATCH] More fixes, bump to 0.8.4 --- CHANGELOG.md | 5 +++++ build.gradle | 2 +- .../java/refinedstorage/RefinedStorage.java | 8 +++++++- .../apiimpl/storage/GroupedStorage.java | 4 ++++ src/main/java/refinedstorage/gui/GuiGrid.java | 2 +- .../network/MessageGridItems.java | 11 +++-------- .../tile/controller/TileController.java | 2 ++ .../java/refinedstorage/tile/grid/IGrid.java | 7 ------- .../refinedstorage/tile/grid/TileGrid.java | 13 ------------- .../refinedstorage/tile/grid/WirelessGrid.java | 18 +----------------- src/main/resources/mcmod.info | 2 +- 11 files changed, 25 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86b9a6cf4..0303a460e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Refined Storage Changelog +### 0.8.4 +**Bugfixes** +- Fixed delay until grid items are visible +- Performance improvements + ### 0.8.3 **Bugfixes** - Fixed drawer controllers not working with external storage diff --git a/build.gradle b/build.gradle index 4d89ded2a..854c48168 100755 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' -version = "0.8.3" +version = "0.8.4" group = "refinedstorage" archivesBaseName = "refinedstorage" diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index d2885a3f9..8056de36a 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -17,10 +17,13 @@ import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import refinedstorage.item.ItemStorageDisk; import refinedstorage.proxy.CommonProxy; +import java.util.ArrayList; +import java.util.List; + @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) public final class RefinedStorage { public static final String ID = "refinedstorage"; - public static final String VERSION = "0.8.3"; + public static final String VERSION = "0.8.4"; public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); @@ -42,6 +45,9 @@ public final class RefinedStorage { @Instance public static RefinedStorage INSTANCE; + public List items = new ArrayList(); + public long lastItemUpdate; + public int cableRfUsage; public int constructorRfUsage; public int crafterRfUsage; diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java index a4fc48678..9a0aee2af 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java @@ -27,6 +27,8 @@ public class GroupedStorage implements IGroupedStorage { @Override public void rebuild() { + System.out.println("Rebuilding!"); + storages.clear(); for (INetworkSlave slave : network.getSlaves()) { @@ -37,6 +39,8 @@ public class GroupedStorage implements IGroupedStorage { stacks.clear(); + System.out.println("Storages (" + storages.size() + ")"); + for (IStorage storage : storages) { for (ItemStack stack : storage.getItems()) { add(stack); diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 8758aa5ad..58ab96869 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -118,7 +118,7 @@ public class GuiGrid extends GuiBase { items.clear(); if (grid.isConnected()) { - items.addAll(grid.getItems()); + items.addAll(RefinedStorage.INSTANCE.items); String query = searchField.getText().trim().toLowerCase(); diff --git a/src/main/java/refinedstorage/network/MessageGridItems.java b/src/main/java/refinedstorage/network/MessageGridItems.java index 082ef08af..b718ce9de 100755 --- a/src/main/java/refinedstorage/network/MessageGridItems.java +++ b/src/main/java/refinedstorage/network/MessageGridItems.java @@ -1,15 +1,13 @@ package refinedstorage.network; import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import refinedstorage.RefinedStorage; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.container.ContainerGrid; import java.util.ArrayList; import java.util.List; @@ -51,11 +49,8 @@ public class MessageGridItems implements IMessage, IMessageHandler getItems(); - - void setItems(List items); - BlockPos getNetworkPosition(); IGridHandler getGridHandler(); diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 61dd4d53d..556d4b880 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -66,9 +66,6 @@ public class TileGrid extends TileSlave implements IGrid { private int sortingType = SORTING_TYPE_NAME; private int searchBoxMode = SEARCH_BOX_MODE_NORMAL; - // Used clientside only - private List items = new ArrayList(); - @Override public int getEnergyUsage() { switch (getType()) { @@ -95,16 +92,6 @@ public class TileGrid extends TileSlave implements IGrid { return type == null ? EnumGridType.NORMAL : type; } - @Override - public List getItems() { - return items; - } - - @Override - public void setItems(List items) { - this.items = items; - } - @Override public BlockPos getNetworkPosition() { return network != null ? network.getPosition() : null; diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 68fa8e0f8..0d0d676de 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -15,9 +15,6 @@ import refinedstorage.network.MessageWirelessGridSettingsUpdate; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.controller.TileController; -import java.util.ArrayList; -import java.util.List; - public class WirelessGrid implements IGrid { private EnumHand hand; private World world; @@ -25,8 +22,6 @@ public class WirelessGrid implements IGrid { private int sortingType; private int sortingDirection; private int searchBoxMode; - private List items = new ArrayList(); - private long lastUpdate; public WirelessGrid(World world, ItemStack stack, EnumHand hand) { this.hand = hand; @@ -42,17 +37,6 @@ public class WirelessGrid implements IGrid { return EnumGridType.NORMAL; } - @Override - public List getItems() { - return items; - } - - @Override - public void setItems(List items) { - this.items = items; - this.lastUpdate = System.currentTimeMillis(); - } - @Override public BlockPos getNetworkPosition() { return controllerPos; @@ -122,6 +106,6 @@ public class WirelessGrid implements IGrid { @Override public boolean isConnected() { - return System.currentTimeMillis() - lastUpdate < 1000; + return System.currentTimeMillis() - RefinedStorage.INSTANCE.lastItemUpdate < 1000; } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5028401fe..51bc8cf98 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "refinedstorage", "name": "Refined Storage", "description": "A Minecraft mod all about storage.", - "version": "0.8.3", + "version": "0.8.4", "mcversion": "1.10", "url": "", "updateUrl": "",