Skip to content

Commit

Permalink
Fixed shading errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
WillFP committed Jan 14, 2021
1 parent 734add6 commit 1a86cc4
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 148 deletions.
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.willfp.eco.util.recipes.lookup;
package com.willfp.eco.common.recipes.lookup;

import com.willfp.eco.util.recipes.parts.EmptyRecipePart;
import com.willfp.eco.util.recipes.parts.RecipePart;
import com.willfp.eco.util.recipes.parts.SimpleRecipePart;
import com.willfp.eco.common.recipes.parts.EmptyRecipePart;
import com.willfp.eco.common.recipes.parts.RecipePart;
import com.willfp.eco.common.recipes.parts.SimpleRecipePart;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;

public class EcoItemLookup implements ItemLookup {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.willfp.eco.util.recipes.lookup;
package com.willfp.eco.common.recipes.lookup;

import com.willfp.eco.util.recipes.parts.RecipePart;
import com.willfp.eco.common.recipes.parts.RecipePart;
import org.jetbrains.annotations.NotNull;

import java.util.function.Function;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.willfp.eco.common.recipes.lookup;

import com.willfp.eco.common.recipes.parts.RecipePart;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;
import org.bukkit.plugin.ServicePriority;
import org.jetbrains.annotations.NotNull;

import java.util.function.Function;

@SuppressWarnings("unchecked")
@UtilityClass
public final class RecipePartUtils {
/**
* Item lookup instance.
*/
private static final ItemLookup itemLookup;

/**
* Lookup recipe part from string.
*
* @param key The string to test.
* @return The generated recipe part, or null if invalid.
*/
public RecipePart lookup(@NotNull final String key) {
return itemLookup.lookup(key);
}

/**
* Register a new lookup.
*
* @param key The key of the lookup.
* @param lookup The lookup to register, where the output is the recipe part generated.
*/
public void registerLookup(@NotNull final String key,
@NotNull final Function<String, RecipePart> lookup) {
itemLookup.registerLookup(key, lookup);
}

static {
if (!Bukkit.getServicesManager().isProvidedFor(ItemLookup.class)) {
Bukkit.getServicesManager().register(ItemLookup.class, new EcoItemLookup(), AbstractEcoPlugin.getInstance(), ServicePriority.Normal);
}

itemLookup = Bukkit.getServicesManager().load(ItemLookup.class);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.willfp.eco.util.recipes.parts;
package com.willfp.eco.common.recipes.parts;

import lombok.Getter;
import org.bukkit.inventory.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.willfp.eco.util.recipes.parts;
package com.willfp.eco.common.recipes.parts;

import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.willfp.eco.util.recipes.parts;
package com.willfp.eco.common.recipes.parts;

import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.willfp.eco.util.recipes.parts;
package com.willfp.eco.common.recipes.parts;

import lombok.Getter;
import org.bukkit.Material;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
import com.willfp.eco.util.integrations.placeholder.plugins.PlaceholderIntegrationPAPI;
import com.willfp.eco.util.optional.Prerequisite;
import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
import com.willfp.eco.util.recipes.RecipeListener;
import com.willfp.eco.util.recipes.RecipeManager;
import com.willfp.eco.util.recipe.RecipeListener;
import com.willfp.eco.util.recipe.RecipeManager;
import com.willfp.eco.util.updater.UpdateChecker;
import lombok.Getter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.willfp.eco.util.recipes;
package com.willfp.eco.util.recipe;

import com.willfp.eco.common.recipes.parts.EmptyRecipePart;
import com.willfp.eco.common.recipes.parts.RecipePart;
import com.willfp.eco.util.interfaces.Registerable;
import com.willfp.eco.util.internal.PluginDependent;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.eco.util.recipes.parts.EmptyRecipePart;
import com.willfp.eco.util.recipes.parts.RecipePart;
import lombok.Getter;
import org.apache.commons.lang.Validate;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -184,9 +183,6 @@ public Builder setOutput(@NotNull final ItemStack output) {
* @return The built recipe.
*/
public EcoShapedRecipe build() {
Validate.notNull(output, "Output cannot be null!");
Validate.isTrue(output.getType() != Material.AIR, "Output cannot be blank!");

for (int i = 0; i < 9; i++) {
if (recipeParts[i] == null) {
recipeParts[i] = new EmptyRecipePart();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.willfp.eco.util.recipes;
package com.willfp.eco.util.recipe;

import com.willfp.eco.util.internal.PluginDependent;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.willfp.eco.util.recipes;
package com.willfp.eco.util.recipe;

import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
Expand Down
122 changes: 0 additions & 122 deletions src/main/java/com/willfp/eco/util/recipes/lookup/RecipePartUtils.java

This file was deleted.

0 comments on commit 1a86cc4

Please sign in to comment.