Skip to content

Commit 65a1a7e

Browse files
committed
Reduce logs slightly
1 parent 4d134c9 commit 65a1a7e

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Library/src/main/java/mezz/jei/library/ingredients/IngredientManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public <V> void addIngredientsAtRuntime(IIngredientType<V> ingredientType, Colle
106106
String ingredientStrings = ingredients.stream()
107107
.map(ingredientHelper::getResourceLocation)
108108
.map(ResourceLocation::toString)
109-
.collect(Collectors.joining("\n", "[","]"));
109+
.collect(Collectors.joining(", ", "[","]"));
110110
LOGGER.debug("Ingredients added at runtime: {}", ingredientStrings);
111111
}
112112

Library/src/main/java/mezz/jei/library/plugins/vanilla/ingredients/ItemStackListFactory.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.minecraft.core.Holder;
1515
import net.minecraft.core.RegistryAccess;
1616
import net.minecraft.core.registries.Registries;
17+
import net.minecraft.network.chat.contents.TranslatableContents;
1718
import net.minecraft.world.entity.player.Player;
1819
import net.minecraft.world.flag.FeatureFlagSet;
1920
import net.minecraft.world.item.CreativeModeTab;
@@ -104,7 +105,8 @@ public static List<ItemStack> create(StackHelper stackHelper, ItemStackHelper it
104105
}
105106

106107
if (displayItems.isEmpty() && searchTabDisplayItems.isEmpty()) {
107-
LOGGER.warn(
108+
Level logLevel = isKnownEmptyTab(tab) ? Level.DEBUG : Level.WARN;
109+
LOGGER.log(logLevel,
108110
"Item Group has no display items and no search tab display items. " +
109111
"Items from this group will be missing from the JEI ingredient list. {}",
110112
tab.getDisplayName().getString()
@@ -141,6 +143,11 @@ public static List<ItemStack> create(StackHelper stackHelper, ItemStackHelper it
141143
return itemList;
142144
}
143145

146+
private static boolean isKnownEmptyTab(CreativeModeTab tab) {
147+
return tab.getDisplayName().getContents() instanceof TranslatableContents translatableContents &&
148+
translatableContents.getKey().equals("itemGroup.op");
149+
}
150+
144151
private static void addFromTab(
145152
Collection<ItemStack> tabDisplayItems,
146153
String displayType,

NeoForge/src/main/java/mezz/jei/neoforge/startup/StartEventObserver.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void register(PermanentEventSubscriptions subscriptions) {
5858

5959
subscriptions.register(ClientPlayerNetworkEvent.LoggingOut.class, event -> {
6060
if (event.getPlayer() != null) {
61-
LOGGER.info("JEI StartEventObserver received {}", event.getClass());
61+
logReceivedEvent(event);
6262
transitionState(State.LISTENING);
6363
}
6464
});
@@ -80,7 +80,7 @@ public void register(PermanentEventSubscriptions subscriptions) {
8080

8181
LOGGER.error("""
8282
A Screen is opening but JEI hasn't started yet.
83-
Normally, JEI is started after {}.
83+
Normally, JEI is started after these event have fired: {}.
8484
Something has caused one or more of these events to fail, so JEI is starting very late.
8585
Missing events: {}""",
8686
requiredEventsString,
@@ -109,7 +109,7 @@ private <T extends Event> void onEvent(T event) {
109109
LOGGER.info("JEI StartEventObserver received {} too early, ignoring", event.getClass());
110110
return;
111111
}
112-
LOGGER.info("JEI StartEventObserver received {}", event.getClass());
112+
logReceivedEvent(event);
113113
Class<? extends Event> eventClass = event.getClass();
114114
if (requiredEvents.contains(eventClass) &&
115115
observedEvents.add(eventClass) &&
@@ -123,6 +123,10 @@ private <T extends Event> void onEvent(T event) {
123123
}
124124
}
125125

126+
private static <T extends Event> void logReceivedEvent(T event) {
127+
LOGGER.debug("JEI StartEventObserver received event: {}", event.getClass());
128+
}
129+
126130
@Nullable
127131
private static Connection getCurrentConnection() {
128132
Minecraft minecraft = Minecraft.getInstance();

0 commit comments

Comments
 (0)