fix issues caused by merge

8 files changed, 94 insertions, 82 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
index 2c69b68a4a..bf59fa292c 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
@@ -15,23 +15,23 @@ public class IMCForNEI {
         sendHandler("pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat", "gregtech:gt.blockores:85");
 
         sendHandler(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.metaitem.01:32619");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.metaitem.01:32619");
         sendCatalyst(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.blockmachines:1157");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.blockmachines:1157");
         sendCatalyst(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.blockmachines:141");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.blockmachines:141");
         sendCatalyst(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.blockmachines:142");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.blockmachines:142");
         sendCatalyst(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.blockmachines:149");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.blockmachines:149");
         sendCatalyst(
-                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
-                "gregtech:gt.blockmachines:148");
+            "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+            "gregtech:gt.blockmachines:148");
     }
 
     private static void sendHandler(String name, String itemStack) {
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
index 5509341696..0db39c8e28 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
@@ -1,6 +1,6 @@
 package pers.gwyog.gtneioreplugin.plugin;
 
-import java.awt.*;
+import java.awt.Rectangle;
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.EnumChatFormatting;
@@ -29,9 +29,7 @@ public abstract class PluginBase extends TemplateRecipeHandler {
     public void loadTransferRects() {
         int stringLength = GuiDraw.getStringWidth(EnumChatFormatting.BOLD + I18n.format("gtnop.gui.nei.seeAll"));
         transferRects.add(
-                new RecipeTransferRect(
-                        new Rectangle(getGuiWidth() - stringLength - 3, 5, stringLength, 9),
-                        getOutputId()));
+            new RecipeTransferRect(new Rectangle(getGuiWidth() - stringLength - 3, 5, stringLength, 9), getOutputId()));
     }
 
     public abstract String getOutputId();
@@ -45,10 +43,10 @@ public abstract class PluginBase extends TemplateRecipeHandler {
      */
     protected void drawSeeAllRecipesLabel() {
         GuiDraw.drawStringR(
-                EnumChatFormatting.BOLD + I18n.format("gtnop.gui.nei.seeAll"),
-                getGuiWidth() - 3,
-                5,
-                0x404040,
-                false);
+            EnumChatFormatting.BOLD + I18n.format("gtnop.gui.nei.seeAll"),
+            getGuiWidth() - 3,
+            5,
+            0x404040,
+            false);
     }
 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
index 646e6d2bc7..895a23ddb1 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
@@ -11,8 +11,11 @@ import pers.gwyog.gtneioreplugin.plugin.PluginBase;
 public abstract class PluginGT5Base extends PluginBase {
 
     protected static String getLocalizedNameForItem(Materials aMaterial, String aFormat) {
-        return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), aMaterial.mLocalizedName)
-                .replace("%temp", "%s");
+        return String.format(
+            aFormat.replace("%s", "%temp")
+                .replace("%material", "%s"),
+            aMaterial.mLocalizedName)
+            .replace("%temp", "%s");
     }
 
     protected static String getLocalizedNameForItem(String aFormat, int aMaterialID) {
@@ -28,10 +31,10 @@ public abstract class PluginGT5Base extends PluginBase {
     public static String getGTOreLocalizedName(short index) {
 
         if (!getLocalizedNameForItem(GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)), index % 1000)
-                .contains("Awakened"))
+            .contains("Awakened"))
             return getLocalizedNameForItem(
-                    GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)),
-                    index % 1000);
+                GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)),
+                index % 1000);
         else return "Aw. Draconium Ore";
     }
 
@@ -46,11 +49,9 @@ public abstract class PluginGT5Base extends PluginBase {
     protected int getMaximumMaterialIndex(short meta, boolean smallOre) {
         int offset = smallOre ? 16000 : 0;
         if (!getGTOreLocalizedName((short) (meta + offset + 5000))
-                .equals(getGTOreUnlocalizedName((short) (meta + offset + 5000))))
-            return 7;
+            .equals(getGTOreUnlocalizedName((short) (meta + offset + 5000)))) return 7;
         else if (!getGTOreLocalizedName((short) (meta + offset + 5000))
-                .equals(getGTOreUnlocalizedName((short) (meta + offset + 5000))))
-            return 6;
+            .equals(getGTOreUnlocalizedName((short) (meta + offset + 5000)))) return 6;
         else return 5;
     }
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
index 76bd66d280..1cf0157354 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
@@ -62,7 +62,8 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
 
     @Override
     public void loadCraftingRecipes(ItemStack stack) {
-        if (stack.getUnlocalizedName().startsWith("gt.blockores")) {
+        if (stack.getUnlocalizedName()
+            .startsWith("gt.blockores")) {
             short oreMeta = (short) (stack.getItemDamage() % 1000);
             loadSmallOre(oreMeta, getMaximumMaterialIndex(oreMeta, true));
         } else if (GT5OreSmallHelper.mapOreDropUnlocalizedNameToOreMeta.containsKey(stack.getUnlocalizedName())) {
@@ -79,7 +80,8 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
         }
 
         for (OreSmallWrapper oreVein : GT5OreSmallHelper.mapOreSmallWrapper.values()) {
-            if (Arrays.asList(getDimNameArrayFromVeinName(oreVein.oreGenName)).contains(dimension)) {
+            if (Arrays.asList(getDimNameArrayFromVeinName(oreVein.oreGenName))
+                .contains(dimension)) {
                 addSmallOre(oreVein, 7);
             }
         }
@@ -103,17 +105,17 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
 
     private void addSmallOre(OreSmallWrapper smallOre, int maximumIndex) {
         this.arecipes.add(
-                new CachedOreSmallRecipe(
-                        smallOre.oreGenName,
-                        smallOre.getMaterialDrops(maximumIndex),
-                        getStoneDusts(maximumIndex),
-                        GT5OreSmallHelper.mapOreMetaToOreDrops.get(smallOre.oreMeta)));
+            new CachedOreSmallRecipe(
+                smallOre.oreGenName,
+                smallOre.getMaterialDrops(maximumIndex),
+                getStoneDusts(maximumIndex),
+                GT5OreSmallHelper.mapOreMetaToOreDrops.get(smallOre.oreMeta)));
     }
 
     private List<ItemStack> getStoneDusts(int maximumIndex) {
         List<ItemStack> materialDustStackList = new ArrayList<>();
         for (int i = 0; i < maximumIndex; i++) materialDustStackList
-                .add(GT_OreDictUnificator.get(OrePrefixes.dust, GT5OreSmallHelper.getDroppedDusts()[i], 1L));
+            .add(GT_OreDictUnificator.get(OrePrefixes.dust, GT5OreSmallHelper.getDroppedDusts()[i], 1L));
         return materialDustStackList;
     }
 
@@ -130,7 +132,11 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
     private String[] getDimNameArrayFromVeinName(String veinName) {
         OreSmallWrapper oreSmall = GT5OreSmallHelper.mapOreSmallWrapper.get(veinName);
         String[] dims = DimensionHelper.parseDimNames(GT5OreSmallHelper.bufferedDims.get(oreSmall));
-        Arrays.sort(dims, Comparator.comparingInt(s -> Arrays.asList(DimensionHelper.DimNameDisplayed).indexOf(s)));
+        Arrays.sort(
+            dims,
+            Comparator.comparingInt(
+                s -> Arrays.asList(DimensionHelper.DimNameDisplayed)
+                    .indexOf(s)));
         return dims;
     }
 
@@ -143,20 +149,17 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
         private final List<PositionedStack> dimensionDisplayItems = new ArrayList<>();
 
         public CachedOreSmallRecipe(String oreGenName, List<ItemStack> stackList, List<ItemStack> materialDustStackList,
-                List<ItemStack> dropStackList) {
+            List<ItemStack> dropStackList) {
             this.oreGenName = oreGenName;
             this.positionedStackOreSmall = new PositionedStack(stackList, 2, 0);
             this.positionedStackMaterialDust = new PositionedStack(
-                    materialDustStackList,
-                    43,
-                    79 + getRestrictBiomeOffset());
+                materialDustStackList,
+                43,
+                79 + getRestrictBiomeOffset());
             List<PositionedStack> positionedDropStackList = new ArrayList<>();
             int i = 1;
             for (ItemStack stackDrop : dropStackList) positionedDropStackList.add(
-                    new PositionedStack(
-                            stackDrop,
-                            43 + 20 * (i % 4),
-                            79 + 16 * ((i++) / 4) + getRestrictBiomeOffset()));
+                new PositionedStack(stackDrop, 43 + 20 * (i % 4), 79 + 16 * ((i++) / 4) + getRestrictBiomeOffset()));
             this.positionedDropStackList = positionedDropStackList;
             setDimensionDisplayItems();
         }
@@ -193,7 +196,7 @@ public class PluginGT5SmallOreStat extends PluginGT5Base {
             List<PositionedStack> outputs = new ArrayList<>();
             positionedStackOreSmall.setPermutationToRender((cycleticks / 20) % positionedStackOreSmall.items.length);
             positionedStackMaterialDust
-                    .setPermutationToRender((cycleticks / 20) % positionedStackMaterialDust.items.length);
+                .setPermutationToRender((cycleticks / 20) % positionedStackMaterialDust.items.length);
             outputs.add(positionedStackOreSmall);
             outputs.add(positionedStackMaterialDust);
             outputs.addAll(positionedDropStackList);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
index 8f7754bbde..5530f5b145 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
@@ -30,7 +30,7 @@ public class PluginGT5UndergroundFluid extends PluginBase {
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOutputId())) {
             for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : GT5UndergroundFluidHelper.getAllEntries()
-                    .entrySet()) {
+                .entrySet()) {
                 Fluid fluid = FluidRegistry.getFluid(entry.getKey());
                 if (fluid != null) {
                     this.arecipes.add(new CachedUndergroundFluidRecipe(fluid, entry.getValue()));
@@ -67,7 +67,7 @@ public class PluginGT5UndergroundFluid extends PluginBase {
         String dimension = ItemDimensionDisplay.getDimension(ingredient);
         if (dimension != null) {
             for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : GT5UndergroundFluidHelper.getAllEntries()
-                    .entrySet()) {
+                .entrySet()) {
                 boolean found = false;
                 for (UndergroundFluidWrapper wrapper : entry.getValue()) {
                     if (wrapper.dimension.equals(dimension)) {
@@ -103,11 +103,14 @@ public class PluginGT5UndergroundFluid extends PluginBase {
         for (int i = 0; i < recipe.dimensionDisplayItems.size(); i++) {
             GuiDraw.drawStringC(format.format((double) recipe.chances.get(i) / 100) + "%", xChance, y, black, false);
             GuiDraw.drawStringC(
-                    recipe.minAmounts.get(i).toString() + "-" + recipe.maxAmounts.get(i).toString(),
-                    xAmount,
-                    y,
-                    black,
-                    false);
+                recipe.minAmounts.get(i)
+                    .toString() + "-"
+                    + recipe.maxAmounts.get(i)
+                        .toString(),
+                xAmount,
+                y,
+                black,
+                false);
             y += lineSpace;
         }
     }
@@ -132,18 +135,18 @@ public class PluginGT5UndergroundFluid extends PluginBase {
 
         private CachedUndergroundFluidRecipe(Fluid fluid, List<UndergroundFluidWrapper> wrappers) {
             targetFluidDisplay = new PositionedStack(
-                    GT_Utility.getFluidDisplayStack(fluid),
-                    getGuiWidth() / 2 - halfItemLength,
-                    3);
+                GT_Utility.getFluidDisplayStack(fluid),
+                getGuiWidth() / 2 - halfItemLength,
+                3);
             int y = 50 - halfItemLength;
             for (UndergroundFluidWrapper wrapper : wrappers) {
                 ItemStack dimensionDisplay = ItemDimensionDisplay.getItem(wrapper.dimension);
                 if (dimensionDisplay != null) {
                     dimensionDisplayItems.add(
-                            new PositionedStack(
-                                    dimensionDisplay,
-                                    xDimensionDisplay - halfItemLength,
-                                    y + GuiDraw.fontRenderer.FONT_HEIGHT / 2));
+                        new PositionedStack(
+                            dimensionDisplay,
+                            xDimensionDisplay - halfItemLength,
+                            y + GuiDraw.fontRenderer.FONT_HEIGHT / 2));
                     y += lineSpace;
                     chances.add(wrapper.chance);
                     maxAmounts.add(wrapper.maxAmount);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index 98f168c2a7..0f3322a500 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -31,7 +31,8 @@ public class PluginGT5VeinStat extends PluginGT5Base {
 
     @Override
     public void loadCraftingRecipes(ItemStack stack) {
-        if (stack.getUnlocalizedName().startsWith("gt.blockores")) {
+        if (stack.getUnlocalizedName()
+            .startsWith("gt.blockores")) {
             loadMatchingVeins((short) (stack.getItemDamage() % 1000));
         } else super.loadCraftingRecipes(stack);
     }
@@ -52,7 +53,8 @@ public class PluginGT5VeinStat extends PluginGT5Base {
         }
 
         for (OreLayerWrapper oreVein : getAllVeins()) {
-            if (Arrays.asList(getDimNameArrayFromVeinName(oreVein.veinName)).contains(dimension)) {
+            if (Arrays.asList(getDimNameArrayFromVeinName(oreVein.veinName))
+                .contains(dimension)) {
                 addVeinWithLayers(oreVein, getMaximumMaterialIndex((short) (stack.getItemDamage() % 1000), false));
             }
         }
@@ -60,12 +62,12 @@ public class PluginGT5VeinStat extends PluginGT5Base {
 
     private void addVeinWithLayers(OreLayerWrapper oreVein, int maximumMaterialIndex) {
         this.arecipes.add(
-                new CachedVeinStatRecipe(
-                        oreVein.veinName,
-                        oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_PRIMARY),
-                        oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_SECONDARY),
-                        oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_BETWEEN),
-                        oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_SPORADIC)));
+            new CachedVeinStatRecipe(
+                oreVein.veinName,
+                oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_PRIMARY),
+                oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_SECONDARY),
+                oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_BETWEEN),
+                oreVein.getVeinLayerOre(maximumMaterialIndex, VEIN_SPORADIC)));
     }
 
     private Collection<OreLayerWrapper> getAllVeins() {
@@ -134,7 +136,11 @@ public class PluginGT5VeinStat extends PluginGT5Base {
     private String[] getDimNameArrayFromVeinName(String veinName) {
         OreLayerWrapper oreLayer = GT5OreLayerHelper.mapOreLayerWrapper.get(veinName);
         String[] dims = DimensionHelper.parseDimNames(GT5OreLayerHelper.bufferedDims.get(oreLayer));
-        Arrays.sort(dims, Comparator.comparingInt(s -> Arrays.asList(DimensionHelper.DimNameDisplayed).indexOf(s)));
+        Arrays.sort(
+            dims,
+            Comparator.comparingInt(
+                s -> Arrays.asList(DimensionHelper.DimNameDisplayed)
+                    .indexOf(s)));
         return dims;
     }
 
@@ -148,8 +154,7 @@ public class PluginGT5VeinStat extends PluginGT5Base {
         private final List<PositionedStack> dimensionDisplayItems = new ArrayList<>();
 
         public CachedVeinStatRecipe(String veinName, List<ItemStack> stackListPrimary,
-                List<ItemStack> stackListSecondary, List<ItemStack> stackListBetween,
-                List<ItemStack> stackListSporadic) {
+            List<ItemStack> stackListSecondary, List<ItemStack> stackListBetween, List<ItemStack> stackListSporadic) {
             this.veinName = veinName;
             positionedStackPrimary = new PositionedStack(stackListPrimary, 2, 0);
             positionedStackSecondary = new PositionedStack(stackListSecondary, 22, 0);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
index b8e9301f3b..01a0b4bebb 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
@@ -21,7 +21,8 @@ public class ItemDimensionDisplay extends ItemBlock {
         super(block);
         setCreativeTab(GTNEIOrePlugin.creativeTab);
 
-        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+        if (FMLCommonHandler.instance()
+            .getEffectiveSide() == Side.CLIENT) {
             MinecraftForgeClient.registerItemRenderer(this, new ItemDimensionDisplayRenderer());
         }
     }
@@ -48,7 +49,8 @@ public class ItemDimensionDisplay extends ItemBlock {
     public String getItemStackDisplayName(ItemStack stack) {
         String dimension = getDimension(stack);
         if (dimension != null) {
-            return DimensionHelper.convertCondensedStringToToolTip(dimension).get(0);
+            return DimensionHelper.convertCondensedStringToToolTip(dimension)
+                .get(0);
         }
         return super.getItemStackDisplayName(stack);
     }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
index 0c670a6d3d..12c62c9830 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
@@ -33,12 +33,12 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer {
         }
 
         renderItem.renderItemIntoGUI(
-                Minecraft.getMinecraft().fontRenderer,
-                Minecraft.getMinecraft().renderEngine,
-                stack,
-                0,
-                0,
-                false);
+            Minecraft.getMinecraft().fontRenderer,
+            Minecraft.getMinecraft().renderEngine,
+            stack,
+            0,
+            0,
+            false);
 
         FontRenderer fontRender = Minecraft.getMinecraft().fontRenderer;
         float smallTextScale = 3F / 4F;
@@ -51,7 +51,7 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer {
         String tooltipPrefix = prefix != -1 ? "T" + prefix : "INVALID. Please, report this to the GTNH team";
 
         fontRender
-                .drawString(tooltipPrefix, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
+            .drawString(tooltipPrefix, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
 
         GL11.glPopMatrix();