Update to 1.16.3

This commit is contained in:
Tomás F 2020-10-14 13:05:05 +01:00 committed by GitHub
commit 93a01271fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 27 deletions

View File

@ -6,7 +6,7 @@
<groupId>com.tomff.beesplus</groupId> <groupId>com.tomff.beesplus</groupId>
<artifactId>BeesPlus</artifactId> <artifactId>BeesPlus</artifactId>
<version>1.5.1</version> <version>1.5.2</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version> <version>1.16.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -5,10 +5,10 @@ import org.bukkit.inventory.ItemStack;
import java.util.Map; import java.util.Map;
public abstract class CustomItem { public interface CustomItem {
public abstract String[] getRecipe(); String[] getRecipe();
public abstract Map<Character, Material> getIngredients(); Map<Character, Material> getIngredients();
public abstract ItemStack getResult(); ItemStack getResult();
} }

View File

@ -24,8 +24,7 @@ import org.bukkit.persistence.PersistentDataType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BeeHiveUpgrade extends CustomItem implements Listener { public class BeeHiveUpgrade implements CustomItem, Listener {
private NamespacedKey upgradeKey; private NamespacedKey upgradeKey;
private int maxPopulation; private int maxPopulation;
@ -34,7 +33,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
maxPopulation = beesPlus.getConfig().getInt("beehiveupgrade.maximumpopulation", 9); maxPopulation = beesPlus.getConfig().getInt("beehiveupgrade.maximumpopulation", 9);
} }
@Override
public String[] getRecipe() { public String[] getRecipe() {
return new String[] { return new String[] {
"CCC", "CCC",
@ -43,7 +41,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
}; };
} }
@Override
public Map<Character, Material> getIngredients() { public Map<Character, Material> getIngredients() {
Map<Character, Material> ingredients = new HashMap<>(); Map<Character, Material> ingredients = new HashMap<>();
@ -53,7 +50,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
return ingredients; return ingredients;
} }
@Override
public ItemStack getResult() { public ItemStack getResult() {
return new ItemBuilder(Material.HONEYCOMB) return new ItemBuilder(Material.HONEYCOMB)
.setName(Localization.get(Localization.BEEHIVE_UPGRADE_ITEM_NAME)) .setName(Localization.get(Localization.BEEHIVE_UPGRADE_ITEM_NAME))

View File

@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BeeProtectionBoots extends CustomItem { public class BeeProtectionBoots implements CustomItem {
@Override
public String[] getRecipe() { public String[] getRecipe() {
return new String[] { return new String[] {
"SSS", "SSS",
@ -19,7 +18,6 @@ public class BeeProtectionBoots extends CustomItem {
}; };
} }
@Override
public Map<Character, Material> getIngredients() { public Map<Character, Material> getIngredients() {
Map<Character, Material> ingredients = new HashMap<>(); Map<Character, Material> ingredients = new HashMap<>();
@ -29,7 +27,6 @@ public class BeeProtectionBoots extends CustomItem {
return ingredients; return ingredients;
} }
@Override
public ItemStack getResult() { public ItemStack getResult() {
return new ItemBuilder(Material.CHAINMAIL_BOOTS) return new ItemBuilder(Material.CHAINMAIL_BOOTS)
.setName(Localization.get(Localization.BEE_PROTECTION_BOOTS)) .setName(Localization.get(Localization.BEE_PROTECTION_BOOTS))

View File

@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BeeProtectionChestplate extends CustomItem { public class BeeProtectionChestplate implements CustomItem {
@Override
public String[] getRecipe() { public String[] getRecipe() {
return new String[] { return new String[] {
"SSS", "SSS",
@ -19,7 +18,6 @@ public class BeeProtectionChestplate extends CustomItem {
}; };
} }
@Override
public Map<Character, Material> getIngredients() { public Map<Character, Material> getIngredients() {
Map<Character, Material> ingredients = new HashMap<>(); Map<Character, Material> ingredients = new HashMap<>();
@ -29,7 +27,6 @@ public class BeeProtectionChestplate extends CustomItem {
return ingredients; return ingredients;
} }
@Override
public ItemStack getResult() { public ItemStack getResult() {
return new ItemBuilder(Material.CHAINMAIL_CHESTPLATE) return new ItemBuilder(Material.CHAINMAIL_CHESTPLATE)
.setName(Localization.get(Localization.BEE_PROTECTION_CHESTPLATE)) .setName(Localization.get(Localization.BEE_PROTECTION_CHESTPLATE))

View File

@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BeeProtectionHelmet extends CustomItem { public class BeeProtectionHelmet implements CustomItem {
@Override
public String[] getRecipe() { public String[] getRecipe() {
return new String[] { return new String[] {
"SSS", "SSS",
@ -19,7 +18,6 @@ public class BeeProtectionHelmet extends CustomItem {
}; };
} }
@Override
public Map<Character, Material> getIngredients() { public Map<Character, Material> getIngredients() {
Map<Character, Material> ingredients = new HashMap<>(); Map<Character, Material> ingredients = new HashMap<>();
@ -29,7 +27,6 @@ public class BeeProtectionHelmet extends CustomItem {
return ingredients; return ingredients;
} }
@Override
public ItemStack getResult() { public ItemStack getResult() {
return new ItemBuilder(Material.CHAINMAIL_HELMET) return new ItemBuilder(Material.CHAINMAIL_HELMET)
.setName(Localization.get(Localization.BEE_PROTECTION_HELMET)) .setName(Localization.get(Localization.BEE_PROTECTION_HELMET))

View File

@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BeeProtectionLeggings extends CustomItem { public class BeeProtectionLeggings implements CustomItem {
@Override
public String[] getRecipe() { public String[] getRecipe() {
return new String[] { return new String[] {
"SSS", "SSS",
@ -19,7 +18,6 @@ public class BeeProtectionLeggings extends CustomItem {
}; };
} }
@Override
public Map<Character, Material> getIngredients() { public Map<Character, Material> getIngredients() {
Map<Character, Material> ingredients = new HashMap<>(); Map<Character, Material> ingredients = new HashMap<>();
@ -29,7 +27,6 @@ public class BeeProtectionLeggings extends CustomItem {
return ingredients; return ingredients;
} }
@Override
public ItemStack getResult() { public ItemStack getResult() {
return new ItemBuilder(Material.CHAINMAIL_LEGGINGS) return new ItemBuilder(Material.CHAINMAIL_LEGGINGS)
.setName(Localization.get(Localization.BEE_PROTECTION_LEGGINGS)) .setName(Localization.get(Localization.BEE_PROTECTION_LEGGINGS))