Variable renames in the Iris fantastic package

src/main/java/net/coderbot/iris/fantastic/IrisParticleTextureSheets.java → src/main/java/net/coderbot/iris/fantastic/IrisParticleRenderTypes.java

@@ -8,8 +8,8 @@
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureManager;
 
-public class IrisParticleTextureSheets {
-	public static final ParticleRenderType OPAQUE_TERRAIN_SHEET = new ParticleRenderType() {
+public class IrisParticleRenderTypes {
+	public static final ParticleRenderType OPAQUE_TERRAIN = new ParticleRenderType() {
 		public void begin(BufferBuilder bufferBuilder, TextureManager textureManager) {
 			RenderSystem.disableBlend();
 			RenderSystem.depthMask(true);

src/main/java/net/coderbot/iris/fantastic/PhasedParticleManager.java → src/main/java/net/coderbot/iris/fantastic/PhasedParticleEngine.java

@@ -1,5 +1,5 @@
 package net.coderbot.iris.fantastic;
 
-public interface PhasedParticleManager {
+public interface PhasedParticleEngine {
 	void setParticleRenderingPhase(ParticleRenderingPhase phase);
 }

src/main/java/net/coderbot/iris/mixin/fantastic/MixinBarrierParticle.java

@@ -1,6 +1,6 @@
 package net.coderbot.iris.mixin.fantastic;
 
-import net.coderbot.iris.fantastic.IrisParticleTextureSheets;
+import net.coderbot.iris.fantastic.IrisParticleRenderTypes;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.BarrierParticle;
 import net.minecraft.client.particle.ParticleRenderType;
@@ -34,9 +34,9 @@ public class MixinBarrierParticle {
 	}
 
 	@Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
-	private void iris$overrideParticleSheet(CallbackInfoReturnable<ParticleRenderType> cir) {
+	private void iris$overrideParticleRenderType(CallbackInfoReturnable<ParticleRenderType> cir) {
 		if (isOpaque) {
-			cir.setReturnValue(IrisParticleTextureSheets.OPAQUE_TERRAIN_SHEET);
+			cir.setReturnValue(IrisParticleRenderTypes.OPAQUE_TERRAIN);
 		}
 	}
 }

src/main/java/net/coderbot/iris/mixin/fantastic/MixinLevelRenderer.java

@@ -3,7 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import net.coderbot.iris.fantastic.ParticleRenderingPhase;
-import net.coderbot.iris.fantastic.PhasedParticleManager;
+import net.coderbot.iris.fantastic.PhasedParticleEngine;
 import net.coderbot.iris.layer.GbufferProgram;
 import net.coderbot.iris.layer.GbufferPrograms;
 import net.minecraft.client.Camera;
@@ -33,7 +33,7 @@ public class MixinLevelRenderer {
 
 	@Inject(method = "renderLevel", at = @At("HEAD"))
 	private void iris$resetParticleManagerPhase(PoseStack poseStack, float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, CallbackInfo ci) {
-		((PhasedParticleManager) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.EVERYTHING);
+		((PhasedParticleEngine) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.EVERYTHING);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "CONSTANT", args = "stringValue=entities"))
@@ -42,12 +42,12 @@ public class MixinLevelRenderer {
 
 		MultiBufferSource.BufferSource bufferSource = renderBuffers.bufferSource();
 
-		((PhasedParticleManager) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.OPAQUE);
+		((PhasedParticleEngine) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.OPAQUE);
 
 		GbufferPrograms.push(GbufferProgram.TEXTURED_LIT);
 		minecraft.particleEngine.render(poseStack, bufferSource, lightTexture, camera, f);
 		GbufferPrograms.pop(GbufferProgram.TEXTURED_LIT);
 
-		((PhasedParticleManager) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.TRANSLUCENT);
+		((PhasedParticleEngine) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.TRANSLUCENT);
 	}
 }

src/main/java/net/coderbot/iris/mixin/fantastic/MixinParticleEngine.java

@@ -1,9 +1,9 @@
 package net.coderbot.iris.mixin.fantastic;
 
 import com.google.common.collect.ImmutableList;
-import net.coderbot.iris.fantastic.IrisParticleTextureSheets;
+import net.coderbot.iris.fantastic.IrisParticleRenderTypes;
 import net.coderbot.iris.fantastic.ParticleRenderingPhase;
-import net.coderbot.iris.fantastic.PhasedParticleManager;
+import net.coderbot.iris.fantastic.PhasedParticleEngine;
 import net.minecraft.client.particle.ParticleEngine;
 import net.minecraft.client.particle.ParticleRenderType;
 import org.spongepowered.asm.mixin.Final;
@@ -17,12 +17,12 @@
 import java.util.List;
 
 /**
- * Extends the ParticleManager class to allow multiple phases of particle rendering.
+ * Extends the ParticleEngine class to allow multiple phases of particle rendering.
  *
  * This is used to enable the rendering of known-opaque particles much earlier than other particles, most notably before
  * translucent content. Normally, particles behind translucent blocks are not visible on Fancy graphics, and a user must
  * enable the much more intensive Fabulous graphics option. This is not ideal because Fabulous graphics is fundamentally
- * incompatible with most shaderpacks.
+ * incompatible with most shader packs.
  *
  * So what causes this? Essentially, on Fancy graphics, all particles are rendered after translucent terrain. Aside from
  * causing problems with particles being invisible, this also causes particles to write to the translucent depth buffer,
@@ -42,19 +42,19 @@
  * As the saying goes, "Work smarter, not harder."
  */
 @Mixin(ParticleEngine.class)
-public class MixinParticleEngine implements PhasedParticleManager {
+public class MixinParticleEngine implements PhasedParticleEngine {
 	@Unique
 	private ParticleRenderingPhase phase = ParticleRenderingPhase.EVERYTHING;
 
 	@Shadow
 	@Final
 	private static List<ParticleRenderType> RENDER_ORDER;
 
-	private static final List<ParticleRenderType> OPAQUE_PARTICLE_TEXTURE_SHEETS;
+	private static final List<ParticleRenderType> OPAQUE_PARTICLE_RENDER_TYPES;
 
 	static {
-		OPAQUE_PARTICLE_TEXTURE_SHEETS = ImmutableList.of(
-			IrisParticleTextureSheets.OPAQUE_TERRAIN_SHEET,
+		OPAQUE_PARTICLE_RENDER_TYPES = ImmutableList.of(
+			IrisParticleRenderTypes.OPAQUE_TERRAIN,
 			ParticleRenderType.PARTICLE_SHEET_OPAQUE,
 			ParticleRenderType.PARTICLE_SHEET_LIT,
 			ParticleRenderType.CUSTOM,
@@ -71,12 +71,12 @@ public class MixinParticleEngine implements PhasedParticleManager {
 			List<ParticleRenderType> toRender = new ArrayList<>(RENDER_ORDER);
 
 			// Remove all known opaque particle texture sheets.
-			toRender.removeAll(OPAQUE_PARTICLE_TEXTURE_SHEETS);
+			toRender.removeAll(OPAQUE_PARTICLE_RENDER_TYPES);
 
 			return toRender;
 		} else if (phase == ParticleRenderingPhase.OPAQUE) {
 			// Render only opaque particle sheets
-			return OPAQUE_PARTICLE_TEXTURE_SHEETS;
+			return OPAQUE_PARTICLE_RENDER_TYPES;
 		} else {
 			// Don't override particle rendering
 			return RENDER_ORDER;

src/main/java/net/coderbot/iris/mixin/fantastic/MixinTerrainParticle.java

@@ -1,6 +1,6 @@
 package net.coderbot.iris.mixin.fantastic;
 
-import net.coderbot.iris.fantastic.IrisParticleTextureSheets;
+import net.coderbot.iris.fantastic.IrisParticleRenderTypes;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.ParticleRenderType;
 import net.minecraft.client.particle.TerrainParticle;
@@ -29,9 +29,9 @@ public class MixinTerrainParticle {
 	}
 
 	@Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
-	private void iris$overrideParticleSheet(CallbackInfoReturnable<ParticleRenderType> cir) {
+	private void iris$overrideParticleRenderType(CallbackInfoReturnable<ParticleRenderType> cir) {
 		if (isOpaque) {
-			cir.setReturnValue(IrisParticleTextureSheets.OPAQUE_TERRAIN_SHEET);
+			cir.setReturnValue(IrisParticleRenderTypes.OPAQUE_TERRAIN);
 		}
 	}
 }