aboutsummaryrefslogtreecommitdiff
path: root/forge/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'forge/src/main/java')
-rw-r--r--forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java2
-rw-r--r--forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
index 6a50e8d71..a7b5a3091 100644
--- a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java
@@ -47,7 +47,7 @@ public class ScreenOverlayImplImpl {
components = new ArrayList<>(components);
for (Tooltip.Entry entry : tooltip.entries()) {
if (!entry.isText()) {
- components.add(1, entry.getAsComponent());
+ components.add(1, ClientTooltipComponent.create(entry.getAsTooltipComponent()));
}
}
screen.tooltipStack = itemStack;
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 6d69f9068..23aac8d92 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
@@ -26,6 +26,7 @@ package me.shedaniel.rei.plugin.client.forge;
import com.google.common.collect.Sets;
import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
import me.shedaniel.rei.plugin.client.BuiltinClientPlugin;
+import net.minecraft.core.Holder;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.alchemy.Potion;
@@ -36,7 +37,6 @@ import net.minecraftforge.common.brewing.BrewingRecipe;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
import net.minecraftforge.common.brewing.IBrewingRecipe;
import net.minecraftforge.common.brewing.VanillaBrewingRecipe;
-import net.minecraftforge.registries.IRegistryDelegate;
import java.util.Arrays;
import java.util.Set;
@@ -57,9 +57,9 @@ public class DefaultClientPluginImpl {
Set<Potion> potions = Sets.newLinkedHashSet();
for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) {
for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) {
- IRegistryDelegate<Potion> from = mix.f_43532_;
+ Holder.Reference<Potion> from = mix.f_43532_;
Ingredient ingredient = mix.ingredient;
- IRegistryDelegate<Potion> to = mix.f_43534_;
+ Holder.Reference<Potion> to = mix.f_43534_;
Ingredient base = Ingredient.of(Arrays.stream(container.getItems())
.map(ItemStack::copy)
.map(stack -> PotionUtils.setPotion(stack, from.get())));
@@ -74,9 +74,9 @@ public class DefaultClientPluginImpl {
}
for (Potion potion : potions) {
for (PotionBrewing.Mix<Item> mix : PotionBrewing.CONTAINER_MIXES) {
- IRegistryDelegate<Item> from = mix.f_43532_;
+ Holder.Reference<Item> from = mix.f_43532_;
Ingredient ingredient = mix.ingredient;
- IRegistryDelegate<Item> to = mix.f_43534_;
+ Holder.Reference<Item> to = mix.f_43534_;
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);