FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-21 11:20:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Fix crash

Browse source
This commit is contained in:
modmuss50 2020-04-30 00:45:49 +01:00
parent a15fc24836
commit bf7c167a1d
4 changed files with 7 additions and 5 deletions
build.gradle
fabric-object-builder-api-v1
build.gradle
src/main/java/net/fabricmc/fabric/mixin/object/builder
MixinBlock.java
fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder
MixinBlock.java

2
build.gradle
View file

@ -12,7 +12,7 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.10.0"
static def baseVersion = "0.10.1"
static def mcVersion = "20w18a"
static def yarnVersion = "+build.1"
}

2
fabric-object-builder-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-object-builder-api-v1"
version = getSubprojectVersion(project, "1.0.0")
version = getSubprojectVersion(project, "1.0.1")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

5
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java
View file

@ -22,13 +22,14 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.block.Block;
import net.minecraft.block.AbstractBlock;
import net.fabricmc.fabric.impl.object.builder.FabricBlockInternals;
@Mixin(Block.class)
public abstract class MixinBlock {
@Inject(method = "<init>(Lnet/minecraft/block/Block$Settings;)V", at = @At("RETURN"))
public void fabric_init(Block.Settings builder, CallbackInfo info) {
@Inject(method = "<init>(Lnet/minecraft/block/AbstractBlock$Settings;)V", at = @At("RETURN"))
public void fabric_init(AbstractBlock.Settings builder, CallbackInfo info) {
FabricBlockInternals.onBuild(builder, (Block) (Object) this);
}
}

3
fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java
View file

@ -22,6 +22,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.block.Block;
import net.minecraft.block.AbstractBlock;
import net.fabricmc.fabric.api.event.registry.BlockConstructedCallback;
@ -29,7 +30,7 @@ import net.fabricmc.fabric.api.event.registry.BlockConstructedCallback;
@Deprecated
public class MixinBlock {
@Inject(method = "<init>(Lnet/minecraft/block/AbstractBlock$Settings;)V", at = @At("RETURN"))
public void init(Block.Settings builder, CallbackInfo info) {
public void init(AbstractBlock.Settings builder, CallbackInfo info) {
BlockConstructedCallback.EVENT.invoker().building(builder, (Block) (Object) this);
}
}