From 424993db2df581a0260bb7de7a32c28ab630f810 Mon Sep 17 00:00:00 2001 From: SD Date: Thu, 11 Feb 2021 22:30:38 +0530 Subject: [PATCH] Items (update 7 of 20) --- .../{DimensionalEraser.java => DimensionalEraserItem.java} | 7 ++++--- .../org/dimdev/dimdoors/item/DimensionalTrapdoorItem.java | 1 - src/main/java/org/dimdev/dimdoors/item/ModItems.java | 3 +-- .../dimdev/dimdoors/item/RiftConfigurationToolItem.java | 2 +- .../java/org/dimdev/dimdoors/item/RiftRemoverItem.java | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) rename src/main/java/org/dimdev/dimdoors/item/{DimensionalEraser.java => DimensionalEraserItem.java} (85%) diff --git a/src/main/java/org/dimdev/dimdoors/item/DimensionalEraser.java b/src/main/java/org/dimdev/dimdoors/item/DimensionalEraserItem.java similarity index 85% rename from src/main/java/org/dimdev/dimdoors/item/DimensionalEraser.java rename to src/main/java/org/dimdev/dimdoors/item/DimensionalEraserItem.java index b25b4a8d..0583980e 100644 --- a/src/main/java/org/dimdev/dimdoors/item/DimensionalEraser.java +++ b/src/main/java/org/dimdev/dimdoors/item/DimensionalEraserItem.java @@ -1,5 +1,6 @@ package org.dimdev.dimdoors.item; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -18,8 +19,8 @@ import org.dimdev.dimdoors.ModConfig; import org.dimdev.dimdoors.block.entity.RiftBlockEntity; import org.dimdev.dimdoors.sound.ModSoundEvents; -public class DimensionalEraser extends Item { - public DimensionalEraser(Settings settings) { +public class DimensionalEraserItem extends Item { + public DimensionalEraserItem(Settings settings) { super(settings); } @@ -30,7 +31,7 @@ public class DimensionalEraser extends Item { HitResult hit = RaycastHelper.raycast(player, RaycastHelper.REACH_DISTANCE, 1.0F, a -> !(a instanceof PlayerEntity)); if (hit != null && hit.getType() == HitResult.Type.ENTITY) { - ((EntityHitResult) hit).getEntity().remove(); + ((EntityHitResult) hit).getEntity().remove(Entity.RemovalReason.KILLED); player.playSound(ModSoundEvents.BLOOP, 1.0f, 1.0f); return new TypedActionResult<>(ActionResult.SUCCESS, stack); } diff --git a/src/main/java/org/dimdev/dimdoors/item/DimensionalTrapdoorItem.java b/src/main/java/org/dimdev/dimdoors/item/DimensionalTrapdoorItem.java index 77042ea2..25d941f9 100644 --- a/src/main/java/org/dimdev/dimdoors/item/DimensionalTrapdoorItem.java +++ b/src/main/java/org/dimdev/dimdoors/item/DimensionalTrapdoorItem.java @@ -21,7 +21,6 @@ public class DimensionalTrapdoorItem extends BlockItem { this.setupFunction = setupFunction; } - @Override public ActionResult place(ItemPlacementContext context) { World world = context.getWorld(); diff --git a/src/main/java/org/dimdev/dimdoors/item/ModItems.java b/src/main/java/org/dimdev/dimdoors/item/ModItems.java index 8e779c84..37afb6af 100644 --- a/src/main/java/org/dimdev/dimdoors/item/ModItems.java +++ b/src/main/java/org/dimdev/dimdoors/item/ModItems.java @@ -19,7 +19,6 @@ import org.dimdev.dimdoors.util.registry.RegistryObject; import org.dimdev.dimdoors.world.ModDimensions; import net.minecraft.block.Block; -import net.minecraft.entity.EntityType; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; import net.minecraft.item.BlockItem; @@ -149,7 +148,7 @@ public final class ModItems { public static final Item RIFT_STABILIZER = create(new RiftStabilizerItem(new Item.Settings().maxCount(1).maxDamage(6).group(DIMENSIONAL_DOORS))); @RegistryObject("dimensional_eraser") - public static final Item DIMENSIONAL_ERASER = create(new DimensionalEraser(new Item.Settings().maxDamage(100).group(DIMENSIONAL_DOORS))); + public static final Item DIMENSIONAL_ERASER = create(new DimensionalEraserItem(new Item.Settings().maxDamage(100).group(DIMENSIONAL_DOORS))); @RegistryObject("monolith_spawner") public static final Item MONOLITH_SPAWNER = new SpawnEggItem(ModEntityTypes.MONOLITH, 0xffffff, 0xffffff, new Item.Settings().group(ItemGroup.MISC)); diff --git a/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java b/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java index 6a297225..eb17b663 100644 --- a/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java +++ b/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java @@ -151,7 +151,7 @@ public class RiftConfigurationToolItem extends Item { if (hand == Hand.OFF_HAND) { packet = new PlayerInventorySlotUpdateS2CPacket(45, stack); } else { - packet = new PlayerInventorySlotUpdateS2CPacket(serverPlayer.inventory.selectedSlot, stack); + packet = new PlayerInventorySlotUpdateS2CPacket(serverPlayer.getInventory().selectedSlot, stack); } PacketByteBuf buf = PacketByteBufs.create(); try { diff --git a/src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java b/src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java index cc1bb975..c3193a71 100644 --- a/src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java +++ b/src/main/java/org/dimdev/dimdoors/item/RiftRemoverItem.java @@ -38,7 +38,6 @@ public class RiftRemoverItem extends Item { list.add(new TranslatableText(this.getTranslationKey() + ".info")); } - @Override public TypedActionResult use(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getStackInHand(hand);