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

Renamed Internals class

Browse Source
This commit is contained in:
Auxilor
2021-06-22 15:28:08 +01:00
parent 5e9a408704
commit 484d4dde75
5 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java
View File

@@ -1,7 +1,7 @@
package com.willfp.eco.core.recipe.parts;
import com.willfp.eco.core.items.TestableItem;
import com.willfp.eco.internal.InternalInterfacing;
import com.willfp.eco.internal.Internals;
import lombok.Getter;
import org.apache.commons.lang.Validate;
import org.bukkit.inventory.ItemStack;
@@ -58,7 +58,7 @@ public class TestableStack implements TestableItem {
List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
assert lore != null;
lore.add("");
String add = InternalInterfacing.getInstance().getLang().getString("multiple-in-craft");
String add = Internals.getInstance().getPlugin().getLangYml().getString("multiple-in-craft");
add = add.replace("%amount%", String.valueOf(amount));
lore.add(add);
meta.setLore(lore);

18
eco-api/src/main/java/com/willfp/eco/internal/InternalInterfacing.java
View File

@@ -1,18 +0,0 @@
package com.willfp.eco.internal;
import com.willfp.eco.core.config.base.LangYml;
import org.jetbrains.annotations.NotNull;
public abstract class InternalInterfacing {
private static InternalInterfacing interfacing;
public static void setInterfacing(@NotNull final InternalInterfacing interfacing) {
InternalInterfacing.interfacing = interfacing;
}
public abstract LangYml getLang();
public static InternalInterfacing getInstance() {
return interfacing;
}
}

18
eco-api/src/main/java/com/willfp/eco/internal/Internals.java Normal file
View File

@@ -0,0 +1,18 @@
package com.willfp.eco.internal;
import com.willfp.eco.core.EcoPlugin;
import org.jetbrains.annotations.NotNull;
public abstract class Internals {
private static Internals internals;
public static void setInterfacing(@NotNull final Internals internals) {
Internals.internals = internals;
}
public abstract EcoPlugin getPlugin();
public static Internals getInstance() {
return internals;
}
}

17
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoInternals.java Normal file
View File

@@ -0,0 +1,17 @@
package com.willfp.eco.spigot;
import com.willfp.eco.internal.Internals;
import org.jetbrains.annotations.NotNull;
public class EcoInternals extends Internals {
private final EcoSpigotPlugin plugin;
EcoInternals(@NotNull final EcoSpigotPlugin plugin) {
this.plugin = plugin;
}
@Override
public EcoSpigotPlugin getPlugin() {
return plugin;
}
}

10
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java
View File

@@ -3,7 +3,6 @@ package com.willfp.eco.spigot;
import com.willfp.eco.core.AbstractPacketAdapter;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.command.AbstractCommand;
import com.willfp.eco.core.config.base.LangYml;
import com.willfp.eco.core.data.Data;
import com.willfp.eco.core.display.Display;
import com.willfp.eco.core.display.DisplayModule;
@@ -11,7 +10,7 @@ import com.willfp.eco.core.integrations.IntegrationLoader;
import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
import com.willfp.eco.core.integrations.mcmmo.McmmoManager;
import com.willfp.eco.internal.InternalInterfacing;
import com.willfp.eco.internal.Internals;
import com.willfp.eco.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.proxy.proxies.SkullProxy;
import com.willfp.eco.proxy.proxies.TridentStackProxy;
@@ -87,12 +86,7 @@ public class EcoSpigotPlugin extends EcoPlugin {
this.dataJson = new DataJson(this);
Data.init(this.dataJson);
InternalInterfacing.setInterfacing(new InternalInterfacing() {
@Override
public LangYml getLang() {
return EcoSpigotPlugin.getInstance().getLangYml();
}
});
Internals.setInterfacing(new EcoInternals(this));
}
@Override