Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-25 15:35:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored NMS packages

Browse Source
This commit is contained in:
Auxilor 2020-12-11 18:34:36 +00:00
parent 1f958e5eb9
commit f2c100538b
31 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/BlockBreak.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
import net.minecraft.server.v1_15_R1.BlockPosition;

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/ChatComponent.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/ChatComponent.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.ChatComponentWrapper;

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/Cooldown.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.CooldownWrapper;
import net.minecraft.server.v1_15_R1.EntityHuman;

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/OpenInventory.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/OpenInventory.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/RepairCost.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/RepairCost.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;

2
NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/TridentStack.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_15_R1;
package com.willfp.ecoenchants.nms.v1_15_R1;
import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
import net.minecraft.server.v1_15_R1.EntityThrownTrident;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/BlockBreak.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
import net.minecraft.server.v1_16_R1.BlockPosition;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/ChatComponent.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/ChatComponent.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/Cooldown.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.willfp.ecoenchants.nms.api.CooldownWrapper;
import org.bukkit.entity.Player;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/OpenInventory.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/OpenInventory.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/RepairCost.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/RepairCost.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;

2
NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/TridentStack.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R1;
package com.willfp.ecoenchants.nms.v1_16_R1;
import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
import net.minecraft.server.v1_16_R1.EntityThrownTrident;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/BlockBreak.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
import net.minecraft.server.v1_16_R2.BlockPosition;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/ChatComponent.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/ChatComponent.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/Cooldown.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.willfp.ecoenchants.nms.api.CooldownWrapper;
import org.bukkit.entity.Player;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/OpenInventory.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/OpenInventory.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/RepairCost.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/RepairCost.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;

2
NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/TridentStack.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R2;
package com.willfp.ecoenchants.nms.v1_16_R2;
import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
import net.minecraft.server.v1_16_R2.EntityThrownTrident;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/BlockBreak.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
import net.minecraft.server.v1_16_R3.BlockPosition;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/ChatComponent.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/ChatComponent.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/Cooldown.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/Cooldown.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.willfp.ecoenchants.nms.api.CooldownWrapper;
import org.bukkit.entity.Player;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/OpenInventory.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/OpenInventory.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/RepairCost.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;

2
NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java → NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/TridentStack.java
View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.v1_16_R3;
package com.willfp.ecoenchants.nms.v1_16_R3;
import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
import net.minecraft.server.v1_16_R3.EntityThrownTrident;

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
View File

@ -25,7 +25,7 @@ public class BlockBreak {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".BlockBreak");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".BlockBreak");
if (BlockBreakWrapper.class.isAssignableFrom(class2)) {
blockBreakWrapper = (BlockBreakWrapper) class2.getConstructor().newInstance();
}

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/ChatComponent.java
View File

@ -27,7 +27,7 @@ public class ChatComponent {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".ChatComponent");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".ChatComponent");
if (ChatComponentWrapper.class.isAssignableFrom(class2)) {
chatComponentWrapper = (ChatComponentWrapper) class2.getConstructor().newInstance();
}

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
View File

@ -25,7 +25,7 @@ public class Cooldown {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".Cooldown");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".Cooldown");
if (CooldownWrapper.class.isAssignableFrom(class2)) {
cooldown = (CooldownWrapper) class2.getConstructor().newInstance();
}

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java
View File

@ -24,7 +24,7 @@ public class OpenInventory {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".OpenInventory");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".OpenInventory");
if (OpenInventoryWrapper.class.isAssignableFrom(class2)) {
openInventoryWrapper = (OpenInventoryWrapper) class2.getConstructor().newInstance();
}

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/RepairCost.java
View File

@ -35,7 +35,7 @@ public class RepairCost {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".RepairCost");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".RepairCost");
if (RepairCostWrapper.class.isAssignableFrom(class2)) {
repairCostWrapper = (RepairCostWrapper) class2.getConstructor().newInstance();
}

2
Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
View File

@ -26,7 +26,7 @@ public class TridentStack {
static {
try {
final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".TridentStack");
final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".TridentStack");
if (TridentStackWrapper.class.isAssignableFrom(class2)) {
tridentStackWrapper = (TridentStackWrapper) class2.getConstructor().newInstance();
}

14
Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
View File

@ -80,6 +80,20 @@ public class Loader {
Logger.info("");
Logger.info("==========================================");
/*
Check server version is supported
*/
if(!Arrays.asList(
"v1_15_R1",
"v1_16_R1",
"v1_16_R2",
"v1_16_R3"
).contains(EcoEnchantsPlugin.NMS_VERSION)) {
Logger.error("Your server version (" + EcoEnchantsPlugin.NMS_VERSION + ") is not supported!");
Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance());
}
/*
Load Configs
*/