From 484c95e26a3f750d776f4562c9544fde1ca36389 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sun, 17 Jul 2022 20:29:29 -0500
Subject: [PATCH] Make event parameter objects internal classes

---
 .../abstractEvents/DhApiAfterRenderEvent.java | 28 ++++++++++++++++---
 .../DhApiBeforeDhInitEvent.java               |  2 +-
 .../DhApiBeforeRenderEvent.java               | 28 ++++++++++++++++---
 .../DhApiAfterRenderParam.java                | 24 ----------------
 .../DhApiBeforeRenderParam.java               | 24 ----------------
 .../DhApiRenderParam.java                     |  4 +--
 6 files changed, 51 insertions(+), 59 deletions(-)
 delete mode 100644 src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiAfterRenderParam.java
 delete mode 100644 src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiBeforeRenderParam.java
 rename src/main/java/com/seibel/lod/core/api/external/methods/events/{parameterObjects => sharedParameterObjects}/DhApiRenderParam.java (89%)

diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java
index e5256931d..f38a58b75 100644
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java
+++ b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java
@@ -1,16 +1,17 @@
 package com.seibel.lod.core.api.external.methods.events.abstractEvents;
 
-import com.seibel.lod.core.api.external.methods.events.parameterObjects.DhApiAfterRenderParam;
+import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
+import com.seibel.lod.core.api.external.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent;
 
 /**
  * @author James Seibel
  * @version 2022-7-17
  */
-public abstract class DhApiAfterRenderEvent implements IDhApiEvent<DhApiAfterRenderParam>
+public abstract class DhApiAfterRenderEvent implements IDhApiEvent<DhApiAfterRenderEvent.Parameter>
 {
 	/** Fired after Distant Horizons finishes rendering fake chunks. */
-	public abstract void afterRender(DhApiAfterRenderParam input);
+	public abstract void afterRender(Parameter input);
 	
 	
 	//=========================//
@@ -18,7 +19,7 @@ public abstract class DhApiAfterRenderEvent implements IDhApiEvent<DhApiAfterRen
 	//=========================//
 	
 	@Override
-	public final boolean onEvent(DhApiAfterRenderParam input)
+	public final boolean onEvent(Parameter input)
 	{
 		afterRender(input);
 		return false;
@@ -26,4 +27,23 @@ public abstract class DhApiAfterRenderEvent implements IDhApiEvent<DhApiAfterRen
 	
 	@Override
 	public final boolean getCancelable() { return false; }
+	
+	
+	//==================//
+	// parameter object //
+	//==================//
+	
+	public static class Parameter extends DhApiRenderParam
+	{
+		public Parameter(
+				DhApiMat4f newMinecraftProjectionMatrix, DhApiMat4f newMinecraftModelViewMatrix,
+				DhApiMat4f newDistantHorizonsProjectionMatrix, DhApiMat4f newDistantHorizonsModelViewMatrix,
+				float newPartialTicks)
+		{
+			super(newMinecraftProjectionMatrix, newMinecraftModelViewMatrix,
+					newDistantHorizonsProjectionMatrix, newDistantHorizonsModelViewMatrix,
+					newPartialTicks);
+		}
+	}
+	
 }
\ No newline at end of file
diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java
index 7aeb29a5c..24e7fa908 100644
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java
+++ b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java
@@ -1,6 +1,6 @@
 package com.seibel.lod.core.api.external.methods.events.abstractEvents;
 
-import com.seibel.lod.core.api.external.methods.events.parameterObjects.DhApiAfterRenderParam;
+import com.seibel.lod.core.api.external.methods.events.sharedParameterObjects.DhApiAfterRenderParam;
 import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent;
 
 /**
diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeRenderEvent.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeRenderEvent.java
index c2acfaf32..bec7694df 100644
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeRenderEvent.java
+++ b/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiBeforeRenderEvent.java
@@ -1,20 +1,21 @@
 package com.seibel.lod.core.api.external.methods.events.abstractEvents;
 
-import com.seibel.lod.core.api.external.methods.events.parameterObjects.DhApiBeforeRenderParam;
+import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
+import com.seibel.lod.core.api.external.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent;
 
 /**
  * @author James Seibel
  * @version 2022-7-17
  */
-public abstract class DhApiBeforeRenderEvent implements IDhApiEvent<DhApiBeforeRenderParam>
+public abstract class DhApiBeforeRenderEvent implements IDhApiEvent<DhApiBeforeRenderEvent.Parameter>
 {
 	/**
 	 * Fired before Distant Horizons finishes rendering fake chunks.
 	 *
 	 * @return whether the event should be canceled or not.
 	 */
-	public abstract boolean beforeRender(DhApiBeforeRenderParam input);
+	public abstract boolean beforeRender(Parameter input);
 	
 	
 	//=========================//
@@ -22,11 +23,30 @@ public abstract class DhApiBeforeRenderEvent implements IDhApiEvent<DhApiBeforeR
 	//=========================//
 	
 	@Override
-	public final boolean onEvent(DhApiBeforeRenderParam input)
+	public final boolean onEvent(Parameter input)
 	{
 		return beforeRender(input);
 	}
 	
 	@Override
 	public final boolean getCancelable() { return true; }
+	
+	
+	//==================//
+	// parameter object //
+	//==================//
+	
+	public static class Parameter extends DhApiRenderParam
+	{
+		public Parameter(
+				DhApiMat4f newMinecraftProjectionMatrix, DhApiMat4f newMinecraftModelViewMatrix,
+				DhApiMat4f newDistantHorizonsProjectionMatrix, DhApiMat4f newDistantHorizonsModelViewMatrix,
+				float newPartialTicks)
+		{
+			super(newMinecraftProjectionMatrix, newMinecraftModelViewMatrix,
+					newDistantHorizonsProjectionMatrix, newDistantHorizonsModelViewMatrix,
+					newPartialTicks);
+		}
+	}
+	
 }
\ No newline at end of file
diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiAfterRenderParam.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiAfterRenderParam.java
deleted file mode 100644
index 6834daf93..000000000
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiAfterRenderParam.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.seibel.lod.core.api.external.methods.events.parameterObjects;
-
-import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
-
-/**
- * Parameter passed into the After Render event.
- *
- * @author James Seibel
- * @version 7-17-2022
- */
-public class DhApiAfterRenderParam extends DhApiRenderParam
-{
-	
-	public DhApiAfterRenderParam(
-			DhApiMat4f newMinecraftProjectionMatrix, DhApiMat4f newMinecraftModelViewMatrix,
-			DhApiMat4f newDistantHorizonsProjectionMatrix, DhApiMat4f newDistantHorizonsModelViewMatrix,
-			float newPartialTicks)
-	{
-		super(newMinecraftProjectionMatrix, newMinecraftModelViewMatrix,
-				newDistantHorizonsProjectionMatrix, newDistantHorizonsModelViewMatrix,
-				newPartialTicks);
-	}
-	
-}
diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiBeforeRenderParam.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiBeforeRenderParam.java
deleted file mode 100644
index 4a0ec202f..000000000
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiBeforeRenderParam.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.seibel.lod.core.api.external.methods.events.parameterObjects;
-
-import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
-
-/**
- * Parameter passed into the Before Render event.
- *
- * @author James Seibel
- * @version 7-17-2022
- */
-public class DhApiBeforeRenderParam extends DhApiRenderParam
-{
-	
-	public DhApiBeforeRenderParam(
-			DhApiMat4f newMinecraftProjectionMatrix, DhApiMat4f newMinecraftModelViewMatrix,
-			DhApiMat4f newDistantHorizonsProjectionMatrix, DhApiMat4f newDistantHorizonsModelViewMatrix,
-			float newPartialTicks)
-	{
-		super(newMinecraftProjectionMatrix, newMinecraftModelViewMatrix,
-				newDistantHorizonsProjectionMatrix, newDistantHorizonsModelViewMatrix,
-				newPartialTicks);
-	}
-	
-}
diff --git a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiRenderParam.java b/src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java
similarity index 89%
rename from src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiRenderParam.java
rename to src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java
index b6f409204..e3309706d 100644
--- a/src/main/java/com/seibel/lod/core/api/external/methods/events/parameterObjects/DhApiRenderParam.java
+++ b/src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.api.external.methods.events.parameterObjects;
+package com.seibel.lod.core.api.external.methods.events.sharedParameterObjects;
 
 import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
 
@@ -8,7 +8,7 @@ import com.seibel.lod.core.api.external.items.objects.math.DhApiMat4f;
  * @author James Seibel
  * @version 7-17-2022
  */
-class DhApiRenderParam // default visibility so this class isn't visible outside the package
+public class DhApiRenderParam
 {
 	/** The projection matrix Minecraft is using to render this frame. */
 	public final DhApiMat4f MinecraftProjectionMatrix;