Merge pull request Sefiraat#228 from balugaq/master

spotless

Author: balugaq

src/main/java/com/balugaq/netex/api/data/AdvancedMachineRecipe.java

@@ -2,6 +2,8 @@
 
 
 import com.ytdd9527.networksexpansion.utils.itemstacks.CompareUtil;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 
@@ -14,7 +16,8 @@ public class AdvancedMachineRecipe {
     private final ItemAmountWrapper[] inputs;
     @Nonnull
     private final AdvancedRandomOutput[] randomOutputs;
-    private final int[] weightBeginValues;
+    private final int @NotNull [] weightBeginValues;
+    @Getter
     private int weightSum = 0;
 
     public AdvancedMachineRecipe(@Nonnull ItemAmountWrapper[] inputs, @Nonnull AdvancedRandomOutput[] randomOutputs) {
@@ -47,15 +50,7 @@ public boolean isRandomOutput() {
         return this.randomOutputs.length > 1;
     }
 
-    public int getWeightSum() {
-        return this.weightSum;
-    }
-
     public record AdvancedRandomOutput(@Nonnull ItemAmountWrapper[] outputItem, int weight) {
-        public AdvancedRandomOutput(@Nonnull ItemAmountWrapper[] outputItem, int weight) {
-            this.outputItem = outputItem;
-            this.weight = weight;
-        }
 
         @Nonnull
         public ItemAmountWrapper[] getOutputItem() {

src/main/java/com/balugaq/netex/api/data/ItemAmountWrapper.java

@@ -3,6 +3,8 @@
 
 import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
 import io.github.sefiraat.networks.utils.StackUtils;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -14,6 +16,8 @@
  * @author Final_ROOT
  * @since 2.0
  */
+@Setter
+@Getter
 public class ItemAmountWrapper extends ItemWrapper {
     private int amount;
 
@@ -72,14 +76,6 @@ public static void addToList(@Nonnull List<ItemAmountWrapper> list, @Nonnull Ite
         list.add(new ItemAmountWrapper(item.getItemStack(), item.getItemMeta(), item.amount * mul));
     }
 
-    public int getAmount() {
-        return this.amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
     public void addAmount(int amount) {
         this.amount += amount;
     }

src/main/java/com/balugaq/netex/api/data/ItemContainer.java

@@ -3,30 +3,37 @@
 import io.github.sefiraat.networks.utils.StackUtils;
 import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper;
 import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 @Getter
 public class ItemContainer {
 
     private final int id;
-    private final ItemStack sample;
+    private final @NotNull ItemStack sample;
     @Getter
-    private final ItemStackWrapper wrapper;
+    private final @NotNull ItemStackWrapper wrapper;
+    @Setter
     @Getter
     private int amount;
 
-    public ItemContainer(int id, ItemStack item, int amount) {
+    public ItemContainer(int id, @NotNull ItemStack item, int amount) {
         this.id = id;
         this.sample = item.clone();
         sample.setAmount(1);
         this.wrapper = ItemStackWrapper.wrap(sample);
         this.amount = amount;
     }
 
-    public ItemStack getSample() {
+    public @NotNull ItemStack getSample() {
         return sample.clone();
     }
 
+    public ItemStack getSampleDirectly() {
+        return sample;
+    }
+
     public boolean isSimilar(ItemStack other) {
         return StackUtils.itemsMatch(wrapper, other);
     }
@@ -52,11 +59,7 @@ public int removeAmount(int amount) {
         }
     }
 
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public String toString() {
+    public @NotNull String toString() {
         return "ItemContainer{" +
                 "id=" + id +
                 ", sample=" + sample +

src/main/java/com/balugaq/netex/api/data/Language.java

@@ -3,17 +3,17 @@
 import com.google.common.base.Preconditions;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 
 public final class Language {
-    private final String lang;
-    private final File currentFile;
-    private final FileConfiguration currentConfig;
+    private final @NotNull String lang;
+    private final @NotNull File currentFile;
+    private final @NotNull FileConfiguration currentConfig;
 
     @ParametersAreNonnullByDefault
     public Language(String lang, File currentFile, FileConfiguration defaultConfig) {
@@ -24,10 +24,8 @@ public Language(String lang, File currentFile, FileConfiguration defaultConfig)
         this.currentFile = currentFile;
         this.currentConfig = YamlConfiguration.loadConfiguration(currentFile);
         this.currentConfig.setDefaults(defaultConfig);
-        Iterator var4 = defaultConfig.getKeys(true).iterator();
 
-        while (var4.hasNext()) {
-            String key = (String) var4.next();
+        for (String key : defaultConfig.getKeys(true)) {
             if (!this.currentConfig.contains(key)) {
                 this.currentConfig.set(key, defaultConfig.get(key));
             }

src/main/java/com/balugaq/netex/api/data/RandomMachineRecipe.java

@@ -3,6 +3,7 @@
 
 import com.ytdd9527.networksexpansion.utils.itemstacks.CompareUtil;
 import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
+import lombok.Getter;
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -111,8 +112,9 @@ public RandomMachineRecipe addRandomOutput(@Nonnull RandomOutput... randomOutput
      */
     public static class RandomOutput {
         @Nonnull
-        private ItemStack[] outputItem;
-        private int weight;
+        private final ItemStack[] outputItem;
+        @Getter
+        private final int weight;
 
         public RandomOutput(@Nonnull List<ItemStack> outputItem, int weight) {
             this.outputItem = outputItem.toArray(new ItemStack[0]);
@@ -139,8 +141,5 @@ public ItemStack[] getOutputItem() {
             return outputItem;
         }
 
-        public int getWeight() {
-            return weight;
-        }
     }
 }