FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-24 16:48:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove DynamicAttributeTool from ToolItem to fix vanilla tools being universally effective

Browse source
This commit is contained in:
Player 2020-04-22 17:18:28 +02:00
parent e40501d4d5
commit 915c4463ea
4 changed files with 3 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -12,7 +12,7 @@ plugins {
def ENV = System.getenv() def ENV = System.getenv()
class Globals { class Globals {
static def baseVersion = "0.7.0" static def baseVersion = "0.7.1"
static def mcVersion = "1.15.2" static def mcVersion = "1.15.2"
static def yarnVersion = "+build.1" static def yarnVersion = "+build.1"
} }

2
fabric-tool-attribute-api-v1/build.gradle
View file

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

48
fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinToolItem.java
View file

@ -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();
}
}

3
fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json
View file

@ -5,8 +5,7 @@
"mixins": [ "mixins": [
"MixinItemStack", "MixinItemStack",
"MixinLivingEntity", "MixinLivingEntity",
"MixinPlayerInventory", "MixinPlayerInventory"
"MixinToolItem"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1