Add AOTL to Smooth AOTE (#734)

2 files changed, 12 insertions, 5 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
index 72431697..93cbbf99 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
@@ -96,6 +96,13 @@ public class CustomItemEffects {
 
 	private final Pattern etherwarpDistancePattern = Pattern.compile("up to (?<distance>\\d{2}) blocks away\\.");
 
+	private final List<String> aoteNames = Arrays.asList(
+		"ASPECT_OF_THE_END",
+		"ASPECT_OF_THE_VOID",
+		"ASPECT_OF_THE_LEECH_1",
+		"ASPECT_OF_THE_LEECH_2"
+	);
+
 	public int aoteTeleportationMillis = 0;
 	public Vector3f aoteTeleportationCurr = null;
 
@@ -196,7 +203,7 @@ public class CustomItemEffects {
 				if (tpTime <= 0 || Minecraft.getMinecraft().gameSettings.thirdPersonView != 0) return;
 
 				boolean aote = NotEnoughUpdates.INSTANCE.config.itemOverlays.enableSmoothAOTE &&
-					(internal.equals("ASPECT_OF_THE_END") || internal.equals("ASPECT_OF_THE_VOID"));
+					aoteNames.contains(internal);
 				boolean hyp = NotEnoughUpdates.INSTANCE.config.itemOverlays.enableSmoothHyperion && shadowWarp;
 				if (usingEtherwarp) {
 					tpTime = NotEnoughUpdates.INSTANCE.config.itemOverlays.smoothTpMillisEtherwarp;
@@ -759,7 +766,6 @@ public class CustomItemEffects {
 		add(Blocks.farmland);
 	}};
 
-
 	List<Block> scytheBlocks = Arrays.asList(
 		Blocks.leaves, Blocks.leaves2, Blocks.red_flower, Blocks.yellow_flower, Blocks.tallgrass, Blocks.double_plant);
 
@@ -1296,7 +1302,8 @@ public class CustomItemEffects {
 			HashSet<BlockPos> candidatesOld = new HashSet<>();
 			TreeMap<Float, Set<BlockPos>> candidatesOldSorted = new TreeMap<>();
 
-			getBuildersWandCandidates(Minecraft.getMinecraft().thePlayer,
+			getBuildersWandCandidates(
+				Minecraft.getMinecraft().thePlayer,
 				event.target,
 				event.partialTicks,
 				candidatesOld,
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
index 96ce838a..36f9e76c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
@@ -143,7 +143,7 @@ public class ItemOverlays {
 	public String zapperOverlayColour = "0:102:171:5:0";
 
 	@ConfigOption(
-		name = "Smooth AOTE/AOTV/Hyp",
+		name = "Smooth AOTE/AOTV/AOTL/Hyp",
 		desc = ""
 	)
 	@ConfigEditorAccordion(id = 3)
@@ -152,7 +152,7 @@ public class ItemOverlays {
 	@Expose
 	@ConfigOption(
 		name = "Enable Smooth AOTE",
-		desc = "Teleport smoothly to your destination when using AOTE or AOTV"
+		desc = "Teleport smoothly to your destination when using AOTE, AOTV or AOTL"
 	)
 	@ConfigEditorBoolean
 	@ConfigAccordionId(id = 3)