From a6900532610247cae49f1c782442d07d8f7b1d2d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 26 Aug 2022 16:48:42 +0900 Subject: It compiles now --- .../rei/plugin/client/categories/DefaultBrewingCategory.java | 12 ++++++------ .../plugin/client/categories/DefaultCampfireCategory.java | 2 +- .../plugin/client/categories/DefaultCompostingCategory.java | 2 +- .../rei/plugin/client/categories/DefaultFuelCategory.java | 2 +- .../client/categories/DefaultOxidationScrapingCategory.java | 2 +- .../plugin/client/categories/DefaultOxidizingCategory.java | 2 +- .../rei/plugin/client/categories/DefaultPathingCategory.java | 2 +- .../plugin/client/categories/DefaultSmithingCategory.java | 2 +- .../client/categories/DefaultStoneCuttingCategory.java | 2 +- .../plugin/client/categories/DefaultStrippingCategory.java | 2 +- .../rei/plugin/client/categories/DefaultTillingCategory.java | 2 +- .../plugin/client/categories/DefaultWaxScrapingCategory.java | 2 +- .../rei/plugin/client/categories/DefaultWaxingCategory.java | 2 +- .../plugin/client/categories/anvil/DefaultAnvilCategory.java | 2 +- .../client/categories/beacon/DefaultBeaconBaseCategory.java | 2 +- .../categories/beacon/DefaultBeaconPaymentCategory.java | 2 +- .../client/categories/cooking/DefaultCookingCategory.java | 2 +- .../client/categories/crafting/DefaultCraftingCategory.java | 2 +- .../rei/plugin/client/categories/tag/DefaultTagCategory.java | 2 +- .../plugin/client/categories/tag/ReferenceTagNodeWidget.java | 6 +++--- .../rei/plugin/client/categories/tag/ValueTagNodeWidget.java | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) (limited to 'default-plugin/src/main/java') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java index 9e020da89..d52357628 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java @@ -74,12 +74,12 @@ public class DefaultBrewingCategory implements DisplayCategory @Override public DisplayRenderer getDisplayRenderer(DefaultFuelDisplay display) { - Slot slot = Widgets.createSlot(new Point(0, 0)).entries(display.getInputEntries().get(0)).disableBackground().disableHighlight(); + Slot slot = Widgets.createSlot(new Point(0, 0)).entries(display.getInputEntries().get(0)).noBackground().noHighlight(); String burnItems = DECIMAL_FORMAT.format(display.getFuelTime() / 200d); return new DisplayRenderer() { private TranslatableComponent text = new TranslatableComponent("category.rei.fuel.time_short.items", burnItems); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java index 4f5d1e849..079393311 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java @@ -66,7 +66,7 @@ public class DefaultOxidationScrapingCategory implements DisplayCategory Widgets.createSlot(new Point(0, 0)).disableBackground().entry(t)))); + widgets.add(new ScrollableSlotsWidget(rectangle, CollectionUtils.map(display.getEntries(), t -> Widgets.createSlot(new Point(0, 0)).noBackground().entry(t)))); return widgets; } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java index 17071e68d..c2ebdda40 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java @@ -87,7 +87,7 @@ public class DefaultBeaconPaymentCategory implements DisplayCategory Widgets.createSlot(new Point(0, 0)).disableBackground().entry(t)))); + widgets.add(new ScrollableSlotsWidget(rectangle, CollectionUtils.map(display.getEntries(), t -> Widgets.createSlot(new Point(0, 0)).noBackground().entry(t)))); return widgets; } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java index 5e8b4c0a2..7e609774c 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java @@ -72,7 +72,7 @@ public class DefaultCookingCategory implements DisplayCategory key.location().toString()).orElse("null"))); + return Tooltip.create(context, new TextComponent(holder.unwrapKey().map(key -> key.location().toString()).orElse("null"))); } }); } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java index 019e4f3d2..f98bfb805 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java @@ -55,9 +55,9 @@ public class ReferenceTagNodeWidget extends TagNodeWidget { this.overflowBounds = overflowBounds; this.bounds = new Rectangle(0, 0, 24, 23); this.slot = Widgets.createSlot(new Rectangle(0, 0, 18, 18)) - .disableBackground() - .disableHighlight() - .disableTooltips() + .noBackground() + .noHighlight() + .noTooltips() .entries(EntryIngredients.ofTag(node.getReference(), mapper)); this.children = Collections.singletonList(this.slot); } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java index 5936e1842..f53fd92d9 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ValueTagNodeWidget.java @@ -66,7 +66,7 @@ public class ValueTagNodeWidget extends TagNodeWidget { int y = i / width; Slot slot = Widgets.createSlot(new Rectangle(x * 16 + 5, y * 16 + 5, 18, 18)) .entry(mapper.apply(holder)) - .disableBackground(); + .noBackground(); this.widgets.add(slot); i++; } -- cgit