diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java index f4d048f4c..3c724282f 100644 --- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java @@ -191,7 +191,12 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte @Override protected void onPlayerJoin(Player p) { + if(getDimension().getResourcePack().trim().isEmpty()) + { + return; + } + p.setResourcePack(getDimension().getResourcePack()); } @Override diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index f3fb199de..8a31fe5d0 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -53,6 +53,10 @@ public class IrisDimension extends IrisRegistrant @DontObfuscate @Desc("Create an inverted dimension in the sky (like the nether)") private IrisDimension sky = null; + + @DontObfuscate + @Desc("Upon joining this world, Iris will send a resource pack request to the client. If they have previously selected yes, it will auto-switch depending on which dimension they go to.") + private String resourcePack = ""; @DontObfuscate @Desc("Place text on terrain") diff --git a/src/main/java/com/volmit/iris/object/IrisLoot.java b/src/main/java/com/volmit/iris/object/IrisLoot.java index 5c80b703f..f11ab572b 100644 --- a/src/main/java/com/volmit/iris/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/object/IrisLoot.java @@ -39,7 +39,6 @@ import lombok.experimental.Accessors; @Data public class IrisLoot { - @DontObfuscate @Desc("The target inventory slot types to fill this loot with") private InventorySlotType slotTypes = InventorySlotType.STORAGE;