Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-11 01:01:53 +01:00
Code Issues Projects Releases Wiki Activity

WorldEdit schematic support, +bug fix

Browse Source
This commit is contained in:
Esophose 2019-05-09 04:30:13 -06:00
parent 6775dd3759
commit e620d3eb0e
9 changed files with 128 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -37,6 +37,9 @@ dependencies {
// WildStacker
implementation (group: 'com.bgsoftware', name: 'wildstacker-api', version: 'b14')
// WorldEdit
implementation (group: 'com.sk89q', name: 'worldedit', version: '7.0.0')
// Apache Commons
shade (group: 'org.apache.commons', name: 'commons-lang3', version: '3.0')
shade (group: 'commons-io', name: 'commons-io', version: '2.5')

4
src/main/java/me/goodandevil/skyblock/config/FileManager.java
View File

@ -49,6 +49,10 @@ public class FileManager {
new File(skyblock.getDataFolder().toString() + "/structures").mkdir();
}
if (Bukkit.getPluginManager().isPluginEnabled("WorldEdit") && !new File(skyblock.getDataFolder().toString() + "/schematics").exists()) {
new File(skyblock.getDataFolder().toString() + "/schematics").mkdir();
}
Map<String, File> configFiles = new LinkedHashMap<>();
configFiles.put("worlds.yml", new File(skyblock.getDataFolder(), "worlds.yml"));
configFiles.put("levelling.yml", new File(skyblock.getDataFolder(), "levelling.yml"));

35
src/main/java/me/goodandevil/skyblock/island/IslandManager.java
View File

@ -746,21 +746,30 @@ public class IslandManager {
}
try {
File structureFile = null;
if (world == IslandWorld.Normal) {
structureFile = new File(new File(skyblock.getDataFolder().toString() + "/structures"),
structure.getOverworldFile());
} else if (world == IslandWorld.Nether) {
structureFile = new File(new File(skyblock.getDataFolder().toString() + "/structures"),
structure.getNetherFile());
} else if (world == IslandWorld.End) {
structureFile = new File(new File(skyblock.getDataFolder().toString() + "/structures"),
structure.getEndFile());
String structureFileName = null;
switch (world) {
case Normal:
structureFileName = structure.getOverworldFile();
break;
case Nether:
structureFileName = structure.getNetherFile();
break;
case End:
structureFileName = structure.getEndFile();
break;
}
boolean isStructureFile = structureFileName.endsWith(".structure");
File structureFile = new File(new File(skyblock.getDataFolder().toString() + "/" + (isStructureFile ? "structures" : "schematics")), structureFileName);
Float[] direction;
if (isStructureFile) {
direction = StructureUtil.pasteStructure(StructureUtil.loadStructure(structureFile),
island.getLocation(world, IslandEnvironment.Island), BlockDegreesType.ROTATE_360);
} else {
direction = StructureUtil.pasteSchematic(structureFile, island.getLocation(world, IslandEnvironment.Island));
}
Float[] direction = StructureUtil.pasteStructure(StructureUtil.loadStructure(structureFile),
island.getLocation(world, IslandEnvironment.Island), BlockDegreesType.ROTATE_360);
org.bukkit.Location spawnLocation = island.getLocation(world, IslandEnvironment.Main).clone();
spawnLocation.setYaw(direction[0]);
spawnLocation.setPitch(direction[1]);

2
src/main/java/me/goodandevil/skyblock/levelling/LevellingManager.java
View File

@ -52,7 +52,7 @@ public class LevellingManager {
WorldManager worldManager = skyblock.getWorldManager();
StackableManager stackableManager = skyblock.getStackableManager();
if (islandManager.getIslandPlayerAt(player) != island) {
if (player != null && islandManager.getIslandPlayerAt(player) != island) {
String message = ChatColor.translateAlternateColorCodes('&', this.skyblock.getFileManager()
.getConfig(new File(this.skyblock.getDataFolder(), "language.yml"))
.getFileConfiguration().getString("Command.Island.Level.Scanning.NotOnIsland.Message"));

18
src/main/java/me/goodandevil/skyblock/menus/Creator.java
View File

@ -127,7 +127,8 @@ public class Creator {
}
if (!fileManager.isFileExist(
new File(new File(skyblock.getDataFolder().toString() + "/structures"),
new File(new File(skyblock.getDataFolder().toString() + "/" +
(structureList.getOverworldFile().endsWith(".structure") ? "structures" : "schematics")),
structureList.getOverworldFile()))) {
messageManager.sendMessage(player,
configLoad.getString("Island.Creator.Selector.File.Overworld.Message"));
@ -138,7 +139,8 @@ public class Creator {
return;
} else if (!fileManager.isFileExist(
new File(new File(skyblock.getDataFolder().toString() + "/structures"),
new File(new File(skyblock.getDataFolder().toString() + "/" +
(structureList.getNetherFile().endsWith(".structure") ? "structures" : "schematics")),
structureList.getNetherFile()))) {
messageManager.sendMessage(player,
configLoad.getString("Island.Creator.Selector.File.Nether.Message"));
@ -147,6 +149,18 @@ public class Creator {
event.setWillClose(false);
event.setWillDestroy(false);
return;
} else if (!fileManager.isFileExist(
new File(new File(skyblock.getDataFolder().toString() + "/" +
(structureList.getEndFile().endsWith(".structure") ? "structures" : "schematics")),
structureList.getEndFile()))) {
messageManager.sendMessage(player,
configLoad.getString("Island.Creator.Selector.File.End.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event.setWillClose(false);
event.setWillDestroy(false);
return;
} else if (fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Creation.Cooldown.Creation.Enable")

4
src/main/java/me/goodandevil/skyblock/placeholder/EZPlaceholder.java
View File

@ -85,8 +85,8 @@ public class EZPlaceholder extends PlaceholderExpansion implements Listener {
return ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Placeholder.fabledskyblock_leaderboard_bank.Empty.Message"));
} else if (identifier.equalsIgnoreCase("leaderboard_bank_" + (i + 1))) {
if (i < leaderboardLevelPlayers.size()) {
Leaderboard leaderboard = leaderboardLevelPlayers.get(i);
if (i < leaderboardBankPlayers.size()) {
Leaderboard leaderboard = leaderboardBankPlayers.get(i);
Visit visit = leaderboard.getVisit();
IslandLevel level = visit.getLevel();

80
src/main/java/me/goodandevil/skyblock/utils/structure/StructureUtil.java
View File

@ -2,7 +2,18 @@ package me.goodandevil.skyblock.utils.structure;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.session.ClipboardHolder;
import me.goodandevil.skyblock.SkyBlock;
import me.goodandevil.skyblock.config.FileManager;
import me.goodandevil.skyblock.config.FileManager.Config;
@ -14,10 +25,10 @@ import me.goodandevil.skyblock.utils.world.block.BlockDegreesType;
import me.goodandevil.skyblock.utils.world.block.BlockUtil;
import me.goodandevil.skyblock.utils.world.entity.EntityData;
import me.goodandevil.skyblock.utils.world.entity.EntityUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Entity;
@ -25,7 +36,12 @@ import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@ -177,6 +193,64 @@ public final class StructureUtil {
return new Float[] { yaw, pitch };
}
@SuppressWarnings("deprecation")
public static Float[] pasteSchematic(File schematicFile, org.bukkit.Location location) {
if (!Bukkit.getPluginManager().isPluginEnabled("WorldEdit"))
throw new IllegalStateException("Tried to generate an island using a schematic file without WorldEdit installed!");
Bukkit.getScheduler().runTask(SkyBlock.getInstance(), () -> {
if (NMSUtil.getVersionNumber() > 12) { // WorldEdit 7
ClipboardFormat format = ClipboardFormats.findByFile(schematicFile);
try (ClipboardReader reader = format.getReader(new FileInputStream(schematicFile))) {
Clipboard clipboard = reader.read();
try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(location.getWorld()), -1)) {
Operation operation = new ClipboardHolder(clipboard)
.createPaste(editSession)
.to(BlockVector3.at(location.getX(), location.getY(), location.getZ()))
.ignoreAirBlocks(true)
.build();
Operations.complete(operation);
} catch (WorldEditException e) {
e.printStackTrace();
}
} catch (IOException e) {
e.printStackTrace();
}
} else { // WorldEdit 6 or earlier
// I don't want to use modules so reflection it is
// TODO: Cache this later
try {
Class<?> bukkitWorldClass = Class.forName("com.sk89q.worldedit.bukkit.BukkitWorld");
Constructor bukkitWorldConstructor = bukkitWorldClass.getConstructor(World.class);
Class<?> editSessionClass = Class.forName("com.sk89q.worldedit.EditSession");
Class<?> localWorldClass = Class.forName("com.sk89q.worldedit.LocalWorld");
Constructor editSessionConstructor = editSessionClass.getConstructor(localWorldClass, int.class);
Class<?> cuboidClipboardClass = Class.forName("com.sk89q.worldedit.CuboidClipboard");
Method loadSchematicMethod = cuboidClipboardClass.getMethod("loadSchematic", File.class);
Class<?> vectorClass = Class.forName("com.sk89q.worldedit.Vector");
Constructor vectorConstructor = vectorClass.getConstructor(double.class, double.class, double.class);
Method pasteMethod = cuboidClipboardClass.getMethod("paste", editSessionClass, vectorClass, boolean.class);
Object editSessionObj = editSessionConstructor.newInstance(bukkitWorldConstructor.newInstance(location.getWorld()), 999999999);
Object cuboidClipboardObj = loadSchematicMethod.invoke(null, schematicFile);
Object vectorObj = vectorConstructor.newInstance(location.getX(), location.getY(), location.getZ());
pasteMethod.invoke(cuboidClipboardObj, editSessionObj, vectorObj, true);
/*
EditSession es = new EditSession(new BukkitWorld(location.getWorld()), 999999999);
CuboidClipboard cc = CuboidClipboard.loadSchematic(schematicFile);
cc.paste(es, new Vector(location.getX(), location.getY(), location.getZ()), true);
*/
} catch (Exception e) {
e.printStackTrace();
}
}
});
return new Float[] { location.getYaw(), location.getPitch() };
}
public static ItemStack getTool() throws Exception {
SkyBlock skyblock = SkyBlock.getInstance();

2
src/main/resources/language.yml
View File

@ -894,6 +894,8 @@ Island:
Message: "&bSkyBlock &8| &cError&8: &eThe structure file for the overworld does not exist."
Nether:
Message: "&bSkyBlock &8| &cError&8: &eThe structure file for the nether does not exist."
End:
Message: "&bSkyBlock &8| &cError&8: &eThe structure file for the end does not exist."
Cooldown:
Word:
Minute: "minute(s)"

2
src/main/resources/plugin.yml
View File

@ -4,7 +4,7 @@ version: @version@
api-version: 1.13
description: A unique SkyBlock plugin
author: Songoda
softdepend: [PlaceholderAPI, MVdWPlaceholderAPI, Vault, LeaderHeads, EpicSpawners, WildStacker]
softdepend: [PlaceholderAPI, MVdWPlaceholderAPI, Vault, LeaderHeads, EpicSpawners, WildStacker, WorldEdit]
loadbefore: [Multiverse-Core]
commands:
island: