use method presence instead of class presence

Nolij · Apr 5, 2024 · 4812f54 · 4812f54
1 parent 9cd9718
commit 4812f54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/lexforge16/src/main/java/dev/nolij/zume/lexforge16/LexZume16.java b/lexforge16/src/main/java/dev/nolij/zume/lexforge16/LexZume16.java
@@ -72,11 +72,6 @@ public boolean isZoomOutPressed() {
 		MethodHandle thirdPersonView = null;
 
 		try {
-			Class.forName(
-				ObfuscationReflectionHelper.remapName(
-					INameMappingService.Domain.CLASS, "net/minecraft/client/CameraType")
-				.replace('/', '.'));
-
 			final String getCameraTypeName = ObfuscationReflectionHelper.remapName(
 				INameMappingService.Domain.METHOD, "func_243230_g");
 
@@ -85,14 +80,14 @@ public boolean isZoomOutPressed() {
 
 			ordinal = lookup.unreflect(Enum.class.getMethod("ordinal"))
 				.asType(MethodType.methodType(int.class, Enum.class));
-		} catch (ClassNotFoundException ignored) {
+		} catch (NoSuchMethodException ignored) {
 			try {
 				//noinspection JavaLangInvokeHandleSignature
 				thirdPersonView = lookup.findGetter(Options.class, "field_74320_O", int.class);
 			} catch (NoSuchFieldException | IllegalAccessException e) {
 				throw new AssertionError(e);
 			}
-		} catch (IllegalAccessException | NoSuchMethodException e) {
+		} catch (IllegalAccessException e) {
 			throw new AssertionError(e);
 		}
 

diff --git a/modern/src/main/java/dev/nolij/zume/modern/ModernZume.java b/modern/src/main/java/dev/nolij/zume/modern/ModernZume.java
@@ -60,8 +60,6 @@ public boolean isZoomOutPressed() {
 		MethodHandle perspective = null;
 
 		try {
-			Class.forName(mappingResolver.mapClassName("intermediary", "net.minecraft.class_5498"));
-
 			final String getPerspectiveName = mappingResolver.mapMethodName("intermediary", 
 				"net.minecraft.class_315", "method_31044", "()Lnet/minecraft/class_5498;");
 
@@ -70,14 +68,14 @@ public boolean isZoomOutPressed() {
 
 			ordinal = lookup.unreflect(Enum.class.getMethod("ordinal"))
 				.asType(MethodType.methodType(int.class, Enum.class));
-		} catch (ClassNotFoundException ignored) {
+		} catch (NoSuchMethodException ignored) {
 			try {
 				//noinspection JavaLangInvokeHandleSignature
 				perspective = lookup.findGetter(GameOptions.class, "field_1850", int.class);
 			} catch (IllegalAccessException | NoSuchFieldException e) {
 				throw new AssertionError(e);
 			}
-		} catch (IllegalAccessException | NoSuchMethodException e) {
+		} catch (IllegalAccessException e) {
 			throw new AssertionError(e);
 		}