Mojmap migration

Author: LopyMine

LICENSE

@@ -1,165 +1 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+Particle Effects © 2025 by LopyMine & KlashRaick is licensed under CC-BY-ND 4.0. To view a copy of this license, visit https://creativecommons.org/licenses/by-nd/4.0/

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.parallel=true
 # Mod Properties
 data.mod_id = particle-effects
 data.mod_name = Particle Effects
-data.mod_version = 1.0.8
+data.mod_version = 1.1.0
 data.mod_group = net.lopymine.pe
 data.mod_maven_group = net.lopymine
 

src/main/java/net/lopymine/pe/ParticleEffects.java

@@ -17,7 +17,11 @@ public class ParticleEffects implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_NAME);
 
 	public static ResourceLocation id(String path) {
+		//? if >=1.21 {
 		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
+		//?} else {
+		/*return ResourceLocation.tryBuild(MOD_ID, path);
+		 *///?}
 	}
 
 	public static Component text(String path, Object... args) {

src/main/java/net/lopymine/pe/client/ParticleEffectsClient.java

@@ -1,5 +1,6 @@
 package net.lopymine.pe.client;
 
+import net.lopymine.pe.debug.DebugParticleInfoRenderer;
 import org.slf4j.*;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -15,6 +16,7 @@ public class ParticleEffectsClient implements ClientModInitializer {
 	public void onInitializeClient() {
 		LOGGER.info("{} Client Initialized", ParticleEffects.MOD_NAME);
 		ParticleEffectsManager.onInitializeClient();
+		DebugParticleInfoRenderer.register();
 	}
 
 }

src/main/java/net/lopymine/pe/debug/DebugParticleInfoRenderer.java

@@ -1,10 +1,12 @@
 package net.lopymine.pe.debug;
 
+import java.util.Queue;
 import net.lopymine.pe.ParticleEffects;
 import net.lopymine.pe.particle.TexturedParticle;
 import net.lopymine.pe.utils.*;
 import net.minecraft.client.*;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.Font.DisplayMode;
 import net.minecraft.client.particle.*;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.LightTexture;
@@ -13,45 +15,59 @@
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
+//? if =1.20.1 {
+/*
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+*/
+//?}
+
 public class DebugParticleInfoRenderer {
 
-	public static void renderDebugInfo(PoseStack matrices, Camera camera, float tickProgress, Iterable<? extends Particle> particles) {
+	public static void register() {
+		//? if =1.20.1 {
+		/*WorldRenderEvents.AFTER_ENTITIES.register((context) -> {
+			for (Queue<Particle> value : Minecraft.getInstance().particleEngine.particles.values()) {
+				for (Particle particle : value) {
+					DebugParticleInfoRenderer.renderDebugInfo(context.matrixStack(), context.camera(), context.tickDelta(), particle);
+				}
+			}
+		});
+		*///?}
+	}
+
+	public static void renderDebugInfo(PoseStack matrices, Camera camera, float tickProgress, Particle particle) {
 		if (!ParticleEffects.getConfig().isDebugLogEnabled()) {
 			return;
 		}
 
-		for (Particle particle : particles) {
-			Vec3 vec3d = camera.getPosition();
-			float x = (float) (Mth.lerp(tickProgress, particle./*? if >=1.21.5 {*/ xo /*?} else {*/ /*prevPosX *//*?}*/, particle.x) - vec3d.x());
-			float y = (float) (Mth.lerp(tickProgress, particle./*? if >=1.21.5 {*/ yo /*?} else {*/ /*prevPosY *//*?}*/, particle.y) - vec3d.y());
-			float z = (float) (Mth.lerp(tickProgress, particle./*? if >=1.21.5 {*/ zo /*?} else {*/ /*prevPosZ *//*?}*/, particle.z) - vec3d.z());
-			Font textRenderer = Minecraft.getInstance().font;
-
-			matrices.pushPose();
-			matrices.translate(x, y + 0.5D, z);
-			//? if <=1.21.8 {
-			/*matrices.multiply(camera.getRotation());
-			matrices.scale(/^? if =1.20.1 {^//^ - ^//^?}^/0.015F, -0.015F, 0.015F);
-			int opacity = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) * 255.0F) << 24;
-			*///?}
+		Vec3 vec3d = camera.getPosition();
+		float x = (float) (Mth.lerp(tickProgress, particle.xo, particle.x) - vec3d.x());
+		float y = (float) (Mth.lerp(tickProgress, particle.yo, particle.y) - vec3d.y());
+		float z = (float) (Mth.lerp(tickProgress, particle.zo, particle.z) - vec3d.z());
+		Font textRenderer = Minecraft.getInstance().font;
 
-			String[] text = getDebugInfo(particle);
+		matrices.pushPose();
+		matrices.translate(x, y + 0.5D, z);
+		//? if <=1.21.8 {
+		/*matrices.mulPose(camera.rotation());
+		matrices.scale(/^? if =1.20.1 {^/ /^- ^//^?}^/0.015F, -0.015F, 0.015F);
+		int opacity = (int) (Minecraft.getInstance().options.getBackgroundOpacity(0.25F) * 255.0F) << 24;
+		*///?}
 
-			int yOffset = 0;
-			for (String line : text) {
-				//? if <=1.21.8 {
-				/*float f = (float) (-textRenderer.getWidth(line)) / 2.0F;
-				*///?}
-				//? if >=1.21.9 {
-				Minecraft.getInstance().levelRenderer.featureRenderDispatcher.getSubmitNodeStorage().submitNameTag(matrices, Vec3.ZERO, -yOffset, Component.literal(line), true, LightTexture.FULL_BRIGHT, 10, Minecraft.getInstance().levelRenderer.levelRenderState.cameraRenderState);
-				//?} else {
-				/*textRenderer.draw(line, f, (float) -yOffset, -1, false, matrices.peek().getPositionMatrix(), MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers(), net.minecraft.client.font.TextRenderer.TextLayerType.NORMAL, opacity, LightmapTextureManager.MAX_LIGHT_COORDINATE);
-				*///?}
-				yOffset += textRenderer.lineHeight + 1;
-			}
+		String[] text = getDebugInfo(particle);
 
-			matrices.popPose();
+		int yOffset = 0;
+		for (String line : text) {
+			//? if >=1.21.9 {
+			Minecraft.getInstance().levelRenderer.featureRenderDispatcher.getSubmitNodeStorage().submitNameTag(matrices, Vec3.ZERO, -yOffset, Component.literal(line), true, LightTexture.FULL_BRIGHT, 10, Minecraft.getInstance().levelRenderer.levelRenderState.cameraRenderState);
+			//?} else {
+			/*float f = (float) (-textRenderer.width(line)) / 2.0F;
+			textRenderer.drawInBatch(line, f, (float) -yOffset, -1, false, matrices.last().pose(), Minecraft.getInstance().renderBuffers().bufferSource(), DisplayMode.NORMAL, opacity, LightTexture.FULL_BRIGHT);
+			*///?}
+			yOffset += textRenderer.lineHeight + 1;
 		}
+
+		matrices.popPose();
 	}
 
 	private static String @NotNull [] getDebugInfo(Particle particle) {
@@ -70,9 +86,9 @@ public static void renderDebugInfo(PoseStack matrices, Camera camera, float tick
 		} else {
 			//? if <=1.21.8 {
 			/*alpha = (int) (particle.alpha * 255);
-			red   = (int) (particle.red * 255);
-			green = (int) (particle.green * 255);
-			blue  = (int) (particle.blue * 255);
+			red   = (int) (particle.rCol * 255);
+			green = (int) (particle.gCol * 255);
+			blue  = (int) (particle.bCol * 255);
 			color = ArgbUtils.getArgb(alpha, red, green, blue);
 			*///?} else {
 			if (particle instanceof SingleQuadParticle billboard) {

src/main/java/net/lopymine/pe/extension/RegistryExtension.java

@@ -0,0 +1,17 @@
+package net.lopymine.pe.extension;
+
+import java.util.List;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.Registry;
+
+public class RegistryExtension {
+
+	public static <T> List<Reference<T>> references(Registry<T> registry) {
+		//? if >=1.21.4 {
+		return registry.listElements().toList();
+		//?} else {
+		/*return registry.holders().toList();
+		*///?}
+	}
+
+}