diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 668f0b31b..bffb09868 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -18,7 +18,7 @@
**/*.yml
**/*.txt
**/*.properties
- **/*.html
+ **/*.json
@@ -33,7 +33,7 @@
shade
- true
+ false
diff --git a/pom.xml b/pom.xml
index b37894618..a4d0d90cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
**/*.yml
**/*.txt
**/*.properties
- **/*.html
+ **/*.json
@@ -44,7 +44,7 @@
shade
- true
+ false
diff --git a/src/main/java/ninja/bytecode/iris/CommandIris.java b/src/main/java/ninja/bytecode/iris/CommandIris.java
index fe4e90550..af5f8abc1 100644
--- a/src/main/java/ninja/bytecode/iris/CommandIris.java
+++ b/src/main/java/ninja/bytecode/iris/CommandIris.java
@@ -1,9 +1,6 @@
package ninja.bytecode.iris;
-import java.io.File;
-
import org.bukkit.ChatColor;
-import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -13,9 +10,7 @@ import org.bukkit.entity.Player;
import ninja.bytecode.iris.controller.TimingsController;
import ninja.bytecode.iris.generator.IrisGenerator;
import ninja.bytecode.iris.pack.IrisBiome;
-import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.format.F;
-import ninja.bytecode.shuriken.io.IO;
public class CommandIris implements CommandExecutor
{
@@ -113,18 +108,6 @@ public class CommandIris implements CommandExecutor
msg(sender, "Reloading Iris...");
Iris.instance.reload();
}
-
- if(args[0].equalsIgnoreCase("clean"))
- {
- msg(sender, "Poof!");
-
- if(sender instanceof Player)
- {
- ((Player) sender).playSound(((Player) sender).getLocation(), Sound.BLOCK_END_PORTAL_SPAWN, 0.33f, (float) 1.65);
- }
-
- J.attempt(() -> IO.delete(new File(Iris.instance.getDataFolder(), "pack")));
- }
}
return false;
diff --git a/src/main/java/ninja/bytecode/iris/Iris.java b/src/main/java/ninja/bytecode/iris/Iris.java
index 263218005..93c345881 100644
--- a/src/main/java/ninja/bytecode/iris/Iris.java
+++ b/src/main/java/ninja/bytecode/iris/Iris.java
@@ -46,7 +46,6 @@ public class Iris extends JavaPlugin implements Listener
getServer().getPluginManager().registerEvents((Listener) this, this);
getCommand("iris").setExecutor(new CommandIris());
getCommand("ish").setExecutor(new CommandIsh());
- getController(PackController.class).createTempCache(getFile());
if(!settings.performance.debugMode)
{
diff --git a/src/main/java/ninja/bytecode/iris/controller/PackController.java b/src/main/java/ninja/bytecode/iris/controller/PackController.java
index 37b2a2cdb..e95b1d453 100644
--- a/src/main/java/ninja/bytecode/iris/controller/PackController.java
+++ b/src/main/java/ninja/bytecode/iris/controller/PackController.java
@@ -2,12 +2,8 @@ package ninja.bytecode.iris.controller;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
import net.md_5.bungee.api.ChatColor;
import ninja.bytecode.iris.Iris;
@@ -19,7 +15,6 @@ import ninja.bytecode.iris.pack.IrisPack;
import ninja.bytecode.iris.util.IrisController;
import ninja.bytecode.shuriken.bench.PrecisionStopwatch;
import ninja.bytecode.shuriken.collections.GMap;
-import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.execution.TaskExecutor;
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup;
import ninja.bytecode.shuriken.format.F;
@@ -55,40 +50,6 @@ public class PackController implements IrisController
return ready;
}
- public void createTempCache(File jar)
- {
- try
- {
- J.a(() -> IO.delete(new File(Iris.instance.getDataFolder(), "pack")));
- File temp = Iris.instance.getDataFolder();
- temp.mkdirs();
- L.i("Iris Cache: " + temp.getAbsolutePath());
- ZipFile zipFile = new ZipFile(jar);
- Enumeration entries = zipFile.entries();
- while(entries.hasMoreElements())
- {
- ZipEntry entry = entries.nextElement();
- if(entry.getName().startsWith("pack/") && !entry.isDirectory())
- {
- File f = new File(temp, entry.getName());
- f.getParentFile().mkdirs();
- InputStream stream = zipFile.getInputStream(entry);
- FileOutputStream fos = new FileOutputStream(f);
- IO.fullTransfer(stream, fos, 16921);
- fos.close();
- stream.close();
- }
- }
-
- zipFile.close();
- }
-
- catch(Throwable e)
- {
- L.w(ChatColor.YELLOW + "Failed to cache internal resources. Did you reload Iris externally?");
- }
- }
-
public void loadContent()
{
dimensions = new GMap<>();
diff --git a/src/main/resources/pack/biomes/jungle.json b/src/main/resources/pack/biomes/jungle.json
index 6b266c6ae..df6f48c47 100644
--- a/src/main/resources/pack/biomes/jungle.json
+++ b/src/main/resources/pack/biomes/jungle.json
@@ -7,6 +7,6 @@
"LONG_GRASS:2=0.13"
],
"objects": [
- "colossal/jungle/massive=0.001"
+ "colossal/jungle/massive=0.0005"
]
}
\ No newline at end of file
diff --git a/src/main/resources/pack/biomes/jungle_hills.json b/src/main/resources/pack/biomes/jungle_hills.json
index ab7fcbc9d..f2f6cff06 100644
--- a/src/main/resources/pack/biomes/jungle_hills.json
+++ b/src/main/resources/pack/biomes/jungle_hills.json
@@ -7,6 +7,6 @@
"LONG_GRASS:2=0.02"
],
"objects": [
- "colossal/jungle/massive=0.001"
+ "colossal/jungle/massive=0.0005"
]
}
\ No newline at end of file
diff --git a/src/main/resources/pack/objects/colossal/jungle/massive/flags.ifl b/src/main/resources/pack/objects/colossal/jungle/massive/flags.ifl
new file mode 100644
index 000000000..9d6d4a78d
--- /dev/null
+++ b/src/main/resources/pack/objects/colossal/jungle/massive/flags.ifl
@@ -0,0 +1 @@
+sink 8
\ No newline at end of file