Fix mixins outside dev env

This commit is contained in:
grimmauld 2021-01-13 09:50:00 +01:00
parent 93a1983302
commit 2b615b68bd
3 changed files with 9 additions and 8 deletions

View file

@ -37,7 +37,7 @@ minecraft {
runs { runs {
client { client {
workingDirectory project.file('run') workingDirectory project.file('run')
property 'mixin.env.disableRefMap', 'true' // property 'mixin.env.disableRefMap', 'true'
arg '-mixin.config=create.mixins.json' arg '-mixin.config=create.mixins.json'
property 'forge.logging.console.level', 'info' property 'forge.logging.console.level', 'info'
property 'fml.earlyprogresswindow', 'false' property 'fml.earlyprogresswindow', 'false'
@ -50,7 +50,7 @@ minecraft {
server { server {
workingDirectory project.file('run/server') workingDirectory project.file('run/server')
property 'mixin.env.disableRefMap', 'true' // property 'mixin.env.disableRefMap', 'true'
arg '-mixin.config=create.mixins.json' arg '-mixin.config=create.mixins.json'
property 'forge.logging.console.level', 'info' property 'forge.logging.console.level', 'info'
mods { mods {
@ -125,6 +125,8 @@ dependencies {
// i'll leave this here commented for easier testing // i'll leave this here commented for easier testing
//runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69") //runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")
//runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984") //runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984")
annotationProcessor 'org.spongepowered:mixin:0.8:processor'
} }
jar { jar {

View file

@ -4,13 +4,14 @@ import net.minecraft.client.multiplayer.ClientChunkProvider;
import net.minecraft.util.math.SectionPos; import net.minecraft.util.math.SectionPos;
import net.minecraft.world.LightType; import net.minecraft.world.LightType;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientChunkProvider.class) @Mixin(ClientChunkProvider.class)
public class LightUpdateMixin { public class LightUpdateMixin {
@Shadow
@Inject(at = @At("HEAD"), method = "markLightChanged(Lnet/minecraft/world/LightType;Lnet/minecraft/util/math/SectionPos;)V") @Inject(at = @At("HEAD"), method = "markLightChanged(Lnet/minecraft/world/LightType;Lnet/minecraft/util/math/SectionPos;)V")
private void onLightUpdate(LightType type, SectionPos pos, CallbackInfo ci) { private void onLightUpdate(LightType type, SectionPos pos, CallbackInfo ci) {

View file

@ -1,20 +1,18 @@
package com.simibubi.create.foundation.mixin; package com.simibubi.create.foundation.mixin;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.multiplayer.ClientChunkProvider;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.util.math.SectionPos;
import net.minecraft.world.LightType;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(WorldRenderer.class) @Mixin(WorldRenderer.class)
public class RenderInLayerMixin { public class RenderInLayerMixin {
@Shadow
@Inject(at = @At("HEAD"), method = "renderLayer") @Inject(at = @At("HEAD"), method = "renderLayer") // (Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/matrix/MatrixStack;DDD)V")
private void renderLayer(RenderType type, MatrixStack stack, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) { private void renderLayer(RenderType type, MatrixStack stack, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
} }