mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Redesign the tool system to rely on the new vanilla tags. (#7970)
Changed: - ToolType is replaced with ToolAction, which can selectively represent which actions are supported by an item. - Added a canPerformAction method to query ToolActions. - Renamed canHarvestBlock to isCorrectToolForDrops to match vanilla. - Added TierSortingRegistry, which can be used to add custom tiers and supports sorting between vanilla or with other mods. How to use: For the breaking system there's 2 methods: - getDestroySpeed decides if an item *can* mine the block fast. Override if you have multiple tags or your item isn't a DiggerItem. - isCorrectToolForDrops decides if an item will get drops. Returning false will also slow down mining, regardless of getDestroySpeed. Override if you have type-dependant tiers or your item isn't a DiggerItem. For the tier system mods can just call `TierSortingRegistry.registerTier(tier, "name", List.of(lesser tiers), List.of(better tiers));` to register their tiers. There's helper methods to query tiers such as TierSortingRegsitry.isCorrectTierForDrops. The ToolActions solve 2 problems: 1. distinguishing which kind of digger an item can be 2. querying if the item can perform specific secondary actions. Any item can override `canPerformAction` to customize which actions it performs.
This commit is contained in:
1 parent
52d7df06da
commit
10b51f257f
34 files changed
+1012
-441
No files matched your search
@@ -1,46 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.block;
|
||||
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraftforge.common.ToolType;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@Mod("block_harvest_tool_test")
|
||||
@Mod.EventBusSubscriber
|
||||
public class HarvestToolTest
|
||||
{
|
||||
@SubscribeEvent
|
||||
public static void onBlockBreak(BlockEvent.BreakEvent event)
|
||||
{
|
||||
Player player = event.getPlayer();
|
||||
BlockState state = event.getState();
|
||||
for (ToolType toolType : player.getMainHandItem().getToolTypes()) {
|
||||
if (state.isToolEffective(toolType)) {
|
||||
player.sendMessage(new TextComponent(String.format("Tool was effective. tool type: %s | harvest level: %d", toolType.getName(), state.getHarvestLevel())), player.getUUID());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.item;
|
||||
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.ForgeTier;
|
||||
import net.minecraftforge.common.TierSortingRegistry;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
@Mod("tag_based_tool_types")
|
||||
@Mod.EventBusSubscriber(bus= Mod.EventBusSubscriber.Bus.MOD)
|
||||
public class TagBasedToolTypesTest
|
||||
{
|
||||
public static final Tag.Named<Block> MY_TOOL_TAG = BlockTags.createOptional(new ResourceLocation("tag_based_tool_types:minable/my_tool"));
|
||||
public static final Tag.Named<Block> MY_TIER_TAG = BlockTags.createOptional(new ResourceLocation("tag_based_tool_types:needs_my_tier_tool"));
|
||||
public static final Tier MY_TIER = TierSortingRegistry.registerTier(
|
||||
new ForgeTier(5, 5000, 10, 100, 0, MY_TIER_TAG, () -> Ingredient.of(Items.BEDROCK)),
|
||||
new ResourceLocation("tag_based_tool_types:my_tier"),
|
||||
List.of(Tiers.DIAMOND), List.of());
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerItems(RegistryEvent.Register<Item> event)
|
||||
{
|
||||
event.getRegistry().register(new DiggerItem(1, 1, MY_TIER, MY_TOOL_TAG, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS))
|
||||
{
|
||||
@Override
|
||||
public float getDestroySpeed(ItemStack stack, BlockState state)
|
||||
{
|
||||
if (state.is(BlockTags.MINEABLE_WITH_AXE)) return speed;
|
||||
if (state.is(BlockTags.MINEABLE_WITH_PICKAXE)) return speed;
|
||||
return super.getDestroySpeed(stack, state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCorrectToolForDrops(ItemStack stack, BlockState state)
|
||||
{
|
||||
if (state.is(BlockTags.MINEABLE_WITH_PICKAXE))
|
||||
return TierSortingRegistry.isCorrectTierForDrops(Tiers.WOOD, state);
|
||||
if (state.is(BlockTags.MINEABLE_WITH_AXE))
|
||||
return TierSortingRegistry.isCorrectTierForDrops(MY_TIER, state);
|
||||
if (state.is(MY_TOOL_TAG))
|
||||
return TierSortingRegistry.isCorrectTierForDrops(MY_TIER, state);
|
||||
return false;
|
||||
}
|
||||
}.setRegistryName("test_item"));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user