kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

所有集装箱都能放在水面上了

Browse source
This commit is contained in:
17146 2025-05-26 03:45:00 +08:00 • committed by Light_Quanta
parent 666da39453
commit 62bd1d5f08
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 19 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/atsuishio/superbwarfare/api/event/RegisterContainersEvent.java
View file

@ -20,26 +20,14 @@ public class RegisterContainersEvent extends Event implements IModBusEvent {
public static final List<ItemStack> containers = new ArrayList<>(); public static final List<ItemStack> containers = new ArrayList<>();
public <T extends Entity> void add(DeferredHolder<EntityType<?>, EntityType<T>> type) { public <T extends Entity> void add(DeferredHolder<EntityType<?>, EntityType<T>> type) {
add(type.get(), false); add(type.get());
}
public <T extends Entity> void add(DeferredHolder<EntityType<?>, EntityType<T>> type, boolean canBePlacedAboveWater) {
add(type.get(), canBePlacedAboveWater);
} }
public <T extends Entity> void add(EntityType<T> type) { public <T extends Entity> void add(EntityType<T> type) {
add(type, false); containers.add(ContainerBlockItem.createInstance(type));
}
public <T extends Entity> void add(EntityType<T> type, boolean canBePlacedAboveWater) {
containers.add(ContainerBlockItem.createInstance(type, canBePlacedAboveWater));
} }
public void add(Entity entity) { public void add(Entity entity) {
add(entity, false); containers.add(ContainerBlockItem.createInstance(entity));
}
public void add(Entity entity, boolean canBePlacedAboveWater) {
containers.add(ContainerBlockItem.createInstance(entity, canBePlacedAboveWater));
} }
} }

56
src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java
View file

@ -18,7 +18,6 @@ import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.CustomData;
import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.ClipContext;
@ -39,6 +38,8 @@ import software.bernie.geckolib.animation.AnimationState;
import software.bernie.geckolib.animation.PlayState; import software.bernie.geckolib.animation.PlayState;
import software.bernie.geckolib.util.GeckoLibUtil; import software.bernie.geckolib.util.GeckoLibUtil;
import javax.annotation.ParametersAreNonnullByDefault;
@EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD) @EventBusSubscriber(modid = Mod.MODID, bus = EventBusSubscriber.Bus.MOD)
public class ContainerBlockItem extends BlockItem implements GeoItem { public class ContainerBlockItem extends BlockItem implements GeoItem {
@ -49,10 +50,10 @@ public class ContainerBlockItem extends BlockItem implements GeoItem {
event.add(ModEntities.HPJ_11); event.add(ModEntities.HPJ_11);
event.add(ModEntities.ANNIHILATOR); event.add(ModEntities.ANNIHILATOR);
event.add(ModEntities.LASER_TOWER); event.add(ModEntities.LASER_TOWER);
event.add(ModEntities.SPEEDBOAT, true); event.add(ModEntities.SPEEDBOAT);
event.add(ModEntities.AH_6); event.add(ModEntities.AH_6);
event.add(ModEntities.LAV_150, true); event.add(ModEntities.LAV_150);
event.add(ModEntities.BMP_2, true); event.add(ModEntities.BMP_2);
event.add(ModEntities.PRISM_TANK); event.add(ModEntities.PRISM_TANK);
event.add(ModEntities.YX_100); event.add(ModEntities.YX_100);
event.add(ModEntities.WHEEL_CHAIR); event.add(ModEntities.WHEEL_CHAIR);
@ -67,31 +68,20 @@ public class ContainerBlockItem extends BlockItem implements GeoItem {
} }
@Override @Override
public @NotNull InteractionResult useOn(UseOnContext context) { public @NotNull InteractionResult useOn(@NotNull UseOnContext context) {
ItemStack stack = context.getItemInHand(); return InteractionResult.PASS;
var data = stack.get(DataComponents.BLOCK_ENTITY_DATA);
if (data != null && data.copyTag().getBoolean("CanPlacedAboveWater")) {
return InteractionResult.PASS;
}
return super.useOn(context);
} }
@Override @Override
public @NotNull InteractionResultHolder<ItemStack> use(@NotNull Level level, Player player, @NotNull InteractionHand hand) { @ParametersAreNonnullByDefault
ItemStack stack = player.getItemInHand(hand); public @NotNull InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand hand) {
var data = stack.get(DataComponents.BLOCK_ENTITY_DATA); BlockHitResult playerPOVHitResult = getPlayerPOVHitResult(level, player, ClipContext.Fluid.WATER);
if (playerPOVHitResult.getType() == HitResult.Type.MISS) {
if (data != null && data.copyTag().getBoolean("CanPlacedAboveWater")) { return super.use(level, player, hand);
BlockHitResult playerPOVHitResult = getPlayerPOVHitResult(level, player, ClipContext.Fluid.WATER);
if (playerPOVHitResult.getType() == HitResult.Type.MISS) {
return super.use(level, player, hand);
}
BlockHitResult blockHitResult = playerPOVHitResult.withPosition(playerPOVHitResult.getBlockPos().above());
InteractionResult interactionresult = super.useOn(new UseOnContext(player, hand, blockHitResult));
return new InteractionResultHolder<>(interactionresult, player.getItemInHand(hand));
} }
return super.use(level, player, hand); BlockHitResult blockHitResult = playerPOVHitResult.withPosition(playerPOVHitResult.getBlockPos().above());
InteractionResult interactionresult = super.useOn(new UseOnContext(player, hand, blockHitResult));
return new InteractionResultHolder<>(interactionresult, player.getItemInHand(hand));
} }
@Override @Override
@ -144,14 +134,6 @@ public class ContainerBlockItem extends BlockItem implements GeoItem {
} }
public static ItemStack createInstance(Entity entity) { public static ItemStack createInstance(Entity entity) {
return createInstance(entity, false);
}
public static ItemStack createInstance(EntityType<?> entityType) {
return createInstance(entityType, false);
}
public static ItemStack createInstance(Entity entity, boolean canPlacedAboveWater) {
ItemStack stack = new ItemStack(ModBlocks.CONTAINER.get()); ItemStack stack = new ItemStack(ModBlocks.CONTAINER.get());
var data = stack.get(DataComponents.BLOCK_ENTITY_DATA); var data = stack.get(DataComponents.BLOCK_ENTITY_DATA);
@ -167,22 +149,16 @@ public class ContainerBlockItem extends BlockItem implements GeoItem {
tag.putString("EntityType", EntityType.getKey(entity.getType()).toString()); tag.putString("EntityType", EntityType.getKey(entity.getType()).toString());
BlockItem.setBlockEntityData(stack, ModBlockEntities.CONTAINER.get(), tag); BlockItem.setBlockEntityData(stack, ModBlockEntities.CONTAINER.get(), tag);
tag.putBoolean("CanPlacedAboveWater", canPlacedAboveWater);
stack.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(tag));
return stack; return stack;
} }
public static ItemStack createInstance(EntityType<?> entityType, boolean canPlacedAboveWater) { public static ItemStack createInstance(EntityType<?> entityType) {
ItemStack stack = new ItemStack(ModBlocks.CONTAINER.get()); ItemStack stack = new ItemStack(ModBlocks.CONTAINER.get());
var data = stack.get(DataComponents.BLOCK_ENTITY_DATA); var data = stack.get(DataComponents.BLOCK_ENTITY_DATA);
var tag = data != null ? data.copyTag() : new CompoundTag(); var tag = data != null ? data.copyTag() : new CompoundTag();
tag.putString("EntityType", EntityType.getKey(entityType).toString()); tag.putString("EntityType", EntityType.getKey(entityType).toString());
BlockItem.setBlockEntityData(stack, ModBlockEntities.CONTAINER.get(), tag); BlockItem.setBlockEntityData(stack, ModBlockEntities.CONTAINER.get(), tag);
tag.putBoolean("CanPlacedAboveWater", canPlacedAboveWater);
stack.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(tag));
return stack; return stack;
} }
} }