Skip to content

Commit f2fcbf1

Browse files
datatagsdatatags
committed
Revert some structure changes
1 parent b036ad1 commit f2fcbf1

30 files changed

Lines changed: 72 additions & 79 deletions

File tree

‎abstraction/build.gradle‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎core/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ dependencies {
2727
implementation 'org.bstats:bstats-bukkit:3.0.0'
2828
compileOnly 'net.luckperms:api:5.4'
2929
implementation 'com.zaxxer:HikariCP:4.0.3'
30-
compileOnly project(':abstraction')
3130
}
3231
shadowJar {
3332
// removes unused classes in 'implementation' path dependencies

‎core/src/main/java/be/isach/ultracosmetics/economy/VaultHook.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package be.isach.ultracosmetics.economy;
22

33
import be.isach.ultracosmetics.UltraCosmetics;
4-
import net.milkbowl.vault.economy.Economy;
4+
55
import org.bukkit.entity.Player;
66
import org.bukkit.plugin.RegisteredServiceProvider;
77

8+
import net.milkbowl.vault.economy.Economy;
9+
810
/**
911
* Vault economy hook.
1012
*
@@ -29,7 +31,7 @@ public VaultHook(UltraCosmetics ultraCosmetics) {
2931
economyEnabled = true;
3032
} else {
3133
ultraCosmetics.getSmartLogger().write("");
32-
ultraCosmetics.getSmartLogger().write("Something happened while hooking into Vault for economy.");
34+
ultraCosmetics.getSmartLogger().write("Found Vault but no economy, please check whether your economy plugin supports Vault.");
3335
ultraCosmetics.getSmartLogger().write("");
3436
economyEnabled = false;
3537
}

‎core/src/main/java/be/isach/ultracosmetics/version/APIAncientUtil.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package be.isach.ultracosmetics.version;
22

3-
import be.isach.ultracosmetics.abstraction.IAncientUtil;
4-
53
import org.bukkit.attribute.Attribute;
64
import org.bukkit.entity.Entity;
75
import org.bukkit.entity.LivingEntity;

‎core/src/main/java/be/isach/ultracosmetics/version/AnvilGUI.java‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package be.isach.ultracosmetics.version;
22

3+
import be.isach.ultracosmetics.UltraCosmeticsData;
4+
35
import org.apache.commons.lang.Validate;
46
import org.bukkit.Bukkit;
57
import org.bukkit.Material;
@@ -16,9 +18,6 @@
1618
import org.bukkit.inventory.meta.ItemMeta;
1719
import org.bukkit.plugin.Plugin;
1820

19-
import be.isach.ultracosmetics.UltraCosmeticsData;
20-
import be.isach.ultracosmetics.abstraction.IAnvilWrapper;
21-
2221
import java.util.function.BiFunction;
2322
import java.util.function.Consumer;
2423

@@ -66,7 +65,7 @@ public class AnvilGUI {
6665
/**
6766
* An {@link BiFunction} that is called when the {@link Slot#OUTPUT} slot has been clicked
6867
*/
69-
private final BiFunction<Player, String, Response> completeFunction;
68+
private final BiFunction<Player,String,Response> completeFunction;
7069

7170
/**
7271
* An {@link Consumer} that is called when the {@link Slot#INPUT_LEFT} slot has been clicked
@@ -100,13 +99,13 @@ public class AnvilGUI {
10099
*
101100
* @param plugin A {@link org.bukkit.plugin.java.JavaPlugin} instance
102101
* @param holder The {@link Player} to open the inventory for
103-
* @param insert What to have the text already set to
102+
* @param insert What to have the text already set to
104103
* @param biFunction A {@link BiFunction} that is called when the player clicks the {@link Slot#OUTPUT} slot
105104
* @throws NullPointerException If the server version isn't supported
106105
* @deprecated As of version 1.2.3, use {@link AnvilGUI.Builder}
107106
*/
108107
@Deprecated
109-
public AnvilGUI(Plugin plugin, Player holder, String insert, BiFunction<Player, String, String> biFunction) {
108+
public AnvilGUI(Plugin plugin, Player holder, String insert, BiFunction<Player,String,String> biFunction) {
110109
this(plugin, holder, "Repair & Name", insert, null, null, false, null, null, null, (player, text) -> {
111110
String response = biFunction.apply(player, text);
112111
if (response != null) {
@@ -140,8 +139,7 @@ private AnvilGUI(
140139
Consumer<Player> closeListener,
141140
Consumer<Player> inputLeftClickListener,
142141
Consumer<Player> inputRightClickListener,
143-
BiFunction<Player, String, Response> completeFunction
144-
) {
142+
BiFunction<Player,String,Response> completeFunction) {
145143
this.plugin = plugin;
146144
this.player = player;
147145
this.inventoryTitle = inventoryTitle;
@@ -200,6 +198,7 @@ public void closeInventory() {
200198

201199
/**
202200
* Closes the inventory if it's open, only sending the close inventory packets if the arg is true
201+
*
203202
* @param sendClosePacket Whether to send the close inventory event, packet, etc
204203
*/
205204
private void closeInventory(boolean sendClosePacket) {
@@ -238,10 +237,8 @@ private class ListenUp implements Listener {
238237

239238
@EventHandler
240239
public void onInventoryClick(InventoryClickEvent event) {
241-
if (
242-
event.getInventory().equals(inventory) &&
243-
(event.getRawSlot() < 3 || event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY))
244-
) {
240+
if (event.getInventory().equals(inventory) &&
241+
(event.getRawSlot() < 3 || event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY))) {
245242
event.setCancelled(true);
246243
final Player clicker = (Player) event.getWhoClicked();
247244
if (event.getRawSlot() == Slot.OUTPUT) {
@@ -250,8 +247,7 @@ public void onInventoryClick(InventoryClickEvent event) {
250247

251248
final Response response = completeFunction.apply(
252249
clicker,
253-
clicked.hasItemMeta() ? clicked.getItemMeta().getDisplayName() : ""
254-
);
250+
clicked.hasItemMeta() ? clicked.getItemMeta().getDisplayName() : "");
255251
if (response.getText() != null) {
256252
final ItemMeta meta = clicked.getItemMeta();
257253
meta.setDisplayName(response.getText());
@@ -322,7 +318,7 @@ public static class Builder {
322318
/**
323319
* An {@link BiFunction} that is called when the anvil output slot has been clicked
324320
*/
325-
private BiFunction<Player, String, Response> completeFunction;
321+
private BiFunction<Player,String,Response> completeFunction;
326322
/**
327323
* The {@link Plugin} that this anvil GUI is associated with
328324
*/
@@ -396,7 +392,7 @@ public Builder onRightInputClick(Consumer<Player> inputRightClickListener) {
396392
* @return The {@link Builder} instance
397393
* @throws IllegalArgumentException when the completeFunction is null
398394
*/
399-
public Builder onComplete(BiFunction<Player, String, Response> completeFunction) {
395+
public Builder onComplete(BiFunction<Player,String,Response> completeFunction) {
400396
Validate.notNull(completeFunction, "Complete function cannot be null");
401397
this.completeFunction = completeFunction;
402398
return this;
@@ -569,7 +565,7 @@ public static Response openInventory(Inventory inventory) {
569565
*/
570566
public static class Slot {
571567

572-
private static final int[] values = new int[]{Slot.INPUT_LEFT, Slot.INPUT_RIGHT, Slot.OUTPUT};
568+
private static final int[] values = new int[] { Slot.INPUT_LEFT, Slot.INPUT_RIGHT, Slot.OUTPUT };
573569

574570
/**
575571
* The slot on the far left, where the first input is inserted. An {@link ItemStack} is always inserted
@@ -597,4 +593,3 @@ public static int[] values() {
597593
}
598594

599595
}
600-

abstraction/src/main/java/be/isach/ultracosmetics/abstraction/IAncientUtil.java renamed to core/src/main/java/be/isach/ultracosmetics/version/IAncientUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.abstraction;
1+
package be.isach.ultracosmetics.version;
22

33
import org.bukkit.entity.Entity;
44
import org.bukkit.entity.LivingEntity;

abstraction/src/main/java/be/isach/ultracosmetics/abstraction/IAnvilWrapper.java renamed to core/src/main/java/be/isach/ultracosmetics/version/IAnvilWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.abstraction;
1+
package be.isach.ultracosmetics.version;
22

33
import org.bukkit.entity.Player;
44
import org.bukkit.inventory.Inventory;

abstraction/src/main/java/be/isach/ultracosmetics/abstraction/IFireworkFactory.java renamed to core/src/main/java/be/isach/ultracosmetics/version/IFireworkFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.abstraction;
1+
package be.isach.ultracosmetics.version;
22

33
import org.bukkit.FireworkEffect;
44
import org.bukkit.Location;

‎core/src/main/java/be/isach/ultracosmetics/version/VersionManager.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package be.isach.ultracosmetics.version;
22

33
import be.isach.ultracosmetics.UltraCosmeticsData;
4-
import be.isach.ultracosmetics.abstraction.IAncientUtil;
5-
import be.isach.ultracosmetics.abstraction.IAnvilWrapper;
6-
import be.isach.ultracosmetics.abstraction.IFireworkFactory;
74
import be.isach.ultracosmetics.cosmetics.pets.APlayerFollower;
85
import be.isach.ultracosmetics.cosmetics.pets.Pet;
96
import be.isach.ultracosmetics.util.ReflectionUtils;

‎core/src/main/java/be/isach/ultracosmetics/worldguard/IFlagManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package be.isach.ultracosmetics.worldguard;
22

3-
import be.isach.ultracosmetics.abstraction.worldguard.UCFlag;
43
import be.isach.ultracosmetics.cosmetics.Category;
54

65
import org.bukkit.entity.Player;

0 commit comments

Comments
 (0)