From 74a9bcc5a0b7e179a71932e7dba88794deeb4c99 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 21:03:52 +0200 Subject: Update spotless formatting --- src/main/java/kubatech/config/Config.java | 63 ++++++++++++---------- src/main/java/kubatech/config/OverridesConfig.java | 30 ++++++----- 2 files changed, 50 insertions(+), 43 deletions(-) (limited to 'src/main/java/kubatech/config') diff --git a/src/main/java/kubatech/config/Config.java b/src/main/java/kubatech/config/Config.java index 7b2520bccc..cbb95085dd 100644 --- a/src/main/java/kubatech/config/Config.java +++ b/src/main/java/kubatech/config/Config.java @@ -62,41 +62,45 @@ public class Config { private static void load(Configuration configuration) { Category category = Category.MOB_HANDLER; - mobHandlerEnabled = configuration.get( - category.get(), - "Enabled", - true, - "Enable \"Mob Drops\" NEI page and Extreme Extermination Chamber").getBoolean(); + mobHandlerEnabled = configuration + .get(category.get(), "Enabled", true, "Enable \"Mob Drops\" NEI page and Extreme Extermination Chamber") + .getBoolean(); StringBuilder c = new StringBuilder("When will cache regeneration trigger? "); - for (_CacheRegenerationTrigger value : _CacheRegenerationTrigger.values()) - c.append(value.ordinal()).append(" - ").append(value.name()).append(", "); + for (_CacheRegenerationTrigger value : _CacheRegenerationTrigger.values()) c.append(value.ordinal()) + .append(" - ") + .append(value.name()) + .append(", "); regenerationTrigger = _CacheRegenerationTrigger.get( - configuration.get( - category.get(), - "CacheRegenerationTrigger", - _CacheRegenerationTrigger.ModAdditionRemovalChange.ordinal(), - c.toString()).getInt()); + configuration + .get( + category.get(), + "CacheRegenerationTrigger", + _CacheRegenerationTrigger.ModAdditionRemovalChange.ordinal(), + c.toString()) + .getInt()); includeEmptyMobs = configuration - .get(category.get(), "IncludeEmptyMobs", true, "Include mobs that have no drops in NEI") - .getBoolean(); - mobBlacklist = configuration.get( + .get(category.get(), "IncludeEmptyMobs", true, "Include mobs that have no drops in NEI") + .getBoolean(); + mobBlacklist = configuration + .get( category.get(), "MobBlacklist", new String[] { "Giant", "Thaumcraft.TravelingTrunk", "chisel.snowman", "OpenBlocks.Luggage", - "OpenBlocks.MiniMe", "SpecialMobs.SpecialCreeper", "SpecialMobs.SpecialZombie", - "SpecialMobs.SpecialPigZombie", "SpecialMobs.SpecialSlime", "SpecialMobs.SpecialSkeleton", - "SpecialMobs.SpecialEnderman", "SpecialMobs.SpecialCaveSpider", "SpecialMobs.SpecialGhast", - "SpecialMobs.SpecialWitch", "SpecialMobs.SpecialSpider", "TwilightForest.HydraHead", - "TwilightForest.RovingCube", "TwilightForest.Harbinger Cube", "TwilightForest.Adherent", - "SpecialMobs.SpecialSilverfish", }, - "These mobs will be skipped when generating recipe map").getStringList(); + "OpenBlocks.MiniMe", "SpecialMobs.SpecialCreeper", "SpecialMobs.SpecialZombie", + "SpecialMobs.SpecialPigZombie", "SpecialMobs.SpecialSlime", "SpecialMobs.SpecialSkeleton", + "SpecialMobs.SpecialEnderman", "SpecialMobs.SpecialCaveSpider", "SpecialMobs.SpecialGhast", + "SpecialMobs.SpecialWitch", "SpecialMobs.SpecialSpider", "TwilightForest.HydraHead", + "TwilightForest.RovingCube", "TwilightForest.Harbinger Cube", "TwilightForest.Adherent", + "SpecialMobs.SpecialSilverfish", }, + "These mobs will be skipped when generating recipe map") + .getStringList(); playerOnlyDropsModifier = configuration - .get( - category.get(), - "PlayerOnlyDropsModifier", - .1d, - "Hard player only loot (such as core mod drops) will be multiplied by this number") - .getDouble(); + .get( + category.get(), + "PlayerOnlyDropsModifier", + .1d, + "Hard player only loot (such as core mod drops) will be multiplied by this number") + .getDouble(); } } @@ -106,7 +110,8 @@ public class Config { private static void load(Configuration configuration) { Category category = Category.DEBUG; - showRenderErrors = configuration.get(category.get(), "ShowRenderErrors", false).getBoolean(); + showRenderErrors = configuration.get(category.get(), "ShowRenderErrors", false) + .getBoolean(); } } diff --git a/src/main/java/kubatech/config/OverridesConfig.java b/src/main/java/kubatech/config/OverridesConfig.java index 3c7e93c92f..9c0a455e93 100644 --- a/src/main/java/kubatech/config/OverridesConfig.java +++ b/src/main/java/kubatech/config/OverridesConfig.java @@ -139,15 +139,16 @@ public class OverridesConfig { reader = Files.newReader(overrideFile, StandardCharsets.UTF_8); overrides = gson.fromJson(reader, new TypeToken>() {}.getType()); overrides.remove("ExampleMob"); - overrides.values().forEach(o -> o.additions.forEach(MobDrop::reconstructStack)); + overrides.values() + .forEach(o -> o.additions.forEach(MobDrop::reconstructStack)); if (LoaderReference.GTNHCoreMod) { LOG.info("Detected GTNH Core Mod, parsing custom drops from there."); CustomDrops coredrops = ReflectionHelper - .getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); + .getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); if (coredrops != null) { @SuppressWarnings("unchecked") ArrayList customdrops = (ArrayList) ((ArrayList) coredrops - .getCustomDrops()).clone(); + .getCustomDrops()).clone(); for (CustomDrops.CustomDrop customdrop : customdrops) { try { Class eclass = Class.forName(customdrop.getEntityName()); @@ -156,7 +157,8 @@ public class OverridesConfig { if (ename == null) continue; MobOverride override = overrides.computeIfAbsent(ename, k -> new MobOverride()); for (CustomDrops.CustomDrop.Drop drop : customdrop.getDrops()) { - String[] parts = drop.getItemName().split(":"); + String[] parts = drop.getItemName() + .split(":"); ItemStack stack = GameRegistry.findItemStack(parts[0], parts[1], 1); if (stack == null) continue; if (parts.length > 2) stack.setItemDamage(Integer.parseInt(parts[2])); @@ -181,8 +183,8 @@ public class OverridesConfig { } stack.stackSize = amount; // Drops from coremod are player only - override.additions.add( - new MobDrop(stack, MobDrop.DropType.Normal, chance, null, null, false, true)); + override.additions + .add(new MobDrop(stack, MobDrop.DropType.Normal, chance, null, null, false, true)); } } catch (Exception e) { e.printStackTrace(); @@ -213,14 +215,14 @@ public class OverridesConfig { exdamages.put(2, 5); exdamages.put(3, 10); ex1.additions.add( - new MobDrop( - new ItemStack(Items.diamond_sword), - MobDrop.DropType.Rare, - 500, - 20, - exdamages, - true, - false)); + new MobDrop( + new ItemStack(Items.diamond_sword), + MobDrop.DropType.Rare, + 500, + 20, + exdamages, + true, + false)); example.put("ExampleMob", ex1); gson.toJson(example, writer); writer.flush(); -- cgit