dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issues #199

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-05 16:35:37 +02:00
parent 20b00a0c28
commit 7334bd7c42
14 changed files with 109 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -3,6 +3,9 @@
### 0.8.16
**Bugfixes**
- Fixed issue with IC2 integration causing console spam
- Slight performance improvement in GUI's
- Fixed not being able to change some configs in blocks
- Fixed serverside configs not syncing up with clientside sometimes
**Features**
- Added German translation by ChillUpX

42
src/main/java/refinedstorage/gui/GuiStorage.java
View File

@@ -8,6 +8,7 @@ import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import refinedstorage.tile.IStorageGui;
import refinedstorage.tile.data.TileDataManager;
import java.io.IOException;
@@ -15,7 +16,7 @@ public class GuiStorage extends GuiBase {
private IStorageGui gui;
private String texture;
private GuiTextField priorityField;
public static GuiTextField PRIORITY;
private int barX = 8;
private int barY = 54;
@@ -35,27 +36,26 @@ public class GuiStorage extends GuiBase {
@Override
public void init(int x, int y) {
if (gui.getRedstoneModeConfig() != null) {
addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeConfig()));
if (gui.getRedstoneModeParameter() != null) {
addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeParameter()));
}
if (gui.getModeConfig() != null) {
addSideButton(new SideButtonMode(gui.getModeConfig()));
if (gui.getFilterParameter() != null) {
addSideButton(new SideButtonMode(gui.getFilterParameter()));
}
if (gui.getCompareConfig() != null) {
addSideButton(new SideButtonCompare(gui.getCompareConfig(), CompareUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(gui.getCompareConfig(), CompareUtils.COMPARE_NBT));
if (gui.getCompareParameter() != null) {
addSideButton(new SideButtonCompare(gui.getCompareParameter(), CompareUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(gui.getCompareParameter(), CompareUtils.COMPARE_NBT));
}
priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT);
// @TODO: Only change this when packet is received
priorityField.setText(String.valueOf(gui.getPriority()));
priorityField.setEnableBackgroundDrawing(false);
priorityField.setVisible(true);
priorityField.setTextColor(16777215);
priorityField.setCanLoseFocus(true);
priorityField.setFocused(false);
PRIORITY = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT);
PRIORITY.setText(String.valueOf(gui.getPriorityParameter().getValue()));
PRIORITY.setEnableBackgroundDrawing(false);
PRIORITY.setVisible(true);
PRIORITY.setTextColor(16777215);
PRIORITY.setCanLoseFocus(true);
PRIORITY.setFocused(false);
}
@Override
@@ -72,7 +72,7 @@ public class GuiStorage extends GuiBase {
drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, barHeight - barHeightNew, barWidth, barHeightNew);
priorityField.drawTextBox();
PRIORITY.drawTextBox();
}
@Override
@@ -97,16 +97,16 @@ public class GuiStorage extends GuiBase {
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
super.mouseClicked(mouseX, mouseY, mouseButton);
priorityField.mouseClicked(mouseX, mouseY, mouseButton);
PRIORITY.mouseClicked(mouseX, mouseY, mouseButton);
}
@Override
protected void keyTyped(char character, int keyCode) throws IOException {
if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) {
Integer result = Ints.tryParse(priorityField.getText());
if (!checkHotbarKeys(keyCode) && PRIORITY.textboxKeyTyped(character, keyCode)) {
Integer result = Ints.tryParse(PRIORITY.getText());
if (result != null) {
gui.onPriorityChanged(result);
TileDataManager.setParameter(gui.getPriorityParameter(), result);
}
} else {
super.keyTyped(character, keyCode);

40
src/main/java/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -37,7 +37,7 @@ public class GuiGrid extends GuiBase {
private GridSortingQuantity quantitySorting = new GridSortingQuantity();
private GridSortingName nameSorting = new GridSortingName();
private GuiTextField searchField;
public static GuiTextField SEARCH_FIELD;
private ContainerGrid container;
private List<ClientStack> items = new ArrayList<ClientStack>();
@@ -64,17 +64,15 @@ public class GuiGrid extends GuiBase {
int sx = x + 80 + 1;
int sy = y + 6 + 1;
if (searchField == null) {
searchField = new GuiTextField(0, fontRendererObj, sx, sy, 88 - 6, fontRendererObj.FONT_HEIGHT);
searchField.setEnableBackgroundDrawing(false);
searchField.setVisible(true);
searchField.setTextColor(16777215);
// @TODO: Only do this after packet
updateSearchBoxFocus(grid.getSearchBoxMode());
if (SEARCH_FIELD == null) {
SEARCH_FIELD = new GuiTextField(0, fontRendererObj, sx, sy, 88 - 6, fontRendererObj.FONT_HEIGHT);
SEARCH_FIELD.setEnableBackgroundDrawing(false);
SEARCH_FIELD.setVisible(true);
SEARCH_FIELD.setTextColor(16777215);
updateSearchFieldFocus(grid.getSearchBoxMode());
} else {
searchField.xPosition = sx;
searchField.yPosition = sy;
SEARCH_FIELD.xPosition = sx;
SEARCH_FIELD.yPosition = sy;
}
addSideButton(new SideButtonGridViewType(grid));
@@ -94,7 +92,7 @@ public class GuiGrid extends GuiBase {
if (grid.isConnected()) {
items.addAll(RefinedStorage.INSTANCE.items);
String query = searchField.getText().trim().toLowerCase();
String query = SEARCH_FIELD.getText().trim().toLowerCase();
Iterator<ClientStack> t = items.iterator();
@@ -245,7 +243,7 @@ public class GuiGrid extends GuiBase {
drawTexture(x + 152, y + 114, 240, ty * 16, 16, 16);
}
searchField.drawTextBox();
SEARCH_FIELD.drawTextBox();
}
@Override
@@ -330,11 +328,11 @@ public class GuiGrid extends GuiBase {
public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException {
super.mouseClicked(mouseX, mouseY, clickedButton);
searchField.mouseClicked(mouseX, mouseY, clickedButton);
SEARCH_FIELD.mouseClicked(mouseX, mouseY, clickedButton);
if (clickedButton == 1 && inBounds(79, 5, 90, 12, mouseX - guiLeft, mouseY - guiTop)) {
searchField.setText("");
searchField.setFocused(true);
SEARCH_FIELD.setText("");
SEARCH_FIELD.setFocused(true);
updateJEI();
}
@@ -387,7 +385,7 @@ public class GuiGrid extends GuiBase {
@Override
protected void keyTyped(char character, int keyCode) throws IOException {
if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) {
if (!checkHotbarKeys(keyCode) && SEARCH_FIELD.textboxKeyTyped(character, keyCode)) {
updateJEI();
} else {
super.keyTyped(character, keyCode);
@@ -396,12 +394,12 @@ public class GuiGrid extends GuiBase {
private void updateJEI() {
if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
IntegrationJEI.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
IntegrationJEI.INSTANCE.getRuntime().getItemListOverlay().setFilterText(SEARCH_FIELD.getText());
}
}
public void updateSearchBoxFocus(int mode) {
searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(mode));
searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(mode));
public static void updateSearchFieldFocus(int mode) {
SEARCH_FIELD.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(mode));
SEARCH_FIELD.setFocused(TileGrid.isSearchBoxModeWithAutoselection(mode));
}
}

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -43,7 +43,5 @@ public class SideButtonGridSearchBoxMode extends SideButton {
}
gui.getGrid().onSearchBoxModeChanged(mode);
gui.updateSearchBoxFocus(mode);
}
}

12
src/main/java/refinedstorage/tile/IStorageGui.java
View File

@@ -6,17 +6,15 @@ import refinedstorage.tile.data.TileDataParameter;
public interface IStorageGui {
String getGuiTitle();
int getPriority();
void onPriorityChanged(int priority);
IItemHandler getFilters();
TileDataParameter<Integer> getRedstoneModeConfig();
TileDataParameter<Integer> getRedstoneModeParameter();
TileDataParameter<Integer> getCompareConfig();
TileDataParameter<Integer> getCompareParameter();
TileDataParameter<Integer> getModeConfig();
TileDataParameter<Integer> getFilterParameter();
TileDataParameter<Integer> getPriorityParameter();
int getStored();

6
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -48,14 +48,14 @@ public class TileDetector extends TileNode implements IComparable {
tile.markDirty();
}
}, new ITileDataListener() {
}, new ITileDataListener<Integer>() {
@Override
public void onChanged() {
public void onChanged(TileDataParameter<Integer> parameter) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof GuiDetector) {
((GuiDetector) gui).AMOUNT.setText(String.valueOf(AMOUNT.getValue()));
((GuiDetector) gui).AMOUNT.setText(String.valueOf(parameter.getValue()));
}
}
}

17
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -21,7 +21,6 @@ import refinedstorage.inventory.ItemValidatorBasic;
import refinedstorage.tile.config.IComparable;
import refinedstorage.tile.config.IFilterable;
import refinedstorage.tile.config.IPrioritizable;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;
import java.util.List;
@@ -284,30 +283,30 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
}
@Override
public TileDataParameter<Integer> getRedstoneModeConfig() {
public TileDataParameter<Integer> getRedstoneModeParameter() {
return REDSTONE_MODE;
}
@Override
public TileDataParameter<Integer> getCompareConfig() {
public TileDataParameter<Integer> getCompareParameter() {
return COMPARE;
}
@Override
public TileDataParameter<Integer> getModeConfig() {
public TileDataParameter<Integer> getFilterParameter() {
return MODE;
}
@Override
public TileDataParameter<Integer> getPriorityParameter() {
return PRIORITY;
}
@Override
public int getPriority() {
return priority;
}
@Override
public void onPriorityChanged(int priority) {
TileDataManager.setParameter(PRIORITY, priority);
}
@Override
public void setPriority(int priority) {
this.priority = priority;

16
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -206,20 +206,25 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
}
@Override
public TileDataParameter<Integer> getRedstoneModeConfig() {
public TileDataParameter<Integer> getRedstoneModeParameter() {
return REDSTONE_MODE;
}
@Override
public TileDataParameter<Integer> getCompareConfig() {
public TileDataParameter<Integer> getCompareParameter() {
return COMPARE;
}
@Override
public TileDataParameter<Integer> getModeConfig() {
public TileDataParameter<Integer> getFilterParameter() {
return MODE;
}
@Override
public TileDataParameter<Integer> getPriorityParameter() {
return PRIORITY;
}
public NBTTagCompound getStorageTag() {
return storageTag;
}
@@ -237,11 +242,6 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
return priority;
}
@Override
public void onPriorityChanged(int priority) {
TileDataManager.setParameter(PRIORITY, priority);
}
@Override
public void setPriority(int priority) {
this.priority = priority;

21
src/main/java/refinedstorage/tile/config/IPrioritizable.java
View File

@@ -1,11 +1,13 @@
package refinedstorage.tile.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.tileentity.TileEntity;
import refinedstorage.tile.data.ITileDataConsumer;
import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import refinedstorage.gui.GuiStorage;
import refinedstorage.tile.data.*;
public interface IPrioritizable {
static <T extends TileEntity> TileDataParameter createParameter() {
@@ -19,6 +21,17 @@ public interface IPrioritizable {
public void setValue(T tile, Integer value) {
((IPrioritizable) tile).setPriority(value);
}
}, new ITileDataListener<Integer>() {
@Override
public void onChanged(TileDataParameter<Integer> parameter) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if (gui instanceof GuiStorage) {
((GuiStorage) gui).PRIORITY.setText(String.valueOf(parameter.getValue()));
}
}
}
});
}

4
src/main/java/refinedstorage/tile/data/ITileDataListener.java
View File

@@ -1,5 +1,5 @@
package refinedstorage.tile.data;
public interface ITileDataListener {
void onChanged();
public interface ITileDataListener<T> {
void onChanged(TileDataParameter<T> parameter);
}

6
src/main/java/refinedstorage/tile/data/TileDataParameter.java
View File

@@ -35,15 +35,11 @@ public class TileDataParameter<T> {
return valueConsumer;
}
public ITileDataListener getListener() {
return listener;
}
public void setValue(T value) {
this.value = value;
if (listener != null) {
listener.onChanged();
listener.onChanged(this);
}
}

16
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -170,11 +170,6 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
return priority;
}
@Override
public void onPriorityChanged(int priority) {
TileDataManager.setParameter(PRIORITY, priority);
}
@Override
public void setPriority(int priority) {
this.priority = priority;
@@ -221,20 +216,25 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
}
@Override
public TileDataParameter<Integer> getRedstoneModeConfig() {
public TileDataParameter<Integer> getRedstoneModeParameter() {
return REDSTONE_MODE;
}
@Override
public TileDataParameter<Integer> getCompareConfig() {
public TileDataParameter<Integer> getCompareParameter() {
return COMPARE;
}
@Override
public TileDataParameter<Integer> getModeConfig() {
public TileDataParameter<Integer> getFilterParameter() {
return MODE;
}
@Override
public TileDataParameter<Integer> getPriorityParameter() {
return PRIORITY;
}
@Override
public int getStored() {
int stored = 0;

15
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -8,6 +8,8 @@ import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import net.minecraftforge.items.wrapper.InvWrapper;
@@ -21,15 +23,13 @@ import refinedstorage.block.BlockGrid;
import refinedstorage.block.EnumGridType;
import refinedstorage.container.ContainerGrid;
import refinedstorage.gui.grid.GridFilteredItem;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemHandlerGridFilterInGrid;
import refinedstorage.inventory.ItemValidatorBasic;
import refinedstorage.item.ItemPattern;
import refinedstorage.tile.TileNode;
import refinedstorage.tile.data.ITileDataConsumer;
import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;
import refinedstorage.tile.data.*;
import java.util.ArrayList;
import java.util.List;
@@ -97,6 +97,13 @@ public class TileGrid extends TileNode implements IGrid {
tile.markDirty();
}
}
}, new ITileDataListener<Integer>() {
@Override
public void onChanged(TileDataParameter<Integer> parameter) {
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
GuiGrid.updateSearchFieldFocus(parameter.getValue());
}
}
});
public static final String NBT_VIEW_TYPE = "ViewType";

3
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -10,6 +10,7 @@ import refinedstorage.RefinedStorage;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.block.EnumGridType;
import refinedstorage.gui.grid.GridFilteredItem;
import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemHandlerGridFilterInGrid;
import refinedstorage.item.ItemWirelessGrid;
@@ -135,6 +136,8 @@ public class WirelessGrid implements IGrid {
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
this.searchBoxMode = searchBoxMode;
GuiGrid.updateSearchFieldFocus(searchBoxMode);
}
@Override