Add compat for Mixed Litter (No Man's Land), closes #17

evanbones · evanbones · commit 7d660064c8d7 · 2026-03-07T00:09:16.000-08:00
diff --git a/common/build.gradle b/common/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     compileOnly "maven.modrinth:entitytexturefeatures:${etf_version}-neoforge-1.21"
     compileOnly "maven.modrinth:reliable-remover:${reliable_remover_version}-neoforge-1.21.1"
     compileOnly "maven.modrinth:exposure:${exposure_neoforge_version}"
+    compileOnly "maven.modrinth:mixed-litter:${mixed_litter_version}"
 
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
     compileOnly group: 'org.ow2.asm', name: 'asm-tree', version: '9.6'
diff --git a/common/src/main/java/com/evandev/fieldguide/client/FieldGuideClient.java b/common/src/main/java/com/evandev/fieldguide/client/FieldGuideClient.java
@@ -3,7 +3,7 @@
 import com.evandev.fieldguide.Constants;
 import com.evandev.fieldguide.client.gui.screens.BookScreen;
 import com.evandev.fieldguide.client.gui.screens.FieldGuideEntryScreen;
-import com.evandev.fieldguide.client.gui.screens.FieldGuideScreen;
+import com.evandev.fieldguide.client.gui.screens.FieldGuideCategoryScreen;
 import com.evandev.fieldguide.client.scanning.FieldGuideScanner;
 import com.evandev.fieldguide.config.ModConfig;
 import com.evandev.fieldguide.data.Category;
@@ -54,8 +54,8 @@ public static void onClientTick(Minecraft minecraft) {
                 if (isRecent && lastEntry != null) {
                     Category targetCategory = manager.getCategoryForEntry(lastEntry);
                     if (targetCategory != null) {
-                        int page = FieldGuideScreen.getPageForEntry(targetCategory, lastEntry);
-                        FieldGuideScreen mainScreen = new FieldGuideScreen(targetCategory, page);
+                        int page = FieldGuideCategoryScreen.getPageForEntry(targetCategory, lastEntry);
+                        FieldGuideCategoryScreen mainScreen = new FieldGuideCategoryScreen(targetCategory, page);
                         minecraft.setScreen(new FieldGuideEntryScreen(mainScreen, lastEntry));
                         return;
                     }
@@ -65,7 +65,7 @@ public static void onClientTick(Minecraft minecraft) {
                 if ("last_opened_screen".equals(defaultMode) && BookScreen.lastOpenedScreen != null) {
                     minecraft.setScreen(BookScreen.lastOpenedScreen);
                 } else {
-                    minecraft.setScreen(new FieldGuideScreen());
+                    minecraft.setScreen(new FieldGuideCategoryScreen());
                 }
             }
         }
diff --git a/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideCategoryScreen.java b/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideCategoryScreen.java
@@ -36,7 +36,7 @@
 
 import java.util.*;
 
-public class FieldGuideScreen extends BookScreen {
+public class FieldGuideCategoryScreen extends BookScreen {
     private static final int ITEMS_PER_PAGE = 9;
     private static final int ITEMS_PER_VIEW = ITEMS_PER_PAGE * 2;
 
@@ -63,21 +63,21 @@ public class FieldGuideScreen extends BookScreen {
     private PageTurnButton backButton;
     private FieldGuideSearchBox searchBox;
 
-    public FieldGuideScreen() {
+    public FieldGuideCategoryScreen() {
         super(Component.translatable("title.fieldguide.field_guide"));
     }
 
-    public FieldGuideScreen(Category initialCategory) {
+    public FieldGuideCategoryScreen(Category initialCategory) {
         this();
         this.setSelectedCategory(initialCategory);
     }
 
-    public FieldGuideScreen(Category initialCategory, int initialPage) {
+    public FieldGuideCategoryScreen(Category initialCategory, int initialPage) {
         this(initialCategory);
         this.currentPage = initialPage;
     }
 
-    public FieldGuideScreen(String searchQuery, Screen parent) {
+    public FieldGuideCategoryScreen(String searchQuery, Screen parent) {
         this();
         this.searchQuery = searchQuery;
         this.parent = parent;
@@ -743,6 +743,10 @@ private void renderEntryInGrid(GuiGraphics guiGraphics, Object entry, int x, int
                         try {
                             entity = type.create(this.minecraft.level);
                             if (entity != null) {
+                                if (Services.PLATFORM.isModLoaded("mixed_litter")) {
+                                    Services.PLATFORM.applyMixedLitterCompat(entity);
+                                }
+
                                 entryCache.put(type, entity);
                             }
                         } catch (Exception e) {
diff --git a/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideEntryScreen.java b/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideEntryScreen.java
@@ -37,13 +37,13 @@
 import java.util.Locale;
 
 public class FieldGuideEntryScreen extends BookScreen {
-    private final FieldGuideScreen parent;
+    private final FieldGuideCategoryScreen parent;
     private final Object entry;
     private final List<ResourceLocation> spawnBiomes = new ArrayList<>();
     private Entity renderedEntity;
     private long lastClickTime = 0;
 
-    public FieldGuideEntryScreen(FieldGuideScreen parent, Object entry) {
+    public FieldGuideEntryScreen(FieldGuideCategoryScreen parent, Object entry) {
         super(getTitleForEntry(entry));
         this.parent = parent;
         this.entry = entry;
@@ -103,6 +103,9 @@ private void setupEntityPreview() {
         if (renderEntry instanceof EntityType<?> type && this.minecraft != null && this.minecraft.level != null) {
             try {
                 this.renderedEntity = type.create(this.minecraft.level);
+                if (Services.PLATFORM.isModLoaded("mixed_litter")) {
+                    Services.PLATFORM.applyMixedLitterCompat(this.renderedEntity);
+                }
             } catch (Exception ignored) {
             }
         }
@@ -164,7 +167,7 @@ private void setupBiomeWidget(boolean unlocked) {
                     graphics.renderTooltip(this.font, Component.translatable("biome." + item.getNamespace() + "." + item.getPath()), mouseX, mouseY);
                 }
             }, item -> {
-                if (this.minecraft != null) this.minecraft.setScreen(new FieldGuideScreen("=!" + item, this));
+                if (this.minecraft != null) this.minecraft.setScreen(new FieldGuideCategoryScreen("=!" + item, this));
             }));
         }
     }
@@ -193,7 +196,7 @@ private void setupDropWidget(boolean unlocked) {
                 }
             }, stack -> {
                 if (this.minecraft != null)
-                    this.minecraft.setScreen(new FieldGuideScreen("=^" + stack.getHoverName().getString().toLowerCase(Locale.ROOT), this));
+                    this.minecraft.setScreen(new FieldGuideCategoryScreen("=^" + stack.getHoverName().getString().toLowerCase(Locale.ROOT), this));
             }));
         }
     }
@@ -225,7 +228,7 @@ private void setupNavigationButtons() {
 
         this.addRenderableWidget(new FieldGuideSearchBox(this.font, this.width / 2 - 70, this.bounds.bottom() + 5, 140, 20, "", q -> {
             if (!q.isEmpty() && this.minecraft != null) {
-                FieldGuideScreen searchScreen = new FieldGuideScreen(q, this);
+                FieldGuideCategoryScreen searchScreen = new FieldGuideCategoryScreen(q, this);
                 searchScreen.setInitialSearchFocus(true);
                 this.minecraft.setScreen(searchScreen);
             }
diff --git a/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideJournalScreen.java b/common/src/main/java/com/evandev/fieldguide/client/gui/screens/FieldGuideJournalScreen.java
@@ -101,7 +101,7 @@ protected void init() {
 
         this.searchBox = new FieldGuideSearchBox(this.font, this.width / 2 - 70, this.bounds.bottom() + 5, 140, 20, "", q -> {
             if (!q.isEmpty() && this.minecraft != null) {
-                FieldGuideScreen searchScreen = new FieldGuideScreen(q, this);
+                FieldGuideCategoryScreen searchScreen = new FieldGuideCategoryScreen(q, this);
                 searchScreen.setInitialSearchFocus(true);
                 this.minecraft.setScreen(searchScreen);
             }
@@ -165,7 +165,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
     public void onTabClick(Category category) {
         if (category.getId().getPath().equals("intro")) return;
         cleanupEmptyPages();
-        Objects.requireNonNull(this.minecraft).setScreen(new FieldGuideScreen(category, 0));
+        Objects.requireNonNull(this.minecraft).setScreen(new FieldGuideCategoryScreen(category, 0));
     }
 
     @Override
diff --git a/common/src/main/java/com/evandev/fieldguide/mixin/client/InventoryScreenMixin.java b/common/src/main/java/com/evandev/fieldguide/mixin/client/InventoryScreenMixin.java
@@ -2,7 +2,7 @@
 
 import com.evandev.fieldguide.Constants;
 import com.evandev.fieldguide.client.gui.screens.BookScreen;
-import com.evandev.fieldguide.client.gui.screens.FieldGuideScreen;
+import com.evandev.fieldguide.client.gui.screens.FieldGuideCategoryScreen;
 import com.evandev.fieldguide.config.ModConfig;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.ImageButton;
@@ -47,7 +47,7 @@ private void addFieldGuideButton(CallbackInfo ci) {
                 if ("last_opened_screen".equals(defaultMode) && BookScreen.lastOpenedScreen != null) {
                     this.minecraft.setScreen(BookScreen.lastOpenedScreen);
                 } else {
-                    this.minecraft.setScreen(new FieldGuideScreen());
+                    this.minecraft.setScreen(new FieldGuideCategoryScreen());
                 }
             }
         }
diff --git a/common/src/main/java/com/evandev/fieldguide/mixin/client/PauseScreenMixin.java b/common/src/main/java/com/evandev/fieldguide/mixin/client/PauseScreenMixin.java
@@ -2,7 +2,7 @@
 
 import com.evandev.fieldguide.Constants;
 import com.evandev.fieldguide.client.gui.screens.BookScreen;
-import com.evandev.fieldguide.client.gui.screens.FieldGuideScreen;
+import com.evandev.fieldguide.client.gui.screens.FieldGuideCategoryScreen;
 import com.evandev.fieldguide.config.ModConfig;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.ImageButton;
@@ -63,7 +63,7 @@ private void addFieldGuideButton(CallbackInfo ci) {
                 if ("last_opened_screen".equals(defaultMode) && BookScreen.lastOpenedScreen != null) {
                     this.minecraft.setScreen(BookScreen.lastOpenedScreen);
                 } else {
-                    this.minecraft.setScreen(new FieldGuideScreen());
+                    this.minecraft.setScreen(new FieldGuideCategoryScreen());
                 }
             }
         },
diff --git a/common/src/main/java/com/evandev/fieldguide/mixin/client/ScreenMixin.java b/common/src/main/java/com/evandev/fieldguide/mixin/client/ScreenMixin.java
@@ -1,7 +1,7 @@
 package com.evandev.fieldguide.mixin.client;
 
 import com.evandev.fieldguide.client.FieldGuideClient;
-import com.evandev.fieldguide.client.gui.screens.FieldGuideScreen;
+import com.evandev.fieldguide.client.gui.screens.FieldGuideCategoryScreen;
 import com.evandev.fieldguide.compat.emi.EmiCompat;
 import com.evandev.fieldguide.platform.Services;
 import net.minecraft.client.Minecraft;
@@ -26,7 +26,7 @@ public class ScreenMixin {
 
                 if (hoveredStack != null && !hoveredStack.isEmpty()) {
                     String query = "=^" + hoveredStack.getHoverName().getString().toLowerCase(Locale.ROOT);
-                    FieldGuideScreen screen = new FieldGuideScreen(query, (Screen) (Object) this);
+                    FieldGuideCategoryScreen screen = new FieldGuideCategoryScreen(query, (Screen) (Object) this);
                     screen.setSearchItemStack(hoveredStack);
                     Minecraft.getInstance().setScreen(screen);
                     cir.setReturnValue(true);
diff --git a/common/src/main/java/com/evandev/fieldguide/platform/services/IPlatformHelper.java b/common/src/main/java/com/evandev/fieldguide/platform/services/IPlatformHelper.java
@@ -1,5 +1,7 @@
 package com.evandev.fieldguide.platform.services;
 
+import net.minecraft.world.entity.Entity;
+
 import java.nio.file.Path;
 
 public interface IPlatformHelper {
@@ -42,4 +44,10 @@ default String getEnvironmentName() {
      */
     Path getConfigDirectory();
 
+    /**
+     * Applies platform-specific dummy entity configurations.
+     */
+    default void applyMixedLitterCompat(Entity entity) {
+    }
+
 }
diff --git a/gradle.properties b/gradle.properties
@@ -31,6 +31,7 @@ etf_version=7.0.5
 exposure_neoforge_version=WYaaE1QE
 exposure_fabric_version=EDtO2y84
 fcapi_version=v21.1.6-1.21.1
+mixed_litter_version=1.0.3
 
 # Fabric
 fabric_version=0.116.7+1.21.1
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -61,6 +61,9 @@ dependencies {
 
     // Exposure
     implementation "maven.modrinth:exposure:${exposure_neoforge_version}"
+
+    // Mixed Litter
+    compileOnly "maven.modrinth:mixed-litter:${mixed_litter_version}"
 }
 
 publishMods {
diff --git a/neoforge/src/main/java/com/evandev/fieldguide/compat/mixedlitter/MixedLitterCompat.java b/neoforge/src/main/java/com/evandev/fieldguide/compat/mixedlitter/MixedLitterCompat.java
@@ -0,0 +1,32 @@
+package com.evandev.fieldguide.compat.mixedlitter;
+
+import dev.tazer.mixed_litter.MLRegistries;
+import dev.tazer.mixed_litter.VariantUtil;
+import dev.tazer.mixed_litter.variants.Variant;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+
+import java.util.Collections;
+
+public class MixedLitterCompat {
+
+    public static void applyDummyVariant(Entity entity) {
+        try {
+            Registry<Variant> variantRegistry = entity.registryAccess().registryOrThrow(MLRegistries.VARIANT_KEY);
+            String entityPath = BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).getPath();
+
+            for (ResourceLocation id : variantRegistry.keySet()) {
+                if (id.getPath().toLowerCase().contains(entityPath)) {
+                    Variant variant = variantRegistry.get(id);
+                    if (variant != null) {
+                        VariantUtil.setVariants(entity, Collections.singletonList(variant));
+                        return;
+                    }
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+}
diff --git a/neoforge/src/main/java/com/evandev/fieldguide/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/com/evandev/fieldguide/platform/NeoForgePlatformHelper.java
@@ -1,6 +1,7 @@
 package com.evandev.fieldguide.platform;
 
 import com.evandev.fieldguide.platform.services.IPlatformHelper;
+import net.minecraft.world.entity.Entity;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
@@ -28,4 +29,9 @@ public boolean isDevelopmentEnvironment() {
     public Path getConfigDirectory() {
         return FMLPaths.CONFIGDIR.get();
     }
+
+    @Override
+    public void applyMixedLitterCompat(Entity entity) {
+        com.evandev.fieldguide.compat.mixedlitter.MixedLitterCompat.applyDummyVariant(entity);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@`
`37`	`37`	`import java.util.Locale;`
`38`	`38`
`39`	`39`	`public class FieldGuideEntryScreen extends BookScreen {`
`40`		`- private final FieldGuideScreen parent;`
	`40`	`+ private final FieldGuideCategoryScreen parent;`
`41`	`41`	`private final Object entry;`
`42`	`42`	`private final List<ResourceLocation> spawnBiomes = new ArrayList<>();`
`43`	`43`	`private Entity renderedEntity;`
`44`	`44`	`private long lastClickTime = 0;`
`45`	`45`
`46`		`- public FieldGuideEntryScreen(FieldGuideScreen parent, Object entry) {`
	`46`	`+ public FieldGuideEntryScreen(FieldGuideCategoryScreen parent, Object entry) {`
`47`	`47`	`super(getTitleForEntry(entry));`
`48`	`48`	`this.parent = parent;`
`49`	`49`	`this.entry = entry;`
`@@ -103,6 +103,9 @@ private void setupEntityPreview() {`
`103`	`103`	`if (renderEntry instanceof EntityType<?> type && this.minecraft != null && this.minecraft.level != null) {`
`104`	`104`	`try {`
`105`	`105`	`this.renderedEntity = type.create(this.minecraft.level);`
	`106`	`+ if (Services.PLATFORM.isModLoaded("mixed_litter")) {`
	`107`	`+ Services.PLATFORM.applyMixedLitterCompat(this.renderedEntity);`
	`108`	`+ }`
`106`	`109`	`} catch (Exception ignored) {`
`107`	`110`	`}`
`108`	`111`	`}`
`@@ -164,7 +167,7 @@ private void setupBiomeWidget(boolean unlocked) {`
`164`	`167`	`graphics.renderTooltip(this.font, Component.translatable("biome." + item.getNamespace() + "." + item.getPath()), mouseX, mouseY);`
`165`	`168`	`}`
`166`	`169`	`}, item -> {`
`167`		`- if (this.minecraft != null) this.minecraft.setScreen(new FieldGuideScreen("=!" + item, this));`
	`170`	`+ if (this.minecraft != null) this.minecraft.setScreen(new FieldGuideCategoryScreen("=!" + item, this));`
`168`	`171`	`}));`
`169`	`172`	`}`
`170`	`173`	`}`
`@@ -193,7 +196,7 @@ private void setupDropWidget(boolean unlocked) {`
`193`	`196`	`}`
`194`	`197`	`}, stack -> {`
`195`	`198`	`if (this.minecraft != null)`
`196`		`- this.minecraft.setScreen(new FieldGuideScreen("=^" + stack.getHoverName().getString().toLowerCase(Locale.ROOT), this));`
	`199`	`+ this.minecraft.setScreen(new FieldGuideCategoryScreen("=^" + stack.getHoverName().getString().toLowerCase(Locale.ROOT), this));`
`197`	`200`	`}));`
`198`	`201`	`}`
`199`	`202`	`}`
`@@ -225,7 +228,7 @@ private void setupNavigationButtons() {`
`225`	`228`
`226`	`229`	`this.addRenderableWidget(new FieldGuideSearchBox(this.font, this.width / 2 - 70, this.bounds.bottom() + 5, 140, 20, "", q -> {`
`227`	`230`	`if (!q.isEmpty() && this.minecraft != null) {`
`228`		`- FieldGuideScreen searchScreen = new FieldGuideScreen(q, this);`
	`231`	`+ FieldGuideCategoryScreen searchScreen = new FieldGuideCategoryScreen(q, this);`
`229`	`232`	`searchScreen.setInitialSearchFocus(true);`
`230`	`233`	`this.minecraft.setScreen(searchScreen);`
`231`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.evandev.fieldguide.Constants;`
`4`	`4`	`import com.evandev.fieldguide.client.gui.screens.BookScreen;`
`5`		`-import com.evandev.fieldguide.client.gui.screens.FieldGuideScreen;`
	`5`	`+import com.evandev.fieldguide.client.gui.screens.FieldGuideCategoryScreen;`
`6`	`6`	`import com.evandev.fieldguide.config.ModConfig;`
`7`	`7`	`import net.minecraft.client.gui.GuiGraphics;`
`8`	`8`	`import net.minecraft.client.gui.components.ImageButton;`
`@@ -47,7 +47,7 @@ private void addFieldGuideButton(CallbackInfo ci) {`
`47`	`47`	`if ("last_opened_screen".equals(defaultMode) && BookScreen.lastOpenedScreen != null) {`
`48`	`48`	`this.minecraft.setScreen(BookScreen.lastOpenedScreen);`
`49`	`49`	`} else {`
`50`		`- this.minecraft.setScreen(new FieldGuideScreen());`
	`50`	`+ this.minecraft.setScreen(new FieldGuideCategoryScreen());`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`