Skip to content

Commit 5ee0eca

Browse files
Attack8Attack8
committed
Merge branch 'refs/heads/mc1.20.1/dev' into mc1.20.1/mmc-5
# Conflicts: # src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
2 parents 769e41d + 2cf08a1 commit 5ee0eca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+233
-98
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ registrate_version = MC1.20-1.3.3
2525
flywheel_minecraft_version = 1.20.1
2626
flywheel_version = 1.0.0-beta-145
2727
jei_minecraft_version = 1.20.1
28-
jei_version = 15.10.0.39
28+
jei_version = 15.19.0.85
2929
curios_minecraft_version = 1.20.1
3030
curios_version = 5.3.1
3131

‎src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-10-11T10:29:49.10689745 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
1+
// 1.20.1 2025-01-04T09:59:54.9600791 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
22
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
33
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
44
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@@ -4185,6 +4185,7 @@ a5874f73c7dc0a3ae12999e6ae8abf45bc7fb9be data/create/tags/blocks/passive_boiler_
41854185
9bc8c13fd80bdbe7f767b91ee1a1042e9aff02b0 data/create/tags/blocks/roots.json
41864186
79ed9149ee2ce143114db4ccafda8a2b6a293aac data/create/tags/blocks/safe_nbt.json
41874187
79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/blocks/seats.json
4188+
f02fc9781e8f0ae33ed3b98cf4f46ba6927c7ff8 data/create/tags/blocks/sugar_cane_variants.json
41884189
5def5088f7fd31b80e6f28c1c4ea146aa9d7d15b data/create/tags/blocks/toolboxes.json
41894190
2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/tracks.json
41904191
1b6977d9a399cf6ee042e3f8f5e64e4d3cda5489 data/create/tags/blocks/tree_attachments.json

‎src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-09-06T15:13:15.0209174 Create's Processing Recipes
1+
// 1.20.1 2024-12-15T23:26:23.3573034 Create's Processing Recipes
22
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
33
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
44
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
@@ -814,7 +814,7 @@ d480b1b4c48440c6d6cb775321e95be7ea171aa5 data/create/recipes/milling/andesite.js
814814
a3b4a9eb3970eea745dff83c2d5fbab403ed481f data/create/recipes/milling/blue_orchid.json
815815
720ff9753bb30e874483fc850c3cbc8bfa973224 data/create/recipes/milling/bone.json
816816
e84433fe6ec772c212d20109268fa74ceb8fa3ab data/create/recipes/milling/bone_meal.json
817-
08771e9c43212ed8a378a7f4b2e5147ebe37fe0b data/create/recipes/milling/cactus.json
817+
77b571f6ee4e8775d87077accdce4a23fb6a0c56 data/create/recipes/milling/cactus.json
818818
d6073794b0be05fb52faf2d78d0daeb6ce3beab5 data/create/recipes/milling/calcite.json
819819
5b6ccdbc1bf1dcc3fc3fca94ff1fa46c17f46622 data/create/recipes/milling/charcoal.json
820820
6323f36ea7a1a46d0999dfe24e4fa86d677e319d data/create/recipes/milling/clay.json

‎src/generated/resources/data/create/recipes/milling/cactus.json

-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
{
22
"type": "create:milling",
3-
"conditions": [
4-
{
5-
"type": "forge:not",
6-
"value": {
7-
"type": "forge:mod_loaded",
8-
"modid": "quark"
9-
}
10-
}
11-
],
123
"ingredients": [
134
{
145
"item": "minecraft:cactus"

‎src/generated/resources/data/create/recipes/pressing/path.json

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
},
88
{
99
"item": "minecraft:dirt"
10+
},
11+
{
12+
"item": "minecraft:coarse_dirt"
13+
},
14+
{
15+
"item": "minecraft:rooted_dirt"
1016
}
1117
]
1218
],

‎src/generated/resources/data/create/tags/blocks/sugar_cane_variants.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:sugar_cane"
4+
]
5+
}

‎src/main/java/com/simibubi/create/AllBlocks.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import static com.simibubi.create.AllInteractionBehaviours.interactionBehaviour;
44
import static com.simibubi.create.AllMovementBehaviours.movementBehaviour;
55
import static com.simibubi.create.Create.REGISTRATE;
6+
7+
import com.simibubi.create.api.contraption.train.TrainConductorHandler;
8+
69
import static com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours.assignDataBehaviour;
710
import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
811
import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll;
@@ -185,7 +188,7 @@
185188
import com.simibubi.create.content.processing.basin.BasinMovementBehaviour;
186189
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
187190
import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
188-
import com.simibubi.create.content.processing.burner.BlazeBurnerInteractionBehaviour;
191+
import com.simibubi.create.content.processing.burner.BlockBasedTrainConductorInteractionBehaviour;
189192
import com.simibubi.create.content.processing.burner.BlazeBurnerMovementBehaviour;
190193
import com.simibubi.create.content.processing.burner.LitBlazeBurnerBlock;
191194
import com.simibubi.create.content.redstone.RoseQuartzLampBlock;
@@ -708,7 +711,7 @@ public class AllBlocks {
708711
.loot((lt, block) -> lt.add(block, BlazeBurnerBlock.buildLootTable()))
709712
.blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))
710713
.onRegister(movementBehaviour(new BlazeBurnerMovementBehaviour()))
711-
.onRegister(interactionBehaviour(new BlazeBurnerInteractionBehaviour()))
714+
.onRegister(block -> TrainConductorHandler.registerBlazeBurner())
712715
.item(BlazeBurnerBlockItem::withBlaze)
713716
.model(AssetLookup.customBlockItemModel("blaze_burner", "block_with_blaze"))
714717
.build()

‎src/main/java/com/simibubi/create/AllFluids.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77

88
import javax.annotation.Nullable;
99

10+
import com.simibubi.create.content.fluids.VirtualFluid;
11+
1012
import org.jetbrains.annotations.NotNull;
1113
import org.joml.Vector3f;
1214

1315
import com.mojang.blaze3d.shaders.FogShape;
1416
import com.mojang.blaze3d.systems.RenderSystem;
1517
import com.simibubi.create.AllTags.AllFluidTags;
1618
import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
17-
import com.simibubi.create.content.fluids.VirtualFluid;
1819
import com.simibubi.create.content.fluids.potion.PotionFluid;
1920
import com.simibubi.create.content.fluids.potion.PotionFluid.PotionFluidType;
2021
import com.simibubi.create.foundation.utility.Color;
@@ -46,7 +47,7 @@ public class AllFluids {
4647
}
4748

4849
public static final FluidEntry<PotionFluid> POTION =
49-
REGISTRATE.virtualFluid("potion", PotionFluidType::new, PotionFluid::new)
50+
REGISTRATE.virtualFluid("potion", PotionFluidType::new, PotionFluid::createSource, PotionFluid::createFlowing)
5051
.lang("Potion")
5152
.register();
5253

‎src/main/java/com/simibubi/create/AllTags.java

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public enum AllBlockTags {
104104
WINDMILL_SAILS,
105105
WRENCH_PICKUP,
106106
ROOTS,
107+
SUGAR_CANE_VARIANTS,
107108

108109
CORALS,
109110

‎src/main/java/com/simibubi/create/api/contraption/train/TrainConductorHandler.java

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package com.simibubi.create.api.contraption.train;
2+
3+
import com.simibubi.create.AllBlocks;
4+
import com.simibubi.create.AllInteractionBehaviours;
5+
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
6+
7+
import com.simibubi.create.content.processing.burner.BlockBasedTrainConductorInteractionBehaviour;
8+
9+
import net.minecraft.resources.ResourceLocation;
10+
import net.minecraft.world.level.block.state.BlockState;
11+
12+
13+
import org.jetbrains.annotations.ApiStatus;
14+
15+
import java.util.ArrayList;
16+
import java.util.List;
17+
import java.util.function.Consumer;
18+
import java.util.function.Predicate;
19+
20+
21+
/**
22+
* All required methods to make your block a train conductor similar to the blaze burner
23+
*/
24+
public interface TrainConductorHandler {
25+
26+
@ApiStatus.Internal
27+
List<TrainConductorHandler> CONDUCTOR_HANDLERS = new ArrayList<>();
28+
29+
30+
31+
boolean isValidConductor(BlockState state);
32+
33+
private static void registerHandler(TrainConductorHandler handler) {
34+
CONDUCTOR_HANDLERS.add(handler);
35+
}
36+
37+
static void registerConductor(ResourceLocation blockRl, Predicate<BlockState> isValidConductor, UpdateScheduleCallback updateScheduleCallback) {
38+
AllInteractionBehaviours.registerBehaviour(blockRl, new BlockBasedTrainConductorInteractionBehaviour(isValidConductor, updateScheduleCallback));
39+
registerHandler(isValidConductor::test);
40+
}
41+
42+
@ApiStatus.Internal
43+
static void registerBlazeBurner() {
44+
registerConductor(AllBlocks.BLAZE_BURNER.getId(), blockState -> AllBlocks.BLAZE_BURNER.has(blockState)
45+
&& blockState.getValue(BlazeBurnerBlock.HEAT_LEVEL) != BlazeBurnerBlock.HeatLevel.NONE, UpdateScheduleCallback.EMPTY);
46+
}
47+
48+
interface UpdateScheduleCallback {
49+
50+
UpdateScheduleCallback EMPTY = (hasSchedule, blockState, blockStateSetter) -> {};
51+
52+
void update(boolean hasSchedule, BlockState currentBlockState, Consumer<BlockState> blockStateSetter);
53+
}
54+
}

‎src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public final Object[] getCursorPos() {
3636

3737
@LuaFunction(mainThread = true)
3838
public final Object[] getSize() {
39+
blockEntity.updateGatheredData();
3940
DisplayTargetStats stats = blockEntity.activeTarget.provideStats(new DisplayLinkContext(blockEntity.getLevel(), blockEntity));
4041
return new Object[]{stats.maxRows(), stats.maxColumns()};
4142
}

‎src/main/java/com/simibubi/create/compat/jei/CreateJEI.java

+20
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import mezz.jei.api.gui.drawable.IDrawable;
7979
import mezz.jei.api.helpers.IPlatformFluidHelper;
8080
import mezz.jei.api.recipe.category.IRecipeCategory;
81+
import mezz.jei.api.registration.IExtraIngredientRegistration;
8182
import mezz.jei.api.registration.IGuiHandlerRegistration;
8283
import mezz.jei.api.registration.IRecipeCatalystRegistration;
8384
import mezz.jei.api.registration.IRecipeCategoryRegistration;
@@ -90,6 +91,7 @@
9091
import net.minecraft.resources.ResourceLocation;
9192
import net.minecraft.world.item.ItemStack;
9293
import net.minecraft.world.item.Items;
94+
import net.minecraft.world.item.alchemy.Potion;
9395
import net.minecraft.world.item.crafting.AbstractCookingRecipe;
9496
import net.minecraft.world.item.crafting.CraftingRecipe;
9597
import net.minecraft.world.item.crafting.Recipe;
@@ -98,7 +100,9 @@
98100
import net.minecraft.world.level.ItemLike;
99101
import net.minecraft.world.level.block.Blocks;
100102
import net.minecraftforge.common.crafting.IShapedRecipe;
103+
import net.minecraftforge.fluids.FluidStack;
101104
import net.minecraftforge.fml.ModList;
105+
import net.minecraftforge.registries.ForgeRegistries;
102106

103107
@JeiPlugin
104108
@SuppressWarnings("unused")
@@ -363,6 +367,22 @@ public <T> void registerFluidSubtypes(ISubtypeRegistration registration, IPlatfo
363367
registration.registerSubtypeInterpreter(ForgeTypes.FLUID_STACK, potionFluid.getFlowing(), interpreter);
364368
}
365369

370+
@Override
371+
public void registerExtraIngredients(IExtraIngredientRegistration registration) {
372+
Collection<Potion> potions = ForgeRegistries.POTIONS.getValues();
373+
Collection<FluidStack> potionFluids = new ArrayList<>(potions.size() * 3);
374+
for (Potion potion : potions) {
375+
// @goshante: Ingame potion fluids always have Bottle tag that specifies
376+
// to what bottle type this potion belongs
377+
// Potion fluid without this tag wouldn't be recognized by other mods
378+
for (PotionFluid.BottleType bottleType : PotionFluid.BottleType.values()) {
379+
FluidStack potionFluid = PotionFluid.of(1000, potion, bottleType);
380+
potionFluids.add(potionFluid);
381+
}
382+
}
383+
registration.addExtraIngredients(ForgeTypes.FLUID_STACK, potionFluids);
384+
}
385+
366386
@SuppressWarnings({ "unchecked", "rawtypes" })
367387
@Override
368388
public void registerGuiHandlers(IGuiHandlerRegistration registration) {

‎src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, BasinRecipe recipe, IFocusGr
6767
.addSlot(RecipeIngredientRole.INPUT, 17 + xOffset + (i % 3) * 19, 51 - (i / 3) * 19)
6868
.setBackground(getRenderedSlot(), -1, -1)
6969
.addIngredients(ForgeTypes.FLUID_STACK, withImprovedVisibility(fluidIngredient.getMatchingFluidStacks()))
70-
.addTooltipCallback(addFluidTooltip(fluidIngredient.getRequiredAmount()));
70+
.addRichTooltipCallback(addFluidTooltip(fluidIngredient.getRequiredAmount()));
7171
i++;
7272
}
7373

@@ -82,7 +82,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, BasinRecipe recipe, IFocusGr
8282
.addSlot(RecipeIngredientRole.OUTPUT, xPosition, yPosition)
8383
.setBackground(getRenderedSlot(result), -1, -1)
8484
.addItemStack(result.getStack())
85-
.addTooltipCallback(addStochasticTooltip(result));
85+
.addRichTooltipCallback(addStochasticTooltip(result));
8686
i++;
8787
}
8888

@@ -94,7 +94,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, BasinRecipe recipe, IFocusGr
9494
.addSlot(RecipeIngredientRole.OUTPUT, xPosition, yPosition)
9595
.setBackground(getRenderedSlot(), -1, -1)
9696
.addIngredient(ForgeTypes.FLUID_STACK, withImprovedVisibility(fluidResult))
97-
.addTooltipCallback(addFluidTooltip(fluidResult.getAmount()));
97+
.addRichTooltipCallback(addFluidTooltip(fluidResult.getAmount()));
9898
i++;
9999
}
100100

‎src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java

+8-18
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import javax.annotation.ParametersAreNonnullByDefault;
1010

11+
import mezz.jei.api.gui.ingredient.IRecipeSlotRichTooltipCallback;
12+
1113
import org.jetbrains.annotations.NotNull;
1214

1315
import com.simibubi.create.AllFluids;
@@ -108,11 +110,11 @@ public static ItemStack getResultItem(Recipe<?> recipe) {
108110
return recipe.getResultItem(level.registryAccess());
109111
}
110112

111-
public static IRecipeSlotTooltipCallback addStochasticTooltip(ProcessingOutput output) {
113+
public static IRecipeSlotRichTooltipCallback addStochasticTooltip(ProcessingOutput output) {
112114
return (view, tooltip) -> {
113115
float chance = output.getChance();
114116
if (chance != 1)
115-
tooltip.add(1, Lang.translateDirect("recipe.processing.chance", chance < 0.01 ? "<1" : (int) (chance * 100))
117+
tooltip.add(Lang.translateDirect("recipe.processing.chance", chance < 0.01 ? "<1" : (int) (chance * 100))
116118
.withStyle(ChatFormatting.GOLD));
117119
};
118120
}
@@ -130,11 +132,11 @@ public static FluidStack withImprovedVisibility(FluidStack stack) {
130132
return display;
131133
}
132134

133-
public static IRecipeSlotTooltipCallback addFluidTooltip() {
135+
public static IRecipeSlotRichTooltipCallback addFluidTooltip() {
134136
return addFluidTooltip(-1);
135137
}
136138

137-
public static IRecipeSlotTooltipCallback addFluidTooltip(int mbAmount) {
139+
public static IRecipeSlotRichTooltipCallback addFluidTooltip(int mbAmount) {
138140
return (view, tooltip) -> {
139141
Optional<FluidStack> displayed = view.getDisplayedIngredient(ForgeTypes.FLUID_STACK);
140142
if (displayed.isEmpty())
@@ -143,26 +145,14 @@ public static IRecipeSlotTooltipCallback addFluidTooltip(int mbAmount) {
143145
FluidStack fluidStack = displayed.get();
144146

145147
if (fluidStack.getFluid().isSame(AllFluids.POTION.get())) {
146-
Component name = fluidStack.getDisplayName();
147-
if (tooltip.isEmpty())
148-
tooltip.add(0, name);
149-
else
150-
tooltip.set(0, name);
151-
152148
ArrayList<Component> potionTooltip = new ArrayList<>();
153149
PotionFluidHandler.addPotionTooltip(fluidStack, potionTooltip, 1);
154-
tooltip.addAll(1, potionTooltip.stream().toList());
150+
tooltip.addAll(potionTooltip.stream().toList());
155151
}
156152

157153
int amount = mbAmount == -1 ? fluidStack.getAmount() : mbAmount;
158154
Component text = Components.literal(String.valueOf(amount)).append(Lang.translateDirect("generic.unit.millibuckets")).withStyle(ChatFormatting.GOLD);
159-
if (tooltip.isEmpty())
160-
tooltip.add(0, text);
161-
else {
162-
List<Component> siblings = tooltip.get(0).getSiblings();
163-
siblings.add(Components.literal(" "));
164-
siblings.add(text);
165-
}
155+
tooltip.add(text);
166156
};
167157
}
168158

‎src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, AbstractCrushingRecipe recip
4141
.addSlot(RecipeIngredientRole.OUTPUT, (xOffset) + layoutEntry.posX() + 1, yOffset + layoutEntry.posY() + 1)
4242
.setBackground(getRenderedSlot(layoutEntry.output()), -1, -1)
4343
.addItemStack(layoutEntry.output().getStack())
44-
.addTooltipCallback(addStochasticTooltip(layoutEntry.output()))
44+
.addRichTooltipCallback(addStochasticTooltip(layoutEntry.output()))
4545
);
4646
}
4747

‎src/main/java/com/simibubi/create/compat/jei/category/DeployingCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, DeployerApplicationRecipe re
4747
builder.addSlot(RecipeIngredientRole.OUTPUT, single ? 132 : 132 + xOffset, 51 + yOffset)
4848
.setBackground(getRenderedSlot(output), -1, -1)
4949
.addItemStack(output.getStack())
50-
.addTooltipCallback(addStochasticTooltip(output));
50+
.addRichTooltipCallback(addStochasticTooltip(output));
5151
}
5252

5353
if (recipe.shouldKeepHeldItem())

‎src/main/java/com/simibubi/create/compat/jei/category/ItemApplicationCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, ItemApplicationRecipe recipe
5858
builder.addSlot(RecipeIngredientRole.OUTPUT, single ? 132 : 132 + xOffset, 38 + yOffset)
5959
.setBackground(getRenderedSlot(output), -1, -1)
6060
.addItemStack(output.getStack())
61-
.addTooltipCallback(addStochasticTooltip(output));
61+
.addRichTooltipCallback(addStochasticTooltip(output));
6262
}
6363
}
6464

‎src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, EmptyingRecipe recipe, IFocu
100100
.addSlot(RecipeIngredientRole.OUTPUT, 132, 8)
101101
.setBackground(getRenderedSlot(), -1, -1)
102102
.addIngredient(ForgeTypes.FLUID_STACK, withImprovedVisibility(recipe.getResultingFluid()))
103-
.addTooltipCallback(addFluidTooltip(recipe.getResultingFluid().getAmount()));
103+
.addRichTooltipCallback(addFluidTooltip(recipe.getResultingFluid().getAmount()));
104104
builder
105105
.addSlot(RecipeIngredientRole.OUTPUT, 132, 27)
106106
.setBackground(getRenderedSlot(), -1, -1)

‎src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, AbstractCrushingRecipe recip
4242
.addSlot(RecipeIngredientRole.OUTPUT, single ? 139 : 133 + xOffset, 27 + yOffset)
4343
.setBackground(getRenderedSlot(output), -1, -1)
4444
.addItemStack(output.getStack())
45-
.addTooltipCallback(addStochasticTooltip(output));
45+
.addRichTooltipCallback(addStochasticTooltip(output));
4646

4747
i++;
4848
}

‎src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, SandPaperPolishingRecipe rec
4040
.addSlot(RecipeIngredientRole.OUTPUT, 132, 29)
4141
.setBackground(getRenderedSlot(output), -1, -1)
4242
.addItemStack(output.getStack())
43-
.addTooltipCallback(addStochasticTooltip(output));
43+
.addRichTooltipCallback(addStochasticTooltip(output));
4444
}
4545

4646
@Override

0 commit comments

Comments
 (0)