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

Improve to-be invtweaks integration code

Browse Source
This commit is contained in:
raoulvdberge
2019-11-01 11:11:23 +01:00
parent 5a51767696
commit d42c25b45e
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java Normal file
View File

@@ -0,0 +1,9 @@
package com.raoulvdberge.refinedstorage.integration.inventorytweaks;
import net.minecraftforge.fml.ModList;
public class InventoryTweaksIntegration {
public static boolean isLoaded() {
return ModList.get().isLoaded("inventorytweaks");
}
}

2
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java
View File

@@ -547,7 +547,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
sorters.add(new QuantityGridSorter()); sorters.add(new QuantityGridSorter());
sorters.add(new IdGridSorter()); sorters.add(new IdGridSorter());
sorters.add(new LastModifiedGridSorter()); sorters.add(new LastModifiedGridSorter());
sorters.add(new InvTweaksGridSorter()); sorters.add(new InventoryTweaksGridSorter());
return sorters; return sorters;
} }

6
src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InvTweaksGridSorter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java
View File

@@ -3,10 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
// TODO public class InventoryTweaksGridSorter implements IGridSorter {
public class InvTweaksGridSorter implements IGridSorter {
public static final String MOD_ID = "inventorytweaks";
@Override @Override
public boolean isApplicable(IGrid grid) { public boolean isApplicable(IGrid grid) {
return false; return false;
@@ -44,5 +41,4 @@ public class InvTweaksGridSorter implements IGridSorter {
return 0; return 0;
}*/ }*/
} }

3
src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java
View File

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode;
import com.raoulvdberge.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration;
import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
@@ -45,7 +46,7 @@ public class GridSortingTypeSideButton extends SideButton {
} else if (type == IGrid.SORTING_TYPE_ID) { } else if (type == IGrid.SORTING_TYPE_ID) {
type = IGrid.SORTING_TYPE_LAST_MODIFIED; type = IGrid.SORTING_TYPE_LAST_MODIFIED;
} else if (type == GridNetworkNode.SORTING_TYPE_LAST_MODIFIED) { } else if (type == GridNetworkNode.SORTING_TYPE_LAST_MODIFIED) {
if (grid.getGridType() == GridType.FLUID || /* TODO !Loader.isModLoaded(GridSorterInventoryTweaks.MOD_ID)*/false) { if (grid.getGridType() == GridType.FLUID || !InventoryTweaksIntegration.isLoaded()) {
type = IGrid.SORTING_TYPE_QUANTITY; type = IGrid.SORTING_TYPE_QUANTITY;
} else { } else {
type = IGrid.SORTING_TYPE_INVENTORYTWEAKS; type = IGrid.SORTING_TYPE_INVENTORYTWEAKS;