diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 02:20:18 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 02:21:31 +0900 |
| commit | 9fcf1faed017a08ab4d04fb1147108b659e15d7c (patch) | |
| tree | f3a00eb90dc9e04e4ffeaeb3ea519366477189ed /default-plugin/src/main/java/me/shedaniel/rei/plugin/client | |
| parent | 5f61d89501a4eadd99c805c973b1ef49a3a3aaee (diff) | |
| parent | d96699c5e2858ef1d25d2a2fc77deff59041af81 (diff) | |
| download | RoughlyEnoughItems-9fcf1faed017a08ab4d04fb1147108b659e15d7c.tar.gz RoughlyEnoughItems-9fcf1faed017a08ab4d04fb1147108b659e15d7c.tar.bz2 RoughlyEnoughItems-9fcf1faed017a08ab4d04fb1147108b659e15d7c.zip | |
Merge remote-tracking branch 'origin/12.x-1.20' into feature/13.1
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
# default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
Diffstat (limited to 'default-plugin/src/main/java/me/shedaniel/rei/plugin/client')
| -rw-r--r-- | default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index 2764ca379..a99e1a9a1 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -27,10 +27,7 @@ import com.google.common.collect.*; import dev.architectury.event.EventResult; import dev.architectury.networking.NetworkManager; import dev.architectury.platform.Platform; -import it.unimi.dsi.fastutil.objects.Object2FloatMap; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; -import it.unimi.dsi.fastutil.objects.ReferenceSet; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.favorites.FavoriteEntry; import me.shedaniel.rei.api.client.favorites.FavoriteEntryType; @@ -310,7 +307,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin registry.registerRecipeFiller(CampfireCookingRecipe.class, RecipeType.CAMPFIRE_COOKING, DefaultCampfireDisplay::new); registry.registerRecipeFiller(StonecutterRecipe.class, RecipeType.STONECUTTING, DefaultStoneCuttingDisplay::new); registry.registerRecipeFiller(SmithingTransformRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::ofTransforming); - registry.registerRecipeFiller(SmithingTrimRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::ofTrimming); + registry.registerRecipesFiller(SmithingTrimRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::fromTrimming); registry.registerFiller(AnvilRecipe.class, DefaultAnvilDisplay::new); registry.registerFiller(BrewingRecipe.class, DefaultBrewingDisplay::new); registry.registerFiller(TagKey.class, tagKey -> { |