Misc code fixes

This commit is contained in:
nossr50
2020-07-13 11:39:03 -07:00
parent 428c093ae4
commit 7eae59a0b3
153 changed files with 1139 additions and 1474 deletions

View File

@@ -18,16 +18,16 @@ import java.util.Map;
public class PotionConfig extends ConfigLoader {
private static PotionConfig instance;
private List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
private List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
private final List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
private Map<String, AlchemyPotion> potionMap = new HashMap<String, AlchemyPotion>();
private final Map<String, AlchemyPotion> potionMap = new HashMap<String, AlchemyPotion>();
private PotionConfig() {
super("potions.yml");
@@ -280,8 +280,7 @@ public class PotionConfig extends ConfigLoader {
green += color.getGreen();
blue += color.getBlue();
}
Color color = Color.fromRGB(red/colors.size(), green/colors.size(), blue/colors.size());
return color;
return Color.fromRGB(red/colors.size(), green/colors.size(), blue/colors.size());
}
}

View File

@@ -15,7 +15,7 @@ import java.util.*;
public class RepairConfig extends ConfigLoader {
private List<Repairable> repairables;
private HashSet<String> notSupported;
private final HashSet<String> notSupported;
public RepairConfig(String fileName) {
super(fileName);

View File

@@ -18,7 +18,7 @@ import java.util.*;
public class SalvageConfig extends ConfigLoader {
private List<Salvageable> salvageables;
private HashSet<String> notSupported;
private final HashSet<String> notSupported;
public SalvageConfig(String fileName) {
super(fileName);