mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #778 from VolmitSoftware/Development

Browse Source 
Development
This commit is contained in:
Brian Fopiano 2022-04-03 01:41:16 -07:00 committed by GitHub
commit 03554eb372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -24,8 +24,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" id "de.undercouch.download" version "5.0.1"
} }
group 'com.volmit.iris' version '2.0.4-1.18.2' // Needs to be version specific
version '2.0.3-1.18.2' // Needs to be specific
def nmsVersion = "1.18.2" def nmsVersion = "1.18.2"
def apiVersion = '1.18' def apiVersion = '1.18'
def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT' def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT'
@ -137,15 +136,15 @@ dependencies {
// Dynamically Loaded // Dynamically Loaded
implementation 'io.timeandspace:smoothie-map:2.0.2' 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 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
implementation 'org.zeroturnaround:zt-zip:1.14' 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 '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 'bsf:bsf:2.4.0'
implementation 'rhino:js:1.7R2' 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' implementation 'org.apache.commons:commons-lang3:3.12.0'
} }

2
src/main/java/com/volmit/iris/core/link/MythicMobsLink.java
View File

@ -65,7 +65,7 @@ public class MythicMobsLink {
} }
try { try {
Class<?> mythicMobClass = Class.forName("io.lumine.xikage.mythicmobs.MythicMobs"); Class<?> mythicMobClass = Class.forName("io.lumine.mythic.bukkit.MythicBukkit");
Method getInst = mythicMobClass.getDeclaredMethod("inst"); Method getInst = mythicMobClass.getDeclaredMethod("inst");
Object inst = getInst.invoke(null); Object inst = getInst.invoke(null);
Method getAPIHelper = mythicMobClass.getDeclaredMethod("getAPIHelper"); Method getAPIHelper = mythicMobClass.getDeclaredMethod("getAPIHelper");

7
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -405,7 +405,7 @@ public class IrisDimension extends IrisRegistrant {
} }
} }
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"); File dimType = new File(datapacks, "iris/data/minecraft/dimension_type/" + getLoadKey().toLowerCase() + ".json");
if(!dimType.exists()) if(!dimType.exists())
changed = true; changed = true;
@ -417,8 +417,7 @@ public class IrisDimension extends IrisRegistrant {
} catch(IOException e) { } catch(IOException e) {
Iris.reportError(e); Iris.reportError(e);
e.printStackTrace(); e.printStackTrace();
} }*/
}
if(write) { if(write) {
File mcm = new File(datapacks, "iris/pack.mcmeta"); File mcm = new File(datapacks, "iris/pack.mcmeta");
@ -427,7 +426,7 @@ public class IrisDimension extends IrisRegistrant {
{ {
"pack": { "pack": {
"description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.", "description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.",
"pack_format": 7 "pack_format": 9
} }
} }
"""); """);

2
src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java
View File

@ -42,7 +42,7 @@ public class IrisObjectLimit {
@MinNumber(0) @MinNumber(0)
@MaxNumber(1024) @MaxNumber(1024)
@Desc("The maximum height for placement (top of object)") @Desc("The maximum height for placement (top of object)")
private int maximumHeight = 512; private int maximumHeight = 255;
public boolean canPlace(int h, int l) { public boolean canPlace(int h, int l) {
return h <= maximumHeight && l >= minimumHeight; return h <= maximumHeight && l >= minimumHeight;