From 8e4470eeefdf06dec1eeac2f215e809d6f9f2978 Mon Sep 17 00:00:00 2001
From: Maxx <53229958+MBatt1@users.noreply.github.com>
Date: Sun, 31 Mar 2024 11:43:55 -0500
Subject: [PATCH] checkstyle

---
 .../net/id/paradiselost/items/ParadiseLostItems.java |  8 ++++++--
 .../paradiselost/mixin/entity/LivingEntityMixin.java | 12 ------------
 .../ParadiseLostMiscConfiguredFeatures.java          |  1 -
 .../world/feature/features/JaggedOreFeature.java     |  1 -
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java
index c0cc7cfd9..270bd5550 100644
--- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java
+++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java
@@ -73,8 +73,12 @@ private static Settings tool() {
     private static final Settings tool = tool();
     private static final Settings rareTool = tool().rarity(RARE);
     private static final Settings paradiseLostLootTool = tool().rarity(ParadiseLostRarity.PARADISE_LOST_LOOT);
-    private static Settings unstackableTool() { return tool().maxCount(1); }
-    private static Settings unstackableRareTool() { return tool().maxCount(1).rarity(RARE); }
+    private static Settings unstackableTool() {
+        return tool().maxCount(1);
+    }
+    private static Settings unstackableRareTool() {
+        return tool().maxCount(1).rarity(RARE);
+    }
 
     // Olvite
     public static final ShovelItem OLVITE_SHOVEL = add("olvite_shovel", new ShovelItem(ParadiseLostToolMaterials.OLVITE, 1.5f, -3f, tool()));
diff --git a/src/main/java/net/id/paradiselost/mixin/entity/LivingEntityMixin.java b/src/main/java/net/id/paradiselost/mixin/entity/LivingEntityMixin.java
index d23fb82f4..c558a78dc 100644
--- a/src/main/java/net/id/paradiselost/mixin/entity/LivingEntityMixin.java
+++ b/src/main/java/net/id/paradiselost/mixin/entity/LivingEntityMixin.java
@@ -81,18 +81,6 @@ private double changeGravity(double gravity) {
         return gravity;
     }
 
-    // 24: Removed because of gravitite's removal
-//    @Inject(method = "damage", at = @At("RETURN"))
-//    private void onDamage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-//        Entity attacker = source.getAttacker();
-//        if (cir.getReturnValue() && attacker instanceof LivingEntity) {
-//            Item item = ((LivingEntity) attacker).getMainHandStack().getItem();
-//            if (item instanceof ToolItem tool && tool.getMaterial() == ParadiseLostToolMaterials.GRAVITITE) {
-//                this.addVelocity(0, amount / 20 + 0.1, 0);
-//            }
-//        }
-//    }
-
     @Inject(method = "tick", at = @At("TAIL"))
     private void tick(CallbackInfo ci) {
         if (flipped) {
diff --git a/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java b/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java
index 7c72bb411..739ec99ad 100644
--- a/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java
+++ b/src/main/java/net/id/paradiselost/world/feature/configured_features/ParadiseLostMiscConfiguredFeatures.java
@@ -1,6 +1,5 @@
 package net.id.paradiselost.world.feature.configured_features;
 
-import net.id.paradiselost.blocks.ParadiseLostBlocks;
 import net.id.paradiselost.world.feature.ParadiseLostFeatures;
 import net.id.paradiselost.world.feature.configs.BoulderFeatureConfig;
 import net.id.paradiselost.world.feature.configs.GroundcoverFeatureConfig;
diff --git a/src/main/java/net/id/paradiselost/world/feature/features/JaggedOreFeature.java b/src/main/java/net/id/paradiselost/world/feature/features/JaggedOreFeature.java
index 0aa84c85d..d8aabfc63 100644
--- a/src/main/java/net/id/paradiselost/world/feature/features/JaggedOreFeature.java
+++ b/src/main/java/net/id/paradiselost/world/feature/features/JaggedOreFeature.java
@@ -2,7 +2,6 @@
 
 import com.mojang.serialization.Codec;
 import net.id.paradiselost.blocks.FloatingBlock;
-import net.id.paradiselost.blocks.ParadiseLostBlocks;
 import net.id.paradiselost.tag.ParadiseLostBlockTags;
 import net.id.paradiselost.world.feature.configs.JaggedOreConfig;
 import net.minecraft.block.Block;