Apply spotless

GTNewHorizons · Mar 16, 2024 · 97904b5 · 97904b5
1 parent 8ac3acf
commit 97904b5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/src/main/java/buildcraft/oiltweak/BuildCraftOilTweak.java b/src/main/java/buildcraft/oiltweak/BuildCraftOilTweak.java
@@ -21,12 +21,12 @@
  * @author Vexatos
  */
 @Mod(
-        modid = Mods.BCOilTweak,
-        name = Mods.BCOilTweak_NAME,
-        canBeDeactivated = true,
-        dependencies = "after:BuildCraft|Core@[6.4.1,);after:Forge@[10.13.2.1236,);"
-                + "after:BuildCraft|Energy@[6.4.1,);after:EnderIO@[1.7.10_2.2.7,);after:simplyjetpacks")
+    modid = Mods.BCOilTweak,
+    name = Mods.BCOilTweak_NAME,
     version = Tags.VERSION,
+    canBeDeactivated = true,
+    dependencies = "after:BuildCraft|Core@[6.4.1,);after:Forge@[10.13.2.1236,);"
+        + "after:BuildCraft|Energy@[6.4.1,);after:EnderIO@[1.7.10_2.2.7,);after:simplyjetpacks")
 public class BuildCraftOilTweak extends OilTweakAPI {
 
     @Instance(Mods.BCOilTweak)
@@ -48,19 +48,25 @@ public void preInit(FMLPreInitializationEvent event) {
     @EventHandler
     public void init(FMLInitializationEvent event) {
         eventHandler = new OilTweakEventHandler();
-        FMLCommonHandler.instance().bus().register(eventHandler);
+        FMLCommonHandler.instance()
+            .bus()
+            .register(eventHandler);
         MinecraftForge.EVENT_BUS.register(eventHandler);
         if (Mods.isLoaded(Mods.SimplyJetpacks)) {
             simplyJetpacks = new IntegrationSimplyJetpacks();
-            FMLCommonHandler.instance().bus().register(simplyJetpacks);
+            FMLCommonHandler.instance()
+                .bus()
+                .register(simplyJetpacks);
             simplyJetpacks.init();
         }
     }
 
     @EventHandler
     public void deInit(FMLModDisabledEvent event) {
         if (eventHandler != null) {
-            FMLCommonHandler.instance().bus().unregister(eventHandler);
+            FMLCommonHandler.instance()
+                .bus()
+                .unregister(eventHandler);
             MinecraftForge.EVENT_BUS.unregister(eventHandler);
         }
         if (Mods.isLoaded(Mods.SimplyJetpacks) && simplyJetpacks != null) {

diff --git a/src/main/java/buildcraft/oiltweak/OilTweakEventHandler.java b/src/main/java/buildcraft/oiltweak/OilTweakEventHandler.java
@@ -58,7 +58,7 @@ protected InOil getInOil(Entity entity) {
                     for (int z = minZ; z <= maxZ; ++z) {
                         if (isOil(entity.worldObj.getBlock(x, y, z))) {
                             return maxY == minY || isOil(entity.worldObj.getBlock(x, maxY, z)) ? InOil.FULL
-                                    : InOil.HALF;
+                                : InOil.HALF;
                         }
                     }
                 }
@@ -73,8 +73,9 @@ private boolean isOil(Block block) {
         }
         Fluid fluid = FluidRegistry.lookupFluidForBlock(block);
         return fluid != null && FluidRegistry.isFluidRegistered(fluid)
-                && fluid.getName() != null
-                && fluid.getName().equalsIgnoreCase("oil");
+            && fluid.getName() != null
+            && fluid.getName()
+                .equalsIgnoreCase("oil");
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
@@ -164,7 +165,7 @@ public void onTeleportAttempt(EnderTeleportEvent e) {
         }
         EntityLivingBase player = e.entityLiving;
         if (!(player instanceof EntityPlayer && ((EntityPlayer) player).capabilities.isCreativeMode)
-                && getInOil(player).halfOfFull()) {
+            && getInOil(player).halfOfFull()) {
             e.setCanceled(true);
             e.setResult(Event.Result.DENY);
         }
@@ -178,14 +179,12 @@ public void onRightClick(PlayerInteractEvent e) {
         EntityPlayer player = e.entityPlayer;
         if (!player.capabilities.isCreativeMode && player.getCurrentEquippedItem() != null) {
             InOil inOil = getInOil(player);
-            if (inOil.halfOfFull()
-                    && ((inOil == InOil.FULL && !(player.getCurrentEquippedItem().getItem() instanceof ItemBlock))
-                            || OilTweakAPI.INSTANCE.getItemBlacklistRegistry()
-                                    .isBlacklisted(player, player.getCurrentEquippedItem()))) {
+            if (inOil.halfOfFull() && ((inOil == InOil.FULL && !(player.getCurrentEquippedItem()
+                .getItem() instanceof ItemBlock)) || OilTweakAPI.INSTANCE.getItemBlacklistRegistry()
+                    .isBlacklisted(player, player.getCurrentEquippedItem()))) {
                 player.addChatComponentMessage(
-                        new ChatComponentTranslation(
-                                inOil == InOil.FULL ? "oiltweak.chat.tooDense.use"
-                                        : "oiltweak.chat.tooDense.use.half"));
+                    new ChatComponentTranslation(
+                        inOil == InOil.FULL ? "oiltweak.chat.tooDense.use" : "oiltweak.chat.tooDense.use.half"));
                 e.setCanceled(true);
             }
         }

diff --git a/src/main/java/buildcraft/oiltweak/OilTweakProperties.java b/src/main/java/buildcraft/oiltweak/OilTweakProperties.java
@@ -10,7 +10,6 @@
  */
 public class OilTweakProperties implements IExtendedEntityProperties {
 
-    private Entity entity;
     public float realStepHeight;
     public boolean inOil;
 
@@ -34,7 +33,6 @@ public void loadNBTData(NBTTagCompound data) {
 
     @Override
     public void init(Entity entity, World world) {
-        this.entity = entity;
         this.inOil = false;
         this.realStepHeight = entity.stepHeight;
     }

diff --git a/src/main/java/buildcraft/oiltweak/reference/Mods.java b/src/main/java/buildcraft/oiltweak/reference/Mods.java
@@ -13,7 +13,7 @@ public class Mods {
 
     // Other mods
     public static final String BuildCraftCore = "BuildCraft|Core", BuildCraftEnergy = "BuildCraft|Energy",
-            SimplyJetpacks = "simplyjetpacks";
+        SimplyJetpacks = "simplyjetpacks";
 
     public static boolean hasAPI(String name) {
         return ModAPIManager.INSTANCE.hasAPI(name);