fixed canvas compat

Globox1997 · Jul 19, 2021 · 0b7023c · 0b7023c
1 parent 3d4195d
commit 0b7023c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
 	// Canvas
-	// modCompile "grondag:canvas-mc116:1.0.+"
+	// modCompileOnly "grondag:canvas-mc117-1.17:1.0.+"
 }
 
 processResources {

diff --git a/src/main/java/net/adventurez/entity/render/feature/layer/ExtraRenderLayer.java b/src/main/java/net/adventurez/entity/render/feature/layer/ExtraRenderLayer.java
@@ -1,11 +1,15 @@
 package net.adventurez.entity.render.feature.layer;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.Identifier;
 
 public class ExtraRenderLayer {
     public static RenderLayer getGlowing(String string) {
-        return RenderLayer.getEntityAlpha(new Identifier(string));
+        if (FabricLoader.getInstance().isModLoaded("canvas")) {
+            return RenderLayer.getEntityDecal(new Identifier(string));
+        } else
+            return RenderLayer.getEntityAlpha(new Identifier(string));
     }
 
 }
diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/dragon.json b/src/main/resources/assets/adventurez/materialmaps/entity/dragon.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"

diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/nightmare.json b/src/main/resources/assets/adventurez/materialmaps/entity/nightmare.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"

diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/soul_reaper.json b/src/main/resources/assets/adventurez/materialmaps/entity/soul_reaper.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"

diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/summoner.json b/src/main/resources/assets/adventurez/materialmaps/entity/summoner.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"

diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/void_shade.json b/src/main/resources/assets/adventurez/materialmaps/entity/void_shade.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"

diff --git a/src/main/resources/assets/adventurez/materialmaps/entity/void_shadow.json b/src/main/resources/assets/adventurez/materialmaps/entity/void_shadow.json
@@ -3,7 +3,7 @@
         {
             "predicate": {
                 "materialPredicate": {
-                    "renderLayerName": "entity_glowing"
+                    "renderLayerName": "entity_decal"
                 }
             },
             "material": "canvas:emissive_transform"