infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

19w35a

Browse source
This commit is contained in:
modmuss50 2019-08-28 18:59:15 +01:00
parent d7b19f7e1c
commit 27da48aaf2
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -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

2
fabric-events-interaction-v0/build.gradle
View file

@ -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')

2
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinClientPlayerInteractionManager.java
View file

@ -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;

2
fabric-renderer-indigo/build.gradle
View file

@ -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')

2
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java
View file

@ -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);
}
}

2
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/BlockRenderContext.java
View file

@ -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) {

2
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/ChunkRenderInfo.java
View file

@ -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;