diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 4f3b97564..18cea67c0 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -30,7 +30,7 @@ import com.volmit.iris.engine.object.biome.LoaderBiome; import com.volmit.iris.engine.object.dimensional.LoaderDimension; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.loot.LoaderLootTable; -import com.volmit.iris.engine.object.loot.LootMode; +import com.volmit.iris.engine.object.loot.IrisLootMode; import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.engine.object.regional.LoaderRegion; import com.volmit.iris.util.hunk.Hunk; @@ -316,7 +316,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro @Override default void injectTables(KList list, IrisLootReference r) { - if (r.getMode().equals(LootMode.CLEAR) || r.getMode().equals(LootMode.REPLACE)) { + if (r.getMode().equals(IrisLootMode.CLEAR) || r.getMode().equals(IrisLootMode.REPLACE)) { list.clear(); } diff --git a/src/main/java/com/volmit/iris/engine/object/loot/LootMode.java b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/loot/LootMode.java rename to src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java index a596d31b1..1cbb0b960 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/LootMode.java +++ b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.object.loot; import com.volmit.iris.engine.object.annotations.Desc; @Desc("A loot mode is used to describe what to do with the existing loot layers before adding this loot. Using ADD will simply add this table to the building list of tables (i.e. add dimension tables, region tables then biome tables). By using clear or replace, you remove the parent tables before and add just your tables.") -public enum LootMode { +public enum IrisLootMode { @Desc("Add to the existing parent loot tables") ADD, @Desc("Clear all loot tables then add this table") diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java index 65b3bc188..447fbad75 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java @@ -37,7 +37,7 @@ import lombok.experimental.Accessors; @Data public class IrisLootReference { @Desc("Add = add on top of parent tables, Replace = clear first then add these. Clear = Remove all and dont add loot from this or parent.") - private LootMode mode = LootMode.ADD; + private IrisLootMode mode = IrisLootMode.ADD; @RegistryListResource(LoaderLootTable.class) @ArrayType(min = 1, type = String.class)