Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "hold the shift to stop sort items (#188)" + update deps #206

Merged
merged 3 commits into from
May 1, 2024
Merged

Revert "hold the shift to stop sort items (#188)" + update deps #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92ad9b0
Revert "hold the shift to stop sort items (#188)"
Caedis Apr 30, 2024
ba6e17d
update deps
Caedis Apr 30, 2024
61445ff
remove extra file
Caedis Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-349-GTNH:dev')
api('com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-352-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.7.3:dev')

Expand All @@ -45,15 +45,15 @@ dependencies {
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev')
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.9:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.7.3:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.153:dev') {
compileOnly('com.github.GTNewHorizons:EnderIO:2.7.4:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.00:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.10-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.4-GTNH:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.42:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.5-GTNH:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.43:dev") { transitive = false }

runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.2.3:dev")
}
10 changes: 0 additions & 10 deletions src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,14 +778,4 @@ public boolean hideItemPanelSlot(int tx, int ty, int tw, int th) {
public boolean isOverTextField(int mousex, int mousey) {
return searchField.isMouseIn(mousex, mousey);
}

@Override
public void handleKeyboardInput() {
super.handleKeyboardInput();
hasShiftKeyDown |= isShiftKeyDown();
if (hasShiftKeyDown && !Keyboard.getEventKeyState()) { // keyup
this.repo.updateView();
hasShiftKeyDown = false;
}
}
}
36 changes: 16 additions & 20 deletions src/main/java/com/glodblock/github/client/me/EssentiaRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public EssentiaRepo(final IScrollSource src, final ISortSource sortSrc) {

@Override
public void updateView() {
if (needUpdateView()) this.view.clear();
this.view.clear();
this.dsp.clear();

this.view.ensureCapacity(this.list.size());
Expand Down Expand Up @@ -58,7 +58,7 @@ public void updateView() {
}
}

for (IAEItemStack is : needUpdateView() ? this.list : this.cache) {
for (IAEItemStack is : this.list) {
if (this.myPartitionList != null) {
if (!this.myPartitionList.isListed(is)) {
continue;
Expand Down Expand Up @@ -87,30 +87,26 @@ public void updateView() {
this.view.add(is);
}
}
if (needUpdateView()) {
final Enum<?> SortBy = this.sortSrc.getSortBy();
final Enum<?> SortDir = this.sortSrc.getSortDir();

FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();

if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}

final Enum<?> SortBy = this.sortSrc.getSortBy();
final Enum<?> SortDir = this.sortSrc.getSortDir();

FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();

if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.cache.clear();
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}

for (final IAEItemStack is : this.view) {
this.dsp.add(is.getItemStack());
}
this.lastSearchString = this.searchString;
Iterator<IAEItemStack> it1 = this.view.iterator();
while (it1.hasNext()) {
IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(it1.next());
Expand Down
48 changes: 16 additions & 32 deletions src/main/java/com/glodblock/github/client/me/FluidRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

package com.glodblock.github.client.me;

import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
Expand Down Expand Up @@ -47,14 +45,12 @@ public class FluidRepo implements IDisplayRepo {
protected final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
protected final ArrayList<IAEItemStack> view = new ArrayList<>();
protected final ArrayList<ItemStack> dsp = new ArrayList<>();
protected final ArrayList<IAEItemStack> cache = new ArrayList<>();
protected final IScrollSource src;
protected final ISortSource sortSrc;

protected int rowSize = 9;

protected String searchString = "";
protected String lastSearchString = "";
protected IPartitionList<IAEItemStack> myPartitionList;
private String NEIWord = null;
private boolean hasPower;
Expand Down Expand Up @@ -90,19 +86,11 @@ public void postUpdate(final IAEItemStack is) {
if (st != null) {
st.reset();
st.add(is);
if (isShiftKeyDown() && this.view.contains(st)) {
this.view.get(this.view.indexOf(st)).setStackSize(st.getStackSize());
}
} else {
if (isShiftKeyDown()) this.cache.add(is);
this.list.add(is);
}
}

protected boolean needUpdateView() {
return !isShiftKeyDown() || !this.lastSearchString.equals(this.searchString);
}

@Override
public void setViewCell(final ItemStack[] list) {
this.myPartitionList = ItemViewCell.createFilter(list);
Expand All @@ -111,7 +99,7 @@ public void setViewCell(final ItemStack[] list) {

@Override
public void updateView() {
if (needUpdateView()) this.view.clear();
this.view.clear();
this.dsp.clear();

this.view.ensureCapacity(this.list.size());
Expand Down Expand Up @@ -142,7 +130,7 @@ public void updateView() {
}
}

for (IAEItemStack is : needUpdateView() ? this.list : this.cache) {
for (IAEItemStack is : this.list) {
if (this.myPartitionList != null) {
if (!this.myPartitionList.isListed(is)) {
continue;
Expand Down Expand Up @@ -179,30 +167,26 @@ public void updateView() {
}
}
}
if (needUpdateView()) {
final Enum<?> SortBy = this.sortSrc.getSortBy();
final Enum<?> SortDir = this.sortSrc.getSortDir();

FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();

if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}

final Enum<?> SortBy = this.sortSrc.getSortBy();
final Enum<?> SortDir = this.sortSrc.getSortDir();

FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
FluidSorters.init();

if (SortBy == SortOrder.MOD) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
} else if (SortBy == SortOrder.AMOUNT) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
} else if (SortBy == SortOrder.INVTWEAKS) {
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
} else {
this.cache.clear();
this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
}

for (final IAEItemStack is : this.view) {
this.dsp.add(is.getItemStack());
}
this.lastSearchString = this.searchString;
}

protected void updateNEI(final String filter) {
Expand Down