Renamed project to ShowControl.
This commit is contained in:
parent
3425cb1c70
commit
8ac4017b9b
29 changed files with 152 additions and 238 deletions
26
pom.xml
26
pom.xml
|
@ -5,13 +5,13 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>nl.SBDeveloper</groupId>
|
||||
<artifactId>ShowAPI</artifactId>
|
||||
<artifactId>ShowControl</artifactId>
|
||||
<version>1.3</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>ShowAPI</name>
|
||||
<name>ShowControl</name>
|
||||
<url>https://sbdplugins.nl</url>
|
||||
|
||||
<description>Make perfect shows with this API!</description>
|
||||
<description>Create shows easily using this plugin!</description>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
@ -53,25 +53,21 @@
|
|||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
||||
<shadedArtifactAttached>false</shadedArtifactAttached>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>org.inventivetalent.apihelper</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showapi.helpers.apihelper</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>fr.minuskube.inv</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showapi.helpers.inv</shadedPattern>
|
||||
<shadedPattern>nl.sbdeveloper.showcontrol.libs.inv</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>com.github.fierioziy.particlenativeapi</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showapi.helpers.particleapi</shadedPattern>
|
||||
<pattern>fr.skytasul.guardianbeam</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showcontrol.libs.guardianbeam</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>co.aikar.commands</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showapi.helpers.acf</shadedPattern>
|
||||
<shadedPattern>nl.sbdeveloper.showcontrol.libs.commands</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>co.aikar.locales</pattern>
|
||||
<shadedPattern>nl.sbdeveloper.showapi.helpers.locales</shadedPattern>
|
||||
<shadedPattern>nl.sbdeveloper.showcontrol.libs.locales</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
|
@ -124,12 +120,6 @@
|
|||
<artifactId>XSeries</artifactId>
|
||||
<version>9.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.fierioziy.particlenativeapi</groupId>
|
||||
<artifactId>ParticleNativeAPI-plugin</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>co.aikar</groupId>
|
||||
<artifactId>acf-paper</artifactId>
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
package nl.sbdeveloper.showapi;
|
||||
|
||||
import co.aikar.commands.PaperCommandManager;
|
||||
import com.github.fierioziy.particlenativeapi.api.ParticleNativeAPI;
|
||||
import com.github.fierioziy.particlenativeapi.api.utils.ParticleException;
|
||||
import com.github.fierioziy.particlenativeapi.core.ParticleNativeCore;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showapi.commands.ShowCMD;
|
||||
import nl.sbdeveloper.showapi.data.DataConversion;
|
||||
import nl.sbdeveloper.showapi.data.DataSaving;
|
||||
import nl.sbdeveloper.showapi.data.Shows;
|
||||
import nl.sbdeveloper.showapi.utils.Inventory;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class ShowAPIPlugin extends JavaPlugin {
|
||||
private static ShowAPIPlugin instance;
|
||||
|
||||
private static PaperCommandManager commandManager;
|
||||
|
||||
private static ParticleNativeAPI particleAPI;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
instance = this;
|
||||
|
||||
DataConversion.handle();
|
||||
|
||||
commandManager = new PaperCommandManager(this);
|
||||
commandManager.enableUnstableAPI("help");
|
||||
|
||||
commandManager.registerCommand(new ShowCMD());
|
||||
|
||||
commandManager.getCommandCompletions().registerCompletion("showname", c -> Shows.getShowsMap().keySet());
|
||||
commandManager.getCommandCompletions().registerStaticCompletion("showtype", Arrays.stream(TriggerType.values()).map(Enum::name).collect(Collectors.toList()));
|
||||
|
||||
try {
|
||||
particleAPI = ParticleNativeCore.loadAPI(this);
|
||||
} catch (ParticleException ex) {
|
||||
ex.printStackTrace();
|
||||
getPluginLoader().disablePlugin(this);
|
||||
return;
|
||||
}
|
||||
|
||||
Inventory.init();
|
||||
|
||||
Bukkit.getScheduler().runTaskLater(this, DataSaving::load, 1L); //Load 1 tick later, because of multi world
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
instance = null;
|
||||
|
||||
DataSaving.save();
|
||||
|
||||
Shows.getShowsMap().values().forEach(show -> show.forEach(showCue -> showCue.getTask().remove()));
|
||||
}
|
||||
|
||||
public static ShowAPIPlugin getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static PaperCommandManager getCommandManager() {
|
||||
return commandManager;
|
||||
}
|
||||
|
||||
public static ParticleNativeAPI getParticleAPI() {
|
||||
return particleAPI;
|
||||
}
|
||||
}
|
|
@ -1,53 +0,0 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
|
||||
public class FakeFireworkTrigger extends TriggerTask {
|
||||
private Location spawnLoc;
|
||||
private float xVelocity;
|
||||
private float yVelocity;
|
||||
private float zVelocity;
|
||||
|
||||
public FakeFireworkTrigger(String[] data) {
|
||||
super(TriggerType.FAKE_FIREWORK, data);
|
||||
|
||||
World w = Bukkit.getWorld(data[0]);
|
||||
if (w == null) {
|
||||
Bukkit.getLogger().info("De wereld is null!");
|
||||
return;
|
||||
}
|
||||
|
||||
int x;
|
||||
int y;
|
||||
int z;
|
||||
try {
|
||||
x = Integer.parseInt(data[1]);
|
||||
y = Integer.parseInt(data[2]);
|
||||
z = Integer.parseInt(data[3]);
|
||||
} catch (NumberFormatException ex) {
|
||||
Bukkit.getLogger().info("De positie is incorrect!");
|
||||
return;
|
||||
}
|
||||
|
||||
this.spawnLoc = new Location(w, x, y, z);
|
||||
|
||||
try {
|
||||
this.xVelocity = Float.parseFloat(data[4]);
|
||||
this.yVelocity = Float.parseFloat(data[5]);
|
||||
this.zVelocity = Float.parseFloat(data[6]);
|
||||
} catch (NumberFormatException ex) {
|
||||
Bukkit.getLogger().info("De velocity is incorrect!");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void trigger() {
|
||||
//TODO Fix this trigger
|
||||
ShowAPIPlugin.getParticleAPI().getParticles_1_13().DUST().color(255, 0, 0, 5).packet(true, spawnLoc.getX(), spawnLoc.getY(), spawnLoc.getZ(), xVelocity, yVelocity, zVelocity, 0.01, 40);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,50 @@
|
|||
package nl.sbdeveloper.showcontrol;
|
||||
|
||||
import co.aikar.commands.PaperCommandManager;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.commands.ShowCMD;
|
||||
import nl.sbdeveloper.showcontrol.data.DataConversion;
|
||||
import nl.sbdeveloper.showcontrol.data.DataSaving;
|
||||
import nl.sbdeveloper.showcontrol.data.Shows;
|
||||
import nl.sbdeveloper.showcontrol.utils.Inventory;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class ShowControlPlugin extends JavaPlugin {
|
||||
private static ShowControlPlugin instance;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
instance = this;
|
||||
|
||||
DataConversion.handle();
|
||||
|
||||
final PaperCommandManager commandManager = new PaperCommandManager(this);
|
||||
commandManager.enableUnstableAPI("help");
|
||||
|
||||
commandManager.registerCommand(new ShowCMD());
|
||||
|
||||
commandManager.getCommandCompletions().registerCompletion("showname", c -> Shows.getShowsMap().keySet());
|
||||
commandManager.getCommandCompletions().registerStaticCompletion("showtype", Arrays.stream(TriggerType.values()).map(Enum::name).collect(Collectors.toList()));
|
||||
|
||||
Inventory.init();
|
||||
|
||||
Bukkit.getScheduler().runTaskLater(this, DataSaving::load, 1L); //Load 1 tick later, because of multi world
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
instance = null;
|
||||
|
||||
DataSaving.save();
|
||||
|
||||
Shows.getShowsMap().values().forEach(show -> show.forEach(showCue -> showCue.getTask().remove()));
|
||||
}
|
||||
|
||||
public static ShowControlPlugin getInstance() {
|
||||
return instance;
|
||||
}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.api;
|
||||
package nl.sbdeveloper.showcontrol.api;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.api;
|
||||
package nl.sbdeveloper.showcontrol.api;
|
||||
|
||||
public abstract class TriggerTask {
|
||||
private final TriggerType type;
|
|
@ -1,6 +1,6 @@
|
|||
package nl.sbdeveloper.showapi.api;
|
||||
package nl.sbdeveloper.showcontrol.api;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.triggers.*;
|
||||
import nl.sbdeveloper.showcontrol.api.triggers.*;
|
||||
|
||||
public enum TriggerType {
|
||||
COMMAND(CommandTrigger.class, 2),
|
|
@ -1,7 +1,7 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
public class AnimaTrigger extends TriggerTask {
|
|
@ -1,7 +1,7 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
public class CommandTrigger extends TriggerTask {
|
|
@ -1,9 +1,9 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showapi.elements.Fireworks;
|
||||
import nl.sbdeveloper.showapi.utils.Color;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.elements.Fireworks;
|
||||
import nl.sbdeveloper.showcontrol.utils.Color;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.FireworkEffect;
|
||||
import org.bukkit.Location;
|
|
@ -1,8 +1,8 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showapi.elements.Lasers;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.elements.Lasers;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
|
@ -1,7 +1,7 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Particle;
|
|
@ -1,8 +1,8 @@
|
|||
package nl.sbdeveloper.showapi.api.triggers;
|
||||
package nl.sbdeveloper.showcontrol.api.triggers;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showapi.elements.Spots;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.elements.Spots;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
|
@ -1,12 +1,12 @@
|
|||
package nl.sbdeveloper.showapi.commands;
|
||||
package nl.sbdeveloper.showcontrol.commands;
|
||||
|
||||
import co.aikar.commands.BaseCommand;
|
||||
import co.aikar.commands.annotation.*;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.data.Shows;
|
||||
import nl.sbdeveloper.showapi.gui.ShowCueGUI;
|
||||
import nl.sbdeveloper.showapi.utils.MainUtil;
|
||||
import nl.sbdeveloper.showapi.utils.TimeUtil;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.data.Shows;
|
||||
import nl.sbdeveloper.showcontrol.gui.ShowCueGUI;
|
||||
import nl.sbdeveloper.showcontrol.utils.MainUtil;
|
||||
import nl.sbdeveloper.showcontrol.utils.TimeUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
|
@ -1,9 +1,9 @@
|
|||
package nl.sbdeveloper.showapi.data;
|
||||
package nl.sbdeveloper.showcontrol.data;
|
||||
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.utils.MainUtil;
|
||||
import nl.sbdeveloper.showapi.utils.YamlFile;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.utils.MainUtil;
|
||||
import nl.sbdeveloper.showcontrol.utils.YamlFile;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
@ -13,13 +13,13 @@ public class DataConversion {
|
|||
}
|
||||
|
||||
private static boolean isOldSystem() {
|
||||
File dataFolder = ShowAPIPlugin.getInstance().getDataFolder();
|
||||
File dataFolder = ShowControlPlugin.getInstance().getDataFolder();
|
||||
File dataFile = new File(dataFolder, "data.yml");
|
||||
return dataFile.exists();
|
||||
}
|
||||
|
||||
private static void convert() {
|
||||
File dataFolder = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data");
|
||||
File dataFolder = new File(ShowControlPlugin.getInstance().getDataFolder(), "data");
|
||||
if(!dataFolder.exists()) {
|
||||
dataFolder.mkdirs();
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ public class DataConversion {
|
|||
}
|
||||
|
||||
//STEP 2: Remove old storage.
|
||||
File data = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data.yml");
|
||||
File data = new File(ShowControlPlugin.getInstance().getDataFolder(), "data.yml");
|
||||
data.delete();
|
||||
}
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
package nl.sbdeveloper.showapi.data;
|
||||
package nl.sbdeveloper.showcontrol.data;
|
||||
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showapi.api.ShowCue;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.utils.MainUtil;
|
||||
import nl.sbdeveloper.showapi.utils.YamlFile;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import nl.sbdeveloper.showcontrol.api.ShowCue;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.utils.MainUtil;
|
||||
import nl.sbdeveloper.showcontrol.utils.YamlFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
|
@ -17,7 +17,7 @@ public class DataSaving {
|
|||
}
|
||||
|
||||
public static void load() {
|
||||
File showsFolder = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data");
|
||||
File showsFolder = new File(ShowControlPlugin.getInstance().getDataFolder(), "data");
|
||||
for (File showFile : showsFolder.listFiles()) {
|
||||
String showID = removeExtension(showFile.getName());
|
||||
YamlFile showConfig = new YamlFile("data/" + showID);
|
|
@ -1,9 +1,9 @@
|
|||
package nl.sbdeveloper.showapi.data;
|
||||
package nl.sbdeveloper.showcontrol.data;
|
||||
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showapi.api.ShowCue;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.utils.YamlFile;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import nl.sbdeveloper.showcontrol.api.ShowCue;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.utils.YamlFile;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.io.File;
|
||||
|
@ -27,7 +27,7 @@ public class Shows {
|
|||
public static void delete(String name) {
|
||||
showsMap.remove(name);
|
||||
|
||||
File data = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data/" + name + ".yml");
|
||||
File data = new File(ShowControlPlugin.getInstance().getDataFolder(), "data/" + name + ".yml");
|
||||
data.delete();
|
||||
}
|
||||
|
||||
|
@ -65,7 +65,7 @@ public class Shows {
|
|||
Bukkit.getLogger().info("Scheduled show " + name);
|
||||
for (ShowCue point : getPoints(name)) {
|
||||
Bukkit.getLogger().info("Point " + point.getTask().getDataString() + " on " + point.getTime());
|
||||
showTimer.schedule(() -> Bukkit.getScheduler().runTask(ShowAPIPlugin.getInstance(), () -> point.getTask().trigger()), point.getTime(), TimeUnit.MILLISECONDS);
|
||||
showTimer.schedule(() -> Bukkit.getScheduler().runTask(ShowControlPlugin.getInstance(), () -> point.getTask().trigger()), point.getTime(), TimeUnit.MILLISECONDS);
|
||||
}
|
||||
showTimers.put(name, showTimer);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.elements;
|
||||
package nl.sbdeveloper.showcontrol.elements;
|
||||
|
||||
import org.bukkit.Color;
|
||||
import org.bukkit.FireworkEffect;
|
|
@ -1,7 +1,7 @@
|
|||
package nl.sbdeveloper.showapi.elements;
|
||||
package nl.sbdeveloper.showcontrol.elements;
|
||||
|
||||
import fr.skytasul.guardianbeam.Laser;
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
|
@ -32,7 +32,7 @@ public class Lasers {
|
|||
public static boolean start(String name, Location baseLoc) {
|
||||
try {
|
||||
lasers.put(name, new LaserRunnable(name, baseLoc));
|
||||
lasers.get(name).runTaskTimer(ShowAPIPlugin.getInstance(), 0, 1);
|
||||
lasers.get(name).runTaskTimer(ShowControlPlugin.getInstance(), 0, 1);
|
||||
return true;
|
||||
} catch (ReflectiveOperationException e) {
|
||||
e.printStackTrace();
|
||||
|
@ -97,7 +97,7 @@ public class Lasers {
|
|||
|
||||
laser.changePositionLocation(oldLoc);
|
||||
}
|
||||
}.runTaskTimer(ShowAPIPlugin.getInstance(), 0L, 1L);
|
||||
}.runTaskTimer(ShowControlPlugin.getInstance(), 0L, 1L);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -119,7 +119,7 @@ public class Lasers {
|
|||
this.name = name;
|
||||
this.baseLoc = baseLoc;
|
||||
this.laser = new Laser.GuardianLaser(baseLoc, baseLoc.add(0, 5, 0), -1, 50);
|
||||
this.laser.start(ShowAPIPlugin.getInstance());
|
||||
this.laser.start(ShowControlPlugin.getInstance());
|
||||
}
|
||||
|
||||
@Override
|
|
@ -1,7 +1,7 @@
|
|||
package nl.sbdeveloper.showapi.elements;
|
||||
package nl.sbdeveloper.showcontrol.elements;
|
||||
|
||||
import fr.skytasul.guardianbeam.Laser;
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
|
@ -32,7 +32,7 @@ public class Spots {
|
|||
public static boolean start(String name, Location baseLoc) {
|
||||
try {
|
||||
spots.put(name, new SpotRunnable(name, baseLoc));
|
||||
spots.get(name).runTaskTimer(ShowAPIPlugin.getInstance(), 0, 1);
|
||||
spots.get(name).runTaskTimer(ShowControlPlugin.getInstance(), 0, 1);
|
||||
return true;
|
||||
} catch (ReflectiveOperationException e) {
|
||||
e.printStackTrace();
|
||||
|
@ -97,7 +97,7 @@ public class Spots {
|
|||
|
||||
laser.changePositionLocation(oldLoc);
|
||||
}
|
||||
}.runTaskTimer(ShowAPIPlugin.getInstance(), 0L, 1L);
|
||||
}.runTaskTimer(ShowControlPlugin.getInstance(), 0L, 1L);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -119,7 +119,7 @@ public class Spots {
|
|||
this.name = name;
|
||||
this.baseLoc = baseLoc;
|
||||
this.spot = new Laser.CrystalLaser(baseLoc, baseLoc.add(0, 5, 0), -1, 50);
|
||||
this.spot.start(ShowAPIPlugin.getInstance());
|
||||
this.spot.start(ShowControlPlugin.getInstance());
|
||||
}
|
||||
|
||||
@Override
|
|
@ -1,14 +1,14 @@
|
|||
package nl.sbdeveloper.showapi.gui;
|
||||
package nl.sbdeveloper.showcontrol.gui;
|
||||
|
||||
import fr.minuskube.inv.ClickableItem;
|
||||
import fr.minuskube.inv.content.InventoryContents;
|
||||
import fr.minuskube.inv.content.Pagination;
|
||||
import fr.minuskube.inv.content.SlotIterator;
|
||||
import nl.sbdeveloper.showapi.api.ShowCue;
|
||||
import nl.sbdeveloper.showapi.data.Shows;
|
||||
import nl.sbdeveloper.showapi.utils.Inventory;
|
||||
import nl.sbdeveloper.showapi.utils.ItemBuilder;
|
||||
import nl.sbdeveloper.showapi.utils.MainUtil;
|
||||
import nl.sbdeveloper.showcontrol.api.ShowCue;
|
||||
import nl.sbdeveloper.showcontrol.data.Shows;
|
||||
import nl.sbdeveloper.showcontrol.utils.Inventory;
|
||||
import nl.sbdeveloper.showcontrol.utils.ItemBuilder;
|
||||
import nl.sbdeveloper.showcontrol.utils.MainUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -17,7 +17,7 @@ import java.util.ArrayList;
|
|||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import static nl.sbdeveloper.showapi.utils.MainUtil.__;
|
||||
import static nl.sbdeveloper.showcontrol.utils.MainUtil.__;
|
||||
|
||||
public class ShowCueGUI extends Inventory {
|
||||
private final String showName;
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
public enum Color {
|
||||
WHITE(org.bukkit.Color.fromRGB(16777215)),
|
|
@ -1,13 +1,13 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import fr.minuskube.inv.InventoryManager;
|
||||
import fr.minuskube.inv.SmartInventory;
|
||||
import fr.minuskube.inv.content.InventoryContents;
|
||||
import fr.minuskube.inv.content.InventoryProvider;
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import static nl.sbdeveloper.showapi.utils.MainUtil.__;
|
||||
import static nl.sbdeveloper.showcontrol.utils.MainUtil.__;
|
||||
|
||||
public abstract class Inventory implements InventoryProvider {
|
||||
/*
|
||||
|
@ -47,7 +47,7 @@ public abstract class Inventory implements InventoryProvider {
|
|||
}
|
||||
|
||||
public static void init() {
|
||||
manager = new InventoryManager(ShowAPIPlugin.getInstance());
|
||||
manager = new InventoryManager(ShowControlPlugin.getInstance());
|
||||
manager.init();
|
||||
}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import com.cryptomorin.xseries.SkullUtils;
|
||||
import org.bukkit.Bukkit;
|
|
@ -1,8 +1,8 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import nl.sbdeveloper.showapi.api.ShowCue;
|
||||
import nl.sbdeveloper.showapi.api.TriggerTask;
|
||||
import nl.sbdeveloper.showapi.api.TriggerType;
|
||||
import nl.sbdeveloper.showcontrol.api.ShowCue;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerTask;
|
||||
import nl.sbdeveloper.showcontrol.api.TriggerType;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.inventory.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.format.DateTimeFormatter;
|
|
@ -1,4 +1,4 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package nl.sbdeveloper.showapi.utils;
|
||||
package nl.sbdeveloper.showcontrol.utils;
|
||||
|
||||
import nl.sbdeveloper.showapi.ShowAPIPlugin;
|
||||
import nl.sbdeveloper.showcontrol.ShowControlPlugin;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
@ -20,14 +20,14 @@ public class YamlFile {
|
|||
public YamlFile(String name) {
|
||||
this.name = name;
|
||||
|
||||
if (!ShowAPIPlugin.getInstance().getDataFolder().exists()) {
|
||||
if (!ShowAPIPlugin.getInstance().getDataFolder().mkdir()) {
|
||||
if (!ShowControlPlugin.getInstance().getDataFolder().exists()) {
|
||||
if (!ShowControlPlugin.getInstance().getDataFolder().mkdir()) {
|
||||
Bukkit.getLogger().severe("[ShowAPI] Couldn't generate the pluginfolder!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.file = new File(ShowAPIPlugin.getInstance().getDataFolder(), name + ".yml");
|
||||
this.file = new File(ShowControlPlugin.getInstance().getDataFolder(), name + ".yml");
|
||||
if (!this.file.exists()) {
|
||||
try {
|
||||
if (!this.file.createNewFile()) {
|
||||
|
@ -44,7 +44,7 @@ public class YamlFile {
|
|||
}
|
||||
|
||||
public void loadDefaults() {
|
||||
Reader defConfigStream1 = new InputStreamReader(Objects.requireNonNull(ShowAPIPlugin.getInstance().getResource(name + ".yml"), "Resource is null"), StandardCharsets.UTF_8);
|
||||
Reader defConfigStream1 = new InputStreamReader(Objects.requireNonNull(ShowControlPlugin.getInstance().getResource(name + ".yml"), "Resource is null"), StandardCharsets.UTF_8);
|
||||
YamlConfiguration defConfig1 = YamlConfiguration.loadConfiguration(defConfigStream1);
|
||||
getFile().setDefaults(defConfig1);
|
||||
getFile().options().copyDefaults(true);
|
|
@ -1,7 +1,7 @@
|
|||
name: ShowAPI
|
||||
name: ShowControl
|
||||
version: ${project.version}
|
||||
main: nl.sbdeveloper.showapi.ShowAPIPlugin
|
||||
api-version: 1.17
|
||||
main: nl.sbdeveloper.showcontrol.ShowControlPlugin
|
||||
api-version: 1.13
|
||||
authors: [SBDeveloper]
|
||||
description: Make perfect shows with this API!
|
||||
website: https://sbdplugins.nl
|
||||
website: https://sbdevelopment.tech
|
Loading…
Add table
Reference in a new issue