From f04d72b96e5c562d4de7f5f5e5521942de5df49a Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 14 Nov 2021 03:20:23 +0800 Subject: Removed deprecated APIs, 1.18-pre1 --- .../rei/plugin/client/favorites/GameModeFavoriteEntry.java | 4 ++-- .../rei/plugin/client/favorites/WeatherFavoriteEntry.java | 4 ++-- .../java/me/shedaniel/rei/plugin/common/DefaultPlugin.java | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'default-plugin/src/main') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java index 47d023529..b8125f9fd 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java @@ -190,14 +190,14 @@ public class GameModeFavoriteEntry extends FavoriteEntry { INSTANCE; @Override - public DataResult readResult(CompoundTag object) { + public DataResult read(CompoundTag object) { String stringValue = object.getString(KEY); GameType type = stringValue.equals("NOT_SET") ? null : GameType.valueOf(stringValue); return DataResult.success(new GameModeFavoriteEntry(type), Lifecycle.stable()); } @Override - public DataResult fromArgsResult(Object... args) { + public DataResult fromArgs(Object... args) { if (args.length == 0) return DataResult.error("Cannot create GameModeFavoriteEntry from empty args!"); if (!(args[0] instanceof GameType type)) return DataResult.error("Creation of GameModeFavoriteEntry from args expected GameType as the first argument!"); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java index 55483ac53..ce102b422 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java @@ -197,14 +197,14 @@ public class WeatherFavoriteEntry extends FavoriteEntry { INSTANCE; @Override - public DataResult readResult(CompoundTag object) { + public DataResult read(CompoundTag object) { String stringValue = object.getString(KEY); Weather weather = stringValue.equals("NOT_SET") ? null : Weather.valueOf(stringValue); return DataResult.success(new WeatherFavoriteEntry(weather), Lifecycle.stable()); } @Override - public DataResult fromArgsResult(Object... args) { + public DataResult fromArgs(Object... args) { if (args.length == 0) return DataResult.error("Cannot create WeatherFavoriteEntry from empty args!"); if (!(args[0] instanceof Weather weather)) return DataResult.error("Creation of WeatherFavoriteEntry from args expected Weather as the first argument!"); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java index 807fec537..b9eb3b585 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java @@ -36,6 +36,7 @@ import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.REIServerPlugin; import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry; import me.shedaniel.rei.api.common.transfer.info.simple.RecipeBookGridMenuInfo; +import me.shedaniel.rei.api.common.transfer.info.simple.SimpleMenuInfoProvider; import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.plugin.common.displays.*; import me.shedaniel.rei.plugin.common.displays.beacon.DefaultBeaconBaseDisplay; @@ -127,11 +128,11 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin { @Override public void registerMenuInfo(MenuInfoRegistry registry) { - registry.register(BuiltinPlugin.CRAFTING, CraftingMenu.class, new RecipeBookGridMenuInfo<>()); - registry.register(BuiltinPlugin.CRAFTING, InventoryMenu.class, new RecipeBookGridMenuInfo<>()); - registry.register(BuiltinPlugin.SMELTING, FurnaceMenu.class, new RecipeBookGridMenuInfo<>()); - registry.register(BuiltinPlugin.SMOKING, SmokerMenu.class, new RecipeBookGridMenuInfo<>()); - registry.register(BuiltinPlugin.BLASTING, BlastFurnaceMenu.class, new RecipeBookGridMenuInfo<>()); + registry.register(BuiltinPlugin.CRAFTING, CraftingMenu.class, SimpleMenuInfoProvider.of(RecipeBookGridMenuInfo::new)); + registry.register(BuiltinPlugin.CRAFTING, InventoryMenu.class, SimpleMenuInfoProvider.of(RecipeBookGridMenuInfo::new)); + registry.register(BuiltinPlugin.SMELTING, FurnaceMenu.class, SimpleMenuInfoProvider.of(RecipeBookGridMenuInfo::new)); + registry.register(BuiltinPlugin.SMOKING, SmokerMenu.class, SimpleMenuInfoProvider.of(RecipeBookGridMenuInfo::new)); + registry.register(BuiltinPlugin.BLASTING, BlastFurnaceMenu.class, SimpleMenuInfoProvider.of(RecipeBookGridMenuInfo::new)); } @Override -- cgit