diff options
Diffstat (limited to 'runtime')
6 files changed, 166 insertions, 19 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index 0e771ac4b..8a31cb95a 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -24,11 +24,13 @@ package me.shedaniel.rei; import com.google.common.collect.ImmutableList; +import dev.architectury.event.events.common.LifecycleEvent; import dev.architectury.platform.Mod; import dev.architectury.platform.Platform; import dev.architectury.registry.ReloadListenerRegistry; import dev.architectury.utils.Env; import dev.architectury.utils.EnvExecutor; +import dev.architectury.utils.GameInstance; import me.shedaniel.rei.api.common.entry.type.EntryType; import me.shedaniel.rei.api.common.plugins.REICommonPlugin; import me.shedaniel.rei.impl.Internals; @@ -147,9 +149,12 @@ public class RoughlyEnoughItemsCore { RoughlyEnoughItemsNetwork.onInitialize(); if (Platform.getEnvironment() == Env.SERVER) { - MutableLong lastReload = new MutableLong(-1); + LifecycleEvent.SERVER_STARTED.register(server -> { + ReloadManagerImpl.reloadPlugins(null, ReloadInterruptionContext.ofNever()); + }); ReloadListenerRegistry.register(PackType.SERVER_DATA, (preparationBarrier, resourceManager, executor, executor2) -> { return preparationBarrier.wait(Unit.INSTANCE).thenRunAsync(() -> { + if (GameInstance.getServer() == null) return; ReloadManagerImpl.reloadPlugins(null, ReloadInterruptionContext.ofNever()); }, executor2); }); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java index 8b85d4255..0c081340e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java @@ -51,6 +51,7 @@ import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.impl.client.REIRuntimeImpl; import me.shedaniel.rei.impl.client.gui.craftable.CraftableFilter; import me.shedaniel.rei.impl.client.gui.dragging.CurrentDraggingStack; +import me.shedaniel.rei.impl.client.gui.hints.ImportantWarningsWidget; import me.shedaniel.rei.impl.client.gui.modules.MenuAccess; import me.shedaniel.rei.impl.client.gui.modules.MenuHolder; import me.shedaniel.rei.impl.client.gui.widget.*; @@ -187,6 +188,8 @@ public abstract class ScreenOverlayImpl extends ScreenOverlay { this.widgets.add(draggingStack); this.widgets.add(InternalWidgets.wrapLateRenderable(hintsWidget)); this.hintsWidget.init(); + + this.widgets.add(InternalWidgets.wrapLateRenderable(new ImportantWarningsWidget())); } private Rectangle getSearchFieldArea() { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/hints/ImportantWarningsWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/hints/ImportantWarningsWidget.java new file mode 100644 index 000000000..66daf5c3f --- /dev/null +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/hints/ImportantWarningsWidget.java @@ -0,0 +1,132 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.shedaniel.rei.impl.client.gui.hints; + +import me.shedaniel.math.Rectangle; +import me.shedaniel.rei.RoughlyEnoughItemsCoreClient; +import me.shedaniel.rei.api.client.ClientHelper; +import me.shedaniel.rei.api.client.gui.config.DisplayPanelLocation; +import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds; +import me.shedaniel.rei.api.client.gui.widgets.Widgets; +import me.shedaniel.rei.api.client.registry.entry.EntryRegistry; +import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; +import me.shedaniel.rei.impl.common.entry.type.EntryRegistryImpl; +import me.shedaniel.rei.impl.common.entry.type.EntryRegistryListener; +import me.shedaniel.rei.impl.common.util.InstanceHelper; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import java.util.List; + +public class ImportantWarningsWidget extends WidgetWithBounds { + private static final EntryRegistryListener LISTENER = new EntryRegistryListener() { + }; + private static String prevId = ""; + private static boolean dirty = false; + private boolean visible; + private final Rectangle bounds; + private final Rectangle buttonBounds = new Rectangle(); + private List<Component> texts; + + public ImportantWarningsWidget() { + if (((EntryRegistryImpl) EntryRegistry.getInstance()).listeners.add(LISTENER)) { + String newId = Minecraft.getInstance().hasSingleplayerServer() ? + "integrated:" + Minecraft.getInstance().getSingleplayerServer().getWorldData().getLevelName() + : InstanceHelper.connectionFromClient() != null ? "server:" + InstanceHelper.connectionFromClient().getId() + : "null"; + if (!newId.equals(prevId)) { + prevId = newId; + dirty = true; + } + dirty = dirty && !ClientHelper.getInstance().canUseMovePackets(); + } + + this.visible = dirty; + this.texts = List.of( + Component.translatable("text.rei.recipes.not.full.title").withStyle(ChatFormatting.RED), + Component.translatable("text.rei.recipes.not.full.desc", Component.translatable("text.rei.recipes.not.full.desc.command").withStyle(ChatFormatting.AQUA, ChatFormatting.UNDERLINE)).withStyle(ChatFormatting.GRAY) + ); + this.bounds = ScreenRegistry.getInstance().getOverlayBounds(DisplayPanelLocation.LEFT, Minecraft.getInstance().screen); + this.bounds.setBounds(this.bounds.x + 10, this.bounds.y + 10, this.bounds.width - 20, this.bounds.height - 20); + int heightRequired = -5; + for (Component text : texts) { + heightRequired += Minecraft.getInstance().font.wordWrapHeight(text, this.bounds.width * 2) / 2; + heightRequired += 5; + } + this.bounds.height = Math.min(heightRequired + 20, this.bounds.height); + } + + @Override + public Rectangle getBounds() { + return bounds; + } + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + if (!visible) + return; + graphics.pose().pushPose(); + graphics.pose().translate(0, 0, 900); + graphics.fill(bounds.x - 5, bounds.y - 5, bounds.getMaxX() + 5, bounds.getMaxY() + 5, 0x90111111); + int y = bounds.y; + for (Component text : texts) { + graphics.pose().pushPose(); + graphics.pose().translate(bounds.x, y, 0); + graphics.pose().scale(0.5f, 0.5f, 1); + graphics.drawWordWrap(Minecraft.getInstance().font, text, 0, 0, bounds.width * 2, -1); + y += Minecraft.getInstance().font.wordWrapHeight(text, bounds.width * 2) / 2 + 5; + graphics.pose().popPose(); + } + + MutableComponent okayText = Component.translatable("text.rei.recipes.not.full.button.okay"); + graphics.pose().pushPose(); + graphics.pose().translate(bounds.x + bounds.width / 2 - Minecraft.getInstance().font.width(okayText) * 0.75 / 2, bounds.getMaxY() - 9, 0); + graphics.pose().scale(0.75f, 0.75f, 1); + this.buttonBounds.setBounds(bounds.x, bounds.getMaxY() - 20, bounds.width, 20); + graphics.drawString(Minecraft.getInstance().font, okayText, 0, 0, + buttonBounds.contains(mouseX, mouseY) ? 0xfffff8de : 0xAAFFFFFF); + graphics.pose().popPose(); + graphics.pose().popPose(); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.visible && button == 0 && buttonBounds.contains(mouseX, mouseY)) { + dirty = false; + this.visible = false; + Widgets.produceClickSound(); + return true; + } + return false; + } + + @Override + public List<? extends GuiEventListener> children() { + return List.of(); + } +} diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/DeferringEntryTypeProviderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/DeferringEntryTypeProviderImpl.java index 20f6171ff..f53ee9dc3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/DeferringEntryTypeProviderImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/DeferringEntryTypeProviderImpl.java @@ -84,24 +84,27 @@ public enum DeferringEntryTypeProviderImpl implements Function<ResourceLocation, @Environment(EnvType.CLIENT) public EntryType<Renderer> renderingType(ResourceLocation id) { + @Environment(EnvType.CLIENT) + class RenderType implements EntryType<Renderer> { + private final int hashCode = id.hashCode(); + + @Override + public ResourceLocation getId() { + return id; + } + + @Override + public EntryDefinition<Renderer> getDefinition() { + return RenderingEntryDefinition.RENDERING; + } + + @Override + public int hashCode() { + return hashCode; + } + } if (render == null) { - int hashCode = id.hashCode(); - render = new EntryType<>() { - @Override - public ResourceLocation getId() { - return id; - } - - @Override - public EntryDefinition<Renderer> getDefinition() { - return RenderingEntryDefinition.RENDERING; - } - - @Override - public int hashCode() { - return hashCode; - } - }; + render = new RenderType(); } return render; } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java index 0f1dcfacb..5a67a2bd9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; @ApiStatus.Internal public class EmptyEntryDefinition { - public static final EntryDefinition<Unit> EMPTY = new BuiltinEntryDefinition<>(Unit.class, BuiltinEntryTypes.EMPTY, true, () -> Unit.INSTANCE, () -> () -> new EmptyRenderer()); + public static final EntryDefinition<Unit> EMPTY = new BuiltinEntryDefinition<>(Unit.class, BuiltinEntryTypes.EMPTY, true, () -> Unit.INSTANCE, () -> EmptyRenderer::new); @Environment(EnvType.CLIENT) public static class EmptyRenderer implements EntryRenderer<Unit> { diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index af68baab0..d6c807650 100755 --- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -21,6 +21,10 @@ "text.rei.caching.search.step": "Step %d/%d (%s%%):", "text.rei.searching": "REI searching results...", "text.rei.searching.step": "This is slower on the first search.\nProgress: %s%%", + "text.rei.recipes.not.full.title": "Partial Recipes Data Warning", + "text.rei.recipes.not.full.desc": "REI does not have access to all recipes data!\nHere's what you can do:\n• If you are on a vanilla server and have operator permissions, running %s will unlock some recipes.\n• If you are on a modded server, ask the server owner to install REI on the server.", + "text.rei.recipes.not.full.desc.command": "/recipe give @p *", + "text.rei.recipes.not.full.button.okay": "Okay, I understand!", "text.rei.config.menu.dark_theme": "Dark Theme", "text.rei.config.menu.reduced_motion": "Reduced Motion", "text.rei.config.menu.craftable_filter": "Craftable Filter", |