mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 23:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes i guess

Browse Source
This commit is contained in:
RePixelatedMC
2024-08-02 17:29:39 +02:00
parent 6174ec04ab
commit 1477dc037c
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1
View File
@@ -156,6 +156,7 @@ allprojects {
compileOnly 'net.bytebuddy:byte-buddy-agent:1.12.8' compileOnly 'net.bytebuddy:byte-buddy-agent:1.12.8'
compileOnly 'org.bytedeco:javacpp:1.5.10' compileOnly 'org.bytedeco:javacpp:1.5.10'
compileOnly 'org.bytedeco:cuda-platform:12.3-8.9-1.5.10' compileOnly 'org.bytedeco:cuda-platform:12.3-8.9-1.5.10'
compileOnly 'org.mapdb:mapdb:3.1.0'
} }
/** /**
core/src/main/java/com/volmit/iris/Iris.java
+23 -21
View File
@@ -517,32 +517,34 @@ public class Iris extends VolmitPlugin implements Listener {
continue; continue;
} }
String generator = entry.getString("generator"); String generator = entry.getString("backup-generator");
if (!generator.startsWith("Iris")) { if (!generator.startsWith("Iris")) {
continue; continue;
} }
// if (generator.startsWith("Iris:")) { if (new File(Bukkit.getWorldContainer().getPath() + "/" + s).exists()) {
// generator = generator.split("\\Q:\\E")[1]; File world = new File(Bukkit.getWorldContainer().getPath() + "/" + s + "/iris/engine-data/");
// } else if (generator.equalsIgnoreCase("Iris")) { IOFileFilter jsonFilter = org.apache.commons.io.filefilter.FileFilterUtils.suffixFileFilter(".json");
// generator = IrisSettings.get().getGenerator().getDefaultWorldType(); Collection<File> files = FileUtils.listFiles(world, jsonFilter, TrueFileFilter.INSTANCE);
// } else { if(files.size() != 1) {
// continue; Iris.info(C.DARK_GRAY + "------------------------------------------");
// } Iris.info(C.RED + "Failed to load " + C.GRAY + s + C.RED + ". No valid engine-data file was found.");
Iris.info(C.DARK_GRAY + "------------------------------------------");
continue;
}
File world = new File(Bukkit.getWorldContainer().getPath() + "/" + s + "/iris/engine-data/"); for (File file : files) {
IOFileFilter jsonFilter = org.apache.commons.io.filefilter.FileFilterUtils.suffixFileFilter(".json"); int lastDotIndex = file.getName().lastIndexOf(".");
Collection<File> files = FileUtils.listFiles(world, jsonFilter, TrueFileFilter.INSTANCE); generator = file.getName().substring(0, lastDotIndex);
if(files.size() != 1) { }
Iris.info(C.DARK_GRAY + "------------------------------------------"); } else {
Iris.info(C.RED + "Failed to load " + C.GRAY + s + C.RED + ". No valid engine-data file was found."); if (generator.startsWith("Iris:")) {
Iris.info(C.DARK_GRAY + "------------------------------------------"); generator = generator.split("\\Q:\\E")[1];
continue; } else if (generator.equalsIgnoreCase("Iris")) {
} generator = IrisSettings.get().getGenerator().getDefaultWorldType();
} else {
for (File file : files) { continue;
int lastDotIndex = file.getName().lastIndexOf("."); }
generator = file.getName().substring(0, lastDotIndex);
} }
Iris.info("2 World: %s | Generator: %s", s, generator); Iris.info("2 World: %s | Generator: %s", s, generator);
core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
+1 -1
View File
@@ -238,7 +238,7 @@ public class IrisCreator {
String gen = "Iris:" + dimension; String gen = "Iris:" + dimension;
ConfigurationSection section = yml.contains("worlds") ? yml.getConfigurationSection("worlds") : yml.createSection("worlds"); ConfigurationSection section = yml.contains("worlds") ? yml.getConfigurationSection("worlds") : yml.createSection("worlds");
if (!section.contains(name)) { if (!section.contains(name)) {
section.createSection(name).set("generator", gen); section.createSection(name).set("backup-generator", gen);
try { try {
yml.save(BUKKIT_YML); yml.save(BUKKIT_YML);
Iris.info("Registered \"" + name + "\" in bukkit.yml"); Iris.info("Registered \"" + name + "\" in bukkit.yml");
core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+2
View File
@@ -56,6 +56,8 @@ import org.bukkit.Material;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.mapdb.DB;
import org.mapdb.DBMaker;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
core/src/main/resources/plugin.yml
+1
View File
@@ -6,6 +6,7 @@ authors: [ cyberpwn, NextdoorPsycho, Vatuu ]
website: volmit.com website: volmit.com
description: More than a Dimension! description: More than a Dimension!
libraries: libraries:
- org.mapdb:mapdb:3.1.0
- org.bytedeco:cuda-platform:12.3-8.9-1.5.10 - org.bytedeco:cuda-platform:12.3-8.9-1.5.10
- org.bytedeco:javacpp:1.5.10 - org.bytedeco:javacpp:1.5.10
- net.bytebuddy:byte-buddy:1.14.14 - net.bytebuddy:byte-buddy:1.14.14