From 8ef58448442e17595d7e7c876430c88826c96cd2 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 8 Sep 2023 10:46:25 -0400 Subject: [PATCH] lint --- .../dev/marston/randomloot/CaseModifier.java | 4 +--- .../java/dev/marston/randomloot/Config.java | 6 ----- .../marston/randomloot/ModLootModifiers.java | 3 ++- .../dev/marston/randomloot/RandomLootMod.java | 20 ++++------------ .../dev/marston/randomloot/loot/LootCase.java | 6 ----- .../dev/marston/randomloot/loot/LootItem.java | 6 ----- .../marston/randomloot/loot/LootRegistry.java | 23 ------------------- .../marston/randomloot/loot/LootUtils.java | 2 +- .../loot/modifiers/BlockBreakModifier.java | 2 -- .../loot/modifiers/HoldModifier.java | 1 - .../loot/modifiers/ModifierRegistry.java | 1 - .../loot/modifiers/UseModifier.java | 4 ---- .../loot/modifiers/breakers/Attracting.java | 1 - .../loot/modifiers/breakers/Explode.java | 7 ------ .../loot/modifiers/breakers/Learning.java | 6 +---- .../loot/modifiers/holders/Effect.java | 11 --------- .../loot/modifiers/holders/Hasty.java | 8 ------- .../loot/modifiers/holders/OreFinder.java | 9 -------- .../loot/modifiers/holders/Rainy.java | 8 ------- .../modifiers/holders/TreasureFinder.java | 9 -------- .../loot/modifiers/hurter/Charging.java | 2 +- .../loot/modifiers/hurter/Combo.java | 11 +-------- .../loot/modifiers/hurter/Critical.java | 2 +- .../loot/modifiers/hurter/Draining.java | 2 +- .../loot/modifiers/hurter/HurtEffect.java | 13 ----------- .../loot/modifiers/users/DirtPlace.java | 6 ----- .../loot/modifiers/users/TorchPlace.java | 3 --- 27 files changed, 14 insertions(+), 162 deletions(-) diff --git a/src/main/java/dev/marston/randomloot/CaseModifier.java b/src/main/java/dev/marston/randomloot/CaseModifier.java index 3325b5d..66ee9e3 100644 --- a/src/main/java/dev/marston/randomloot/CaseModifier.java +++ b/src/main/java/dev/marston/randomloot/CaseModifier.java @@ -8,12 +8,10 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.data.PackOutput; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraftforge.common.data.GlobalLootModifierProvider; import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/dev/marston/randomloot/Config.java b/src/main/java/dev/marston/randomloot/Config.java index b60bac8..124d20f 100644 --- a/src/main/java/dev/marston/randomloot/Config.java +++ b/src/main/java/dev/marston/randomloot/Config.java @@ -1,18 +1,12 @@ package dev.marston.randomloot; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.registries.ForgeRegistries; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - // An example config class. This is not required, but it's a good idea to have one to keep your config organized. // Demonstrates how to use Forge's config APIs @Mod.EventBusSubscriber(modid = RandomLootMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/src/main/java/dev/marston/randomloot/ModLootModifiers.java b/src/main/java/dev/marston/randomloot/ModLootModifiers.java index cd49c1e..0efb2be 100644 --- a/src/main/java/dev/marston/randomloot/ModLootModifiers.java +++ b/src/main/java/dev/marston/randomloot/ModLootModifiers.java @@ -1,11 +1,12 @@ package dev.marston.randomloot; +import com.mojang.serialization.Codec; + import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import com.mojang.serialization.Codec; public class ModLootModifiers { public static final DeferredRegister> LOOT_MODIFIER_SERIALIZERS = diff --git a/src/main/java/dev/marston/randomloot/RandomLootMod.java b/src/main/java/dev/marston/randomloot/RandomLootMod.java index b91e87f..628fe93 100644 --- a/src/main/java/dev/marston/randomloot/RandomLootMod.java +++ b/src/main/java/dev/marston/randomloot/RandomLootMod.java @@ -1,24 +1,20 @@ package dev.marston.randomloot; +import java.util.Map; + +import org.slf4j.Logger; + import com.mojang.logging.LogUtils; -import dev.marston.randomloot.loot.LootCase; -import dev.marston.randomloot.loot.LootItem; import dev.marston.randomloot.loot.LootRegistry; import dev.marston.randomloot.loot.LootUtils; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.core.registries.Registries; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.BlockItem; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; @@ -35,12 +31,6 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegisterEvent; -import net.minecraftforge.registries.RegistryObject; -import net.minecraft.resources.ResourceLocation; - -import java.util.Map; - -import org.slf4j.Logger; @Mod(RandomLootMod.MODID) public class RandomLootMod { diff --git a/src/main/java/dev/marston/randomloot/loot/LootCase.java b/src/main/java/dev/marston/randomloot/loot/LootCase.java index ed827cc..2a3c090 100644 --- a/src/main/java/dev/marston/randomloot/loot/LootCase.java +++ b/src/main/java/dev/marston/randomloot/loot/LootCase.java @@ -4,10 +4,8 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.RandomLootMod; import dev.marston.randomloot.loot.modifiers.Modifier; import net.minecraft.ChatFormatting; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; @@ -16,15 +14,11 @@ import net.minecraft.stats.StatType; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; public class LootCase extends Item { diff --git a/src/main/java/dev/marston/randomloot/loot/LootItem.java b/src/main/java/dev/marston/randomloot/loot/LootItem.java index 14983f0..991ea3e 100644 --- a/src/main/java/dev/marston/randomloot/loot/LootItem.java +++ b/src/main/java/dev/marston/randomloot/loot/LootItem.java @@ -18,18 +18,12 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; import net.minecraft.network.chat.MutableComponent; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.InteractionResult; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectCategory; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/dev/marston/randomloot/loot/LootRegistry.java b/src/main/java/dev/marston/randomloot/loot/LootRegistry.java index e937aa0..bb2dcce 100644 --- a/src/main/java/dev/marston/randomloot/loot/LootRegistry.java +++ b/src/main/java/dev/marston/randomloot/loot/LootRegistry.java @@ -1,31 +1,8 @@ package dev.marston.randomloot.loot; -import java.util.ArrayList; import java.util.HashMap; -import java.util.function.Consumer; -import com.mojang.logging.LogUtils; - -import dev.marston.randomloot.RandomLootMod; -import net.minecraft.client.Minecraft; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegisterEvent; -import net.minecraftforge.registries.RegisterEvent.RegisterHelper; -import net.minecraftforge.registries.RegistryObject; -import net.minecraft.resources.ResourceLocation; public class LootRegistry { diff --git a/src/main/java/dev/marston/randomloot/loot/LootUtils.java b/src/main/java/dev/marston/randomloot/loot/LootUtils.java index ddda458..56171fe 100644 --- a/src/main/java/dev/marston/randomloot/loot/LootUtils.java +++ b/src/main/java/dev/marston/randomloot/loot/LootUtils.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; + import javax.json.Json; import javax.json.JsonObject; -import dev.marston.randomloot.RandomLootMod; import dev.marston.randomloot.loot.LootItem.ToolType; import dev.marston.randomloot.loot.modifiers.Modifier; import dev.marston.randomloot.loot.modifiers.ModifierRegistry; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/BlockBreakModifier.java b/src/main/java/dev/marston/randomloot/loot/modifiers/BlockBreakModifier.java index bd2edb9..a88d202 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/BlockBreakModifier.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/BlockBreakModifier.java @@ -1,9 +1,7 @@ package dev.marston.randomloot.loot.modifiers; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; public interface BlockBreakModifier extends Modifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/HoldModifier.java b/src/main/java/dev/marston/randomloot/loot/modifiers/HoldModifier.java index e3f2d91..80cc897 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/HoldModifier.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/HoldModifier.java @@ -1,7 +1,6 @@ package dev.marston.randomloot.loot.modifiers; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/ModifierRegistry.java b/src/main/java/dev/marston/randomloot/loot/modifiers/ModifierRegistry.java index 3e37e51..719e0f1 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/ModifierRegistry.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/ModifierRegistry.java @@ -5,7 +5,6 @@ import dev.marston.randomloot.RandomLootMod; import dev.marston.randomloot.loot.modifiers.breakers.Attracting; -import dev.marston.randomloot.loot.modifiers.breakers.Explode; import dev.marston.randomloot.loot.modifiers.breakers.Learning; import dev.marston.randomloot.loot.modifiers.holders.Effect; import dev.marston.randomloot.loot.modifiers.holders.Hasty; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/UseModifier.java b/src/main/java/dev/marston/randomloot/loot/modifiers/UseModifier.java index a24c545..ff26013 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/UseModifier.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/UseModifier.java @@ -1,9 +1,5 @@ package dev.marston.randomloot.loot.modifiers; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; public interface UseModifier extends Modifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Attracting.java b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Attracting.java index 863d3e6..efaaa30 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Attracting.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Attracting.java @@ -15,7 +15,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Explode.java b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Explode.java index c4f5c64..ae7e86d 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Explode.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Explode.java @@ -4,21 +4,14 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.Level.ExplosionInteraction; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Learning.java b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Learning.java index b4daffa..ea83d13 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Learning.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/breakers/Learning.java @@ -4,23 +4,19 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; +import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; public class Learning implements BlockBreakModifier { diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Effect.java b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Effect.java index 26a9e32..70d15ba 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Effect.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Effect.java @@ -4,30 +4,19 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; public class Effect implements HoldModifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Hasty.java b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Hasty.java index 95068f6..673ea93 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Hasty.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Hasty.java @@ -4,28 +4,20 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; public class Hasty implements HoldModifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/OreFinder.java b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/OreFinder.java index 1632c7c..4039dc1 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/OreFinder.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/OreFinder.java @@ -6,30 +6,21 @@ import javax.annotation.Nullable; import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.entity.monster.Shulker; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Rainy.java b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Rainy.java index 3dfaedf..100c5c9 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Rainy.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/Rainy.java @@ -4,28 +4,20 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; public class Rainy implements HoldModifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/TreasureFinder.java b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/TreasureFinder.java index dc258ba..7b597a7 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/holders/TreasureFinder.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/holders/TreasureFinder.java @@ -6,30 +6,21 @@ import javax.annotation.Nullable; import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.entity.monster.Shulker; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Charging.java b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Charging.java index 5f4ea1b..37e3cfe 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Charging.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Charging.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; +import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.modifiers.EntityHurtModifier; import dev.marston.randomloot.loot.modifiers.Modifier; import net.minecraft.ChatFormatting; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Combo.java b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Combo.java index 9786902..1306f72 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Combo.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Combo.java @@ -1,29 +1,20 @@ package dev.marston.randomloot.loot.modifiers.hurter; import java.util.List; -import java.util.Random; import javax.annotation.Nullable; import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem; import dev.marston.randomloot.loot.LootItem.ToolType; +import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.modifiers.EntityHurtModifier; import dev.marston.randomloot.loot.modifiers.Modifier; import net.minecraft.ChatFormatting; -import net.minecraft.client.particle.Particle; -import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Critical.java b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Critical.java index 6b71bb1..730a616 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Critical.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Critical.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import dev.marston.randomloot.loot.LootItem; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; +import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.modifiers.EntityHurtModifier; import dev.marston.randomloot.loot.modifiers.Modifier; import net.minecraft.ChatFormatting; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Draining.java b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Draining.java index 65d51d4..e1ba266 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Draining.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/Draining.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import dev.marston.randomloot.loot.LootItem; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; +import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.modifiers.EntityHurtModifier; import dev.marston.randomloot.loot.modifiers.Modifier; import net.minecraft.ChatFormatting; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/HurtEffect.java b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/HurtEffect.java index 0fd2fb8..15a151d 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/HurtEffect.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/hurter/HurtEffect.java @@ -4,31 +4,18 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.RandomLootMod; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.modifiers.BlockBreakModifier; import dev.marston.randomloot.loot.modifiers.EntityHurtModifier; -import dev.marston.randomloot.loot.modifiers.HoldModifier; import dev.marston.randomloot.loot.modifiers.Modifier; -import dev.marston.randomloot.loot.modifiers.ModifierRegistry; -import dev.marston.randomloot.loot.modifiers.users.TorchPlace; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.item.PrimedTnt; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.Level.ExplosionInteraction; public class HurtEffect implements EntityHurtModifier{ diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/users/DirtPlace.java b/src/main/java/dev/marston/randomloot/loot/modifiers/users/DirtPlace.java index 5051523..a90b1b3 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/users/DirtPlace.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/users/DirtPlace.java @@ -5,17 +5,13 @@ import javax.annotation.Nullable; import dev.marston.randomloot.loot.LootItem.ToolType; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.NameGenerator; import dev.marston.randomloot.loot.modifiers.Modifier; import dev.marston.randomloot.loot.modifiers.ModifierRegistry; import dev.marston.randomloot.loot.modifiers.UseModifier; -import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.MinecraftServer; @@ -25,9 +21,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; diff --git a/src/main/java/dev/marston/randomloot/loot/modifiers/users/TorchPlace.java b/src/main/java/dev/marston/randomloot/loot/modifiers/users/TorchPlace.java index 0a1d178..66093ec 100644 --- a/src/main/java/dev/marston/randomloot/loot/modifiers/users/TorchPlace.java +++ b/src/main/java/dev/marston/randomloot/loot/modifiers/users/TorchPlace.java @@ -4,16 +4,13 @@ import javax.annotation.Nullable; -import dev.marston.randomloot.loot.LootUtils; import dev.marston.randomloot.loot.LootItem.ToolType; import dev.marston.randomloot.loot.modifiers.Modifier; import dev.marston.randomloot.loot.modifiers.ModifierRegistry; import dev.marston.randomloot.loot.modifiers.UseModifier; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.EquipmentSlot;