Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c29859d49 | ||
|
|
02510127d1 | ||
|
|
f6b5c8f7e0 | ||
|
|
dbfef3094b |
@@ -19,7 +19,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
fResult.setAccessible(true);
|
fResult.setAccessible(true);
|
||||||
|
|
||||||
ItemStack result = merchantRecipe.getResult();
|
ItemStack result = merchantRecipe.getResult();
|
||||||
Display.displayAndFinalize(result);
|
Display.display(result);
|
||||||
fResult.set(merchantRecipe, result);
|
fResult.set(merchantRecipe, result);
|
||||||
|
|
||||||
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
||||||
@@ -31,7 +31,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
fSelling.setAccessible(true);
|
fSelling.setAccessible(true);
|
||||||
|
|
||||||
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
||||||
Display.displayAndFinalize(selling);
|
Display.display(selling);
|
||||||
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
||||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
||||||
fResult.setAccessible(true);
|
fResult.setAccessible(true);
|
||||||
ItemStack result = merchantRecipe.getResult();
|
ItemStack result = merchantRecipe.getResult();
|
||||||
Display.displayAndFinalize(result);
|
Display.display(result);
|
||||||
fResult.set(merchantRecipe, result);
|
fResult.set(merchantRecipe, result);
|
||||||
|
|
||||||
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
||||||
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
fSelling.setAccessible(true);
|
fSelling.setAccessible(true);
|
||||||
|
|
||||||
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
||||||
Display.displayAndFinalize(selling);
|
Display.display(selling);
|
||||||
|
|
||||||
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
||||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
||||||
fResult.setAccessible(true);
|
fResult.setAccessible(true);
|
||||||
ItemStack result = merchantRecipe.getResult();
|
ItemStack result = merchantRecipe.getResult();
|
||||||
Display.displayAndFinalize(result);
|
Display.display(result);
|
||||||
fResult.set(merchantRecipe, result);
|
fResult.set(merchantRecipe, result);
|
||||||
|
|
||||||
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
||||||
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
fSelling.setAccessible(true);
|
fSelling.setAccessible(true);
|
||||||
|
|
||||||
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
||||||
Display.displayAndFinalize(selling);
|
Display.display(selling);
|
||||||
|
|
||||||
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
||||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
Field fResult = MerchantRecipe.class.getDeclaredField("result");
|
||||||
fResult.setAccessible(true);
|
fResult.setAccessible(true);
|
||||||
ItemStack result = merchantRecipe.getResult();
|
ItemStack result = merchantRecipe.getResult();
|
||||||
Display.displayAndFinalize(result);
|
Display.display(result);
|
||||||
fResult.set(merchantRecipe, result);
|
fResult.set(merchantRecipe, result);
|
||||||
|
|
||||||
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
// Get NMS MerchantRecipe from CraftMerchantRecipe
|
||||||
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
|
|||||||
fSelling.setAccessible(true);
|
fSelling.setAccessible(true);
|
||||||
|
|
||||||
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
|
||||||
Display.displayAndFinalize(selling);
|
Display.display(selling);
|
||||||
|
|
||||||
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
|
||||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.willfp.eco.util.config;
|
|||||||
import com.willfp.eco.util.config.internal.AbstractUpdatableConfig;
|
import com.willfp.eco.util.config.internal.AbstractUpdatableConfig;
|
||||||
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
|
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
public abstract class ExtendableConfig extends AbstractUpdatableConfig {
|
public abstract class ExtendableConfig extends AbstractUpdatableConfig {
|
||||||
/**
|
/**
|
||||||
@@ -23,7 +22,7 @@ public abstract class ExtendableConfig extends AbstractUpdatableConfig {
|
|||||||
@NotNull final AbstractEcoPlugin plugin,
|
@NotNull final AbstractEcoPlugin plugin,
|
||||||
@NotNull final Class<?> source,
|
@NotNull final Class<?> source,
|
||||||
@NotNull final String subDirectoryPath,
|
@NotNull final String subDirectoryPath,
|
||||||
@Nullable final String... updateBlacklist) {
|
@NotNull final String... updateBlacklist) {
|
||||||
super(configName, plugin, subDirectoryPath, source, removeUnused, updateBlacklist);
|
super(configName, plugin, subDirectoryPath, source, removeUnused, updateBlacklist);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ public final class EcoShapedRecipe extends PluginDependent implements Registerab
|
|||||||
/**
|
/**
|
||||||
* Recipe parts.
|
* Recipe parts.
|
||||||
*/
|
*/
|
||||||
|
@Getter
|
||||||
private final RecipePart[] parts;
|
private final RecipePart[] parts;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import java.util.function.Function;
|
|||||||
@UtilityClass
|
@UtilityClass
|
||||||
public final class RecipePartUtils {
|
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<>();
|
private static final Map<String, Function<String, RecipePart>> TESTS = new HashMap<>();
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
version = 3.6.0
|
version = 3.7.0
|
||||||
plugin-name = eco
|
plugin-name = eco
|
||||||
Reference in New Issue
Block a user