diff --git a/build.gradle b/build.gradle index 217733de8..3e275958a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.7.0" + static def baseVersion = "0.7.1" static def mcVersion = "1.15.2" static def yarnVersion = "+build.1" } diff --git a/fabric-tool-attribute-api-v1/build.gradle b/fabric-tool-attribute-api-v1/build.gradle index 273347912..e85aa34d9 100644 --- a/fabric-tool-attribute-api-v1/build.gradle +++ b/fabric-tool-attribute-api-v1/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-tool-attribute-api-v1" -version = getSubprojectVersion(project, "1.0.1") +version = getSubprojectVersion(project, "1.0.2") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinToolItem.java b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinToolItem.java deleted file mode 100644 index 3fe2c5b26..000000000 --- a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinToolItem.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.mixin.tool.attribute; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolItem; -import net.minecraft.item.ToolMaterial; - -import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; - -@Mixin(ToolItem.class) -public abstract class MixinToolItem extends Item implements DynamicAttributeTool { - @Shadow - public abstract ToolMaterial getMaterial(); - - public MixinToolItem(Settings settings) { - super(settings); - } - - @Override - public int getMiningLevel(ItemStack stack, LivingEntity user) { - return this.getMaterial().getMiningLevel(); - } - - @Override - public float getMiningSpeedMultiplier(ItemStack stack, LivingEntity user) { - return this.getMaterial().getMiningSpeed(); - } -} diff --git a/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json b/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json index d41f8b3af..b2b1ad5d9 100644 --- a/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json +++ b/fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json @@ -5,8 +5,7 @@ "mixins": [ "MixinItemStack", "MixinLivingEntity", - "MixinPlayerInventory", - "MixinToolItem" + "MixinPlayerInventory" ], "injectors": { "defaultRequire": 1