From 1c5826c39f8c1f9c1f690cf4758c8c4b963f006b Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 6 Jan 2025 23:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9B=86=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E7=89=A9=E5=93=81=E6=B3=A8=E5=86=8C=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/init/ModTabs.java | 12 ++++----- .../item/ContainerBlockItem.java | 25 ------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java index 5f610fa11..8be6c1c6e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTabs.java @@ -103,12 +103,12 @@ public class ModTabs { .withTabsBefore(AMMO_TAB.getKey()) .displayItems((param, output) -> ModItems.ITEMS.getEntries().forEach(registryObject -> { if (registryObject.get() == ModItems.CONTAINER.get()) { - output.accept(ContainerBlockItem.createMk42Instance()); - output.accept(ContainerBlockItem.createMle1934Instance()); - output.accept(ContainerBlockItem.createAnnihilatorInstance()); - output.accept(ContainerBlockItem.createSpeedboatInstance()); - output.accept(ContainerBlockItem.createWheelChairInstance()); - output.accept(ContainerBlockItem.createAh6Instance()); + output.accept(ContainerBlockItem.createInstance(ModEntities.MK_42.get())); + output.accept(ContainerBlockItem.createInstance(ModEntities.MLE_1934.get())); + output.accept(ContainerBlockItem.createInstance(ModEntities.ANNIHILATOR.get())); + output.accept(ContainerBlockItem.createInstance(ModEntities.SPEEDBOAT.get(), true)); + output.accept(ContainerBlockItem.createInstance(ModEntities.WHEEL_CHAIR.get())); + output.accept(ContainerBlockItem.createInstance(ModEntities.AH_6.get())); } else { output.accept(registryObject.get()); if (registryObject.get() == ModItems.ARMOR_PLATE.get()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java b/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java index 2d9ca63ef..c4164d447 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/ContainerBlockItem.java @@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.item; import com.atsuishio.superbwarfare.client.renderer.block.ContainerBlockItemRenderer; import com.atsuishio.superbwarfare.init.ModBlockEntities; import com.atsuishio.superbwarfare.init.ModBlocks; -import com.atsuishio.superbwarfare.init.ModEntities; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.InteractionHand; @@ -130,28 +129,4 @@ public class ContainerBlockItem extends BlockItem implements GeoItem { stack.getOrCreateTag().putBoolean("CanPlacedAboveWater", canPlacedAboveWater); return stack; } - - public static ItemStack createMk42Instance() { - return createInstance(ModEntities.MK_42.get()); - } - - public static ItemStack createMle1934Instance() { - return createInstance(ModEntities.MLE_1934.get()); - } - - public static ItemStack createAnnihilatorInstance() { - return createInstance(ModEntities.ANNIHILATOR.get()); - } - - public static ItemStack createSpeedboatInstance() { - return createInstance(ModEntities.SPEEDBOAT.get(), true); - } - - public static ItemStack createWheelChairInstance() { - return createInstance(ModEntities.WHEEL_CHAIR.get()); - } - - public static ItemStack createAh6Instance() { - return createInstance(ModEntities.AH_6.get()); - } }