From 27da48aaf2f1a9feb800fb3f0455e6b4e18f68b0 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 28 Aug 2019 18:59:15 +0100
Subject: [PATCH] 19w35a
---
build.gradle | 4 ++--
fabric-events-interaction-v0/build.gradle | 2 +-
.../MixinClientPlayerInteractionManager.java | 2 +-
fabric-renderer-indigo/build.gradle | 2 +-
.../fabricmc/indigo/renderer/render/AbstractQuadRenderer.java | 2 +-
.../fabricmc/indigo/renderer/render/BlockRenderContext.java | 2 +-
.../net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index 47e30e719..2569d002d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,8 +13,8 @@ def ENV = System.getenv()
class Globals {
static def baseVersion = "0.3.2"
- static def mcVersion = "19w34a"
- static def yarnVersion = "+build.2"
+ static def mcVersion = "19w35a"
+ static def yarnVersion = "+build.1"
}
import org.apache.commons.codec.digest.DigestUtils
diff --git a/fabric-events-interaction-v0/build.gradle b/fabric-events-interaction-v0/build.gradle
index b64b74346..df81ca51c 100644
--- a/fabric-events-interaction-v0/build.gradle
+++ b/fabric-events-interaction-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-events-interaction-v0"
-version = getSubprojectVersion(project, "0.1.1")
+version = getSubprojectVersion(project, "0.1.2")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinClientPlayerInteractionManager.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinClientPlayerInteractionManager.java
index e5aefbd11..237153f2f 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinClientPlayerInteractionManager.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinClientPlayerInteractionManager.java
@@ -61,7 +61,7 @@ public class MixinClientPlayerInteractionManager {
}
}
- @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/GameMode;isCreative()Z", ordinal = 0), method = "method_2902", cancellable = true)
+ @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/GameMode;isCreative()Z", ordinal = 0), method = "updateBlockBreakingProgress", cancellable = true)
public void method_2902(BlockPos pos, Direction direction, CallbackInfoReturnable<Boolean> info) {
if (!gameMode.isCreative()) {
return;
diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle
index f9fa44fef..2d2f57f82 100644
--- a/fabric-renderer-indigo/build.gradle
+++ b/fabric-renderer-indigo/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
-version = getSubprojectVersion(project, "0.1.11")
+version = getSubprojectVersion(project, "0.1.12")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java
index 2a934a32c..539738205 100644
--- a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java
+++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java
@@ -141,6 +141,6 @@ public abstract class AbstractQuadRenderer {
mpos.setOffset(quad.lightFace());
}
// Unfortunately cannot use brightness cache here unless we implement one specifically for flat lighting. See #329
- return blockState.getBlockBrightness(blockInfo.blockView, mpos);
+ return blockInfo.blockView.getLightmapIndex(blockState, mpos);
}
}
diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/BlockRenderContext.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/BlockRenderContext.java
index a347e4926..690ea9778 100644
--- a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/BlockRenderContext.java
+++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/BlockRenderContext.java
@@ -62,7 +62,7 @@ public class BlockRenderContext extends AbstractRenderContext implements RenderC
if(blockInfo.blockView == null) {
return 15 << 20 | 15 << 4;
}
- return blockInfo.blockView.getBlockState(pos).getBlockBrightness(blockInfo.blockView, pos);
+ return blockInfo.blockView.getLightmapIndex(blockInfo.blockView.getBlockState(pos), pos);
}
private float aoLevel(BlockPos pos) {
diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java
index df28c202b..5c3441ab6 100644
--- a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java
+++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java
@@ -190,7 +190,7 @@ public class ChunkRenderInfo {
long key = pos.asLong();
int result = brightnessCache.get(key);
if (result == Integer.MAX_VALUE) {
- result = blockView.getBlockState(pos).getBlockBrightness(blockView, pos);
+ result = blockView.getLightmapIndex(blockView.getBlockState(pos), pos);
brightnessCache.put(key, result);
}
return result;