aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java/me/shedaniel/rei/impl
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-07-27 01:31:56 +0800
committershedaniel <daniel@shedaniel.me>2022-07-27 01:31:56 +0800
commit1d8b8e4e91adb33d208a5c3b4b2ccc36a0ef25a4 (patch)
tree0adc3b81bcecca9c4e9ff5144f4d5bc9b7eca360 /runtime/src/main/java/me/shedaniel/rei/impl
parent664815d74ffdc030fd52f0ed0480b1cd615ef384 (diff)
downloadRoughlyEnoughItems-1d8b8e4e91adb33d208a5c3b4b2ccc36a0ef25a4.tar.gz
RoughlyEnoughItems-1d8b8e4e91adb33d208a5c3b4b2ccc36a0ef25a4.tar.bz2
RoughlyEnoughItems-1d8b8e4e91adb33d208a5c3b4b2ccc36a0ef25a4.zip
Add many more logging
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/impl')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java7
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java7
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java17
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java17
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java19
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/transfer/TransferHandlerRegistryImpl.java7
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java16
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java8
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java10
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginManagerImpl.java23
17 files changed, 114 insertions, 46 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
index 64f3a186c..6dae2f38a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
@@ -67,6 +67,7 @@ import me.shedaniel.rei.impl.client.entry.filtering.rules.ManualFilteringRule;
import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
import me.shedaniel.rei.impl.client.gui.credits.CreditsScreen;
import me.shedaniel.rei.impl.client.gui.performance.entry.PerformanceEntry;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.ChatFormatting;
@@ -135,7 +136,7 @@ public class ConfigManagerImpl implements ConfigManager {
}
, (field) -> field.getType() == List.class, ConfigObjectImpl.UseFilteringScreen.class);
saveConfig();
- RoughlyEnoughItemsCore.LOGGER.info("Config loaded.");
+ InternalLogger.getInstance().info("Config loaded");
}
private static Jankson buildJankson(Jankson.Builder builder) {
@@ -302,6 +303,7 @@ public class ConfigManagerImpl implements ConfigManager {
return InteractionResult.PASS;
});
AutoConfig.getConfigHolder(ConfigObjectImpl.class).save();
+ InternalLogger.getInstance().debug("Config saved");
}
@Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java
index 859c6a867..6124cb83c 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.impl.client.config.addon;
import me.shedaniel.rei.api.client.config.addon.ConfigAddon;
import me.shedaniel.rei.api.client.config.addon.ConfigAddonRegistry;
import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
+import me.shedaniel.rei.impl.common.InternalLogger;
import java.util.ArrayList;
import java.util.List;
@@ -39,8 +40,14 @@ public class ConfigAddonRegistryImpl implements ConfigAddonRegistry {
}
@Override
+ public void endReload() {
+ InternalLogger.getInstance().debug("Registered %d config addons", this.addons.size());
+ }
+
+ @Override
public void register(ConfigAddon addon) {
this.addons.add(addon);
+ InternalLogger.getInstance().debug("Added config addon: %s [%s]", addon, addon.getName().getString());
}
@Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
index 47996d9d3..fbd5f3330 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
@@ -36,6 +36,7 @@ import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
import me.shedaniel.rei.api.common.registry.ReloadStage;
import me.shedaniel.rei.api.common.util.CollectionUtils;
import me.shedaniel.rei.impl.client.config.ConfigManagerImpl;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import org.apache.commons.lang3.mutable.MutableLong;
@@ -67,6 +68,7 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
@Override
public void register(ResourceLocation id, FavoriteEntryType<?> type) {
this.registry.put(id, type);
+ InternalLogger.getInstance().debug("Added favorite entry type [%s]: %s", id, type);
}
@Override
@@ -97,6 +99,7 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
@Override
public <A extends FavoriteEntry> void registerSystemFavorites(SystemFavoriteEntryProvider<A> provider) {
this.systemFavorites.add(Triple.of(provider, new MutableLong(-1), new ArrayList<>()));
+ InternalLogger.getInstance().debug("Added system favorites: %s", provider);
}
public List<Triple<SystemFavoriteEntryProvider<?>, MutableLong, List<FavoriteEntry>>> getSystemProviders() {
@@ -119,6 +122,8 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
ConfigManager.getInstance().saveConfig();
}
+
+ InternalLogger.getInstance().debug("Registered %d favorite entry types", registry.size());
}
private static class SectionImpl implements FavoriteEntryType.Section {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java
index 905aba9b2..60c7b98ce 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java
@@ -36,13 +36,13 @@ import it.unimi.dsi.fastutil.longs.Long2LongMap;
import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
import me.shedaniel.clothconfig2.api.LazyResettable;
import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.config.ConfigObject;
import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer;
import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
import me.shedaniel.rei.api.common.util.EntryStacks;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.RenderStateShard;
@@ -88,7 +88,7 @@ public class CachedEntryListRender {
public static void refresh() {
if (ConfigObject.getInstance().doesCacheEntryRendering()) {
- RoughlyEnoughItemsCore.LOGGER.info("Refreshing cached entry list texture...");
+ InternalLogger.getInstance().info("Refreshing cached entry list texture...");
}
if (cachedTextureLocation != null) {
Minecraft.getInstance().getTextureManager().release(cachedTextureLocation);
@@ -139,7 +139,7 @@ public class CachedEntryListRender {
int width = side * RESOLUTION;
int height = side * RESOLUTION;
- RoughlyEnoughItemsCore.LOGGER.info("Preparing cached texture with size %sx%s for %sx%s entries", width, height, side, side);
+ InternalLogger.getInstance().info("Preparing cached texture with size %sx%s for %sx%s entries", width, height, side, side);
hash = new Long2LongOpenHashMap(list.size() + 10);
Minecraft minecraft = Minecraft.getInstance();
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
index 2aee122fe..a03865208 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
@@ -26,7 +26,6 @@ package me.shedaniel.rei.impl.client.gui.widget.entrylist;
import com.google.common.base.Stopwatch;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.longs.LongSet;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.config.ConfigManager;
import me.shedaniel.rei.api.client.config.ConfigObject;
import me.shedaniel.rei.api.client.gui.config.EntryPanelOrdering;
@@ -37,11 +36,13 @@ import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
import me.shedaniel.rei.api.common.util.EntryStacks;
import me.shedaniel.rei.impl.client.search.AsyncSearchManager;
+import me.shedaniel.rei.impl.common.InternalLogger;
import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsedStack;
import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsibleEntryRegistryImpl;
import net.minecraft.client.Minecraft;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
+import org.apache.logging.log4j.Level;
import org.jetbrains.annotations.Nullable;
import java.util.*;
@@ -79,9 +80,7 @@ public class EntryListSearchManager {
searchManager.getAsync(list -> {
List</*EntryStack<?> | CollapsedStack*/ Object> finalList = collapse(copyAndOrder(list));
- if (ConfigObject.getInstance().doDebugSearchTimeRequired()) {
- RoughlyEnoughItemsCore.LOGGER.info("Search Used: %s", stopwatch.stop().toString());
- }
+ InternalLogger.getInstance().log(ConfigObject.getInstance().doDebugSearchTimeRequired() ? Level.INFO : Level.TRACE, "Search Used: %s", stopwatch.stop().toString());
Minecraft.getInstance().executeBlocking(() -> {
update.accept(finalList);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java
index ee784a849..5ab3f59a7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java
@@ -25,7 +25,6 @@ package me.shedaniel.rei.impl.client.registry.category;
import com.google.common.base.MoreObjects;
import dev.architectury.event.EventResult;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
import me.shedaniel.rei.api.client.registry.category.ButtonArea;
import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
@@ -36,10 +35,12 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategoryView;
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.Display;
import me.shedaniel.rei.api.common.entry.EntryIngredient;
+import me.shedaniel.rei.impl.common.InternalLogger;
import org.jetbrains.annotations.ApiStatus;
import java.util.*;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
@ApiStatus.Internal
public class CategoryRegistryImpl implements CategoryRegistry {
@@ -55,6 +56,15 @@ public class CategoryRegistryImpl implements CategoryRegistry {
@Override
public void startReload() {
this.categories.clear();
+ this.listeners.clear();
+ this.visibilityPredicates.clear();
+ }
+
+ @Override
+ public void endReload() {
+ InternalLogger.getInstance().debug("Registered %d categories: %s", this.categories.size(),
+ this.categories.values().stream().map(configuration -> configuration.getCategory().getTitle().getString())
+ .collect(Collectors.joining(", ")));
}
@Override
@@ -70,6 +80,8 @@ public class CategoryRegistryImpl implements CategoryRegistry {
listener.accept(configuration);
}
}
+
+ InternalLogger.getInstance().debug("Added category [%s]: %s", category.getCategoryIdentifier(), category.getTitle().getString());
}
@Override
@@ -106,6 +118,7 @@ public class CategoryRegistryImpl implements CategoryRegistry {
public void registerVisibilityPredicate(CategoryVisibilityPredicate predicate) {
visibilityPredicates.add(predicate);
visibilityPredicates.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added category visibility predicate: %s [%.2f priority]", predicate, predicate.getPriority());
}
@Override
@@ -117,7 +130,7 @@ public class CategoryRegistryImpl implements CategoryRegistry {
return result.isEmpty() || result.isTrue();
}
} catch (Throwable throwable) {
- RoughlyEnoughItemsCore.LOGGER.error("Failed to check if the category is visible!", throwable);
+ InternalLogger.getInstance().error("Failed to check if the category is visible!", throwable);
}
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
index af84abe0f..bd29f9142 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
@@ -28,7 +28,6 @@ import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ForwardingMapEntry;
import com.google.common.collect.Iterators;
import dev.architectury.event.EventResult;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
@@ -40,6 +39,7 @@ import me.shedaniel.rei.api.client.registry.display.visibility.DisplayVisibility
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.Display;
import me.shedaniel.rei.api.common.plugins.PluginManager;
+import me.shedaniel.rei.impl.common.InternalLogger;
import me.shedaniel.rei.impl.common.registry.RecipeManagerContextImpl;
import net.minecraft.world.item.crafting.Recipe;
import org.apache.commons.lang3.mutable.MutableInt;
@@ -155,7 +155,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
if (!PluginManager.areAnyReloading()) {
if (lastAddWarning != null) {
if (lastAddWarning.getValue() > 0 && System.currentTimeMillis() - lastAddWarning.getValue() > 5000) {
- RoughlyEnoughItemsCore.LOGGER.warn("Detected runtime DisplayRegistry modification, this can be extremely dangerous!");
+ InternalLogger.getInstance().warn("Detected runtime DisplayRegistry modification, this can be extremely dangerous!");
}
lastAddWarning.setValue(System.currentTimeMillis());
}
@@ -179,12 +179,14 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
@Override
public <A extends Display> void registerGlobalDisplayGenerator(DynamicDisplayGenerator<A> generator) {
globalDisplayGenerators.add(generator);
+ InternalLogger.getInstance().debug("Added global display generator: %s", generator);
}
@Override
public <A extends Display> void registerDisplayGenerator(CategoryIdentifier<A> categoryId, DynamicDisplayGenerator<A> generator) {
displayGenerators.computeIfAbsent(categoryId, location -> new ArrayList<>())
.add(generator);
+ InternalLogger.getInstance().debug("Added display generator for category [%s]: %s", categoryId, generator);
}
@Override
@@ -201,6 +203,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
public void registerVisibilityPredicate(DisplayVisibilityPredicate predicate) {
visibilityPredicates.add(predicate);
visibilityPredicates.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added display visibility predicate: %s [%.2f priority]", predicate, predicate.getPriority());
}
@Override
@@ -214,7 +217,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
return result.isEmpty() || result.isTrue();
}
} catch (Throwable throwable) {
- RoughlyEnoughItemsCore.LOGGER.error("Failed to check if the display is visible!", throwable);
+ InternalLogger.getInstance().error("Failed to check if the display is visible!", throwable);
}
}
@@ -234,11 +237,13 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
@Override
public <T, D extends Display> void registerFiller(Class<T> typeClass, BiPredicate<? extends T, DisplayAdditionReasons> predicate, Function<? extends T, D> filler) {
fillers.add(new DisplayFiller<>((o, s) -> typeClass.isInstance(o) && ((BiPredicate<Object, DisplayAdditionReasons>) predicate).test(o, s), (Function<Object, D>) filler));
+ InternalLogger.getInstance().debug("Added display filter: %s for %s", filler, typeClass.getName());
}
@Override
public <D extends Display> void registerFiller(Predicate<?> predicate, Function<?, D> filler) {
fillers.add(new DisplayFiller<>((o, s) -> ((Predicate<Object>) predicate).test(o), (Function<Object, D>) filler));
+ InternalLogger.getInstance().debug("Added display filter: %s", filler);
}
@Override
@@ -263,9 +268,11 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
for (CategoryIdentifier<?> identifier : displays.keySet()) {
if (CategoryRegistry.getInstance().tryGet(identifier).isEmpty()) {
- RoughlyEnoughItemsCore.LOGGER.throwException(new IllegalStateException("Displays registered for unknown registry: " + identifier));
+ InternalLogger.getInstance().error("Found displays registered for unknown registry", new IllegalStateException(identifier.toString()));
}
}
+
+ InternalLogger.getInstance().debug("Registered %d displays", displayCount.getValue());
}
@Override
@@ -307,7 +314,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
return displaysBase.get(display);
}
- private static record DisplayFiller<D extends Display>(
+ private record DisplayFiller<D extends Display>(
BiPredicate<Object, DisplayAdditionReasons> predicate,
Function<Object, D> mappingFunction
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java
index 26f7b6773..85b8090f1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java
@@ -27,11 +27,11 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.gui.config.DisplayPanelLocation;
import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
import me.shedaniel.rei.api.client.registry.screen.ExclusionZonesProvider;
import me.shedaniel.rei.api.common.plugins.PluginManager;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.Minecraft;
@@ -142,8 +142,9 @@ public class ExclusionZonesImpl implements ExclusionZones {
list.put(screenClass, screen -> ((ExclusionZonesProvider<T>) provider).provide((T) screen));
}
+ InternalLogger.getInstance().debug("Added exclusion zones provider: %s for %s", provider, screenClass.getName());
if (!PluginManager.areAnyReloading()) {
- RoughlyEnoughItemsCore.LOGGER.warn("Detected ExclusionZonesImpl modification at runtime, this may cause issues, a single ExclusionZonesProvider can dynamically provide boundaries instead!", new RuntimeException());
+ InternalLogger.getInstance().warn("Detected ExclusionZonesImpl modification at runtime, this may cause issues, a single ExclusionZonesProvider can dynamically provide boundaries instead!", new RuntimeException());
}
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java
index 1e51a0cc8..2fd7035a5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java
@@ -45,6 +45,7 @@ import me.shedaniel.rei.api.common.registry.ReloadStage;
import me.shedaniel.rei.api.common.util.CollectionUtils;
import me.shedaniel.rei.api.common.util.EntryStacks;
import me.shedaniel.rei.impl.client.gui.screen.AbstractDisplayViewingScreen;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.Minecraft;
@@ -158,16 +159,14 @@ public class ScreenRegistryImpl implements ScreenRegistry {
deciders.sort(Comparator.reverseOrder());
cache.clear();
tmpScreen.remove();
- registerDraggableComponentProvider(DraggableComponentProviderWidget.from(context ->
- Widgets.walk(context.getScreen().children(), DraggableComponentProviderWidget.class::isInstance)));
- registerDraggableComponentVisitor(DraggableComponentVisitorWidget.from(context ->
- Widgets.walk(context.getScreen().children(), DraggableComponentVisitorWidget.class::isInstance)));
+ InternalLogger.getInstance().debug("Added overlay decider: %s [%.2f priority]", decider, decider.getPriority());
}
@Override
public void registerFocusedStack(FocusedStackProvider provider) {
focusedStackProviders.add(provider);
focusedStackProviders.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added focused stack provider: %s [%.2f priority]", provider, provider.getPriority());
}
@Override
@@ -184,12 +183,14 @@ public class ScreenRegistryImpl implements ScreenRegistry {
public <T extends Screen, A> void registerDraggableComponentProvider(DraggableComponentProvider<T, A> provider) {
draggableProviders.add((DraggableComponentProvider<Screen, Object>) provider);
draggableProviders.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added draggable component provider: %s [%.2f priority]", provider, provider.getPriority());
}
@Override
public <T extends Screen> void registerDraggableComponentVisitor(DraggableComponentVisitor<T> visitor) {
draggableVisitors.add((DraggableComponentVisitor<Screen>) visitor);
draggableVisitors.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added draggable component visitor: %s [%.2f priority]", visitor, visitor.getPriority());
}
@Override
@@ -219,6 +220,7 @@ public class ScreenRegistryImpl implements ScreenRegistry {
@Override
public <T extends Screen> void registerClickArea(Class<? extends T> screenClass, ClickArea<T> area) {
clickAreas.put(screenClass, area);
+ InternalLogger.getInstance().debug("Added click area provider for %s: %s", screenClass.getName(), area);
}
@Override
@@ -247,6 +249,11 @@ public class ScreenRegistryImpl implements ScreenRegistry {
registerDefault();
}
+ @Override
+ public void endReload() {
+ InternalLogger.getInstance().debug("Registered %d overlay deciders and %d exclusion zones", deciders.size(), exclusionZones.getZonesCount());
+ }
+
private void registerDefault() {
registerDecider(this.exclusionZones = new ExclusionZonesImpl());
registerDecider(new DisplayBoundsProvider<AbstractContainerScreen<?>>() {
@@ -306,5 +313,9 @@ public class ScreenRegistryImpl implements ScreenRegistry {
return -10.0;
}
});
+ registerDraggableComponentProvider(DraggableComponentProviderWidget.from(context ->
+ Widgets.walk(context.getScreen().children(), DraggableComponentProviderWidget.class::isInstance)));
+ registerDraggableComponentVisitor(DraggableComponentVisitorWidget.from(context ->
+ Widgets.walk(context.getScreen().children(), DraggableComponentVisitorWidget.class::isInstance)));
}
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
index ab59401db..c56d30b26 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
@@ -33,6 +33,7 @@ import me.shedaniel.rei.impl.client.search.argument.Argument;
import me.shedaniel.rei.impl.client.search.argument.CompoundArgument;
import me.shedaniel.rei.impl.client.search.argument.type.ArgumentType;
import me.shedaniel.rei.impl.client.util.CrashReportUtils;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
@@ -68,6 +69,7 @@ public class SearchProviderImpl implements SearchProvider {
.map(Argument::getArgument)
.distinct()
.collect(Collectors.toList()));
+ InternalLogger.getInstance().debug("Created search filter with %s using %s", filter, inputMethod.getName().getString());
}
@Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java
index fc6b955fb..8cac7824a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java
@@ -39,6 +39,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
public class InputMethodRegistryImpl implements InputMethodRegistry {
private final Map<ResourceLocation, InputMethod<?>> inputMethods = Maps.newHashMap();
@@ -46,6 +47,7 @@ public class InputMethodRegistryImpl implements InputMethodRegistry {
@Override
public void add(ResourceLocation id, InputMethod<?> inputMethod) {
this.inputMethods.put(id, inputMethod);
+ InternalLogger.getInstance().debug("Added input method [%s]: %s", id, inputMethod.getName().getString());
}
@Override
@@ -95,6 +97,9 @@ public class InputMethodRegistryImpl implements InputMethodRegistry {
}
}).join();
service.shutdown();
+
+ InternalLogger.getInstance().debug("Registered %d input methods: ", inputMethods.size(),
+ inputMethods.values().stream().map(inputMethod -> inputMethod.getName().getString()).collect(Collectors.joining(", ")));
}
@Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/transfer/TransferHandlerRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/transfer/TransferHandlerRegistryImpl.java
index 43b20634b..93cffb1fe 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/transfer/TransferHandlerRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/transfer/TransferHandlerRegistryImpl.java
@@ -29,6 +29,7 @@ import me.shedaniel.rei.api.client.registry.transfer.TransferHandler;
import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerRegistry;
import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.impl.ClientInternals;
+import me.shedaniel.rei.impl.common.InternalLogger;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import org.jetbrains.annotations.ApiStatus;
@@ -53,9 +54,15 @@ public class TransferHandlerRegistryImpl implements TransferHandlerRegistry {
}
@Override
+ public void endReload() {
+ InternalLogger.getInstance().debug("Registered %d transfer handlers", handlers.size());
+ }
+
+ @Override
public void register(TransferHandler handler) {
handlers.add(handler);
handlers.sort(Comparator.reverseOrder());
+ InternalLogger.getInstance().debug("Added transfer handler: %s [%.2f priority]", handler, handler.getPriority());
}
@Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java
index 39b45c0f1..1c579e2e5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Sets;
import it.unimi.dsi.fastutil.longs.Long2LongMap;
import it.unimi.dsi.fastutil.longs.Long2LongMaps;
import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
import me.shedaniel.rei.api.client.config.ConfigObject;
import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
@@ -57,6 +56