diff --git a/build.gradle b/build.gradle index 414824783..e4020d119 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/fabric-object-builder-api-v1/build.gradle b/fabric-object-builder-api-v1/build.gradle index 8690e855a..b1fc9abce 100644 --- a/fabric-object-builder-api-v1/build.gradle +++ b/fabric-object-builder-api-v1/build.gradle @@ -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') diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java index 0f7cc5484..72e114606 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java @@ -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); } } diff --git a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java index 14b11ee8c..13c594d96 100644 --- a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java +++ b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/mixin/object/builder/MixinBlock.java @@ -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); } }