Merge pull request #778 from VolmitSoftware/Development

Development
VolmitSoftware · Apr 3, 2022 · 03554eb · 03554eb
2 parents 2ebc9e0 + dabfe41
commit 03554eb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,8 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-group 'com.volmit.iris'
-version '2.0.3-1.18.2' // Needs to be specific
+version '2.0.4-1.18.2' // Needs to be version specific
 def nmsVersion = "1.18.2"
 def apiVersion = '1.18'
 def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT'
@@ -137,15 +136,15 @@ dependencies {
 
     // Dynamically Loaded
     implementation 'io.timeandspace:smoothie-map:2.0.2'
-    implementation 'it.unimi.dsi:fastutil:8.5.6'
+    implementation 'it.unimi.dsi:fastutil:8.5.8'
     implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
     implementation 'org.zeroturnaround:zt-zip:1.14'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.ow2.asm:asm:9.2'
-    implementation 'com.google.guava:guava:31.0.1-jre'
+    implementation 'com.google.guava:guava:31.1-jre'
     implementation 'bsf:bsf:2.4.0'
     implementation 'rhino:js:1.7R2'
-    implementation 'com.github.ben-manes.caffeine:caffeine:3.0.5'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.0.6'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 }
 

diff --git a/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java b/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java
@@ -65,7 +65,7 @@ Entity spawnMob(String mob, Location location) {
         }
 
         try {
-            Class<?> mythicMobClass = Class.forName("io.lumine.xikage.mythicmobs.MythicMobs");
+            Class<?> mythicMobClass = Class.forName("io.lumine.mythic.bukkit.MythicBukkit");
             Method getInst = mythicMobClass.getDeclaredMethod("inst");
             Object inst = getInst.invoke(null);
             Method getAPIHelper = mythicMobClass.getDeclaredMethod("getAPIHelper");

diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -405,7 +405,7 @@ public boolean installDataPack(DataProvider data, File datapacks) {
             }
         }
 
-        if(!dimensionHeight.equals(new IrisRange(-64, 320))) {
+       /* if(!dimensionHeight.equals(new IrisRange(-64, 320))) {
             File dimType = new File(datapacks, "iris/data/minecraft/dimension_type/" + getLoadKey().toLowerCase() + ".json");
             if(!dimType.exists())
                 changed = true;
@@ -417,8 +417,7 @@ public boolean installDataPack(DataProvider data, File datapacks) {
             } catch(IOException e) {
                 Iris.reportError(e);
                 e.printStackTrace();
-            }
-        }
+            }*/
 
         if(write) {
             File mcm = new File(datapacks, "iris/pack.mcmeta");
@@ -427,7 +426,7 @@ public boolean installDataPack(DataProvider data, File datapacks) {
                     {
                         "pack": {
                             "description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.",
-                            "pack_format": 7
+                            "pack_format": 9
                         }
                     }
                     """);

diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java
@@ -42,7 +42,7 @@ public class IrisObjectLimit {
     @MinNumber(0)
     @MaxNumber(1024)
     @Desc("The maximum height for placement (top of object)")
-    private int maximumHeight = 512;
+    private int maximumHeight = 255;
 
     public boolean canPlace(int h, int l) {
         return h <= maximumHeight && l >= minimumHeight;