Merge remote-tracking branch 'origin/1.19.3' into 1.19

# Conflicts:
#	fabric/project.gradle
#	fabric/src/main/resources/mixins.canvas.client.json

Author: spiralhalo

README.md

@@ -47,7 +47,7 @@ This list is updated infrequently.
 More releases can be found in [`#canvas-3rd-party-releases` channel](https://discord.com/channels/614624415631671316/752632870257950790) on the [discord server](https://discord.gg/7NaqR2e).
 
 # Developing With Canvas
-Before using Canvas, you should first understand RenderMaterials, Meshes, RenderContexts and other features defined by the Fabric Rendering API.  For that information, consult the [rendering article on the Fabric Wiki](https://fabricmc.net/wiki/rendering). Note: Fabric wiki is still WIP as of this writing but should be more complete "soon."
+Before using Canvas, you should first understand RenderMaterials, Meshes, RenderContexts and other features defined by the Fabric Rendering API.  For that information, consult the [rendering article on the Fabric Wiki](https://fabricmc.net/wiki/documentation:rendering). Note: Fabric wiki is still WIP as of this writing but should be more complete "soon."
 
 You can also see [RenderBender](https://github.com/grondag/renderbender) for some (not very good) examples of usage.  Avoid duplicating those examples directly - they aren't especially performant or suitable for use at scale.  As soon as someone releases a model loader / library for Fabric Rendering API / FREX, that will almost certainly be a better approach.
 
@@ -126,10 +126,10 @@ And add Canvas to your dependencies
 
 ```gradle
 dependencies {
-	modCompileOnly "io.vram:canvas-fabric-mc118:1.0.+"
+	modCompileOnly "io.vram:canvas-fabric:19.3.+"
 
 	// optional for testing in dev environment
-	modRuntimeOnly "io.vram:canvas-fabric-mc118:1.0.+"
+	modRuntimeOnly "io.vram:canvas-fabric:19.3.+"
 }
 ```
 

fabric/src/main/resources/mixins.canvas.client.json

@@ -4,9 +4,11 @@
 	"package": "grondag.canvas.mixin",
 	"compatibilityLevel": "JAVA_16",
 	"mixins": [
+    "MixinAccessibilityOptionsScreen",
 		"MixinAnimatedTexture",
 		"MixinAnimationMetadataSection",
 		"MixinBakedGlyph",
+    "MixinBlockEntityRenderDispatcher",
 		"MixinBlockRenderDispatcher",
 		"MixinBufferBuilder",
 		"MixinBufferUploader",

src/main/java/grondag/canvas/apiimpl/rendercontext/CanvasItemRenderContext.java

@@ -91,14 +91,14 @@ protected void renderCustomModel(BlockEntityWithoutLevelRenderer builtInRenderer
 				mode = GuiMode.NORMAL;
 			}
 
-			context.pushItemState(stack);
+			context.push(stack);
 			context.guiMode(mode);
 		}
 
 		builtInRenderer.renderByItem(stack, inputContext.mode(), inputContext.matrixStack().toVanilla(), vertexConsumers, inputContext.lightmap(), inputContext.overlay());
 
 		if (context != null) {
-			context.popItemState();
+			context.pop();
 			context.guiMode(GuiMode.NORMAL);
 		}
 	}

src/main/java/grondag/canvas/material/property/TargetRenderState.java

@@ -30,95 +30,79 @@
 import grondag.canvas.pipeline.Pipeline;
 
 @SuppressWarnings("resource")
-public class TargetRenderState implements Predicate<RenderState> {
-	public static final TargetRenderState SOLID = new TargetRenderState(
+public enum TargetRenderState implements Predicate<RenderState> {
+	SOLID(
 		MaterialConstants.TARGET_SOLID,
 		"solid",
-		() -> {
-			Pipeline.solidTerrainFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState OUTLINE = new TargetRenderState(
+			() -> {
+				Pipeline.solidTerrainFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	OUTLINE(
 		MaterialConstants.TARGET_OUTLINE,
 		"outline",
-		() -> {
-			Minecraft.getInstance().levelRenderer.entityTarget().bindWrite(false);
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState TRANSLUCENT = new TargetRenderState(
+			() -> {
+				Minecraft.getInstance().levelRenderer.entityTarget().bindWrite(false);
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	TRANSLUCENT(
 		MaterialConstants.TARGET_TRANSLUCENT,
 		"translucent",
-		() -> {
-			Pipeline.translucentTerrainFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState PARTICLES = new TargetRenderState(
+			() -> {
+				Pipeline.translucentTerrainFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	PARTICLES(
 		MaterialConstants.TARGET_PARTICLES,
 		"particles",
-		() -> {
-			Pipeline.translucentParticlesFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState WEATHER = new TargetRenderState(
+			() -> {
+				Pipeline.translucentParticlesFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	WEATHER(
 		MaterialConstants.TARGET_WEATHER,
 		"weather",
-		() -> {
-			Pipeline.weatherFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState CLOUDS = new TargetRenderState(
+			() -> {
+				Pipeline.weatherFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	CLOUDS(
 		MaterialConstants.TARGET_CLOUDS,
-		"clouds",
-		() -> {
-			Pipeline.cloudsFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
-	);
-
-	public static final TargetRenderState ENTITIES = new TargetRenderState(
+	"clouds",
+			() -> {
+				Pipeline.cloudsFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
+	),
+	ENTITIES(
 		MaterialConstants.TARGET_ENTITIES,
 		"entities",
-		() -> {
-			Pipeline.translucentEntityFbo.bind();
-		},
-		() -> {
-			Pipeline.defaultFbo.bind();
-		}
+			() -> {
+				Pipeline.translucentEntityFbo.bind();
+			},
+			() -> {
+				Pipeline.defaultFbo.bind();
+			}
 	);
 
-	private static final TargetRenderState[] VALUES = new TargetRenderState[MaterialConstants.TARGET_COUNT];
-
-	static {
-		VALUES[MaterialConstants.TARGET_SOLID] = SOLID;
-		VALUES[MaterialConstants.TARGET_OUTLINE] = OUTLINE;
-		VALUES[MaterialConstants.TARGET_TRANSLUCENT] = TRANSLUCENT;
-		VALUES[MaterialConstants.TARGET_PARTICLES] = PARTICLES;
-		VALUES[MaterialConstants.TARGET_WEATHER] = WEATHER;
-		VALUES[MaterialConstants.TARGET_CLOUDS] = CLOUDS;
-		VALUES[MaterialConstants.TARGET_ENTITIES] = ENTITIES;
-	}
+	private static final TargetRenderState[] VALUES = values();
 
 	public static TargetRenderState fromIndex(int index) {
 		return VALUES[index];
@@ -129,7 +113,7 @@ public static TargetRenderState fromIndex(int index) {
 	private final Runnable startAction;
 	private final Runnable endAction;
 
-	private TargetRenderState(int index, String name, Runnable startAction, Runnable endAction) {
+	TargetRenderState(int index, String name, Runnable startAction, Runnable endAction) {
 		this.index = index;
 		this.name = name;
 		this.startAction = startAction;

src/main/java/grondag/canvas/material/state/RenderContextState.java

@@ -20,67 +20,56 @@
 
 package grondag.canvas.material.state;
 
-import org.jetbrains.annotations.Nullable;
+import java.util.Stack;
+
+import javax.annotation.Nonnull;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
 
 import io.vram.frex.api.material.MaterialFinder;
 import io.vram.frex.api.material.MaterialMap;
 
 public class RenderContextState {
-	@SuppressWarnings("rawtypes")
-	private MaterialMap activeMap = MaterialMap.IDENTITY;
-	@SuppressWarnings("rawtypes")
-	private MaterialMap swapMap = null;
-	private Object activeGameObject = null;
 	private final MaterialFinder finder = MaterialFinder.newInstance();
-
-	private MaterialMap<Entity> entityMap = MaterialMap.identity();
-	private MaterialMap<BlockState> blockEntityMap = MaterialMap.identity();
-	private MaterialMap<ItemStack> itemMap = MaterialMap.identity();
 	private GuiMode guiMode = GuiMode.NORMAL;
-	private boolean renderingItem = false;
 
-	public void setCurrentEntity(@Nullable Entity entity) {
-		entityMap = entity == null ? MaterialMap.identity() : MaterialMap.get(entity.getType());
-		activeGameObject = entity;
-		activeMap = entityMap;
+	// PERF: use int states and bitwise operation
+	private record State (MaterialMap map, Object searchObj) { }
+
+	// PERF: use array with failsafe
+	private final Stack<State> states = new Stack<>();
+
+	public RenderContextState() {
 	}
 
-	public void setCurrentBlockEntity(@Nullable BlockEntity blockEntity) {
-		if (blockEntity == null) {
-			activeGameObject = Blocks.AIR.defaultBlockState();
-			blockEntityMap = MaterialMap.identity();
-		} else {
-			activeGameObject = blockEntity.getBlockState();
-			blockEntityMap = MaterialMap.get(blockEntity.getType());
-		}
+	public void push(@Nonnull Entity entity) {
+		states.push(new State(MaterialMap.get(entity.getType()), entity));
+	}
 
-		activeMap = blockEntityMap;
+	public void push(@Nonnull BlockEntity blockEntity) {
+		states.push(new State(MaterialMap.get(blockEntity.getType()), blockEntity.getBlockState()));
 	}
 
 	/**
 	 * For items with custom renderer.
 	 *
 	 * @param itemStack the item stack
 	 */
-	public void pushItemState(ItemStack itemStack) {
-		assert swapMap == null;
-		itemMap = MaterialMap.get(itemStack);
-		swapMap = activeMap; // preserve active function
-		activeMap = itemMap;
-		renderingItem = true;
+	public void push(@Nonnull ItemStack itemStack) {
+		states.push(new State(MaterialMap.get(itemStack), null));
+	}
+
+	public void pop() {
+		states.pop();
 	}
 
-	public void popItemState() {
-		itemMap = MaterialMap.identity();
-		activeMap = swapMap;
-		swapMap = null;
-		renderingItem = false;
+	/**
+	 * Prevent unwanted state/overflow due to conflicting hooks, etc.
+	 */
+	public void clear() {
+		states.clear();
 	}
 
 	public void guiMode(GuiMode guiMode) {
@@ -89,16 +78,18 @@ public void guiMode(GuiMode guiMode) {
 
 	@SuppressWarnings("unchecked")
 	public CanvasRenderMaterial mapMaterial(CanvasRenderMaterial mat) {
-		if (activeMap.isIdentity() && guiMode == GuiMode.NORMAL) {
+		if (states.empty() && guiMode == GuiMode.NORMAL) {
 			return mat;
 		} else {
 			finder.copyFrom(mat);
 
-			if (renderingItem) {
-				activeMap.map(finder, null);
-				finder.textureIndex(mat.textureIndex()); // custom item wants to retain custom texture
-			} else {
-				activeMap.map(finder, activeGameObject);
+			if (!states.empty()) {
+				final State state = states.peek();
+				state.map.map(finder, state.searchObj);
+
+				if (state.searchObj == null) {
+					finder.textureIndex(mat.textureIndex());
+				}
 			}
 
 			guiMode.apply(finder);

src/main/java/grondag/canvas/mixin/MixinAccessibilityOptionsScreen.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of Canvas Renderer and is licensed to the project under
+ * terms that are compatible with the GNU Lesser General Public License.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership and licensing.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package grondag.canvas.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.OptionInstance;
+import net.minecraft.client.Options;
+import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.SimpleOptionsSubScreen;
+import net.minecraft.network.chat.Component;
+
+import grondag.canvas.apiimpl.CanvasState;
+import grondag.canvas.shader.data.AccessibilityData;
+
+@Mixin(AccessibilityOptionsScreen.class)
+public class MixinAccessibilityOptionsScreen extends SimpleOptionsSubScreen {
+	public MixinAccessibilityOptionsScreen(Screen screen, Options options, Component component, OptionInstance<?>[] optionInstances) {
+		super(screen, options, component, optionInstances);
+	}
+
+	@Inject(at = @At("HEAD"), method = "method_31384")
+	void onClosing(CallbackInfo ci) {
+		canvas_onClose();
+	}
+
+	@Override
+	public void onClose() {
+		canvas_onClose();
+		super.onClose();
+	}
+
+	private static void canvas_onClose() {
+		if (AccessibilityData.checkChanged() && Minecraft.getInstance().level != null) {
+			CanvasState.recompileIfNeeded(true);
+		}
+	}
+}