diff options
Diffstat (limited to 'runtime/src/main/java')
25 files changed, 87 insertions, 76 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java b/runtime/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java index f01c39bf9..645b32f0c 100644 --- a/runtime/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java +++ b/runtime/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java @@ -23,7 +23,7 @@ package me.shedaniel.rei; -import me.shedaniel.architectury.platform.Platform; +import dev.architectury.platform.Platform; import me.shedaniel.rei.api.client.config.ConfigManager; public class REIModMenuEntryPoint { diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index 9513bbe21..49547a544 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -24,16 +24,16 @@ package me.shedaniel.rei; import com.google.common.collect.Lists; -import me.shedaniel.architectury.event.events.GuiEvent; -import me.shedaniel.architectury.event.events.RecipeUpdateEvent; -import me.shedaniel.architectury.event.events.client.ClientScreenInputEvent; -import me.shedaniel.architectury.networking.NetworkManager; -import me.shedaniel.architectury.platform.Platform; -import me.shedaniel.architectury.registry.ReloadListeners; -import me.shedaniel.architectury.utils.Env; +import dev.architectury.event.EventResult; +import dev.architectury.event.events.client.ClientGuiEvent; +import dev.architectury.event.events.client.ClientRecipeUpdateEvent; +import dev.architectury.event.events.client.ClientScreenInputEvent; +import dev.architectury.networking.NetworkManager; +import dev.architectury.platform.Platform; +import dev.architectury.registry.ReloadListenerRegistry; +import dev.architectury.utils.Env; import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.REIHelper; -import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; import me.shedaniel.rei.api.client.favorites.FavoriteEntry; @@ -41,6 +41,7 @@ import me.shedaniel.rei.api.client.favorites.FavoriteEntryType; import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry; import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; +import me.shedaniel.rei.api.client.overlay.ScreenOverlay; 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; @@ -428,7 +429,7 @@ public class RoughlyEnoughItemsCore { if (Platform.getEnvironment() == Env.SERVER) { MutableLong lastReload = new MutableLong(-1); - ReloadListeners.registerReloadListener(PackType.SERVER_DATA, (preparationBarrier, resourceManager, profilerFiller, profilerFiller2, executor, executor2) -> { + ReloadListenerRegistry.register(PackType.SERVER_DATA, (preparationBarrier, resourceManager, profilerFiller, profilerFiller2, executor, executor2) -> { return preparationBarrier.wait(Unit.INSTANCE).thenRunAsync(RoughlyEnoughItemsCore::_reloadPlugins, executor2); }); } @@ -517,8 +518,8 @@ public class RoughlyEnoughItemsCore { Minecraft client = Minecraft.getInstance(); final ResourceLocation recipeButtonTex = new ResourceLocation("textures/gui/recipe_button.png"); MutableLong lastReload = new MutableLong(-1); - RecipeUpdateEvent.EVENT.register(recipeManager -> reloadPlugins(lastReload)); - GuiEvent.INIT_POST.register((screen, access) -> { + ClientRecipeUpdateEvent.EVENT.register(recipeManager -> reloadPlugins(lastReload)); + ClientGuiEvent.INIT_POST.register((screen, access) -> { REIHelperImpl.getInstance().setPreviousScreen(screen); if (ConfigObject.getInstance().doesDisableRecipeBook() && screen instanceof AbstractContainerScreen) { access.getRenderables().removeIf(widget -> widget instanceof ImageButton && ((ImageButton) widget).resourceLocation.equals(recipeButtonTex)); @@ -529,47 +530,47 @@ public class RoughlyEnoughItemsCore { ClientScreenInputEvent.MOUSE_CLICKED_PRE.register((minecraftClient, screen, mouseX, mouseY, button) -> { isLeftMousePressed = true; if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().getOverlay().get().mouseClicked(mouseX, mouseY, button)) { if (button == 0) { screen.setDragging(true); } resetFocused(screen); - return InteractionResult.SUCCESS; + return EventResult.interruptTrue(); } - return InteractionResult.PASS; + return EventResult.pass(); }); ClientScreenInputEvent.MOUSE_RELEASED_PRE.register((minecraftClient, screen, mouseX, mouseY, button) -> { isLeftMousePressed = false; if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().isOverlayVisible() && REIHelper.getInstance().getOverlay().get().mouseReleased(mouseX, mouseY, button) && resetFocused(screen)) { - return InteractionResult.SUCCESS; + return EventResult.interruptTrue(); } - return InteractionResult.PASS; + return EventResult.pass(); }); ClientScreenInputEvent.MOUSE_SCROLLED_PRE.register((minecraftClient, screen, mouseX, mouseY, amount) -> { if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().isOverlayVisible() && REIHelper.getInstance().getOverlay().get().mouseScrolled(mouseX, mouseY, amount) && resetFocused(screen)) - return InteractionResult.SUCCESS; - return InteractionResult.PASS; + return EventResult.interruptTrue(); + return EventResult.pass(); }); ClientScreenInputEvent.CHAR_TYPED_PRE.register((minecraftClient, screen, character, keyCode) -> { if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().getOverlay().get().charTyped(character, keyCode) && resetFocused(screen)) - return InteractionResult.SUCCESS; - return InteractionResult.PASS; + return EventResult.interruptTrue(); + return EventResult.pass(); }); - GuiEvent.RENDER_POST.register((screen, matrices, mouseX, mouseY, delta) -> { + ClientGuiEvent.RENDER_POST.register((screen, matrices, mouseX, mouseY, delta) -> { if (shouldReturn(screen)) return; resetFocused(screen); @@ -579,29 +580,29 @@ public class RoughlyEnoughItemsCore { }); ClientScreenInputEvent.MOUSE_DRAGGED_PRE.register((minecraftClient, screen, mouseX1, mouseY1, button, mouseX2, mouseY2) -> { if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().getOverlay().get().mouseDragged(mouseX1, mouseY1, button, mouseX2, mouseY2) && resetFocused(screen)) - return InteractionResult.SUCCESS; - return InteractionResult.PASS; + return EventResult.interruptTrue(); + return EventResult.pass(); }); ClientScreenInputEvent.KEY_PRESSED_PRE.register((minecraftClient, screen, i, i1, i2) -> { if (shouldReturn(screen)) - return InteractionResult.PASS; + return EventResult.pass(); if (screen instanceof AbstractContainerScreen && ConfigObject.getInstance().doesDisableRecipeBook() && ConfigObject.getInstance().doesFixTabCloseContainer()) { if (i == 258 && minecraftClient.options.keyInventory.matches(i, i1)) { minecraftClient.player.closeContainer(); - return InteractionResult.SUCCESS; + return EventResult.interruptTrue(); } } if (screen.getFocused() != null && screen.getFocused() instanceof EditBox || (screen.getFocused() instanceof RecipeBookComponent && ((RecipeBookComponent) screen.getFocused()).searchBox != null && ((RecipeBookComponent) screen.getFocused()).searchBox.isFocused())) - return InteractionResult.PASS; + return EventResult.pass(); resetFocused(screen); if (REIHelper.getInstance().getOverlay().get().keyPressed(i, i1, i2) && resetFocused(screen)) - return InteractionResult.SUCCESS; - return InteractionResult.PASS; + return EventResult.interruptTrue(); + return EventResult.pass(); }); } diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java index 21042c30e..8973e6a51 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java @@ -23,9 +23,8 @@ package me.shedaniel.rei; +import dev.architectury.networking.NetworkManager; import io.netty.buffer.Unpooled; -import me.shedaniel.architectury.networking.NetworkManager; -import me.shedaniel.rei.api.client.REIHelper; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.impl.common.transfer.InputSlotCrafter; @@ -37,7 +36,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.world.Container; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.inventory.RecipeBookMenu; 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 29d2deb00..45285ccfc 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 @@ -23,11 +23,11 @@ package me.shedaniel.rei.impl.client; +import dev.architectury.networking.NetworkManager; +import dev.architectury.platform.Platform; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; -import me.shedaniel.architectury.networking.NetworkManager; -import me.shedaniel.architectury.platform.Platform; import me.shedaniel.rei.RoughlyEnoughItemsNetwork; import me.shedaniel.rei.api.client.ClientHelper; import me.shedaniel.rei.api.client.REIHelper; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIHelperImpl.java index 1a4d28fcf..d5e088821 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIHelperImpl.java @@ -26,8 +26,9 @@ package me.shedaniel.rei.impl.client; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.mojang.blaze3d.platform.Window; -import me.shedaniel.architectury.event.events.GuiEvent; -import me.shedaniel.architectury.event.events.client.ClientTickEvent; +import dev.architectury.event.EventResult; +import dev.architectury.event.events.client.ClientGuiEvent; +import dev.architectury.event.events.client.ClientTickEvent; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.REIHelper; import me.shedaniel.rei.api.client.config.ConfigManager; @@ -46,8 +47,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -217,10 +216,10 @@ public class REIHelperImpl implements REIHelper { } public void onInitializeClient() { - GuiEvent.INIT_PRE.register((screen, access) -> { + ClientGuiEvent.INIT_PRE.register((screen, access) -> { if (previousContainerScreen != screen && screen instanceof AbstractContainerScreen) previousContainerScreen = (AbstractContainerScreen<?>) screen; - return InteractionResult.PASS; + return EventResult.pass(); }); ClientTickEvent.CLIENT_POST.register(minecraft -> { if (isOverlayVisible()) { 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 292d76358..8cca5cce0 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 @@ -28,7 +28,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.shedaniel.architectury.hooks.screen.ScreenHooks; +import dev.architectury.hooks.client.screen.ScreenHooks; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.annotation.ConfigEntry; import me.shedaniel.autoconfig.gui.ConfigScreenProvider; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java index e4b855e1e..cd99039c4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.impl.client.config; import com.mojang.blaze3d.platform.InputConstants; -import me.shedaniel.architectury.platform.Platform; +import dev.architectury.platform.Platform; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; 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 08f2ad875..bf238c6b8 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 @@ -54,6 +54,7 @@ import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; import me.shedaniel.rei.api.client.view.ViewSearchBuilder; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.entry.EntryStack; +import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.api.common.util.CollectionUtils; import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.api.common.util.ImmutableTextComponent; @@ -133,7 +134,7 @@ public class ScreenOverlayImpl extends ScreenOverlay { public void tick() { if (REIHelperImpl.getSearchField() != null) { REIHelperImpl.getSearchField().tick(); - if (Minecraft.getInstance().player != null) { + if (Minecraft.getInstance().player != null && !PluginManager.areAnyReloading()) { CraftableFilter.INSTANCE.tick(); } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/craftable/CraftableFilter.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/craftable/CraftableFilter.java index 713ea882a..981792653 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/craftable/CraftableFilter.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/craftable/CraftableFilter.java @@ -2,6 +2,7 @@ package me.shedaniel.rei.impl.client.gui.craftable; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; +import it.unimi.dsi.fastutil.longs.LongSets; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import me.shedaniel.rei.api.common.transfer.info.stack.SlotAccessor; @@ -29,7 +30,13 @@ public class CraftableFilter { public void tick() { if (dirty) return; - LongSet currentStacks = ClientHelperImpl.getInstance()._getInventoryItemsTypes(); + LongSet currentStacks; + try { + currentStacks = ClientHelperImpl.getInstance()._getInventoryItemsTypes(); + } catch (Throwable throwable) { + throwable.printStackTrace(); + currentStacks = LongSets.EMPTY_SET; + } if (!currentStacks.equals(this.invStacks)) { invStacks = new LongOpenHashSet(currentStacks); markDirty(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java index 1fcba68d2..841641c75 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.impl.client.gui.credits; import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.architectury.platform.Platform; +import dev.architectury.platform.Platform; import me.shedaniel.rei.api.common.util.ImmutableTextComponent; import me.shedaniel.rei.impl.client.gui.credits.CreditsEntryListWidget.TextCreditsItem; import me.shedaniel.rei.impl.client.gui.credits.CreditsEntryListWidget.TranslationCreditsItem; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java index 104cea37f..2e4f67d26 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; +import dev.architectury.platform.Platform; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; -import me.shedaniel.architectury.platform.Platform; import me.shedaniel.clothconfig2.api.ScissorsHandler; import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget; import me.shedaniel.clothconfig2.impl.EasingMethod; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java index 84df4f6cf..c44622f1a 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.impl.client.gui.widget; import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.architectury.fluid.FluidStack; +import dev.architectury.fluid.FluidStack; import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.ClientHelper; import me.shedaniel.rei.api.client.config.ConfigObject; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java index d420cacd8..cc789d4a7 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.math.Matrix4f; -import me.shedaniel.architectury.fluid.FluidStack; +import dev.architectury.fluid.FluidStack; import me.shedaniel.clothconfig2.ClothConfigInitializer; import me.shedaniel.clothconfig2.api.ScissorsHandler; import me.shedaniel.clothconfig2.api.ScrollingContainer; @@ -40,14 +40,14 @@ import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.client.ClientHelper; import me.shedaniel.rei.api.client.REIHelper; -import me.shedaniel.rei.api.client.overlay.OverlayListWidget; -import me.shedaniel.rei.api.client.overlay.ScreenOverlay; 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; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds; +import me.shedaniel.rei.api.client.overlay.OverlayListWidget; +import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.registry.screen.OverlayDecider; import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; import me.shedaniel.rei.api.common.entry.EntryStack; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java index 18dc55c82..6938b16c4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java @@ -25,8 +25,8 @@ package me.shedaniel.rei.impl.client.gui.widget; import com.google.common.collect.Lists; -import me.shedaniel.architectury.platform.Platform; -import me.shedaniel.architectury.utils.Env; +import dev.architectury.platform.Platform; +import dev.architectury.utils.Env; import me.shedaniel.math.Point; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/compat/LBASupportPlugin.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/compat/LBASupportPlugin.java index 074b5de90..eba988a5d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/compat/LBASupportPlugin.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/compat/LBASupportPlugin.java @@ -26,7 +26,7 @@ package me.shedaniel.rei.impl.common.compat; import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.GroupedFluidInvView; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import me.shedaniel.architectury.hooks.FluidStackHooks; +import dev.architectury.hooks.fluid.FluidStackHooks; import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.REIServerPlugin; import me.shedaniel.rei.api.common.util.EntryStacks; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java index 8c52a7614..db95d6a76 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java @@ -24,11 +24,11 @@ package me.shedaniel.rei.impl.common.entry; import com.mojang.blaze3d.vertex.PoseStack; +import dev.architectury.platform.Platform; +import dev.architectury.utils.Env; import it.unimi.dsi.fastutil.shorts.Short2ObjectMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectMaps; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; -import me.shedaniel.architectury.platform.Platform; -import me.shedaniel.architectury.utils.Env; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.ClientHelper; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java index 67cceb6dd..fd394d04d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.impl.common.entry.comparison; -import me.shedaniel.architectury.fluid.FluidStack; +import dev.architectury.fluid.FluidStack; import me.shedaniel.rei.api.common.entry.comparison.FluidComparatorRegistry; import me.shedaniel.rei.api.common.plugins.REIPlugin; import net.minecraft.world.level.material.Fluid; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java index b02ba00f3..582590f3b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java @@ -23,8 +23,8 @@ package me.shedaniel.rei.impl.common.entry.type.types; -import me.shedaniel.architectury.utils.Env; -import me.shedaniel.architectury.utils.EnvExecutor; +import dev.architectury.utils.Env; +import dev.architectury.utils.EnvExecutor; import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; import me.shedaniel.rei.api.common.entry.EntrySerializer; import me.shedaniel.rei.api.common.entry.EntryStack; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java index df8ed7b72..4ed074f25 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.impl.common.fluid; import com.google.common.collect.ForwardingList; import com.google.common.collect.Lists; -import me.shedaniel.architectury.fluid.FluidStack; +import dev.architectury.fluid.FluidStack; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.REIPlugin; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java index 43177f293..b0dcad2d8 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java @@ -23,8 +23,8 @@ package me.shedaniel.rei.impl.common.registry; -import me.shedaniel.architectury.utils.EnvExecutor; |