From 0cebad1277b80f475451adf4786a1ccb524916b9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 6 Feb 2019 22:25:18 +0200 Subject: [PATCH] Style --- .../minelittlepony/unicopia/block/UFarmland.java | 6 +++--- .../unicopia/forgebullshit/OreReplacer.java | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java b/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java index 004d1ccc..45b18ba6 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java @@ -74,9 +74,9 @@ public abstract class UFarmland extends BlockFarmland { } public boolean hasWater(World world, BlockPos pos) { - return PosHelper.inRegion(pos.add(-4, 0, -4), pos.add(4, 1, 4)).anyMatch(p -> { - return world.getBlockState(p).getMaterial() == Material.WATER; - }); + return PosHelper.inRegion(pos.add(-4, 0, -4), pos.add(4, 1, 4)).anyMatch(p -> + world.getBlockState(p).getMaterial() == Material.WATER + ); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java index d2041c8d..dd55c263 100644 --- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java +++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java @@ -103,21 +103,19 @@ public class OreReplacer { public void done() { log.info("Searching for ore replacements..."); - Streams.stream(ForgeRegistries.RECIPES).forEach(recipe -> { + Streams.stream(ForgeRegistries.RECIPES).forEach(recipe -> remappers.stream() .filter(remapper -> remapper.canRemap(recipe)) .findFirst() - .ifPresent(remapper -> remapper.replaceIngredients(this, recipe)); - }); + .ifPresent(remapper -> remapper.replaceIngredients(this, recipe)) + ); log.info("Replaced {} ingredients.", replacements); } public boolean replaceOre(ItemStack stack, NonNullList newStacks) { - return ores.stream().filter(ore -> ore.matches(stack)).map(ore -> { - ore.getSubItems(stack, newStacks); - - return ore; - }).findFirst().isPresent(); + return ores.stream().filter(ore -> ore.matches(stack)).peek(ore -> + ore.getSubItems(stack, newStacks) + ).findFirst().isPresent(); } public interface IIngredientRemapper {