From 5bf10e476366e9aff291d55c050a324734bae911 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 27 Aug 2020 19:47:47 +0800 Subject: Some Nullable and NotNull annotations Signed-off-by: shedaniel --- .../rei/plugin/beacon/DefaultBeaconBaseCategory.java | 10 +++++----- .../shedaniel/rei/plugin/beacon/DefaultBeaconBaseDisplay.java | 7 ++++--- .../shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java | 3 ++- .../shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java | 9 +++++---- .../shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java | 9 +++++---- .../rei/plugin/campfire/DefaultCampfireCategory.java | 9 +++++---- .../shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java | 11 ++++++----- .../rei/plugin/composting/DefaultCompostingCategory.java | 11 ++++++----- .../rei/plugin/composting/DefaultCompostingDisplay.java | 9 +++++---- .../shedaniel/rei/plugin/cooking/DefaultCookingCategory.java | 11 ++++++----- .../shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java | 9 +++++---- .../rei/plugin/crafting/DefaultCraftingCategory.java | 9 +++++---- .../shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java | 3 ++- .../shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java | 9 +++++---- .../shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java | 9 +++++---- .../rei/plugin/crafting/DefaultShapelessDisplay.java | 9 +++++---- .../me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java | 11 ++++++----- .../java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java | 7 ++++--- .../rei/plugin/information/DefaultInformationCategory.java | 10 +++++----- .../rei/plugin/information/DefaultInformationDisplay.java | 7 ++++--- .../shedaniel/rei/plugin/pathing/DefaultPathingCategory.java | 9 +++++---- .../shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java | 9 +++++---- .../shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java | 3 ++- .../rei/plugin/smithing/DefaultSmithingCategory.java | 9 +++++---- .../shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java | 10 +++++----- .../shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java | 3 ++- .../rei/plugin/stonecutting/DefaultStoneCuttingCategory.java | 9 +++++---- .../rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java | 11 ++++++----- .../rei/plugin/stripping/DefaultStrippingCategory.java | 9 +++++---- .../rei/plugin/stripping/DefaultStrippingDisplay.java | 9 +++++---- .../shedaniel/rei/plugin/tilling/DefaultTillingCategory.java | 9 +++++---- .../shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java | 9 +++++---- 32 files changed, 150 insertions(+), 121 deletions(-) (limited to 'RoughlyEnoughItems-default-plugin/src/main/java') diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java index 0d584b1af..4f7f64963 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java @@ -53,22 +53,22 @@ import java.util.Objects; public class DefaultBeaconBaseCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.BEACON; } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.beacon_base"); } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.BEACON); } @Override - public RecipeEntry getSimpleRenderer(DefaultBeaconBaseDisplay recipe) { + public @NotNull RecipeEntry getSimpleRenderer(DefaultBeaconBaseDisplay recipe) { String name = getCategoryName(); return new RecipeEntry() { @Override @@ -84,7 +84,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory setupDisplay(DefaultBeaconBaseDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultBeaconBaseDisplay display, Rectangle bounds) { List widgets = Lists.newArrayList(); widgets.add(Widgets.createSlot(new Point(bounds.getCenterX() - 8, bounds.y + 3)).entry(getLogo())); Rectangle rectangle = new Rectangle(bounds.getCenterX() - (bounds.width / 2) - 1, bounds.y + 23, bounds.width + 2, bounds.height - 28); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseDisplay.java index d19ecb9aa..603ef2dea 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseDisplay.java @@ -30,6 +30,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -44,7 +45,7 @@ public class DefaultBeaconBaseDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(entries); } @@ -53,12 +54,12 @@ public class DefaultBeaconBaseDisplay implements RecipeDisplay { } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.emptyList(); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.BEACON; } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java index 1336166e2..132aa61d1 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java @@ -29,6 +29,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.BlastingRecipe; +import org.jetbrains.annotations.NotNull; @Environment(EnvType.CLIENT) public class DefaultBlastingDisplay extends DefaultCookingDisplay { @@ -38,7 +39,7 @@ public class DefaultBlastingDisplay extends DefaultCookingDisplay { } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.BLASTING; } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java index e4bc9a64c..37d418fa8 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java @@ -40,6 +40,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -47,22 +48,22 @@ import java.util.List; public class DefaultBrewingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.BREWING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.BREWING_STAND); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.brewing"); } @Override - public List setupDisplay(DefaultBrewingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultBrewingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 52, bounds.getCenterY() - 29); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java index 1d096ab1a..1a882ad3e 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java @@ -35,6 +35,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collections; @@ -60,17 +61,17 @@ public class DefaultBrewingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Lists.newArrayList(Collections.singletonList(input), reactant); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(Collections.singletonList(output)); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.BREWING; } @@ -84,7 +85,7 @@ public class DefaultBrewingDisplay implements RecipeDisplay { } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java index 2f3da489b..5192dc7d9 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java @@ -35,6 +35,7 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.text.DecimalFormat; import java.util.List; @@ -42,22 +43,22 @@ import java.util.List; public class DefaultCampfireCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.CAMPFIRE; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.CAMPFIRE); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.campfire"); } @Override - public List setupDisplay(DefaultCampfireDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultCampfireDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); final double cookingTime = display.getCookTime(); DecimalFormat df = new DecimalFormat("###.##"); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java index 1dd6b1c8d..fa50fb918 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java @@ -34,6 +34,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.CampfireCookingRecipe; import net.minecraft.world.item.crafting.Ingredient; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -63,27 +64,27 @@ public class DefaultCampfireDisplay implements RecipeDisplay { } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(display).map(AbstractCookingRecipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return inputs; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return inputs; } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.CAMPFIRE; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java index 148dcdba7..56447b60f 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java @@ -43,6 +43,7 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.util.*; @@ -50,22 +51,22 @@ import java.util.*; public class DefaultCompostingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.COMPOSTING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.COMPOSTER); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.composting"); } @Override - public RecipeEntry getSimpleRenderer(DefaultCompostingDisplay recipe) { + public @NotNull RecipeEntry getSimpleRenderer(DefaultCompostingDisplay recipe) { return new RecipeEntry() { private Component text = new TranslatableComponent("text.rei.composting.page", recipe.getPage() + 1); @@ -82,7 +83,7 @@ public class DefaultCompostingCategory implements RecipeCategory setupDisplay(DefaultCompostingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultCompostingDisplay display, Rectangle bounds) { List widgets = Lists.newArrayList(); Point startingPoint = new Point(bounds.x + bounds.width - 55, bounds.y + 110); List stacks = new ArrayList<>(display.getRequiredEntries().get(0)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java index 1f166c3a2..f5f1df2f6 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java @@ -32,6 +32,7 @@ import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -56,7 +57,7 @@ public class DefaultCompostingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return CollectionUtils.map(order, Collections::singletonList); } @@ -65,17 +66,17 @@ public class DefaultCompostingDisplay implements RecipeDisplay { } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.COMPOSTING; } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return Collections.singletonList(order); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java index 79f4ec208..048a592c7 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java @@ -38,6 +38,7 @@ import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; import java.text.DecimalFormat; import java.util.Collections; @@ -66,7 +67,7 @@ public class DefaultCookingCategory implements TransferRecipeCategory setupDisplay(DefaultCookingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultCookingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); double cookingTime = display.getCookingTime(); DecimalFormat df = new DecimalFormat("###.##"); @@ -83,7 +84,7 @@ public class DefaultCookingCategory implements TransferRecipeCategory getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(recipe).map(AbstractCookingRecipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return input; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return input; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index 19c214b80..7fdd83869 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -43,6 +43,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -55,22 +56,22 @@ public class DefaultCraftingCategory implements TransferRecipeCategory setupDisplay(DefaultCraftingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultCraftingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java index b3833416c..c91d6e240 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java @@ -33,6 +33,7 @@ import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.crafting.Recipe; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -42,7 +43,7 @@ import java.util.Optional; public interface DefaultCraftingDisplay extends TransferRecipeDisplay { @Override - default ResourceLocation getRecipeCategory() { + default @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.CRAFTING; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java index 76e87d8d9..e8f650cdd 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java @@ -31,6 +31,7 @@ import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -75,22 +76,22 @@ public class DefaultCustomDisplay implements DefaultCraftingDisplay { } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return getRecipe().map(Recipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return input; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return input; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java index 6ce78f007..32bf2ead8 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java @@ -29,6 +29,7 @@ import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.ShapedRecipe; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -48,22 +49,22 @@ public class DefaultShapedDisplay implements DefaultCraftingDisplay { } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(display).map(ShapedRecipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return input; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return input; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java index e3beccfcd..e1d4d8e33 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java @@ -29,6 +29,7 @@ import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.ShapelessRecipe; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -53,22 +54,22 @@ public class DefaultShapelessDisplay implements DefaultCraftingDisplay { } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(display).map(ShapelessRecipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return input; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return input; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java index ba91e7e83..5bf724a4a 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java @@ -42,6 +42,7 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.text.DecimalFormat; @@ -53,12 +54,12 @@ public class DefaultFuelCategory implements RecipeCategory { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.FUEL; } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.fuel"); } @@ -68,12 +69,12 @@ public class DefaultFuelCategory implements RecipeCategory { } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Items.COAL); } @Override - public List setupDisplay(DefaultFuelDisplay recipeDisplay, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultFuelDisplay recipeDisplay, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 17); String burnItems = DECIMAL_FORMAT.format(recipeDisplay.getFuelTime() / 200d); List widgets = Lists.newArrayList(); @@ -86,7 +87,7 @@ public class DefaultFuelCategory implements RecipeCategory { } @Override - public RecipeEntry getSimpleRenderer(DefaultFuelDisplay recipe) { + public @NotNull RecipeEntry getSimpleRenderer(DefaultFuelDisplay recipe) { Slot slot = Widgets.createSlot(new Point(0, 0)).entries(recipe.getInputEntries().get(0)).disableBackground().disableHighlight(); String burnItems = DECIMAL_FORMAT.format(recipe.getFuelTime() / 200d); return new RecipeEntry() { diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java index 9da926c85..e6e3991a7 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java @@ -29,6 +29,7 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -44,17 +45,17 @@ public class DefaultFuelDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(Collections.singletonList(fuel)); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.emptyList(); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.FUEL; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java index e75f397a3..ec1b14ef3 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java @@ -71,17 +71,17 @@ public class DefaultInformationCategory implements RecipeCategory setupDisplay(DefaultInformationDisplay recipeDisplay, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultInformationDisplay recipeDisplay, Rectangle bounds) { List widgets = Lists.newArrayList(); widgets.add(Widgets.createLabel(new Point(bounds.getCenterX(), bounds.y + 3), recipeDisplay.getName()).noShadow().color(0xFF404040, 0xFFBBBBBB)); widgets.add(Widgets.createSlot(new Point(bounds.getCenterX() - 8, bounds.y + 15)).entries(recipeDisplay.getEntryStacks())); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java index aaf0d8132..95f58c7bd 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java @@ -31,6 +31,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.Collection; @@ -58,12 +59,12 @@ public class DefaultInformationDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(entryStacks); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(entryStacks); } @@ -95,7 +96,7 @@ public class DefaultInformationDisplay implements RecipeDisplay { } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.INFO; } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java index be5c07590..946201f12 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java @@ -34,28 +34,29 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; +import org.jetbrains.annotations.NotNull; import java.util.List; public class DefaultPathingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.PATHING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Items.IRON_SHOVEL); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.pathing"); } @Override - public List setupDisplay(DefaultPathingDisplay recipeDisplay, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultPathingDisplay recipeDisplay, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java index 54fb366e1..be2900a22 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java @@ -30,6 +30,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -57,22 +58,22 @@ public class DefaultPathingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(Collections.singletonList(in)); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(Collections.singletonList(out)); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.PATHING; } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java index 7a474b88c..7fd276ca8 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java @@ -29,6 +29,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.SmeltingRecipe; +import org.jetbrains.annotations.NotNull; @Environment(EnvType.CLIENT) public class DefaultSmeltingDisplay extends DefaultCookingDisplay { @@ -38,7 +39,7 @@ public class DefaultSmeltingDisplay extends DefaultCookingDisplay { } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.SMELTING; } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java index 38b3d15d5..15d2efb4e 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java @@ -34,27 +34,28 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.util.List; public class DefaultSmithingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.SMITHING; } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.smithing"); } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.SMITHING_TABLE); } @Override - public List setupDisplay(DefaultSmithingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultSmithingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 31, bounds.getCenterY() - 13); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java index 834b605c7..f5ced69d2 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java @@ -66,27 +66,27 @@ public class DefaultSmithingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return input; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.SMITHING; } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(location); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java index f7cc31acf..41aaff864 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java @@ -27,6 +27,7 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import me.shedaniel.rei.plugin.cooking.DefaultCookingDisplay; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.SmokingRecipe; +import org.jetbrains.annotations.NotNull; public class DefaultSmokingDisplay extends DefaultCookingDisplay { @@ -35,7 +36,7 @@ public class DefaultSmokingDisplay extends DefaultCookingDisplay { } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.SMOKING; } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java index fb336875a..860e863b7 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java @@ -34,28 +34,29 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Blocks; +import org.jetbrains.annotations.NotNull; import java.util.List; public class DefaultStoneCuttingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.STONE_CUTTING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.STONECUTTER); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.stone_cutting"); } @Override - public List setupDisplay(DefaultStoneCuttingDisplay display, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultStoneCuttingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java index cd6b0ae79..a0651697c 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java @@ -34,6 +34,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.SingleItemRecipe; import net.minecraft.world.item.crafting.StonecutterRecipe; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -57,27 +58,27 @@ public class DefaultStoneCuttingDisplay implements RecipeDisplay { } @Override - public Optional getRecipeLocation() { + public @NotNull Optional getRecipeLocation() { return Optional.ofNullable(display).map(SingleItemRecipe::getId); } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return inputs; } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(output); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.STONE_CUTTING; } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java index 938a58c9f..484ae1c8a 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java @@ -34,28 +34,29 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; +import org.jetbrains.annotations.NotNull; import java.util.List; public class DefaultStrippingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.STRIPPING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Items.IRON_AXE); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.stripping"); } @Override - public List setupDisplay(DefaultStrippingDisplay recipeDisplay, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultStrippingDisplay recipeDisplay, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java index a1e92dde6..681c36200 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java @@ -30,6 +30,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -57,22 +58,22 @@ public class DefaultStrippingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(Collections.singletonList(in)); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(Collections.singletonList(out)); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.STRIPPING; } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java index 05be0cfe3..c5ec41e6a 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java @@ -34,28 +34,29 @@ import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; +import org.jetbrains.annotations.NotNull; import java.util.List; public class DefaultTillingCategory implements RecipeCategory { @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.TILLING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Items.IRON_HOE); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.tilling"); } @Override - public List setupDisplay(DefaultTillingDisplay recipeDisplay, Rectangle bounds) { + public @NotNull List setupDisplay(DefaultTillingDisplay recipeDisplay, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 13); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java index 08922cae7..55aa5f3a5 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java @@ -30,6 +30,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -57,22 +58,22 @@ public class DefaultTillingDisplay implements RecipeDisplay { } @Override - public List> getInputEntries() { + public @NotNull List> getInputEntries() { return Collections.singletonList(Collections.singletonList(in)); } @Override - public List> getResultingEntries() { + public @NotNull List> getResultingEntries() { return Collections.singletonList(Collections.singletonList(out)); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.TILLING; } @Override - public List> getRequiredEntries() { + public @NotNull List> getRequiredEntries() { return getInputEntries(); } } -- cgit