Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Reworked crafting

Browse Source
This commit is contained in:
Auxilor
2021-01-14 11:32:10 +00:00
parent 6b28836673
commit 7c700b5fe8
2 changed files with 31 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java
View File

@@ -5,10 +5,14 @@ import com.willfp.eco.util.StringUtils;
import com.willfp.eco.util.config.Configs;
import com.willfp.eco.util.optional.Prerequisite;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.eco.util.recipes.EcoShapedRecipe;
import com.willfp.eco.util.recipes.parts.ComplexRecipePart;
import com.willfp.eco.util.recipes.parts.SimpleRecipePart;
import com.willfp.talismans.config.TalismansConfigs;
import com.willfp.talismans.config.configs.TalismanConfig;
import com.willfp.talismans.display.TalismanDisplay;
import com.willfp.talismans.talismans.meta.TalismanStrength;
import com.willfp.talismans.talismans.util.TalismanChecks;
import com.willfp.talismans.talismans.util.TalismanUtils;
import com.willfp.talismans.talismans.util.Watcher;
import lombok.AccessLevel;
@@ -21,8 +25,6 @@ import org.bukkit.NamespacedKey;
import org.bukkit.World;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.RecipeChoice;
import org.bukkit.inventory.ShapedRecipe;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
@@ -100,19 +102,7 @@ public abstract class Talisman implements Listener, Watcher {
* The talisman recipe.
*/
@Getter
private ShapedRecipe recipe = null;
/**
* The talisman displayed recipe.
*/
@Getter
private ShapedRecipe displayedRecipe = null;
/**
* The talisman recipe overlay.
*/
@Getter
private final Talisman[] recipeTalismanOverlay = new Talisman[9];
private EcoShapedRecipe recipe = null;
/**
* The base64 skull texture.
@@ -204,38 +194,26 @@ public abstract class Talisman implements Listener, Watcher {
this.itemStack = out;
Bukkit.getServer().removeRecipe(this.getKey());
Bukkit.getServer().removeRecipe(new NamespacedKey(this.getPlugin(), this.getKey().getKey() + "_displayed"));
if (this.isEnabled()) {
ShapedRecipe recipe = new ShapedRecipe(this.getKey(), out);
ShapedRecipe displayedRecipe = new ShapedRecipe(new NamespacedKey(this.getPlugin(), this.getKey().getKey() + "_displayed"), out);
EcoShapedRecipe.Builder builder = EcoShapedRecipe.builder(this.getPlugin(), this.getKey().getKey())
.setOutput(out);
List<String> recipeStrings = this.getConfig().getStrings(Talismans.OBTAINING_LOCATION + "recipe");
recipe.shape("012", "345", "678");
displayedRecipe.shape("012", "345", "678");
for (int i = 0; i < 9; i++) {
recipeTalismanOverlay[i] = null;
char ingredientChar = String.valueOf(i).toCharArray()[0];
if (recipeStrings.get(i).startsWith("talisman:")) {
String talismanKey = recipeStrings.get(i).split(":")[1];
NamespacedKey talismanNamespacedKey = new NamespacedKey(this.getPlugin(), talismanKey);
Talisman talisman = Talismans.getByKey(talismanNamespacedKey);
Validate.notNull(talisman, "Talisman specified in " + this.getConfigName() + ".yml's recipe is invalid!");
recipeTalismanOverlay[i] = Talismans.getByKey(talismanNamespacedKey);
recipe.setIngredient(ingredientChar, Material.PLAYER_HEAD);
displayedRecipe.setIngredient(ingredientChar, new RecipeChoice.ExactChoice(talisman.getItemStack()));
Validate.notNull(talisman, "Talisman specified in " + this.getConfigName() + ".yml has an invalid recipe!");
builder.setRecipePart(i, new ComplexRecipePart(test -> Objects.equals(talisman, TalismanChecks.getTalismanOnItem(test)), new ItemStack(Material.PLAYER_HEAD)));
} else {
recipe.setIngredient(ingredientChar, Material.valueOf(recipeStrings.get(i).toUpperCase()));
displayedRecipe.setIngredient(ingredientChar, Material.valueOf(recipeStrings.get(i).toUpperCase()));
builder.setRecipePart(i, new SimpleRecipePart(Material.valueOf(recipeStrings.get(i).toUpperCase())));
}
}
Bukkit.getServer().addRecipe(recipe);
Bukkit.getServer().addRecipe(displayedRecipe);
this.displayedRecipe = displayedRecipe;
this.recipe = builder.build();
this.recipe.register();
}
postUpdate();
@@ -254,6 +232,25 @@ public abstract class Talisman implements Listener, Watcher {
return this.getStrength().getColor() + this.getName();
}
@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Talisman)) {
return false;
}
Talisman talisman = (Talisman) o;
return this.getKey().equals(talisman.getKey());
}
@Override
public int hashCode() {
return Objects.hash(this.getKey());
}
@Override
public String toString() {
return "Talisman{"

148
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java
View File

@@ -12,8 +12,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapedRecipe;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
public class TalismanCraftListener implements Listener {
/**
* Called on item craft.
@@ -73,150 +71,4 @@ public class TalismanCraftListener implements Listener {
event.setCancelled(true);
}
}
/**
* Called on item craft.
* @param event The event to listen for.
*/
@EventHandler
public void prepareCraftTalismanListener(@NotNull final PrepareItemCraftEvent event) {
if (!(event.getRecipe() instanceof ShapedRecipe)) {
return;
}
ShapedRecipe recipe = (ShapedRecipe) event.getRecipe();
if (!recipe.getKey().getNamespace().equals("talismans")) {
return;
}
if (event.getViewers().isEmpty()) {
return;
}
Talisman[] overlay = new Talisman[9];
for (int i = 0; i < 9; i++) {
ItemStack itemStack = event.getInventory().getMatrix()[i];
if (itemStack == null) {
continue;
}
if (itemStack.getType() != Material.PLAYER_HEAD) {
continue;
}
Talisman matchedTalisman = TalismanChecks.getTalismanOnItem(itemStack);
if (matchedTalisman == null) {
continue;
}
overlay[i] = matchedTalisman;
}
boolean empty = true;
for (Talisman overlayTalisman : overlay) {
if (overlayTalisman != null) {
empty = false;
break;
}
}
boolean needsHeads = false;
for (ItemStack itemStack : recipe.getIngredientMap().values()) {
if (itemStack.getType() == Material.PLAYER_HEAD) {
needsHeads = true;
break;
}
}
if (empty && needsHeads) {
event.getInventory().setResult(new ItemStack(Material.AIR));
return;
}
Talisman talisman = Talismans.values().stream().filter(talisman1 -> Arrays.equals(overlay, talisman1.getRecipeTalismanOverlay())).findFirst().orElse(null);
if (talisman == null) {
event.getInventory().setResult(new ItemStack(Material.AIR));
} else {
event.getInventory().setResult(talisman.getItemStack());
}
}
/**
* Called on item craft.
* @param event The event to listen for.
*/
@EventHandler
public void prepareCraftTalismanListener(@NotNull final CraftItemEvent event) {
if (!(event.getRecipe() instanceof ShapedRecipe)) {
return;
}
ShapedRecipe recipe = (ShapedRecipe) event.getRecipe();
if (!recipe.getKey().getNamespace().equals("talismans")) {
return;
}
if (event.getViewers().isEmpty()) {
return;
}
Talisman[] overlay = new Talisman[9];
for (int i = 0; i < 9; i++) {
ItemStack itemStack = event.getInventory().getMatrix()[i];
if (itemStack == null) {
continue;
}
if (itemStack.getType() != Material.PLAYER_HEAD) {
continue;
}
Talisman matchedTalisman = TalismanChecks.getTalismanOnItem(itemStack);
if (matchedTalisman == null) {
continue;
}
overlay[i] = matchedTalisman;
}
boolean empty = true;
for (Talisman overlayTalisman : overlay) {
if (overlayTalisman != null) {
empty = false;
break;
}
}
boolean needsHeads = false;
for (ItemStack itemStack : recipe.getIngredientMap().values()) {
if (itemStack.getType() == Material.PLAYER_HEAD) {
needsHeads = true;
break;
}
}
if (empty && needsHeads) {
event.getInventory().setResult(new ItemStack(Material.AIR));
return;
}
Talisman talisman = Talismans.values().stream().filter(talisman1 -> Arrays.equals(overlay, talisman1.getRecipeTalismanOverlay())).findFirst().orElse(null);
if (talisman == null) {
event.getInventory().setResult(new ItemStack(Material.AIR));
event.setCancelled(true);
} else {
event.getInventory().setResult(talisman.getItemStack());
}
}
}