Use custom render layer instead of TESR for sky blocks

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.json]
+indent_size = 2
+indent_style = space
+
+[*.java]
+indent_size = 4
+indent_style = tab
+tab_width = 4

build.gradle

@@ -60,6 +60,11 @@ minecraft {
         args << '-Dmixin.checks.interfaces=true'
         args << '-Dmixin.debug.export=true'
     }
+    if (project.debug_class_loading.toBoolean()) {
+        args << '-Dlegacy.debugClassLoading=true'
+        args << '-Dlegacy.debugClassLoadingFiner=true'
+        args << '-Dlegacy.debugClassLoadingSave=true'
+    }
     extraRunJvmArguments.addAll(args)
 
     // Include and use dependencies' Access Transformer files
@@ -133,6 +138,14 @@ dependencies {
     //compileOnly group: 'info.openmods', name: 'calc', version: '0.2'
     compileOnly "info.computercraft:ComputerCraft-API:1.80pr0"
     compileOnly "info.openmods:OpenPeripheralCore-API:3.5-unstable"
+
+    // debug stuff
+    compileOnly rfg.deobf("curse.maven:renderlib-624967:6461209")
+    compileOnly rfg.deobf("curse.maven:nothirium-624960:7207682")
+    //runtimeOnly rfg.deobf("curse.maven:renderlib-624967:6461209")
+    //runtimeOnly rfg.deobf("curse.maven:nothirium-624960:7207682")
+
+    //runtimeOnly rfg.deobf("curse.maven:spark-361579:3542217")
 }
 
 // Adds Access Transformer files to tasks

gradle.properties

@@ -14,7 +14,7 @@ maven_group = info.openmods
 # If any properties changes below this line, run `gradlew setupDecompWorkspace` and refresh gradle again to ensure everything is working correctly.
 
 # Boilerplate Options
-use_mixins = false
+use_mixins = true
 use_coremod = true
 use_assetmover = false
 
@@ -24,3 +24,6 @@ use_access_transformer = true
 # Coremod Arguments
 include_mod = true
 coremod_plugin_class_name = openmods.core.OpenModsCorePlugin
+
+# Debug options, always disable before committing
+debug_class_loading = false

src/main/java/openblocks/OpenBlocks.java

@@ -176,7 +176,6 @@
 import openblocks.common.tileentity.TileEntityPaintCan;
 import openblocks.common.tileentity.TileEntityPaintMixer;
 import openblocks.common.tileentity.TileEntityProjector;
-import openblocks.common.tileentity.TileEntitySky;
 import openblocks.common.tileentity.TileEntitySprinkler;
 import openblocks.common.tileentity.TileEntityTank;
 import openblocks.common.tileentity.TileEntityTarget;
@@ -382,7 +381,7 @@ public static class Blocks implements BlockInstances {
 		@RegisterBlock(type = BlockDrawingTable.class, id = "drawing_table", tileEntity = TileEntityDrawingTable.class, legacyIds = "drawingtable")
 		public static Block drawingTable;
 
-		@RegisterBlock(type = BlockSky.class, id = "sky", tileEntity = TileEntitySky.class, itemBlock = ItemSkyBlock.class, unlocalizedName = "sky.normal")
+		@RegisterBlock(type = BlockSky.class, id = "sky", itemBlock = ItemSkyBlock.class, unlocalizedName = "sky.normal")
 		public static Block sky;
 
 		@RegisterBlock(type = BlockXPShower.class, id = "xp_shower", tileEntity = TileEntityXPShower.class, legacyIds = "xpshower")

src/main/java/openblocks/client/ClientProxy.java

@@ -30,7 +30,6 @@
 import openblocks.client.bindings.KeyInputHandler;
 import openblocks.client.fx.FXLiquidSpray;
 import openblocks.client.model.ModelCraneBackpack;
-import openblocks.client.renderer.SkyBlockRenderer;
 import openblocks.client.renderer.TextureUploader;
 import openblocks.client.renderer.block.PathModel;
 import openblocks.client.renderer.block.canvas.CanvasTextureManager;
@@ -47,6 +46,7 @@
 import openblocks.client.renderer.item.stencil.ModelStencil;
 import openblocks.client.renderer.item.stencil.StencilItemOverride;
 import openblocks.client.renderer.item.stencil.StencilTextureManager;
+import openblocks.client.renderer.skyblock.SkyBlockRenderer;
 import openblocks.client.renderer.tileentity.TileEntityAutoEnchantmentTableRenderer;
 import openblocks.client.renderer.tileentity.TileEntityBearTrapRenderer;
 import openblocks.client.renderer.tileentity.TileEntityCannonRenderer;
@@ -56,7 +56,6 @@
 import openblocks.client.renderer.tileentity.TileEntityImaginaryRenderer;
 import openblocks.client.renderer.tileentity.TileEntityPaintMixerRenderer;
 import openblocks.client.renderer.tileentity.TileEntityProjectorRenderer;
-import openblocks.client.renderer.tileentity.TileEntitySkyRenderer;
 import openblocks.client.renderer.tileentity.TileEntitySprinklerRenderer;
 import openblocks.client.renderer.tileentity.TileEntityTankRenderer;
 import openblocks.client.renderer.tileentity.TileEntityTrophyRenderer;
@@ -83,7 +82,6 @@
 import openblocks.common.tileentity.TileEntityImaginary;
 import openblocks.common.tileentity.TileEntityPaintMixer;
 import openblocks.common.tileentity.TileEntityProjector;
-import openblocks.common.tileentity.TileEntitySky;
 import openblocks.common.tileentity.TileEntitySprinkler;
 import openblocks.common.tileentity.TileEntityTank;
 import openblocks.common.tileentity.TileEntityTrophy;
@@ -204,7 +202,6 @@ public void preInit() {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVillageHighlighter.class, new TileEntityVillageHighlighterRenderer());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoEnchantmentTable.class, new TileEntityAutoEnchantmentTableRenderer());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPaintMixer.class, new TileEntityPaintMixerRenderer());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySky.class, new TileEntitySkyRenderer());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGoldenEgg.class, new TileEntityGoldenEggRenderer());
 
 		if (OpenBlocks.Blocks.projector != null) {

src/main/java/openblocks/client/renderer/skyblock/SkyBlockCustomLayer.java

@@ -0,0 +1,64 @@
+package openblocks.client.renderer.skyblock;
+
+import net.minecraft.util.BlockRenderLayer;
+import openmods.renderer.renderlayer.ICustomRenderLayer;
+import openmods.renderer.shaders.ShaderProgram;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+public class SkyBlockCustomLayer implements ICustomRenderLayer {
+	private static SkyBlockCustomLayer INSTANCE;
+	private final Map<Class<? extends Enum<?>>, Integer> ORDINALS = Collections.synchronizedMap(new WeakHashMap<>());
+
+	private BlockRenderLayer layer;
+	private boolean layerInitialized = false;
+
+	public SkyBlockCustomLayer() {
+		INSTANCE = this;
+	}
+
+	public static SkyBlockCustomLayer instance() {
+		return INSTANCE;
+	}
+
+	@Override
+	public ShaderProgram shader() {
+		return SkyBlockRenderer.INSTANCE.shader();
+	}
+
+	@Override
+	public String variantName() {
+		return "SKY_BLOCK";
+	}
+
+	@Override
+	public <T extends Enum<T>> void setOrdinal(Class<T> enumClass, int ordinal) {
+		ORDINALS.put(enumClass, ordinal);
+	}
+
+	@Override
+	public <T extends Enum<T>> int ordinal(Class<T> enumClass) {
+		return ORDINALS.getOrDefault(enumClass, -1);
+	}
+
+	public BlockRenderLayer getBlockRenderLayer() {
+		if (!layerInitialized) {
+			layerInitialized = true;
+			int ordinal = ordinal(BlockRenderLayer.class);
+			layer = ordinal == -1 ? null : BlockRenderLayer.values()[ordinal];
+		}
+		return layer;
+	}
+
+	@Override
+	public boolean preRenderLayer() {
+		return SkyBlockRenderer.INSTANCE.preRenderLayer();
+	}
+
+	@Override
+	public void postRenderLayer() {
+		SkyBlockRenderer.INSTANCE.postRenderLayer();
+	}
+}