aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-07-09 01:02:36 +0800
committershedaniel <daniel@shedaniel.me>2021-08-19 17:34:05 +0800
commit1e1dd2571b4f3f1e523bb008fa29976feeb33853 (patch)
tree52e909068bcf05176a586b7a2be27e5f34daffde
parentf0f5bcd5dc507fbd94e456eeb13ba7e675d42b93 (diff)
downloadRoughlyEnoughItems-1e1dd2571b4f3f1e523bb008fa29976feeb33853.tar.gz
RoughlyEnoughItems-1e1dd2571b4f3f1e523bb008fa29976feeb33853.tar.bz2
RoughlyEnoughItems-1e1dd2571b4f3f1e523bb008fa29976feeb33853.zip
Prevent error spam when the client joins server without recipe sync packets
-rw-r--r--forge/build.gradle4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java5
2 files changed, 9 insertions, 0 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index eaf9f56cc..71108c5a3 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -30,6 +30,10 @@ repositories {
}
}
+loom {
+ mixinConfig "rei-jei-internals-workaround.mixins.json"
+}
+
dependencies {
forge("net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}")
modApi("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}")
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
index 0e3b6e080..09be7e0ba 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
@@ -233,6 +233,11 @@ public class ClientHelperImpl implements ClientHelper {
@ApiStatus.Internal
public LongSet _getInventoryItemsTypes() {
+ try {
+ VanillaEntryTypes.ITEM.getDefinition();
+ } catch (NullPointerException e) {
+ return new LongOpenHashSet();
+ }
return Minecraft.getInstance().player.inventory.compartments.stream()
.flatMap(Collection::stream)
.map(EntryStacks::of)