diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-01-02 14:31:16 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-01-02 14:31:16 +0800 |
| commit | 5e2eccadbd91171c01cdb209d1338bcfb7786b1c (patch) | |
| tree | 6c7387de5baea8b335e8abe58651018f77ad2d41 /src/main/java/me/shedaniel/rei/plugin | |
| parent | e8714fe8fc1dcaec7ad299c63e2b657870c8fb40 (diff) | |
| download | RoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.tar.gz RoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.tar.bz2 RoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.zip | |
3.3
Fix #58
Close #134
Close #158
Fix #227
Diffstat (limited to 'src/main/java/me/shedaniel/rei/plugin')
20 files changed, 152 insertions, 152 deletions
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java index 4b4140819..29551f5be 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java @@ -15,19 +15,19 @@ import net.fabricmc.loader.util.version.VersionParsingException; import net.minecraft.util.Identifier; public class DefaultAutoCraftingPlugin implements REIPluginV0 { - + public static final Identifier PLUGIN = new Identifier("roughlyenoughitems", "default_auto_crafting_plugin"); - + @Override public Identifier getPluginIdentifier() { return PLUGIN; } - + @Override public SemanticVersion getMinimumVersion() throws VersionParsingException { return SemanticVersion.parse("3.0-pre"); } - + @Override public void registerOthers(RecipeHelper recipeHelper) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 0ec68517b..2e7ca7c8f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -55,7 +55,7 @@ import net.minecraft.util.registry.Registry; import java.util.*; public class DefaultPlugin implements REIPluginV0 { - + public static final Identifier CRAFTING = new Identifier("minecraft", "plugins/crafting"); public static final Identifier SMELTING = new Identifier("minecraft", "plugins/smelting"); public static final Identifier SMOKING = new Identifier("minecraft", "plugins/smoking"); @@ -69,25 +69,25 @@ public class DefaultPlugin implements REIPluginV0 { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); private static final Identifier DISPLAY_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/display_dark.png"); private static final List<DefaultBrewingDisplay> BREWING_DISPLAYS = Lists.newArrayList(); - + public static Identifier getDisplayTexture() { return ScreenHelper.isDarkModeEnabled() ? DISPLAY_TEXTURE_DARK : DISPLAY_TEXTURE; } - + public static void registerBrewingDisplay(DefaultBrewingDisplay display) { BREWING_DISPLAYS.add(display); } - + @Override public Identifier getPluginIdentifier() { return PLUGIN; } - + @Override public SemanticVersion getMinimumVersion() throws VersionParsingException { return SemanticVersion.parse("3.2.33"); } - + @Override public void registerEntries(EntryRegistry entryRegistry) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { @@ -107,7 +107,7 @@ public class DefaultPlugin implements REIPluginV0 { entryRegistry.registerEntry(EntryStack.create(item)); } EntryStack stack = EntryStack.create(Items.ENCHANTED_BOOK); - List<EntryStack> enchantments = new ArrayList<>(); + List<EntryStack> enchantments = new ArrayList<>(); for (Enchantment enchantment : Registry.ENCHANTMENT) { for (int i = enchantment.getMinimumLevel(); i <= enchantment.getMaximumLevel(); i++) { Map<Enchantment, Integer> map = new HashMap<>(); @@ -123,7 +123,7 @@ public class DefaultPlugin implements REIPluginV0 { entryRegistry.registerEntry(EntryStack.create(fluid)); } } - + @Override public void registerPluginCategories(RecipeHelper recipeHelper) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { @@ -139,7 +139,7 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerCategory(new DefaultCompostingCategory()); recipeHelper.registerCategory(new DefaultStrippingCategory()); } - + @Override public void registerRecipeDisplays(RecipeHelper recipeHelper) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { @@ -193,7 +193,7 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerDisplay(STRIPPING, new DefaultStrippingDisplay(new ItemStack(set.getKey()), new ItemStack(set.getValue()))); }); } - + @Override public void postRegister() { // Sit tight! This will be a fast journey! @@ -212,12 +212,12 @@ public class DefaultPlugin implements REIPluginV0 { time = System.currentTimeMillis() - time; RoughlyEnoughItemsCore.LOGGER.info("[REI] Applied Check Tags for potion in %dms.", time); } - + private void applyPotionTransformer(EntryStack stack) { if (stack.getItem() instanceof PotionItem) stack.addSetting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE); } - + @Override public void registerBounds(DisplayHelper displayHelper) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { @@ -236,18 +236,18 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return AbstractContainerScreen.class; } - + @Override public Rectangle getLeftBounds(AbstractContainerScreen<?> screen) { return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public Rectangle getRightBounds(AbstractContainerScreen<?> screen) { int startX = ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() + ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth() + 2; return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public float getPriority() { return -1.0f; @@ -258,18 +258,18 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return RecipeViewingScreen.class; } - + @Override public Rectangle getLeftBounds(RecipeViewingScreen screen) { - return new Rectangle(2, 0, ((RecipeViewingScreen) screen).getBounds().x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); + return new Rectangle(2, 0, screen.getBounds().x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public Rectangle getRightBounds(RecipeViewingScreen screen) { - int startX = ((RecipeViewingScreen) screen).getBounds().x + ((RecipeViewingScreen) screen).getBounds().width + 2; + int startX = screen.getBounds().x + screen.getBounds().width + 2; return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public float getPriority() { return -1.0f; @@ -280,25 +280,25 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return VillagerRecipeViewingScreen.class; } - + @Override public Rectangle getLeftBounds(VillagerRecipeViewingScreen screen) { - return new Rectangle(2, 0, ((VillagerRecipeViewingScreen) screen).bounds.x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); + return new Rectangle(2, 0, screen.bounds.x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public Rectangle getRightBounds(VillagerRecipeViewingScreen screen) { - int startX = ((VillagerRecipeViewingScreen) screen).bounds.x + ((VillagerRecipeViewingScreen) screen).bounds.width + 2; + int startX = screen.bounds.x + screen.bounds.width + 2; return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } - + @Override public float getPriority() { return -1.0f; } }); } - + @Override public void registerOthers(RecipeHelper recipeHelper) { if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) { @@ -321,10 +321,10 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), SmokerScreen.class, SMOKING); recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), BlastFurnaceScreen.class, BLASTING); } - + @Override public int getPriority() { return -1; } - + } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java index 5c883e8be..5e50fe3f1 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.function.Supplier; public class DefaultRecipeBookExclusionZones implements Supplier<List<Rectangle>> { - + @Override public List<Rectangle> get() { if (!MinecraftClient.getInstance().player.getRecipeBook().isGuiOpen() || !(MinecraftClient.getInstance().currentScreen instanceof RecipeBookProvider) || !(ScreenHelper.getLastContainerScreen().getContainer() instanceof CraftingContainer)) @@ -31,5 +31,5 @@ public class DefaultRecipeBookExclusionZones implements Supplier<List<Rectangle> l.add(new Rectangle(screenHooks.rei_getContainerLeft() - 4 - 145 - 30, screenHooks.rei_getContainerTop(), 30, size * 27)); return l; } - + } diff --git a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java index 889b057e4..510d5eb96 100644 --- a/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java @@ -11,11 +11,11 @@ import net.minecraft.recipe.BlastingRecipe; import net.minecraft.util.Identifier; public class DefaultBlastingDisplay extends DefaultCookingDisplay { - + public DefaultBlastingDisplay(BlastingRecipe recipe) { super(recipe); } - + @Override public Identifier getRecipeCategory() { return DefaultPlugin.BLASTING; diff --git a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java index c08ef53c1..2e9273038 100644 --- a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java @@ -26,22 +26,22 @@ import java.util.List; import java.util.function.Supplier; public class DefaultBrewingCategory implements RecipeCategory<DefaultBrewingDisplay> { - + @Override public Identifier getIdentifier() { return DefaultPlugin.BREWING; } - + @Override public EntryStack getLogo() { return EntryStack.create(Blocks.BREWING_STAND); } - + @Override public String getCategoryName() { return I18n.translate("category.rei.brewing"); } - + @Override public List<Widget> setupDisplay(Supplier<DefaultBrewingDisplay> recipeDisplaySupplier, Rectangle bounds) { final DefaultBrewingDisplay recipeDisplay = recipeDisplaySupplier.get(); @@ -64,5 +64,5 @@ public class DefaultBrewingCategory implements RecipeCategory<DefaultBrewingDisp widgets.add(EntryWidget.create(startPoint.x + 86, startPoint.y + 35).entries(recipeDisplay.getOutput(2)).noBackground()); return widgets; } - + } diff --git a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java index 8159966fc..21ca07b14 100644 --- a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java @@ -20,10 +20,10 @@ import java.util.Collections; import java.util.List; public class DefaultBrewingDisplay implements RecipeDisplay { - + private EntryStack input, output; private List<EntryStack> reactant; - + public DefaultBrewingDisplay(ItemStack input, Ingredient reactant, ItemStack output) { this.input = EntryStack.create(input).setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(Formatting.YELLOW.toString() + I18n.translate("category.rei.brewing.input"))); this.reactant = new ArrayList<>(); @@ -34,22 +34,22 @@ public class DefaultBrewingDisplay implements RecipeDisplay { } this.output = EntryStack.create(output).setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(Formatting.YELLOW.toString() + I18n.translate("category.rei.brewing.result"))); } - + @Override public List<List<EntryStack>> getInputEntries() { return Lists.newArrayList(Collections.singletonList(input), reactant); } - + @Override public List<EntryStack> getOutputEntries() { return Collections.singletonList(output); } - + @Override public Identifier getRecipeCategory() { return DefaultPlugin.BREWING; } - + public List<EntryStack> getOutput(int slot) { List<EntryStack> stack = new ArrayList<>(); for (int i = 0; i < slot * 2; i++) @@ -58,7 +58,7 @@ public class DefaultBrewingDisplay implements RecipeDisplay { stack.addAll(getOutputEntries()); return stack; } - + @Override public List<List<EntryStack>> getRequiredEntries() { return getInputEntries(); diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java index a11a0c5aa..351376633 100644 --- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java @@ -22,17 +22,17 @@ import java.util.Optional; import java.util.stream.Collectors; public class DefaultCampfireDisplay implements RecipeDisplay { - + private List<List<EntryStack>> inputs; private List<EntryStack> output; private int cookTime; private CampfireCookingRecipe display; - + public DefaultCampfireDisplay(CampfireCookingRecipe recipe) { this(recipe.getPreviewInputs(), recipe.getOutput(), recipe.getCookTime()); this.display = recipe; } - + public DefaultCampfireDisplay(DefaultedList<Ingredient> ingredients, ItemStack output, int cookTime) { this.inputs = ingredients.stream().map(i -> { List<EntryStack> entries = new ArrayList<>(); @@ -44,34 +44,34 @@ public class DefaultCampfireDisplay implements RecipeDisplay { this.output = Collections.singletonList(EntryStack.create(output)); this.cookTime = cookTime; } - + public int getCookTime() { return cookTime; } - + @Override public Optional<Identifier> getRecipeLocation() { return Optional.ofNullable(display).map(AbstractCookingRecipe::getId); } - + @Override public List<List<EntryStack>> getInputEntries() { return inputs; } - + @Override public List<EntryStack> getOutputEntries() { return output; } - + @Override public List<List<EntryStack>> getRequiredEntries() { return inputs; } - + @Override public Identifier getRecipeCategory() { return DefaultPlugin.CAMPFIRE; } - + } diff --git a/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java b/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java index c0a9c0db0..96d3e2027 100644 --- a/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java @@ -31,22 +31,22 @@ import java.util.Map; import java.util.function.Supplier; public class DefaultCompostingCategory implements RecipeCategory<DefaultCompostingDisplay> { - + @Override public Identifier getIdentifier() { return DefaultPlugin.COMPOSTING; } - + @Override public EntryStack getLogo() { return EntryStack.create(Blocks.COMPOSTER); } - + @Override public String getCategoryName() { return I18n.translate("category.rei.composting"); } - + @Override public RecipeEntry getSimpleRenderer(DefaultCompostingDisplay recipe) { return new RecipeEntry() { @@ -54,20 +54,20 @@ public class DefaultCompostingCategory implements RecipeCategory<DefaultComposti public int getHeight() { return 10 + MinecraftClient.getInstance().textRenderer.fontHeight; } - + @Nullable @Override public QueuedTooltip getTooltip(int mouseX, int mouseY) { return null; } - + @Override public void render(Rectangle rectangle, int mouseX, int mouseY, float delta) { MinecraftClient.getInstance().textRenderer.draw(I18n.translate("text.rei.composting.page", recipe.getPage() + 1), rectangle.x + 5, rectangle.y + 6, -1); } }; } - + @Override public List<Widget> setupDisplay(Supplier<DefaultCompostingDisplay> recipeDisplaySupplier, Rectangle bounds) { List<Widget> widgets = Lists.newArrayList(); @@ -98,12 +98,12 @@ public class DefaultCompostingCategory implements RecipeCategory<DefaultComposti widgets.add(EntryWidget.create(startingPoint.x + 34, startingPoint.y + 5).entries(recipeDisplaySupplier.get().getOutputEntries()).noBackground()); return widgets; } - + @Override public int getDisplayHeight() { return 140; } - + @SuppressWarnings("deprecation") @Override public int getFixedRecipesPerPage() { diff --git a/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java b/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java index f910101ad..a10269b6b 100644 --- a/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java +++ b/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java @@ -13,40 +13,40 @@ import net.minecraft.item.ItemStack; public class CraftingContainerInfoWrapper<T extends CraftingContainer<?>> implements ContainerInfo<T> { private Class<? extends CraftingContainer<?>> containerClass; - + public <T extends CraftingContainer<?>> CraftingContainerInfoWrapper(Class<T> containerClass) { this.containerClass = containerClass; } - + public static <T extends CraftingContainer<?>> ContainerInfo<T> create(Class<T> containerClass) { return new CraftingContainerInfoWrapper<T>(containerClass); } - + @Override public Class<? extends Container> getContainerClass() { return containerClass; } - + @Override public int getCraftingResultSlotIndex(T container) { return container.getCraftingResultSlotIndex(); } - + @Override public int getCraftingWidth(T container) { return container.getCraftingWidth(); } - + @Override public int getCraftingHeight(T container) { return container.getCraftingHeight(); } - + @Override public void clearCraftingSlots(T container) { container.clearCraftingSlots(); } - + @Override public void populateRecipeFinder(T container, RecipeFinder var1) { container.populateRecipeFinder(new net.minecraft.recipe.RecipeFinder() { diff --git a/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java index 7eec9a749..f1c33dd81 100644 --- a/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java @@ -28,7 +28,7 @@ public abstract class DefaultCookingDisplay implements TransferRecipeDisplay { private AbstractCookingRecipe recipe; private List<List<EntryStack>> input; private List<EntryStack> output; - + public DefaultCookingDisplay(AbstractCookingRecipe recipe) { this.recipe = recipe; this.input = recipe.getPreviewInputs().stream().map(i -> { @@ -41,49 +41,49 @@ public abstract class DefaultCookingDisplay implements TransferRecipeDisplay { this.input.add(FurnaceBlockEntity.createFuelTimeMap().keySet().stream().map(Item::getStackForRender).map(EntryStack::create).map(e -> e.setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(Formatting.YELLOW.toString() + I18n.translate("category.rei.smelting.fuel")))).collect(Collectors.toList())); this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); } - + @Override public Optional<Identifier> getRecipeLocation() { return Optional.ofNullable(recipe).map(AbstractCookingRecipe::getId); } - + @Override public List<List<EntryStack>> getInputEntries() { return input; } - + @Override public List<EntryStack> getOutputEntries() { return output; } - + public List<EntryStack> getFuel() { return input.get(1); } - + @Override public List<List<EntryStack>> getRequiredEntries() { return input; } - + @Deprecated public Optional<AbstractCookingRecipe> getOptionalRecipe() { return Optional.ofNullable(recipe); } - + @Override public int getWidth() { return 1; } - + @Override public int getHeight() { return 1; } - + @Override public List<List<EntryStack>> getOrganisedInputEntries(ContainerInfo<Container> containerInfo, Container container) { return CollectionUtils.map(recipe.getPreviewInputs(), i -> CollectionUtils.map(i.getMatchingStacksClient(), EntryStack::create)); } - + } diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index 2be9dfe0c..096196f7a 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -31,33 +31,33 @@ import java.util.List; import java.util.function.Supplier; public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCraftingDisplay> { - + @Deprecated public static int getSlotWithSize(DefaultCraftingDisplay recipeDisplay, int num) { return getSlotWithSize(recipeDisplay, num, 3); } - + public static int getSlotWithSize(DefaultCraftingDisplay recipeDisplay, int num, int craftingGridWidth) { int x = num % recipeDisplay.getWidth(); int y = (num - x) / recipeDisplay.getWidth(); return craftingGridWidth * y + x; } - + @Override public Identifier getIdentifier() { return DefaultPlugin.CRAFTING; } - + @Override public EntryStack getLogo() { return EntryStack.create(Blocks.CRAFTING_TABLE); } - + @Override public String getCategoryName() { return I18n.translate("category.rei.crafting"); } - + @Override public List<Widget> setupDisplay(Supplier<DefaultCraftingDisplay> recipeDisplaySupplier, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); @@ -85,7 +85,7 @@ public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCr widgets.add(EntryWidget.create(startPoint.x + 95, startPoint.y + 19).entries(recipeDisplaySupplier.get().getOutputEntries()).noBackground()); return widgets; } - + @Override public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) { ContainerInfo info = ContainerInfoHandler.getContainerInfo(getIdentifier(), ScreenHelper.getLastContainerScreen().getContainer().getClass()); diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java index b08f0da6c..2a0f1d347 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java @@ -19,24 +19,24 @@ import java.util.List; import java.util.Optional; public interface DefaultCraftingDisplay extends TransferRecipeDisplay { - + @Override default Identifier getRecipeCategory() { return DefaultPlugin.CRAFTING; } - + @Override - default public int getWidth() { + default int getWidth() { return 2; } - + @Override - default public int getHeight() { + default int getHeight() { return 2; } |
