yes thank you

9 files changed, 50 insertions, 46 deletions

diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 93e1e023d..3975d3670 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -57,7 +57,7 @@ import java.util.List;
 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");
@@ -71,25 +71,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("2.10");
     }
-
+    
     @Override
     public void onFirstLoad(PluginDisabler pluginDisabler) {
         if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin) {
@@ -99,7 +99,7 @@ public class DefaultPlugin implements REIPluginV0 {
             pluginDisabler.disablePluginFunction(PLUGIN, PluginFunction.REGISTER_OTHERS);
         }
     }
-
+    
     @Override
     public void registerItems(ItemRegistry itemRegistry) {
         Registry.ITEM.stream().forEach(item -> {
@@ -121,7 +121,7 @@ public class DefaultPlugin implements REIPluginV0 {
             }
         });
     }
-
+    
     @Override
     public void registerPluginCategories(RecipeHelper recipeHelper) {
         recipeHelper.registerCategory(new DefaultCraftingCategory());
@@ -134,7 +134,7 @@ public class DefaultPlugin implements REIPluginV0 {
         recipeHelper.registerCategory(new DefaultCompostingCategory());
         recipeHelper.registerCategory(new DefaultStrippingCategory());
     }
-
+    
     @Override
     public void registerRecipeDisplays(RecipeHelper recipeHelper) {
         recipeHelper.registerRecipes(CRAFTING, ShapelessRecipe.class, DefaultShapelessDisplay::new);
@@ -182,7 +182,7 @@ public class DefaultPlugin implements REIPluginV0 {
             recipeHelper.registerDisplay(STRIPPING, new DefaultStrippingDisplay(new ItemStack(set.getKey()), new ItemStack(set.getValue())));
         });
     }
-
+    
     @Override
     public void registerBounds(DisplayHelper displayHelper) {
         displayHelper.getBaseBoundsHandler().registerExclusionZones(AbstractInventoryScreen.class, new DefaultPotionEffectExclusionZones());
@@ -192,18 +192,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().window.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().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight());
             }
-
+            
             @Override
             public float getPriority() {
                 return -1.0f;
@@ -214,18 +214,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().window.getScaledHeight());
             }
-
+            
             @Override
             public Rectangle getRightBounds(RecipeViewingScreen screen) {
                 int startX = ((RecipeViewingScreen) screen).getBounds().x + ((RecipeViewingScreen) screen).getBounds().width + 2;
                 return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight());
             }
-
+            
             @Override
             public float getPriority() {
                 return -1.0f;
@@ -236,18 +236,18 @@ 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().window.getScaledHeight());
             }
-
+            
             @Override
             public Rectangle getRightBounds(VillagerRecipeViewingScreen screen) {
                 int startX = ((VillagerRecipeViewingScreen) screen).bounds.x + ((VillagerRecipeViewingScreen) screen).bounds.width + 2;
                 return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight());
             }
-
+            
             @Override
             public float getPriority() {
                 return -1.0f;
@@ -258,30 +258,30 @@ public class DefaultPlugin implements REIPluginV0 {
             public Class<?> getBaseSupportedClass() {
                 return CreativeInventoryScreen.class;
             }
-
+            
             @Override
             public Rectangle getLeftBounds(CreativeInventoryScreen screen) {
                 return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 2, MinecraftClient.getInstance().window.getScaledHeight());
             }
-
+            
             @Override
             public Rectangle getRightBounds(CreativeInventoryScreen screen) {
                 int startX = ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() + ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth();
                 return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight());
             }
-
+            
             @Override
             public Rectangle getItemListArea(Rectangle rectangle) {
                 return new Rectangle(rectangle.x + 1, rectangle.y + 24, rectangle.width - 2, rectangle.height - (RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField ? 27 + 22 : 27));
             }
-
+            
             @Override
             public float getPriority() {
                 return -0.9f;
             }
         });
     }
-
+    
     @Override
     public void registerOthers(RecipeHelper recipeHelper) {
         recipeHelper.registerWorkingStations(CRAFTING, new ItemStack(Items.CRAFTING_TABLE));
@@ -301,10 +301,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/DefaultPotionEffectExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
index 3ef514ea3..4dac29ba1 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
@@ -35,7 +35,7 @@ public class DefaultPotionEffectExclusionZones implements Function<Boolean, List
         int height = 33;
         if (activePotionEffects.size() > 5)
             height = 132 / (activePotionEffects.size() - 1);
-        for(StatusEffectInstance instance : Ordering.natural().sortedCopy(activePotionEffects)) {
+        for (StatusEffectInstance instance : Ordering.natural().sortedCopy(activePotionEffects)) {
             list.add(new Rectangle(x, y, 166, height));
             y += height;
         }
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 4b30f0200..3a5d9a650 100644
--- a/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java
@@ -46,9 +46,9 @@ public class DefaultBrewingDisplay implements RecipeDisplay {
     
     public List<ItemStack> getOutput(int slot) {
         List<ItemStack> stack = new ArrayList<>();
-        for(int i = 0; i < slot * 2; i++)
+        for (int i = 0; i < slot * 2; i++)
             stack.add(new ItemStack(Blocks.AIR));
-        for(int i = 0; i < 6 - slot * 2; i++)
+        for (int i = 0; i < 6 - slot * 2; i++)
             stack.addAll(getOutput());
         return stack;
     }
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 6d9c53bcc..5aa6635cc 100644
--- a/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java
+++ b/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java
@@ -76,8 +76,8 @@ public class DefaultCompostingCategory implements RecipeCategory<DefaultComposti
         });
         List<ItemConvertible> stacks = new LinkedList<>(recipeDisplaySupplier.get().getItemsByOrder());
         int i = 0;
-        for(int y = 0; y < 6; y++)
-            for(int x = 0; x < 8; x++) {
+        for (int y = 0; y < 6; y++)
+            for (int x = 0; x < 8; x++) {
                 widgets.add(new SlotWidget((int) bounds.getCenterX() - 72 + x * 18, bounds.y + y * 18, stacks.size() > i ? Arrays.asList(stacks.get(i).asItem().getStackForRender()) : Lists.newArrayList(), true, true, true) {
                     @Override
                     protected List<String> getExtraToolTips(ItemStack stack) {
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 4a34f83dd..a52e34a93 100644
--- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java
+++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java
@@ -59,10 +59,10 @@ public class DefaultCraftingCategory implements RecipeCategory<DefaultCraftingDi
         }));
         List<List<ItemStack>> input = recipeDisplaySupplier.get().getInput();
         List<SlotWidget> slots = Lists.newArrayList();
-        for(int y = 0; y < 3; y++)
-            for(int x = 0; x < 3; x++)
+        for (int y = 0; y < 3; y++)
+            for (int x = 0; x < 3; x++)
                 slots.add(new SlotWidget(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, Lists.newArrayList(), true, true, true));
-        for(int i = 0; i < input.size(); i++) {
+        for (int i = 0; i < input.size(); i++) {
             if (recipeDisplaySupplier.get() instanceof DefaultShapedDisplay) {
                 if (!input.get(i).isEmpty())
                     slots.get(getSlotWithSize(recipeDisplaySupplier.get(), i)).setItemList(input.get(i));
diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
index d0be8b967..756b1afe1 100644
--- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
@@ -26,7 +26,7 @@ public class DefaultCustomDisplay implements DefaultCraftingDisplay {
         this.possibleRecipe = possibleRecipe;
         List<Boolean> row = Lists.newArrayList(false, false, false);
         List<Boolean> column = Lists.newArrayList(false, false, false);
-        for(int i = 0; i < 9; i++)
+        for (int i = 0; i < 9; i++)
             if (i < input.size()) {
                 List<ItemStack> stacks = input.get(i);
                 if (stacks.stream().filter(stack -> !stack.isEmpty()).count() > 0) {
diff --git a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java
index b11494b94..bac1d62ab 100644
--- a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java
+++ b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java
@@ -12,7 +12,6 @@ import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
 import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import me.shedaniel.rei.plugin.DefaultPlugin;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.client.resource.language.I18n;
diff --git a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java
index 1c249bcad..81da6c724 100644
--- a/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java
@@ -14,40 +14,40 @@ import java.util.Collections;
 import java.util.List;
 
 public class DefaultStrippingDisplay implements RecipeDisplay {
-
+    
     private ItemStack in, out;
-
+    
     public DefaultStrippingDisplay(ItemStack in, ItemStack out) {
         this.in = in;
         this.out = out;
     }
-
+    
     public final ItemStack getIn() {
         return in;
     }
-
+    
     public final ItemStack getOut() {
         return out;
     }
-
+    
     @Override
     public List<List<ItemStack>> getInput() {
         return Collections.singletonList(Collections.singletonList(in));
     }
-
+    
     @Override
     public List<ItemStack> getOutput() {
         return Collections.singletonList(out);
     }
-
+    
     @Override
     public Identifier getRecipeCategory() {
         return DefaultPlugin.STRIPPING;
     }
-
+    
     @Override
     public List<List<ItemStack>> getRequiredItems() {
         return getInput();
     }
-
+    
 }
diff --git a/src/main/java/me/shedaniel/rei/plugin/stripping/DummyAxeItem.java b/src/main/java/me/shedaniel/rei/plugin/stripping/DummyAxeItem.java
index ec92d6391..a8e147d90 100644
--- a/src/main/java/me/shedaniel/rei/plugin/stripping/DummyAxeItem.java
+++ b/src/main/java/me/shedaniel/rei/plugin/stripping/DummyAxeItem.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
 package me.shedaniel.rei.plugin.stripping;
 
 import net.minecraft.block.Block;
@@ -10,7 +15,7 @@ public class DummyAxeItem extends AxeItem {
     protected DummyAxeItem(ToolMaterial toolMaterial_1, float float_1, float float_2, Settings item$Settings_1) {
         super(toolMaterial_1, float_1, float_2, item$Settings_1);
     }
-
+    
     public static Map<Block, Block> getStrippedBlocksMap() {
         return STRIPPED_BLOCKS;
     }