Upstream/BeesPlus
1
0
Fork 0
mirror of https://github.com/tomasff/BeesPlus.git synced 2024-06-26 14:24:47 +02:00
Code Issues Projects Releases Wiki Activity

Custom items refractoring

Browse Source
This commit is contained in:
Tomás F 2020-07-01 19:42:39 +01:00
parent 512b5c71e8
commit b85876c8b3
8 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/tomff/beesplus/BeesPlus.java
View File

@ -73,8 +73,6 @@ public class BeesPlus extends JavaPlugin {
customItemManager.registerCustomItem("protection_chestplate", new BeeProtectionChestplate()); customItemManager.registerCustomItem("protection_chestplate", new BeeProtectionChestplate());
customItemManager.registerCustomItem("protection_helmet", new BeeProtectionHelmet()); customItemManager.registerCustomItem("protection_helmet", new BeeProtectionHelmet());
customItemManager.registerRecipes();
getServer().getPluginManager().registerEvents(new DamageHandler(this), this); getServer().getPluginManager().registerEvents(new DamageHandler(this), this);
} }

9
src/main/java/com/tomff/beesplus/core/items/CustomItem.java
View File

@ -9,13 +9,6 @@ public abstract class CustomItem {
public abstract String[] getRecipe(); public abstract String[] getRecipe();
public abstract Map<Character, Material> getIngredients(); public abstract Map<Character, Material> getIngredients();
public abstract String getName(); public abstract ItemStack getResult();
public abstract Material getMaterial();
public ItemStack getItem() {
return new ItemBuilder(getMaterial())
.setName(getName())
.build();
}
} }

14
src/main/java/com/tomff/beesplus/core/items/CustomItemManager.java
View File

@ -24,16 +24,12 @@ public class CustomItemManager {
public void registerCustomItem(String id, CustomItem customItem) { public void registerCustomItem(String id, CustomItem customItem) {
customItems.put(id, customItem); customItems.put(id, customItem);
}
public void registerRecipes() { NamespacedKey namespacedKey = new NamespacedKey(beesPlus, id);
customItems.forEach((id, customItem) -> { ShapedRecipe recipe = new ShapedRecipe(namespacedKey, customItem.getResult());
NamespacedKey namespacedKey = new NamespacedKey(beesPlus, id); recipe.shape(customItem.getRecipe());
ShapedRecipe recipe = new ShapedRecipe(namespacedKey, customItem.getItem()); customItem.getIngredients().forEach(recipe::setIngredient);
recipe.shape(customItem.getRecipe());
customItem.getIngredients().forEach(recipe::setIngredient);
Bukkit.addRecipe(recipe); Bukkit.addRecipe(recipe);
});
} }
} }

8
src/main/java/com/tomff/beesplus/handlers/DamageHandler.java
View File

@ -42,10 +42,10 @@ public class DamageHandler implements Listener {
PlayerInventory playerInventory = player.getInventory(); PlayerInventory playerInventory = player.getInventory();
if (Stream.of(playerInventory.getArmorContents()).allMatch(Objects::nonNull)) { if (Stream.of(playerInventory.getArmorContents()).allMatch(Objects::nonNull)) {
if (playerInventory.getHelmet().isSimilar(helmet.getItem()) && if (playerInventory.getHelmet().isSimilar(helmet.getResult()) &&
playerInventory.getChestplate().isSimilar(chestplate.getItem()) && playerInventory.getChestplate().isSimilar(chestplate.getResult()) &&
playerInventory.getLeggings().isSimilar(leggings.getItem()) && playerInventory.getLeggings().isSimilar(leggings.getResult()) &&
playerInventory.getBoots().isSimilar(boots.getItem())) { playerInventory.getBoots().isSimilar(boots.getResult())) {
event.setDamage(reduction * event.getDamage()); event.setDamage(reduction * event.getDamage());
} }

13
src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java
View File

@ -1,8 +1,10 @@
package com.tomff.beesplus.items; package com.tomff.beesplus.items;
import com.tomff.beesplus.core.items.CustomItem; import com.tomff.beesplus.core.items.CustomItem;
import com.tomff.beesplus.core.items.ItemBuilder;
import com.tomff.beesplus.localization.Localization; import com.tomff.beesplus.localization.Localization;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -28,12 +30,9 @@ public class BeeProtectionBoots extends CustomItem {
} }
@Override @Override
public String getName() { public ItemStack getResult() {
return Localization.get(Localization.BEE_PROTECTION_BOOTS); return new ItemBuilder(Material.CHAINMAIL_BOOTS)
} .setName(Localization.get(Localization.BEE_PROTECTION_BOOTS))
.build();
@Override
public Material getMaterial() {
return Material.CHAINMAIL_BOOTS;
} }
} }

13
src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java
View File

@ -1,8 +1,10 @@
package com.tomff.beesplus.items; package com.tomff.beesplus.items;
import com.tomff.beesplus.core.items.CustomItem; import com.tomff.beesplus.core.items.CustomItem;
import com.tomff.beesplus.core.items.ItemBuilder;
import com.tomff.beesplus.localization.Localization; import com.tomff.beesplus.localization.Localization;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -28,12 +30,9 @@ public class BeeProtectionChestplate extends CustomItem {
} }
@Override @Override
public String getName() { public ItemStack getResult() {
return Localization.get(Localization.BEE_PROTECTION_CHESTPLATE); return new ItemBuilder(Material.CHAINMAIL_CHESTPLATE)
} .setName(Localization.get(Localization.BEE_PROTECTION_CHESTPLATE))
.build();
@Override
public Material getMaterial() {
return Material.CHAINMAIL_CHESTPLATE;
} }
} }

13
src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java
View File

@ -1,8 +1,10 @@
package com.tomff.beesplus.items; package com.tomff.beesplus.items;
import com.tomff.beesplus.core.items.CustomItem; import com.tomff.beesplus.core.items.CustomItem;
import com.tomff.beesplus.core.items.ItemBuilder;
import com.tomff.beesplus.localization.Localization; import com.tomff.beesplus.localization.Localization;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -28,12 +30,9 @@ public class BeeProtectionHelmet extends CustomItem {
} }
@Override @Override
public String getName() { public ItemStack getResult() {
return Localization.get(Localization.BEE_PROTECTION_HELMET); return new ItemBuilder(Material.CHAINMAIL_HELMET)
} .setName(Localization.get(Localization.BEE_PROTECTION_HELMET))
.build();
@Override
public Material getMaterial() {
return Material.CHAINMAIL_HELMET;
} }
} }

13
src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java
View File

@ -1,8 +1,10 @@
package com.tomff.beesplus.items; package com.tomff.beesplus.items;
import com.tomff.beesplus.core.items.CustomItem; import com.tomff.beesplus.core.items.CustomItem;
import com.tomff.beesplus.core.items.ItemBuilder;
import com.tomff.beesplus.localization.Localization; import com.tomff.beesplus.localization.Localization;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -28,12 +30,9 @@ public class BeeProtectionLeggings extends CustomItem {
} }
@Override @Override
public String getName() { public ItemStack getResult() {
return Localization.get(Localization.BEE_PROTECTION_LEGGINGS); return new ItemBuilder(Material.CHAINMAIL_LEGGINGS)
} .setName(Localization.get(Localization.BEE_PROTECTION_LEGGINGS))
.build();
@Override
public Material getMaterial() {
return Material.CHAINMAIL_LEGGINGS;
} }
} }