Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
target-api/
target/
destinations.yml

### IntelliJ IDEA ###
.idea/modules.xml
Expand Down
4 changes: 4 additions & 0 deletions API/src/main/java/fr/maxlego08/items/api/ItemComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ public interface ItemComponent {
void sendItemLore(Player player, ItemMeta itemMeta);

void sendMessage(CommandSender sender, String string);

void sendActionBar(Player player, String message);

void sendTitle(Player player, String title, String subtitle, int fadeInTime, int showTime, int fadeOutTime);
}
4 changes: 2 additions & 2 deletions API/src/main/java/fr/maxlego08/items/api/ItemPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public interface ItemPlugin extends Plugin {

ItemManager getItemManager();

PlatformScheduler getScheduler();

RecipesAPI getRecipesAPI();

HookManager getHookManager();

RuneManager getRuneManager();

ItemComponent getItemComponent();

List<BlockAccess> getBlockAccess();

void registerBlockAccess(BlockAccess blockAccess);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,10 @@
import fr.maxlego08.items.api.ItemPlugin;
import fr.maxlego08.items.api.ItemType;
import fr.maxlego08.items.api.configurations.commands.CommandsConfiguration;
import fr.maxlego08.items.api.configurations.meta.ArmorStandConfig;
import fr.maxlego08.items.api.configurations.meta.AttributeConfiguration;
import fr.maxlego08.items.api.configurations.meta.AxolotlBucketConfiguration;
import fr.maxlego08.items.api.configurations.meta.BannerMetaConfiguration;
import fr.maxlego08.items.api.configurations.meta.BlockDataMetaConfiguration;
import fr.maxlego08.items.api.configurations.meta.BlockStateMetaConfiguration;
import fr.maxlego08.items.api.configurations.meta.CustomPotionEffect;
import fr.maxlego08.items.api.configurations.meta.Food;
import fr.maxlego08.items.api.configurations.meta.FoodEffect;
import fr.maxlego08.items.api.configurations.meta.ItemEnchantment;
import fr.maxlego08.items.api.configurations.meta.LeatherArmorMetaConfiguration;
import fr.maxlego08.items.api.configurations.meta.PotionMetaConfiguration;
import fr.maxlego08.items.api.configurations.meta.ToolComponentConfiguration;
import fr.maxlego08.items.api.configurations.meta.TrimConfiguration;
import fr.maxlego08.items.api.configurations.meta.*;
import fr.maxlego08.items.api.enchantments.EnchantmentRegistry;
import fr.maxlego08.items.api.enchantments.Enchantments;
import fr.maxlego08.items.api.recipes.ZRecipeConfiguration;
import fr.maxlego08.items.api.configurations.recipes.ZRecipeConfiguration;
import fr.maxlego08.items.api.runes.ItemRuneConfiguration;
import fr.maxlego08.items.api.runes.Rune;
import fr.maxlego08.items.api.utils.Colors;
Expand All @@ -43,15 +30,7 @@
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.EquipmentSlotGroup;
import org.bukkit.inventory.ItemRarity;
import org.bukkit.inventory.meta.ArmorMeta;
import org.bukkit.inventory.meta.AxolotlBucketMeta;
import org.bukkit.inventory.meta.BannerMeta;
import org.bukkit.inventory.meta.BlockDataMeta;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.inventory.meta.*;
import org.bukkit.inventory.meta.components.ToolComponent;
import org.bukkit.inventory.meta.trim.ArmorTrim;
import org.bukkit.inventory.meta.trim.TrimMaterial;
Expand Down Expand Up @@ -337,8 +316,7 @@ private void loadPotion(ItemPlugin plugin, YamlConfiguration configuration, Stri
this.potionMetaConfiguration = new PotionMetaConfiguration(true, potionColor, customEffects, basePotionType);

} catch (Exception exception) {
plugin.getLogger().severe("Impossible to load the potion meta for item " + fileName);
exception.printStackTrace();
plugin.getLogger().severe("Failed to load potion meta for item " + fileName + ": " + exception.getMessage());
this.potionMetaConfiguration = new PotionMetaConfiguration(false, null, null, null);
}
} else {
Expand Down Expand Up @@ -606,7 +584,7 @@ public void applyLeatherArmorMeta(ItemMeta itemMeta) {
public void createRecipe(ItemPlugin plugin, Item item) {
if (configuration.contains("recipes")) {
for (String key : configuration.getConfigurationSection("recipes").getKeys(false)) {
var recipeConfig = new ZRecipeConfiguration(plugin, key, "recipes." + key, configuration);
var recipeConfig = new ZRecipeConfiguration(key, "recipes." + key, configuration);
recipeConfig.setResult(item.build(null, 1));
var recipe = recipeConfig.build();
this.recipes.add(recipe);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;

public record BlockDataMetaConfiguration(boolean enable, BlockData blockData) {

Expand Down Expand Up @@ -390,8 +391,7 @@ public static BlockDataMetaConfiguration loadBlockDataMeta(ItemPlugin plugin, Ya


} catch (Exception exception) {
plugin.getLogger().severe("Invalid block data or material configuration in " + fileName);
exception.printStackTrace();
plugin.getLogger().log(Level.SEVERE, "Invalid block data or material configuration in file: " + fileName, exception);
enableBlockDataMeta = false;
}
return new BlockDataMetaConfiguration(enableBlockDataMeta, blockData);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
import fr.maxlego08.items.api.ItemComponent;
import fr.maxlego08.items.api.ItemPlugin;
import fr.maxlego08.items.api.configurations.ItemConfiguration;
import fr.maxlego08.items.api.configurations.state.ItemSlot;
import fr.maxlego08.items.api.configurations.state.ItemSlotCustomItem;
import fr.maxlego08.items.api.configurations.state.ItemSlotItem;
import fr.maxlego08.items.api.configurations.state.SignConfiguration;
import fr.maxlego08.items.api.configurations.state.SignLine;
import fr.maxlego08.items.api.configurations.state.*;
import org.bukkit.block.BlockState;
import org.bukkit.block.Container;
import org.bukkit.block.Sign;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.logging.Level;

public record ToolComponentConfiguration(boolean enable, int damagePerBlock, float defaultMiningSpeed,
List<ToolRuleTag> toolRuleTags, List<ToolMaterialTag> toolMaterialsTags) {
Expand Down Expand Up @@ -68,8 +69,7 @@ public static ToolComponentConfiguration loadToolComponent(ItemPlugin plugin, Ya

return new ToolComponentConfiguration(true, damagePerBlock, defaultMiningSpeed, toolRuleTags, toolMaterialTags);
} catch (Exception exception) {
plugin.getLogger().severe("Invalid tool component configuration in " + fileName);
exception.printStackTrace();
plugin.getLogger().log(Level.SEVERE, "Invalid tool component configuration in file: " + fileName, exception);
}
}
return new ToolComponentConfiguration(false, 0, 0f, null, null);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fr.maxlego08.items.api.recipes;

import fr.maxlego08.items.api.ItemPlugin;
import fr.traqueur.recipes.api.domains.BaseIngredient;
import fr.traqueur.recipes.api.domains.Ingredient;
import fr.traqueur.recipes.api.hook.Hook;
import org.bukkit.inventory.ItemStack;

Expand All @@ -19,7 +19,7 @@ public String getPluginName() {
}

@Override
public BaseIngredient getIngredient(String s, Character character) {
public Ingredient getIngredient(String s, Character character) {
return new ZItemIngredient(s, character);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

import fr.maxlego08.items.api.Item;
import fr.maxlego08.items.api.ItemManager;
import fr.traqueur.recipes.api.domains.BaseIngredient;
import fr.traqueur.recipes.api.domains.Ingredient;
import org.bukkit.Bukkit;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.RecipeChoice;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;

public class ZItemIngredient extends BaseIngredient {
public class ZItemIngredient extends Ingredient {

private final Item item;

Expand Down
Loading
Loading