From 42ca5867bc609ba0160257ed83ad5c83bfb6fc4a Mon Sep 17 00:00:00 2001
From: SD <harrypotter.starwars.shrish@gmail.com>
Date: Tue, 23 Mar 2021 08:14:08 +0530
Subject: [PATCH] Access widen MultiPhase and stuff

---
 build.gradle                                      |  4 ++++
 .../block/door/data/condition/Condition.java      | 14 +-------------
 .../client/EntranceRiftBlockEntityRenderer.java   |  3 ++-
 .../dimdoors/mixin/client/GameRendererMixin.java  |  4 ++--
 .../client/accessor/RenderLayerAccessor.java      | 15 +++++++++++++++
 src/main/resources/dimdoors.accesswidener         |  4 ++++
 src/main/resources/dimdoors.mixins.json           |  7 ++++---
 src/main/resources/fabric.mod.json                |  1 +
 8 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/org/dimdev/dimdoors/mixin/client/accessor/RenderLayerAccessor.java
 create mode 100644 src/main/resources/dimdoors.accesswidener

diff --git a/build.gradle b/build.gradle
index db839bb1..7e4ac392 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,6 +95,10 @@ sourceSets {
 	datagen
 }
 
+minecraft {
+	accessWidener = file('src/main/resources/dimdoors.accesswidener')
+}
+
 dependencies {
 	minecraft "com.mojang:minecraft:21w11a"
 	mappings "net.fabricmc:yarn:21w11a+build.4:v2"
diff --git a/src/main/java/org/dimdev/dimdoors/block/door/data/condition/Condition.java b/src/main/java/org/dimdev/dimdoors/block/door/data/condition/Condition.java
index 0425c58f..9c3c62e6 100644
--- a/src/main/java/org/dimdev/dimdoors/block/door/data/condition/Condition.java
+++ b/src/main/java/org/dimdev/dimdoors/block/door/data/condition/Condition.java
@@ -43,8 +43,6 @@ public interface Condition {
 
 		T fromJson(JsonObject json);
 
-		JsonObject toJson(T t, JsonObject json);
-
 		default String getId() {
 			return String.valueOf(REGISTRY.getId(this));
 		}
@@ -53,17 +51,7 @@ public interface Condition {
 		}
 
 		static <T extends Condition> ConditionType<T> register(String name, Function<JsonObject, T> fromJson) {
-			return Registry.register(REGISTRY, new Identifier("dimdoors", name), new ConditionType<T>() {
-				@Override
-				public T fromJson(JsonObject json) {
-					return fromJson.apply(json);
-				}
-
-				@Override
-				public JsonObject toJson(T t, JsonObject json) {
-					return t.toJson(json);
-				}
-			});
+			return Registry.register(REGISTRY, new Identifier("dimdoors", name), json -> fromJson.apply(json));
 		}
 	}
 }
diff --git a/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java b/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java
index ea526d39..80e99e17 100644
--- a/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java
+++ b/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.Random;
 
 import org.dimdev.dimdoors.block.entity.EntranceRiftBlockEntity;
+import org.dimdev.dimdoors.mixin.client.accessor.RenderLayerAccessor;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.RenderLayer;
@@ -48,7 +49,7 @@ public class EntranceRiftBlockEntityRenderer implements BlockEntityRenderer<Entr
 	static {
 		WARP_PATH = new Identifier("dimdoors:textures/other/warp.png");
 		DIMENSIONAL_PORTAL_SHADER = new RenderPhase.class_5942(ModShaders::getDimensionalPortal);
-		RENDER_LAYER = RenderLayer.of(
+		RENDER_LAYER = RenderLayerAccessor.callOf(
 				"dimensional_portal",
 				VertexFormats.POSITION,
 				VertexFormat.DrawMode.QUADS,
diff --git a/src/main/java/org/dimdev/dimdoors/mixin/client/GameRendererMixin.java b/src/main/java/org/dimdev/dimdoors/mixin/client/GameRendererMixin.java
index 7ca83329..1bed3667 100644
--- a/src/main/java/org/dimdev/dimdoors/mixin/client/GameRendererMixin.java
+++ b/src/main/java/org/dimdev/dimdoors/mixin/client/GameRendererMixin.java
@@ -9,11 +9,11 @@ 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.class_5912;
 import net.minecraft.class_5944;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
+import net.minecraft.resource.ResourceFactory;
 import net.minecraft.resource.ResourceManager;
 
 import net.fabricmc.api.EnvType;
@@ -23,7 +23,7 @@ import net.fabricmc.api.Environment;
 @Mixin(GameRenderer.class)
 public abstract class GameRendererMixin {
 	@Shadow
-	protected abstract class_5944 method_34522(class_5912 arg, String string, VertexFormat vertexFormat) throws IOException;
+	protected abstract class_5944 method_34522(ResourceFactory arg, String string, VertexFormat vertexFormat) throws IOException;
 
 	@Inject(method = "method_34538", at = @At(value = "INVOKE", ordinal = 1, target = "Lnet/minecraft/client/render/GameRenderer;method_34522(Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;)Lnet/minecraft/class_5944;"))
 	public void onReload(ResourceManager resourceManager, CallbackInfo ci) throws IOException {
diff --git a/src/main/java/org/dimdev/dimdoors/mixin/client/accessor/RenderLayerAccessor.java b/src/main/java/org/dimdev/dimdoors/mixin/client/accessor/RenderLayerAccessor.java
new file mode 100644
index 00000000..05fbdb8e
--- /dev/null
+++ b/src/main/java/org/dimdev/dimdoors/mixin/client/accessor/RenderLayerAccessor.java
@@ -0,0 +1,15 @@
+package org.dimdev.dimdoors.mixin.client.accessor;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexFormat;
+
+@Mixin(RenderLayer.class)
+public interface RenderLayerAccessor {
+	@Invoker
+	static RenderLayer.MultiPhase callOf(String name, VertexFormat vertexFormat, VertexFormat.DrawMode drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, RenderLayer.MultiPhaseParameters phases) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/src/main/resources/dimdoors.accesswidener b/src/main/resources/dimdoors.accesswidener
new file mode 100644
index 00000000..94f3be9b
--- /dev/null
+++ b/src/main/resources/dimdoors.accesswidener
@@ -0,0 +1,4 @@
+accessWidener v1 named
+
+# Because its package private
+accessible    class    net/minecraft/client/render/RenderLayer$MultiPhase
diff --git a/src/main/resources/dimdoors.mixins.json b/src/main/resources/dimdoors.mixins.json
index 944e88f3..52679c1b 100644
--- a/src/main/resources/dimdoors.mixins.json
+++ b/src/main/resources/dimdoors.mixins.json
@@ -7,9 +7,7 @@
     "ExtendedServerPlayNetworkhandlerMixin",
     "ItemMixin",
     "ItemMixin$SettingsMixin",
-    "accessor.ListTagAccessor",
     "PlayerEntityMixin",
-    "accessor.RecipesProviderAccessor",
     "RegistryKeyMixin",
     "ServerPlayerEntityMixin",
     "ServerPlayerInteractionManagerMixin",
@@ -19,6 +17,8 @@
     "accessor.DirectionAccessor",
     "accessor.EntityAccessor",
     "accessor.GenerationSettingsAccessor",
+    "accessor.ListTagAccessor",
+    "accessor.RecipesProviderAccessor",
     "accessor.RedstoneWireBlockAccessor",
     "accessor.StatsAccessor"
   ],
@@ -26,8 +26,9 @@
     "client.ClientPlayerInteractionManagerMixin",
     "client.ClientPlayNetworkHandlerMixin",
     "client.ExtendedClientPlayNetworkHandlerMixin",
+    "client.GameRendererMixin",
     "client.InGameHudMixin",
-    "client.GameRendererMixin"
+    "client.accessor.RenderLayerAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index c0b70d59..059679d5 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -42,6 +42,7 @@
     "fabricloader": ">=0.4.0",
     "fabric": "*"
   },
+  "accessWidener": "dimdoors.accesswidener",
   "custom": {
     "cardinal-components": [
       "dimdoors:dimensional_registry",