Compare commits

...

4 Commits
3.6.0 ... 3.7.0

Author SHA1 Message Date
Auxilor
5c29859d49 Updated to 3.7.0 2021-02-10 10:50:46 +00:00
Auxilor
02510127d1 Added getParts to EcoShapedRecipe 2021-02-10 10:50:31 +00:00
Auxilor
f6b5c8f7e0 Updated to eco 3.6.1 2021-02-09 09:30:29 +00:00
Auxilor
dbfef3094b Fixed villager trade being finalized 2021-02-09 09:30:08 +00:00
8 changed files with 12 additions and 12 deletions

View File

@@ -19,7 +19,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.displayAndFinalize(result);
Display.display(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -31,7 +31,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.displayAndFinalize(selling);
Display.display(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {
e.printStackTrace();

View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.displayAndFinalize(result);
Display.display(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.displayAndFinalize(selling);
Display.display(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.displayAndFinalize(result);
Display.display(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.displayAndFinalize(selling);
Display.display(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.displayAndFinalize(result);
Display.display(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.displayAndFinalize(selling);
Display.display(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

View File

@@ -3,7 +3,6 @@ package com.willfp.eco.util.config;
import com.willfp.eco.util.config.internal.AbstractUpdatableConfig;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class ExtendableConfig extends AbstractUpdatableConfig {
/**
@@ -23,7 +22,7 @@ public abstract class ExtendableConfig extends AbstractUpdatableConfig {
@NotNull final AbstractEcoPlugin plugin,
@NotNull final Class<?> source,
@NotNull final String subDirectoryPath,
@Nullable final String... updateBlacklist) {
@NotNull final String... updateBlacklist) {
super(configName, plugin, subDirectoryPath, source, removeUnused, updateBlacklist);
}
}

View File

@@ -16,6 +16,7 @@ public final class EcoShapedRecipe extends PluginDependent implements Registerab
/**
* Recipe parts.
*/
@Getter
private final RecipePart[] parts;
/**

View File

@@ -14,7 +14,7 @@ import java.util.function.Function;
@UtilityClass
public final class RecipePartUtils {
/**
* Set of tests that return if the player is telekinetic.
* All recipes.
*/
private static final Map<String, Function<String, RecipePart>> TESTS = new HashMap<>();

View File

@@ -1,2 +1,2 @@
version = 3.6.0
version = 3.7.0
plugin-name = eco