FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-11 22:45:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash on startup

Browse source 
Required as mixin was complaining: target requires method signature because enclosing type information for net.minecraft.client.render.chunk.ChunkBuilder$BuiltChunk$RebuildTask is unavailable
This commit is contained in:
modmuss50 2019-11-29 00:29:17 +00:00
parent c6a8ea893d
commit ea865a1450
3 changed files with 5 additions and 5 deletions
build.gradle
fabric-renderer-indigo
build.gradle
src/main/java/net/fabricmc/fabric/mixin/client/indigo/renderer
MixinChunkRebuildTask.java

2
build.gradle
View file

@ -12,7 +12,7 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.4.17"
static def baseVersion = "0.4.18"
static def mcVersion = "1.15-pre3"
static def yarnVersion = "+build.1"
}

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

@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
version = getSubprojectVersion(project, "0.2.16")
version = getSubprojectVersion(project, "0.2.17")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

6
fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/mixin/client/indigo/renderer/MixinChunkRebuildTask.java
View file

@ -69,7 +69,7 @@ public class MixinChunkRebuildTask {
@Shadow
protected BuiltChunk field_20839;
@Inject(at = @At("HEAD"), method = "render")
@Inject(at = @At("HEAD"), method = "Lnet/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$RebuildTask;render(FFFLnet/minecraft/client/render/chunk/ChunkBuilder$ChunkData;Lnet/minecraft/client/render/chunk/BlockBufferBuilderStorage;)Ljava/util/Set;")
private void hookChunkBuild(float float_1, float float_2, float float_3, ChunkBuilder.ChunkData renderData, BlockBufferBuilderStorage builder, CallbackInfoReturnable<Set<BlockEntity>> ci) {
ChunkRendererRegion region = this.region;
@ -96,7 +96,7 @@ public class MixinChunkRebuildTask {
* Normally this does nothing but will allow mods to create rendering hooks that are
* driven off of render type. (Not recommended or encouraged, but also not prevented.)
*/
@Redirect(method = "render", require = 1, at = @At(value = "INVOKE",
@Redirect(method = "Lnet/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$RebuildTask;render(FFFLnet/minecraft/client/render/chunk/ChunkBuilder$ChunkData;Lnet/minecraft/client/render/chunk/BlockBufferBuilderStorage;)Ljava/util/Set;", require = 1, at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/render/block/BlockRenderManager;renderBlock(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLjava/util/Random;)Z"))
private boolean hookChunkBuildTesselate(BlockRenderManager renderManager, BlockState blockState, BlockPos blockPos, BlockRenderView blockView, MatrixStack matrix, VertexConsumer bufferBuilder, boolean checkSides, Random random) {
if (blockState.getRenderType() == BlockRenderType.MODEL) {
@ -113,7 +113,7 @@ public class MixinChunkRebuildTask {
/**
* Release all references. Probably not necessary but would be $#%! to debug if it is.
*/
@Inject(at = @At("RETURN"), method = "render")
@Inject(at = @At("RETURN"), method = "Lnet/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$RebuildTask;render(FFFLnet/minecraft/client/render/chunk/ChunkBuilder$ChunkData;Lnet/minecraft/client/render/chunk/BlockBufferBuilderStorage;)Ljava/util/Set;")
private void hookRebuildChunkReturn(CallbackInfoReturnable<Set<BlockEntity>> ci) {
TerrainRenderContext.POOL.get().release();
}