diff options
Diffstat (limited to 'RoughlyEnoughItems-default-plugin/src/main/java/me')
32 files changed, 150 insertions, 121 deletions
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<DefaultBeaconBaseDisplay> { @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<DefaultBeaconBa } @Override - public List<Widget> setupDisplay(DefaultBeaconBaseDisplay display, Rectangle bounds) { + public @NotNull List<Widget> setupDisplay(DefaultBeaconBaseDisplay display, Rectangle bounds) { List<Widget> 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<List<EntryStack>> getInputEntries() { + public @NotNull List<List<EntryStack>> getInputEntries() { return Collections.singletonList(entries); } @@ -53,12 +54,12 @@ public class DefaultBeaconBaseDisplay implements RecipeDisplay { } @Override - public List<List<EntryStack>> getResultingEntries() { + public @NotNull List<List<EntryStack>> 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<DefaultBrewingDisplay> { @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<Widget> setupDisplay(DefaultBrewingDisplay display, Rectangle bounds) { + public @NotNull List<Widget> setupDisplay(DefaultBrewingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 52, bounds.getCenterY() - 29); List<Widget> 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<List<EntryStack>> getInputEntries() { + public @NotNull List<List<EntryStack>> getInputEntries() { return Lists.newArrayList(Collections.singletonList(input), reactant); } @Override - public List<List<EntryStack>> getResultingEntries() { + public @NotNull List<List<EntryStack>> 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<List<EntryStack>> getRequiredEntries() { + public @NotNull List<List<EntryStack>> 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<DefaultCampfireDisplay> { @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<Widget> setupDisplay(DefaultCampfireDisplay display, Rectangle bounds) { + public @NotNull List<Widget> 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<ResourceLocation> getRecipeLocation() { + public @NotNull Optional<ResourceLocation> getRecipeLocation() { return Optional.ofNullable(display).map(AbstractCookingRecipe::getId); } @Override - public List<List<EntryStack>> getInputEntries() { + public @NotNull List<List<EntryStack>> getInputEntries() { return inputs; } @Override - public List<List<EntryStack>> getResultingEntries() { + public @NotNull List<List<EntryStack>> getResultingEntries() { return Collections.singletonList(output); } @Override - public List<List<EntryStack>> getRequiredEntries() { + public @NotNull List<List<EntryStack>> 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<DefaultCompostingDisplay> { @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<DefaultComposti } @Override - public List<Widget> setupDisplay(DefaultCompostingDisplay display, Rectangle bounds) { + public @NotNull List<Widget> setupDisplay(DefaultCompostingDisplay display, Rectangle bounds) { List<Widget> widgets = Lists.newArrayList(); Point startingPoint = new Point(bounds.x + bounds.width - 55, bounds.y + 110); List<EntryStack> 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<List<EntryStack>> getInputEntries() { + public @NotNull List<List<EntryStack>> getInputEntries() { return CollectionUtils.map(order, Collections::singletonList); } @@ -65,17 +66,17 @@ public class DefaultCompostingDisplay implements RecipeDisplay { } @Override - public List<List<EntryStack>> getResultingEntries() { + public @NotNull List<List<EntryStack>> getResultingEntries() { return Collections.singletonList(output); } @Override - public ResourceLocation getRecipeCategory() { + public @NotNull ResourceLocation getRecipeCategory() { return DefaultPlugin.COMPOSTING; } @Override - public List<List<EntryStack>> getRequiredEntries() { + public @NotNull List<List<EntryStack>> 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<DefaultCoo } @Override - public List<Widget> setupDisplay(DefaultCookingDisplay display, Rectangle bounds) { + public @NotNull List<Widget> 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<DefaultCoo } @Override - public RecipeEntry getSimpleRenderer(DefaultCookingDisplay recipe) { + public @NotNull RecipeEntry getSimpleRenderer(DefaultCookingDisplay recipe) { return SimpleRecipeEntry.from(Collections.singletonList(recipe.getInputEntries().get(0)), recipe.getResultingEntries()); } @@ -93,17 +94,17 @@ public class DefaultCookingCategory implements TransferRecipeCategory<DefaultCoo } @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return identifier; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return logo; } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get(categoryName); } } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java index d8c6761a9..c4f80373f 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java @@ -36,6 +36,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.level.block.entity.FurnaceBlockEntity; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; @@ -69,22 +70,22 @@ public abstract class DefaultCookingDisplay implements TransferRecipeDisplay { } @Override - public Optional<ResourceLocation> getRecipeLocation() { + public @NotNull Optional<ResourceLocation> getRecipeLocation() { return Optional.ofNullable(recipe).map(AbstractCookingRecipe::getId); } @Override - public List<List<EntryStack>> getInputEntries() { + public @NotNull List<List<EntryStack>> getInputEntries() { return input; } @Override - public List<List<EntryStack>> getResultingEntries() { + public @NotNull List<List<EntryStack>> getResultingEntries() { return Collections.singletonList(output); } @Override - public List<List<EntryStack>> getRequiredEntries() { + public @NotNull List<List<EntryStack>> 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<DefaultCr } @Override - public ResourceLocation getIdentifier() { + public @NotNull ResourceLocation getIdentifier() { return DefaultPlugin.CRAFTING; } @Override - public EntryStack getLogo() { + public @NotNull EntryStack getLogo() { return EntryStack.create(Blocks.CRAFTING_TABLE); } @Override - public String getCategoryName() { + public @NotNull String getCategoryName() { return I18n.get("category.rei.crafting"); } @Override - public List<Widget> setupDisplay(DefaultCraftingDisplay display, Rectangle bounds) { + public @NotNull List<Widget> setupDisplay(DefaultCraftingDisplay display, Rectangle bounds) { Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); List<Widget> 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 { |