From 5e6d446bc68c16249b2669c7b426d8737fbfc4a0 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 28 Jun 2017 13:02:35 +0200 Subject: [PATCH] Fixed some misc bugs with pattern grid, removed unused translations --- .../apiimpl/network/node/NetworkNodeGrid.java | 5 ----- .../refinedstorage/container/ContainerGrid.java | 10 ++++++++++ .../raoulvdberge/refinedstorage/gui/grid/GuiGrid.java | 2 +- .../refinedstorage/tile/grid/TileGrid.java | 3 +-- .../resources/assets/refinedstorage/lang/de_de.lang | 6 ------ .../resources/assets/refinedstorage/lang/fr_fr.lang | 6 ------ .../resources/assets/refinedstorage/lang/ko_kr.lang | 7 ------- .../resources/assets/refinedstorage/lang/nl_nl.lang | 4 ---- .../resources/assets/refinedstorage/lang/pt_br.lang | 4 ---- .../resources/assets/refinedstorage/lang/ru_ru.lang | 4 ---- .../resources/assets/refinedstorage/lang/zh_cn.lang | 4 ---- 11 files changed, 12 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index e6282cc18..5a2a28392 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -9,7 +9,6 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.block.BlockGrid; import com.raoulvdberge.refinedstorage.block.GridType; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; @@ -330,10 +329,6 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { for (int i = 0; i < matrix.getSizeInventory(); ++i) { matrix.setInventorySlotContents(i, ItemStack.EMPTY); } - - world.getMinecraftServer().getPlayerList().getPlayers().stream() - .filter(player -> player.openContainer instanceof ContainerGrid && ((ContainerGrid) player.openContainer).getTile() != null && ((ContainerGrid) player.openContainer).getTile().getPos().equals(pos)) - .forEach(player -> player.openContainer.detectAndSendChanges()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index 203fe8b9d..c65fcce0b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -148,6 +148,16 @@ public class ContainerGrid extends ContainerBase { } } + public void sendAllSlots() { + for (int i = 0; i < inventorySlots.size(); ++i) { + Slot slot = inventorySlots.get(i); + + for (IContainerListener listener : listeners) { + listener.sendSlotContents(this, i, slot.getStack()); + } + } + } + @Override public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 3102a8467..07d16969f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -324,7 +324,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { case CRAFTING: return inBounds(82, y, 7, 7, mouseX, mouseY); case PATTERN: - if (TileGrid.PROCESSING_PATTERN.getValue()) { + if (((NetworkNodeGrid) grid).isProcessingPattern()) { return inBounds(154, y, 7, 7, mouseX, mouseY); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java index f6d23e73f..b67f8ceb1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java @@ -149,8 +149,7 @@ public class TileGrid extends TileNode { .filter(player -> player.openContainer instanceof ContainerGrid && ((ContainerGrid) player.openContainer).getTile() != null && ((ContainerGrid) player.openContainer).getTile().getPos().equals(tile.getPos())) .forEach(player -> { ((ContainerGrid) player.openContainer).initSlots(); - - player.openContainer.detectAndSendChanges(); + ((ContainerGrid) player.openContainer).sendAllSlots(); }); } }, parameter -> { diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang index b4a498fe3..e030391e0 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_de.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang @@ -31,9 +31,6 @@ gui.refinedstorage:crafting_monitor.waiting_for_items=Warte auf Teile gui.refinedstorage:wireless_transmitter=Funk-Sender gui.refinedstorage:wireless_transmitter.distance=%d Blöcke gui.refinedstorage:crafter=automatische Werkbank -gui.refinedstorage:crafter.processing=externe Steuerung -gui.refinedstorage:processing_pattern_encoder=Matrix für externen Bauplan -gui.refinedstorage:processing_pattern_encoder.pattern_create=Bauplan erstellen gui.refinedstorage:filter=Filter gui.refinedstorage:filter.compare_damage=Schaden gui.refinedstorage:filter.compare_nbt=NBT @@ -171,9 +168,6 @@ block.refinedstorage:crafting_monitor.name=Fertigungsmonitor block.refinedstorage:wireless_transmitter.name=Funk-Sender block.refinedstorage:wireless_transmitter.tooltip=Auf %s montieren. block.refinedstorage:crafter.name=automatische Werkbank -block.refinedstorage:processing_pattern_encoder.name=Matrix für externen Bauplan -block.refinedstorage:processing_pattern_encoder.tooltip.0=Nur für Baupläne mit anderen Maschinen. -block.refinedstorage:processing_pattern_encoder.tooltip.1=Für normale Baupläne %s benutzen. block.refinedstorage:network_receiver.name=Funk-Netzwerkempfänger block.refinedstorage:network_transmitter.name=Funk-Netzwerksender block.refinedstorage:fluid_interface.name=Flüssigkeiten Schnittstelle diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang index 0425f8866..3e5b98504 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang @@ -31,9 +31,6 @@ gui.refinedstorage:crafting_monitor.waiting_for_items=En attente d'items gui.refinedstorage:wireless_transmitter=Émetteur sans Fil gui.refinedstorage:wireless_transmitter.distance=%d blocs gui.refinedstorage:crafter=Crafteur -gui.refinedstorage:crafter.processing=Traitement -gui.refinedstorage:processing_pattern_encoder=Encodeur de Modèle de Traitement -gui.refinedstorage:processing_pattern_encoder.pattern_create=Créer Modèle gui.refinedstorage:grid=Filtre gui.refinedstorage:grid.compare_damage=Dommage gui.refinedstorage:grid.compare_nbt=NBT @@ -172,9 +169,6 @@ block.refinedstorage:crafting_monitor.name=Moniteur de Craft block.refinedstorage:wireless_transmitter.name=Émetteur sans Fil block.refinedstorage:wireless_transmitter.tooltip=À besoin d'être placé sur %s. block.refinedstorage:crafter.name=Crafteur -block.refinedstorage:processing_pattern_encoder.name=Encodeur de Modèle de Traitement -block.refinedstorage:processing_pattern_encoder.tooltip.0=Seulement utiliser pour créer des modèles de traitement. -block.refinedstorage:processing_pattern_encoder.tooltip.1=Pour créer un modèle de craft, utiliser le %s. block.refinedstorage:network_receiver.name=Récepteur de Réseau block.refinedstorage:network_transmitter.name=Émetteur de Réseau block.refinedstorage:fluid_interface.name=Interface de Fluides diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang index e83ae4080..ada0d084f 100644 --- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang +++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang @@ -35,9 +35,6 @@ gui.refinedstorage:crafting_monitor.blocked=막힘 - 다른 작업에서 대기 gui.refinedstorage:wireless_transmitter=무선 송신기 gui.refinedstorage:wireless_transmitter.distance=%d블럭 gui.refinedstorage:crafter=조합기 -gui.refinedstorage:crafter.processing=제작 중 -gui.refinedstorage:processing_pattern_encoder=가공 패턴 제작대 -gui.refinedstorage:processing_pattern_encoder.pattern_create=패턴 제작 gui.refinedstorage:filter=필터 gui.refinedstorage:filter.compare_damage=데미지 gui.refinedstorage:filter.compare_nbt=NBT @@ -207,10 +204,6 @@ block.refinedstorage:interface.name=인터페이스 block.refinedstorage:crafting_monitor.name=조합 모니터 block.refinedstorage:wireless_transmitter.name=무선 송신기 block.refinedstorage:wireless_transmitter.tooltip=%s에 설치되어야 합니다. -block.refinedstorage:crafter.name=조합기 -block.refinedstorage:processing_pattern_encoder.name=가공 패턴 제작대 -block.refinedstorage:processing_pattern_encoder.tooltip.0=가공 패턴을 만드는 데에만 이용됩니다. -block.refinedstorage:processing_pattern_encoder.tooltip.1=조합 패턴을 제작할 때에는 %s를 사용하세요. block.refinedstorage:network_receiver.name=네트워크 수신기 block.refinedstorage:network_transmitter.name=네트워크 송신기 block.refinedstorage:fluid_interface.name=액체 인터페이스 diff --git a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang index 3cb309e9a..1e09b7447 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang @@ -27,9 +27,6 @@ gui.refinedstorage:crafting_monitor.machine_none=Geen machine gevonden gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:wireless_transmitter.distance=%d blokken gui.refinedstorage:crafter=Crafter -gui.refinedstorage:crafter.processing=Verwerking -gui.refinedstorage:processing_pattern_encoder=Verwerkingspatroon Codeerder -gui.refinedstorage:processing_pattern_encoder.pattern_create=Patroon maken gui.refinedstorage:filter=Filter gui.refinedstorage:filter.compare_damage=Schade gui.refinedstorage:filter.compare_nbt=NBT @@ -140,7 +137,6 @@ block.refinedstorage:interface.name=Interface block.refinedstorage:crafting_monitor.name=Crafting Monitor block.refinedstorage:wireless_transmitter.name=Draadloze Zender block.refinedstorage:crafter.name=Crafter -block.refinedstorage:processing_pattern_encoder.name=Verwerkingspatroon Codeerder block.refinedstorage:network_receiver.name=Netwerkontvanger block.refinedstorage:network_transmitter.name=Netwerkzender block.refinedstorage:fluid_interface.name=Vloeistof Interface diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang index 87ec3b289..6db15f7a5 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang @@ -24,9 +24,6 @@ gui.refinedstorage:crafting_monitor.items_processing=Itens em processamento gui.refinedstorage:wireless_transmitter=Transmissor Sem Fio gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:crafter=Fabricador -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 FE misc.refinedstorage:energy_usage=Usage: %d FE/t @@ -103,7 +100,6 @@ block.refinedstorage:interface.name=Interface block.refinedstorage:crafting_monitor.name=Monitor de Fabricação block.refinedstorage:wireless_transmitter.name=Transmissor Sem Fio block.refinedstorage:crafter.name=Fabricador -block.refinedstorage:processing_pattern_encoder.name=Codificador de Padrão de Processamento item.refinedstorage:storage_disk.0.name=Disco de Armazenamento 1k item.refinedstorage:storage_disk.1.name=Disco de Armazenamento 4k diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang index f8b897f12..f53e62dd7 100755 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang @@ -25,9 +25,6 @@ gui.refinedstorage:crafting_monitor.items_processing=Предметы с воз gui.refinedstorage:wireless_transmitter=Передатчик gui.refinedstorage:wireless_transmitter.distance=%d блоков gui.refinedstorage:crafter=Крафтер -gui.refinedstorage:crafter.processing=Обработка -gui.refinedstorage:processing_pattern_encoder=Кодировщик шаблонов -gui.refinedstorage:processing_pattern_encoder.pattern_create=Создать шаблон gui.refinedstorage:filter=Сортировка gui.refinedstorage:filter.compare_damage=Урон предмета gui.refinedstorage:filter.compare_nbt=NBT @@ -127,7 +124,6 @@ block.refinedstorage:interface.name=Интерфейс block.refinedstorage:crafting_monitor.name=Терминал запросов block.refinedstorage:wireless_transmitter.name=Передатчик block.refinedstorage:crafter.name=Крафтер -block.refinedstorage:processing_pattern_encoder.name=Кодировщик шаблонов block.refinedstorage:network_receiver.name=Сетевой приемник block.refinedstorage:network_transmitter.name=Сетевой передатчик block.refinedstorage:fluid_interface.name=Жидкостный интерфейс diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang index db9ebc9ee..6cbd79c01 100755 --- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang +++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang @@ -27,9 +27,6 @@ gui.refinedstorage:crafting_monitor.machine_none=找不到机器 gui.refinedstorage:wireless_transmitter=无线访问点 gui.refinedstorage:wireless_transmitter.distance=%d 方块 gui.refinedstorage:crafter=装配室 -gui.refinedstorage:crafter.processing=处理中 -gui.refinedstorage:processing_pattern_encoder=处理编码器 -gui.refinedstorage:processing_pattern_encoder.pattern_create=写入模板 gui.refinedstorage:filter=终端过滤 gui.refinedstorage:filter.compare_damage=耐久 gui.refinedstorage:filter.compare_nbt=NBT @@ -137,7 +134,6 @@ block.refinedstorage:interface.name=物品传输接口 block.refinedstorage:crafting_monitor.name=合成监控处理器 block.refinedstorage:wireless_transmitter.name=无线访问点 block.refinedstorage:crafter.name=装配室 -block.refinedstorage:processing_pattern_encoder.name=处理编码器 block.refinedstorage:network_receiver.name=网络接收器 block.refinedstorage:network_transmitter.name=网络变送器 block.refinedstorage:fluid_interface.name=流体面板