Fix build, update FREX version

vram-guild · Jun 15, 2020 · e7cf0b5 · e7cf0b5
1 parent 76ff276
commit e7cf0b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -66,8 +66,8 @@ dependencies {
 	}
 
     if (!(gradle.startParameter.taskNames.contains("publish") || gradle.startParameter.taskNames.contains("publishToMavenLocal"))) {
+		include "grondag:frex-${project.mc_tag}:${project.frex_version}.+"
 		include "grondag:fermion-${project.mc_tag}:${project.fermion_version}.+"
-		include "grondag:fermion-modkeys-${project.mc_tag}:${project.fermion_modkeys_version}.+"
 	    include "grondag:fermion-varia-${project.mc_tag}:${project.fermion_varia_version}.+"
 	    include "grondag:fermion-orientation-${project.mc_tag}:${project.fermion_orientation_version}.+"
 	    include "grondag:special-circumstances-${project.mc_tag}:${project.special_circumstances_version}.+"

diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ fermion_version=2.0
 special_circumstances_version=1.6
 fermion_varia_version=2.0
 fermion_orientation_version=1.0
-frex_version=2.1
+frex_version=2.2
 
 jankson_version=3.0.0+j1.2.0
 clothconfig_version=4.5.3

diff --git a/src/main/java/grondag/canvas/apiimpl/rendercontext/AbstractRenderContext.java b/src/main/java/grondag/canvas/apiimpl/rendercontext/AbstractRenderContext.java
@@ -58,11 +58,12 @@ public abstract class AbstractRenderContext implements RenderContext {
 	private static final QuadTransform NO_TRANSFORM = (q) -> true;
 	private final SpriteAtlasTexture atlas = MinecraftClient.getInstance().getBakedModelManager().method_24153(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
 	private final SpriteFinder spriteFinder = SpriteFinder.get(atlas);
+	private static final MaterialMap defaultMap = MaterialMap.defaultMaterialMap();
 
 	protected Matrix4f matrix;
 	protected Matrix3fExt normalMatrix;
 	protected int overlay;
-	protected MaterialMap materialMap = MaterialMap.DEFAULT_MATERIAL_MAP;
+	protected MaterialMap materialMap = defaultMap;
 
 	private final QuadTransform stackTransform = (q) -> {
 		int i = transformStack.size() - 1;
@@ -87,7 +88,7 @@ protected boolean hasTransform() {
 	}
 
 	void mapMaterials(MutableQuadView quad) {
-		if (materialMap == MaterialMap.DEFAULT_MATERIAL_MAP) {
+		if (materialMap == defaultMap) {
 			return;
 		}