Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"gui.anvilcraft.category.super_heating.need_activated": "Need Activated",
"gui.anvilcraft.category.super_heating.produce_fluid": "Produce: %d mB of %s",
"gui.anvilcraft.category.unpack": "Unpack",
"item.anvilcraft_lite.crab_claw": "Crab Claw",
"item.anvilcraft_lite.magnet_ingot": "Magnet Ingot",
"item.anvilcraft_lite.resin": "Resin",
"itemGroup.anvilcraft_lite.tab": "AnvilCraft: Lite",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package dev.anvilcraft.lite.event;

import dev.anvilcraft.lite.init.item.ModItems;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.storage.loot.BuiltInLootTables;
import net.minecraft.world.level.storage.loot.LootPool;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.entries.LootItem;
import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.LootTableLoadEvent;
import org.jetbrains.annotations.NotNull;

@EventBusSubscriber
public class LootTableEventListener {
@SubscribeEvent
public static void lootTable(@NotNull LootTableLoadEvent event) {
ResourceLocation id = event.getName();
LootTable table = event.getTable();
if (BuiltInLootTables.FISHING_JUNK.location().equals(id)) {
table.addPool(
LootPool.lootPool()
.add(LootItem.lootTableItem(ModItems.CRAB_CLAW))
.apply(SetItemCountFunction.setCount(ConstantValue.exactly(1)))
.build()
);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package dev.anvilcraft.lite.event;

import dev.anvilcraft.lite.item.CrabClawItem;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.tick.PlayerTickEvent;

@EventBusSubscriber
public class PlayerTickEventListener {
@SubscribeEvent
public static void onPlayerTick(PlayerTickEvent.Post event) {
CrabClawItem.holdingCrabClawIncreasesRange(event.getEntity());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class ModItemGroups {
entries.accept(ModItems.MAGNET_BLOCK.get());
entries.accept(ModItems.HOLLOW_MAGNET_BLOCK.get());
entries.accept(ModItems.FERRITE_CORE_MAGNET_BLOCK.get());
entries.accept(ModItems.CRAB_CLAW.get());
})
);

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/dev/anvilcraft/lite/init/item/ModItems.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.anvilcraft.lite.init.item;

import dev.anvilcraft.lite.init.block.ModBlocks;
import dev.anvilcraft.lite.item.CrabClawItem;
import dev.anvilcraft.lite.item.MagnetItem;
import dev.anvilcraft.lite.item.ResinBlockItem;
import net.minecraft.world.item.BlockItem;
Expand Down Expand Up @@ -30,6 +31,9 @@ public class ModItems {
.lang("Ferrite-Cored Block of Magnet")
.register();

public static final DeferredItem<CrabClawItem> CRAB_CLAW = REGISTER.item("crab_claw", CrabClawItem::new)
.register();

public static void init() {
}
}
119 changes: 119 additions & 0 deletions src/main/java/dev/anvilcraft/lite/item/CrabClawItem.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package dev.anvilcraft.lite.item;

import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import dev.anvilcraft.lite.AnvilCraftLite;
import dev.anvilcraft.lite.init.item.ModItems;
import dev.anvilcraft.lite.item.better.BetterItem;
import dev.anvilcraft.lite.util.Util;
import net.minecraft.ChatFormatting;
import net.minecraft.core.Holder;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.monster.Shulker;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.ItemAttributeModifiers;
import net.minecraft.world.item.component.TooltipDisplay;

import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;

public class CrabClawItem extends BetterItem {
public static final AttributeModifier RANGE_ATTRIBUTE_MODIFIER = new AttributeModifier(
AnvilCraftLite.of("range_modifier"),
3,
AttributeModifier.Operation.ADD_VALUE
);
private static final Supplier<Multimap<Holder<Attribute>, AttributeModifier>> RANGE_MODIFIER_SUPPLIER = Suppliers.memoize(() -> ImmutableMultimap.of(
Attributes.BLOCK_INTERACTION_RANGE, RANGE_ATTRIBUTE_MODIFIER,
Attributes.ENTITY_INTERACTION_RANGE, RANGE_ATTRIBUTE_MODIFIER
));
public static final String CRAB_CLAW_MARKER = "crabClaw";
public static final String DUAL_CRAB_CLAW_MARKER = "dualCrabClaw";

public CrabClawItem(Properties properties) {
super(properties);
}

/**
* 蟹钳增加交互距离
*/
public static void holdingCrabClawIncreasesRange(LivingEntity entity) {
if (!(entity instanceof Player player)) return;
if (entity.level().isClientSide) return;
CompoundTag customData = entity.getPersistentData();
boolean inOffHand = player.getOffhandItem().is(ModItems.CRAB_CLAW);
boolean inMainHand = player.getMainHandItem().is(ModItems.CRAB_CLAW);
boolean holdingDualCrabClaw = inOffHand && inMainHand;
boolean holdingCrabClaw = inOffHand || inMainHand;
boolean wasHoldingCrabClaw = customData.contains(CRAB_CLAW_MARKER);
boolean wasHoldingDualCrabClaw = customData.contains(DUAL_CRAB_CLAW_MARKER);
if (!holdingCrabClaw) {
player.getAttributes().removeAttributeModifiers(RANGE_MODIFIER_SUPPLIER.get());
if (wasHoldingCrabClaw) {
customData.remove(CRAB_CLAW_MARKER);
}
} else {
player.getAttributes().addTransientAttributeModifiers(RANGE_MODIFIER_SUPPLIER.get());
if (!wasHoldingDualCrabClaw) {
customData.putBoolean(CRAB_CLAW_MARKER, true);
}
}

if (!holdingDualCrabClaw) {
if (wasHoldingDualCrabClaw) {
customData.remove(DUAL_CRAB_CLAW_MARKER);
}
} else {
if (!wasHoldingDualCrabClaw) {
customData.putBoolean(DUAL_CRAB_CLAW_MARKER, true);
}
}
}

@Override
public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, InteractionHand hand) {
if (!(target instanceof Shulker shulker) || !shulker.isAlive()) return InteractionResult.PASS;
if (!player.level().isClientSide) {
Optional.ofNullable(shulker.getAttribute(Attributes.ARMOR))
.ifPresent(attribute -> attribute.removeModifier(Shulker.COVERED_ARMOR_MODIFIER_ID));
shulker.getEntityData().set(Shulker.DATA_PEEK_ID, (byte) 100);
}

return Util.sidedSuccess(player.level().isClientSide);

}

@Override
public void appendTooltip(
ItemStack stack,
TooltipContext context,
TooltipDisplay display,
Consumer<Component> adder,
TooltipFlag flag
) {
adder.accept(CommonComponents.EMPTY);
adder.accept(Component.translatable("item.modifiers.hand").withStyle(ChatFormatting.GRAY));
adder.accept(Component.translatable(
"attribute.modifier.plus." + RANGE_ATTRIBUTE_MODIFIER.operation().id(),
ItemAttributeModifiers.ATTRIBUTE_MODIFIER_FORMAT.format(RANGE_ATTRIBUTE_MODIFIER.amount()),
Component.translatable(Attributes.BLOCK_INTERACTION_RANGE.value().getDescriptionId())
).withStyle(Attributes.BLOCK_INTERACTION_RANGE.value().getStyle(true)));
adder.accept(Component.translatable(
"attribute.modifier.plus." + RANGE_ATTRIBUTE_MODIFIER.operation().id(),
ItemAttributeModifiers.ATTRIBUTE_MODIFIER_FORMAT.format(RANGE_ATTRIBUTE_MODIFIER.amount()),
Component.translatable(Attributes.ENTITY_INTERACTION_RANGE.value().getDescriptionId())
).withStyle(Attributes.ENTITY_INTERACTION_RANGE.value().getStyle(true)));
}
}
47 changes: 47 additions & 0 deletions src/main/java/dev/anvilcraft/lite/item/better/BetterItem.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package dev.anvilcraft.lite.item.better;

import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.TooltipDisplay;
import org.jetbrains.annotations.ApiStatus;

import java.util.function.Consumer;

/**
* 用于替换部分方法以去除<b>无用</b>的警告,<br>
* 如将
* {@link Item#appendHoverText(ItemStack, TooltipContext, TooltipDisplay, Consumer, TooltipFlag) appendHoverText}
* 替换为
* {@link BetterItem#appendTooltip(ItemStack, TooltipContext, TooltipDisplay, Consumer, TooltipFlag) appendTooltip}
* 以去除其弃用警告
*/
@SuppressWarnings("deprecation")
public abstract class BetterItem extends Item {
public BetterItem(Properties properties) {
super(properties);
}

@Override
@ApiStatus.NonExtendable
public void appendHoverText(
ItemStack stack,
TooltipContext context,
TooltipDisplay display,
Consumer<Component> adder,
TooltipFlag flag
) {
super.appendHoverText(stack, context, display, adder, flag);
this.appendTooltip(stack, context, display, adder, flag);
}

public void appendTooltip(
ItemStack stack,
TooltipContext context,
TooltipDisplay display,
Consumer<Component> adder,
TooltipFlag flag
) {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package dev.anvilcraft.lite.item.better;

import net.minecraft.MethodsReturnNonnullByDefault;

import javax.annotation.ParametersAreNonnullByDefault;
11 changes: 8 additions & 3 deletions src/main/java/dev/anvilcraft/lite/util/Util.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.anvilcraft.lite.util;

import net.minecraft.world.InteractionResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -35,10 +36,14 @@ public static <T> Optional<T> castSafely(@Nullable Object o, Class<T> clazz) {
@SuppressWarnings("TypeParameterExplicitlyExtendsObject")
@SafeVarargs
public static boolean instanceOfAny(@Nullable Object o, Class<? extends Object>... classes) {
Optional<Object> op = Optional.empty();
Optional<Object> optional = Optional.empty();
for (Class<?> clazz : classes) {
op = op.or(() -> Util.castSafely(o, clazz));
optional = optional.or(() -> Util.castSafely(o, clazz));
}
return op.isPresent();
return optional.isPresent();
}

public static InteractionResult sidedSuccess(boolean isClientSide) {
return isClientSide ? InteractionResult.SUCCESS : InteractionResult.SUCCESS_SERVER;
}
}
3 changes: 3 additions & 0 deletions src/main/resources/META-INF/accesstransformer.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ public-f net.minecraft.world.level.block.state.BlockBehaviour hasCollision

public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
public net.minecraft.world.level.lighting.LevelLightEngine <init>()V

public net.minecraft.world.entity.monster.Shulker COVERED_ARMOR_MODIFIER_ID
public net.minecraft.world.entity.monster.Shulker DATA_PEEK_ID
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "anvilcraft_lite:item/crab_claw"
}
}
Loading
Loading