From ab89d6a22fa3c05902ab93aaf8874f6a73cf0cd3 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Thu, 20 Aug 2020 22:10:17 -0400 Subject: [PATCH] +3 depth dir finding for objects --- src/main/java/com/volmit/iris/object/IrisObject.java | 2 +- .../java/com/volmit/iris/object/ObjectPlaceMode.java | 5 +---- .../java/com/volmit/iris/util/ObjectConverter.java | 6 ------ .../com/volmit/iris/util/ObjectResourceLoader.java | 11 +++++++++++ 4 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 src/main/java/com/volmit/iris/util/ObjectConverter.java diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/object/IrisObject.java index 8b330a3c7..8fc0fa01f 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/object/IrisObject.java @@ -230,7 +230,7 @@ public class IrisObject extends IrisRegistrant } } - else if(config.getMode().equals(ObjectPlaceMode.PAINT) || config.getMode().equals(ObjectPlaceMode.STILT)) + else if(config.getMode().equals(ObjectPlaceMode.PAINT)) { y = placer.getHighest(x, z, config.isUnderwater()) + rty; paintmap = new KMap<>(); diff --git a/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java b/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java index 6031bb74d..8f0a26f4f 100644 --- a/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java +++ b/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java @@ -20,8 +20,5 @@ public enum ObjectPlaceMode MIN_HEIGHT_RIGID, @DontObfuscate - PAINT, - - @DontObfuscate - STILT; + PAINT; } diff --git a/src/main/java/com/volmit/iris/util/ObjectConverter.java b/src/main/java/com/volmit/iris/util/ObjectConverter.java deleted file mode 100644 index e5d89c6cb..000000000 --- a/src/main/java/com/volmit/iris/util/ObjectConverter.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.volmit.iris.util; - -public class ObjectConverter -{ - -} diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index 8aa3821e0..582b0920b 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -127,6 +127,17 @@ public class ObjectResourceLoader extends ResourceLoader { m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.iob\\E", "")); } + + else if(k.isDirectory()) + { + for(File l : k.listFiles()) + { + if(l.isFile() && l.getName().endsWith(".iob")) + { + m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.iob\\E", "")); + } + } + } } } }