Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Auxilor
2022-01-12 11:17:23 +00:00
parent 5e7b9573a1 8635e5f7a5
commit f2d0e8c368
13 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eco-api/build.gradle
View File

@@ -15,6 +15,7 @@ dependencies {
compileOnly 'org.apache.maven:maven-artifact:3.8.1'
compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
compileOnly 'com.google.code.gson:gson:2.8.8'
compileOnly 'org.apache.commons:commons-lang3:3.0'
}
java {

2
eco-api/src/main/java/com/willfp/eco/core/items/args/ColorArgParser.java
View File

@@ -15,7 +15,7 @@ import java.util.function.Predicate;
* @deprecated Moved to internals.
*/
@Deprecated(since = "6.16.0", forRemoval = true)
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.1")
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.2")
public class ColorArgParser implements LookupArgParser {
/**
* Instantiate arg parser.

2
eco-api/src/main/java/com/willfp/eco/core/items/args/CustomModelDataArgParser.java
View File

@@ -15,7 +15,7 @@ import java.util.function.Predicate;
* @deprecated Moved to internals.
*/
@Deprecated(since = "6.16.0", forRemoval = true)
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.1")
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.2")
public class CustomModelDataArgParser implements LookupArgParser {
/**
* Instantiate arg parser.

2
eco-api/src/main/java/com/willfp/eco/core/items/args/EnchantmentArgParser.java
View File

@@ -15,7 +15,7 @@ import java.util.function.Predicate;
* @deprecated Moved to internals.
*/
@Deprecated(since = "6.16.0", forRemoval = true)
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.1")
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.2")
public class EnchantmentArgParser implements LookupArgParser {
/**
* Instantiate arg parser.

2
eco-api/src/main/java/com/willfp/eco/core/items/args/TextureArgParser.java
View File

@@ -15,7 +15,7 @@ import java.util.function.Predicate;
* @deprecated Moved to internals.
*/
@Deprecated(since = "6.16.0", forRemoval = true)
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.1")
@ApiStatus.ScheduledForRemoval(inVersion = "6.18.2")
public class TextureArgParser implements LookupArgParser {
/**
* Instantiate arg parser.

2
eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java
View File

@@ -111,7 +111,7 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
assert lore != null;
lore.add("");
String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
String add = Eco.getHandler().getEcoPlugin().getLangYml().getFormattedString("multiple-in-craft");
add = add.replace("%amount%", String.valueOf(item.getAmount()));
lore.add(add);
meta.setLore(lore);