R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inventory sorter voiding items in the Mechanical Sieve GUI. Closes #36

Browse Source
This commit is contained in:
thedarkcolour 2024-01-14 13:51:10 -08:00
parent ffe9225a25
commit aac2073e38
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -139,6 +139,12 @@ repositories {
includeModule("maven.modrinth", "embeddium") includeModule("maven.modrinth", "embeddium")
} }
} }
maven {
url "https://cursemaven.com"
content {
includeGroup "curse.maven"
}
}
} }
dependencies { dependencies {
@ -169,6 +175,7 @@ dependencies {
// testing // testing
//implementation fg.deobf("curse.maven:allthecompressed-514045:4938351") //implementation fg.deobf("curse.maven:allthecompressed-514045:4938351")
//implementation fg.deobf("curse.maven:inventorysorter-240633:4655091")
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'

2
src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
View File

@ -18,6 +18,7 @@
package thedarkcolour.exdeorum.compat; package thedarkcolour.exdeorum.compat;
@SuppressWarnings("SpellCheckingInspection")
public class ModIds { public class ModIds {
public static final String MINECRAFT = "minecraft"; public static final String MINECRAFT = "minecraft";
public static final String THE_ONE_PROBE = "theoneprobe"; public static final String THE_ONE_PROBE = "theoneprobe";
@ -41,4 +42,5 @@ public class ModIds {
public static final String PAMS_HARVESTCRAFT_CROPS = "pamhc2crops"; public static final String PAMS_HARVESTCRAFT_CROPS = "pamhc2crops";
public static final String NUCLEARCRAFT_NEOTERIC = "nuclearcraft"; public static final String NUCLEARCRAFT_NEOTERIC = "nuclearcraft";
public static final String JEI = "jei"; public static final String JEI = "jei";
public static final String INVENTORY_SORTER = "inventorysorter";
} }

5
src/main/java/thedarkcolour/exdeorum/event/EventHandler.java
View File

@ -57,6 +57,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.loading.FMLEnvironment;
import thedarkcolour.exdeorum.ExDeorum; import thedarkcolour.exdeorum.ExDeorum;
import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity; import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity;
import thedarkcolour.exdeorum.blockentity.helper.ItemHelper;
import thedarkcolour.exdeorum.client.CompostColors; import thedarkcolour.exdeorum.client.CompostColors;
import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.compat.ModIds;
import thedarkcolour.exdeorum.compat.top.ExDeorumTopCompat; import thedarkcolour.exdeorum.compat.top.ExDeorumTopCompat;
@ -230,6 +231,10 @@ public final class EventHandler {
if (ModList.get().isLoaded(ModIds.THE_ONE_PROBE)) { if (ModList.get().isLoaded(ModIds.THE_ONE_PROBE)) {
InterModComms.sendTo(ModIds.THE_ONE_PROBE, "getTheOneProbe", ExDeorumTopCompat::new); InterModComms.sendTo(ModIds.THE_ONE_PROBE, "getTheOneProbe", ExDeorumTopCompat::new);
} }
// todo instead of doing this, figure out the real reason sorting voids items
if (ModList.get().isLoaded(ModIds.INVENTORY_SORTER)) {
InterModComms.sendTo(ModIds.INVENTORY_SORTER, "slotblacklist", ItemHelper.Slot.class::getName);
}
} }
private static void addReloadListeners(AddReloadListenerEvent event) { private static void addReloadListeners(AddReloadListenerEvent event) {