diff options
Diffstat (limited to 'forge/src/main/java')
4 files changed, 9 insertions, 9 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java index 5cd817c82..13f06f360 100644 --- a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java @@ -32,7 +32,7 @@ import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.common.ForgeHooks; import java.util.Collection; import java.util.LinkedHashMap; @@ -51,7 +51,7 @@ public class CreativeModeTabCollectorImpl { ResourceKey<CreativeModeTab> resourceKey = BuiltInRegistries.CREATIVE_MODE_TAB .getResourceKey(tab) .orElseThrow(() -> new IllegalStateException("Unregistered creative tab: " + tab)); - ForgeHooksClient.onCreativeModeTabBuildContents(tab, resourceKey, tab.displayItemsGenerator, parameters, (stack, visibility) -> { + ForgeHooks.onCreativeModeTabBuildContents(tab, resourceKey, tab.displayItemsGenerator, parameters, (stack, visibility) -> { if (visibility == CreativeModeTab.TabVisibility.SEARCH_TAB_ONLY) return; builder.accept(stack, visibility); }); diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java index 989b0eb63..333f8fdbc 100644 --- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java +++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java @@ -25,8 +25,8 @@ package me.shedaniel.rei.mixin.forge; import me.shedaniel.rei.RoughlyEnoughItemsCoreClient; import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket; import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket; -import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket; import net.minecraft.world.item.crafting.RecipeManager; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java index 591cd987f..dc12ed85d 100644 --- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java +++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java @@ -26,7 +26,7 @@ package me.shedaniel.rei.mixin.forge; import me.shedaniel.rei.api.client.config.ConfigObject; import net.minecraft.client.gui.components.toasts.RecipeToast; import net.minecraft.client.gui.components.toasts.ToastComponent; -import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RecipeToast.class) public class MixinRecipeToast { @Inject(method = "addOrUpdate", at = @At("HEAD"), cancellable = true) - private static void addOrUpdate(ToastComponent toastGui, Recipe<?> recipe, CallbackInfo info) { + private static void addOrUpdate(ToastComponent toastGui, RecipeHolder<?> recipe, CallbackInfo info) { if (disableRecipeBook()) info.cancel(); } diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java index 64ce38b62..8c389d3e8 100644 --- a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java @@ -59,9 +59,9 @@ public class DefaultClientPluginImpl extends DefaultClientPlugin { Set<Potion> potions = Sets.newLinkedHashSet(); for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) { for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) { - Holder.Reference<Potion> from = mix.f_43532_; + Holder.Reference<Potion> from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference<Potion> to = mix.f_43534_; + Holder.Reference<Potion> to = mix.to; Ingredient base = Ingredient.of(Arrays.stream(container.getItems()) .map(ItemStack::copy) .map(stack -> PotionUtils.setPotion(stack, from.get()))); @@ -76,9 +76,9 @@ public class DefaultClientPluginImpl extends DefaultClientPlugin { } for (Potion potion : potions) { for (PotionBrewing.Mix<Item> mix : PotionBrewing.CONTAINER_MIXES) { - Holder.Reference<Item> from = mix.f_43532_; + Holder.Reference<Item> from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference<Item> to = mix.f_43534_; + Holder.Reference<Item> to = mix.to; Ingredient base = Ingredient.of(PotionUtils.setPotion(new ItemStack(from.get()), potion)); ItemStack output = PotionUtils.setPotion(new ItemStack(to.get()), potion); clientPlugin.registerBrewingRecipe(base, ingredient, output); |