diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-29 10:49:48 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-29 10:49:48 -0800 |
commit | 7b66e23199db44891c57865160afb5c66f6fd94f (patch) | |
tree | d5e7a4fde785e5299646adcd8573f342af5f42fe /src/main/java/pers | |
parent | ec1ed112790794d344ff6679ed0bbc13a9b5d1ee (diff) | |
download | GT5-Unofficial-7b66e23199db44891c57865160afb5c66f6fd94f.tar.gz GT5-Unofficial-7b66e23199db44891c57865160afb5c66f6fd94f.tar.bz2 GT5-Unofficial-7b66e23199db44891c57865160afb5c66f6fd94f.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/pers')
22 files changed, 415 insertions, 427 deletions
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/Config.java b/src/main/java/pers/gwyog/gtneioreplugin/Config.java index eedd953316..e486ea9f1e 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/Config.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/Config.java @@ -1,10 +1,13 @@ package pers.gwyog.gtneioreplugin; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; import java.io.File; + import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + public class Config { + public Configuration tConfig; public Config(FMLPreInitializationEvent preinit, String cfgname) { diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java index 9876e07276..7f88441ebc 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java @@ -1,22 +1,24 @@ package pers.gwyog.gtneioreplugin; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import pers.gwyog.gtneioreplugin.plugin.IMCForNEI; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper; import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; @Mod( modid = GTNEIOrePlugin.MODID, @@ -24,6 +26,7 @@ import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper; version = GTNEIOrePlugin.VERSION, dependencies = "required-after:gregtech;required-after:NotEnoughItems") public class GTNEIOrePlugin { + public static final String MODID = "GRADLETOKEN_MODID"; public static final String NAME = "GRADLETOKEN_MODNAME"; public static final String VERSION = "GRADLETOKEN_VERSION"; @@ -34,10 +37,10 @@ public class GTNEIOrePlugin { public static boolean toolTips = true; public static int maxTooltipLines = 11; public static final CreativeTabs creativeTab = new CreativeTabs(MODID) { + @Override public Item getTabIconItem() { - return GameRegistry.makeItemStack("gregtech:gt.blockores", 386, 1, null) - .getItem(); + return GameRegistry.makeItemStack("gregtech:gt.blockores", 386, 1, null).getItem(); } }; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java index 72aaf6fb85..961d29c2b3 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java @@ -1,10 +1,12 @@ package pers.gwyog.gtneioreplugin.plugin; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; + import pers.gwyog.gtneioreplugin.GTNEIOrePlugin; +import cpw.mods.fml.common.event.FMLInterModComms; public class IMCForNEI { + public static void IMCSender() { // Though these 2 are already registered in NEI jar, we need to re-register // because new DimensionDisplayItems made tabs a bit taller. diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java index 17193b07fe..31405a2f7a 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java @@ -1,11 +1,11 @@ package pers.gwyog.gtneioreplugin.plugin; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; import pers.gwyog.gtneioreplugin.GTNEIOrePlugin; import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat; import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid; import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat; +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; public class NEIPluginConfig implements IConfigureNEI { diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java index 71c770a86b..5509341696 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java @@ -1,11 +1,13 @@ package pers.gwyog.gtneioreplugin.plugin; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.recipe.TemplateRecipeHandler; import java.awt.*; + import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.recipe.TemplateRecipeHandler; + public abstract class PluginBase extends TemplateRecipeHandler { @Override @@ -26,8 +28,10 @@ public abstract class PluginBase extends TemplateRecipeHandler { @Override 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())); + transferRects.add( + new RecipeTransferRect( + new Rectangle(getGuiWidth() - stringLength - 3, 5, stringLength, 9), + getOutputId())); } public abstract String getOutputId(); @@ -41,6 +45,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/block/ModBlocks.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java index fce0a0883e..419dbe8d00 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java @@ -1,11 +1,13 @@ package pers.gwyog.gtneioreplugin.plugin.block; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.HashMap; import java.util.Map; + import net.minecraft.block.Block; + import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay; import pers.gwyog.gtneioreplugin.util.DimensionHelper; +import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { 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 1c7e14db79..f0a9433a70 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java @@ -1,15 +1,17 @@ package pers.gwyog.gtneioreplugin.plugin.gregtech5; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.recipe.GuiRecipe; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; import java.awt.Point; import java.awt.Rectangle; + import net.minecraft.client.resources.I18n; + import pers.gwyog.gtneioreplugin.plugin.PluginBase; import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.recipe.GuiRecipe; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.util.GT_LanguageManager; public abstract class PluginGT5Base extends PluginBase { @@ -33,7 +35,8 @@ public abstract class PluginGT5Base extends PluginBase { if (!getLocalizedNameForItem(GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)), index % 1000) .contains("Awakened")) return getLocalizedNameForItem( - GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)), index % 1000); + GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index)), + index % 1000); else return "Aw. Draconium Ore"; } @@ -56,8 +59,8 @@ public abstract class PluginGT5Base extends PluginBase { /** * Produce a rectangle covering the area of displayed dimension names * - * @param gui An instance of the currentscreen - * @param recipe The recipe index being handled + * @param gui An instance of the currentscreen + * @param recipe The recipe index being handled * @param dimNames Dimension names to produce a rectangle for * @return Rectangle area of dimension names */ @@ -74,9 +77,11 @@ 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 bf24ee186e..08c3d11411 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java @@ -1,18 +1,20 @@ package pers.gwyog.gtneioreplugin.plugin.gregtech5; -import codechicken.nei.PositionedStack; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; + import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; + import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay; import pers.gwyog.gtneioreplugin.util.DimensionHelper; import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper.OreSmallWrapper; +import codechicken.nei.PositionedStack; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; public class PluginGT5SmallOreStat extends PluginGT5Base { @@ -101,18 +103,18 @@ 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))); + this.arecipes.add( + 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)); + for (int i = 0; i < maximumIndex; i++) materialDustStackList + .add(GT_OreDictUnificator.get(OrePrefixes.dust, GT5OreSmallHelper.getDroppedDusts()[i], 1L)); return materialDustStackList; } @@ -141,32 +143,33 @@ 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; } public class CachedOreSmallRecipe extends CachedRecipe { + public String oreGenName; public PositionedStack positionedStackOreSmall; public PositionedStack positionedStackMaterialDust; public List<PositionedStack> positionedDropStackList; private final List<PositionedStack> dimensionDisplayItems = new ArrayList<>(); - public CachedOreSmallRecipe( - String oreGenName, - List<ItemStack> stackList, - List<ItemStack> materialDustStackList, + public CachedOreSmallRecipe(String oreGenName, List<ItemStack> stackList, List<ItemStack> materialDustStackList, List<ItemStack> dropStackList) { this.oreGenName = oreGenName; this.positionedStackOreSmall = new PositionedStack(stackList, 2, 0); - this.positionedStackMaterialDust = - new PositionedStack(materialDustStackList, 43, 79 + getRestrictBiomeOffset()); + this.positionedStackMaterialDust = new PositionedStack( + 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())); + for (ItemStack stackDrop : dropStackList) positionedDropStackList.add( + new PositionedStack( + stackDrop, + 43 + 20 * (i % 4), + 79 + 16 * ((i++) / 4) + getRestrictBiomeOffset())); this.positionedDropStackList = positionedDropStackList; setDimensionDisplayItems(); } @@ -202,8 +205,8 @@ public class PluginGT5SmallOreStat extends PluginGT5Base { public List<PositionedStack> getOtherStacks() { List<PositionedStack> outputs = new ArrayList<>(); positionedStackOreSmall.setPermutationToRender((cycleticks / 20) % positionedStackOreSmall.items.length); - positionedStackMaterialDust.setPermutationToRender( - (cycleticks / 20) % positionedStackMaterialDust.items.length); + positionedStackMaterialDust + .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 0cdf2b53b7..4ce0d15047 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java @@ -1,21 +1,23 @@ package pers.gwyog.gtneioreplugin.plugin.gregtech5; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import gregtech.api.util.GT_Utility; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; + import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import pers.gwyog.gtneioreplugin.plugin.PluginBase; import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay; import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper; import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper.UndergroundFluidWrapper; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; +import gregtech.api.util.GT_Utility; public class PluginGT5UndergroundFluid extends PluginBase { @@ -26,8 +28,8 @@ public class PluginGT5UndergroundFluid extends PluginBase { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(getOutputId())) { - for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : - GT5UndergroundFluidHelper.getAllEntries().entrySet()) { + for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : GT5UndergroundFluidHelper.getAllEntries() + .entrySet()) { Fluid fluid = FluidRegistry.getFluid(entry.getKey()); if (fluid != null) { this.arecipes.add(new CachedUndergroundFluidRecipe(fluid, entry.getValue())); @@ -63,8 +65,8 @@ public class PluginGT5UndergroundFluid extends PluginBase { public void loadUsageRecipes(ItemStack ingredient) { String dimension = ItemDimensionDisplay.getDimension(ingredient); if (dimension != null) { - for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : - GT5UndergroundFluidHelper.getAllEntries().entrySet()) { + for (Map.Entry<String, List<UndergroundFluidWrapper>> entry : GT5UndergroundFluidHelper.getAllEntries() + .entrySet()) { boolean found = false; for (UndergroundFluidWrapper wrapper : entry.getValue()) { if (wrapper.dimension.equals(dimension)) { @@ -105,8 +107,7 @@ public class PluginGT5UndergroundFluid extends PluginBase { black, false); GuiDraw.drawStringC( - recipe.minAmounts.get(i).toString() + "-" - + recipe.maxAmounts.get(i).toString(), + recipe.minAmounts.get(i).toString() + "-" + recipe.maxAmounts.get(i).toString(), xAmount, y, black, @@ -134,16 +135,19 @@ public class PluginGT5UndergroundFluid extends PluginBase { private final List<Integer> minAmounts = new ArrayList<>(); private CachedUndergroundFluidRecipe(Fluid fluid, List<UndergroundFluidWrapper> wrappers) { - targetFluidDisplay = - new PositionedStack(GT_Utility.getFluidDisplayStack(fluid), getGuiWidth() / 2 - halfItemLength, 3); + targetFluidDisplay = new PositionedStack( + 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)); + dimensionDisplayItems.add( + 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 cafb69a8f6..52fc458246 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java @@ -2,19 +2,21 @@ package pers.gwyog.gtneioreplugin.plugin.gregtech5; import static pers.gwyog.gtneioreplugin.util.OreVeinLayer.*; -import codechicken.nei.PositionedStack; -import cpw.mods.fml.common.Loader; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.List; + import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; + import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay; import pers.gwyog.gtneioreplugin.util.DimensionHelper; import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper; +import codechicken.nei.PositionedStack; +import cpw.mods.fml.common.Loader; public class PluginGT5VeinStat extends PluginGT5Base { @@ -57,12 +59,13 @@ 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))); + 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))); } private Collection<OreLayerWrapper> getAllVeins() { @@ -144,12 +147,12 @@ 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; } public class CachedVeinStatRecipe extends CachedRecipe { + public String veinName; public PositionedStack positionedStackPrimary; public PositionedStack positionedStackSecondary; @@ -157,11 +160,8 @@ public class PluginGT5VeinStat extends PluginGT5Base { public PositionedStack positionedStackSporadic; private final List<PositionedStack> dimensionDisplayItems = new ArrayList<>(); - public CachedVeinStatRecipe( - String veinName, - List<ItemStack> stackListPrimary, - List<ItemStack> stackListSecondary, - List<ItemStack> stackListBetween, + public CachedVeinStatRecipe(String veinName, List<ItemStack> stackListPrimary, + List<ItemStack> stackListSecondary, List<ItemStack> stackListBetween, List<ItemStack> stackListSporadic) { this.veinName = veinName; positionedStackPrimary = new PositionedStack(stackListPrimary, 2, 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 0e5bf0c24b..6595929e89 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java @@ -2,18 +2,20 @@ package pers.gwyog.gtneioreplugin.plugin.item; import static pers.gwyog.gtneioreplugin.GTNEIOrePlugin.LOG; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import java.util.Objects; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.client.MinecraftForgeClient; + import pers.gwyog.gtneioreplugin.GTNEIOrePlugin; import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer; import pers.gwyog.gtneioreplugin.util.DimensionHelper; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; public class ItemDimensionDisplay extends ItemBlock { 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 c4cca1387c..a86482d17f 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java @@ -5,7 +5,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; + import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay; public class ItemDimensionDisplayRenderer implements IItemRenderer { @@ -31,7 +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; @@ -43,8 +50,8 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer { long prefix = getPrefix(dimension); 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); + fontRender + .drawString(tooltipPrefix, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true); GL11.glPopMatrix(); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java index 24cc1dd023..05279919e6 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java @@ -1,9 +1,5 @@ package pers.gwyog.gtneioreplugin.util; -import com.opencsv.CSVWriter; -import com.opencsv.bean.ColumnPositionMappingStrategy; -import com.opencsv.bean.StatefulBeanToCsv; -import com.opencsv.bean.StatefulBeanToCsvBuilder; import java.io.BufferedWriter; import java.nio.file.Files; import java.nio.file.Paths; @@ -11,10 +7,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; + import pers.gwyog.gtneioreplugin.GTNEIOrePlugin; import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat; import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper; +import com.opencsv.CSVWriter; +import com.opencsv.bean.ColumnPositionMappingStrategy; +import com.opencsv.bean.StatefulBeanToCsv; +import com.opencsv.bean.StatefulBeanToCsvBuilder; + public class CSVMaker implements Runnable { public CSVMaker() {} @@ -34,13 +36,8 @@ public class CSVMaker implements Runnable { schritt = (int) (schritt / 1.3); } for (int i = 0; i < liste2.size() - schritt; i++) { - if (liste2.get(i) - .getOreName() - .substring(0, 3) - .compareTo((liste2.get(i + schritt) - .getOreName() - .substring(0, 3))) - > 0) { + if (liste2.get(i).getOreName().substring(0, 3) + .compareTo((liste2.get(i + schritt).getOreName().substring(0, 3))) > 0) { Oremix tmp = (Oremix) liste2.get(i); liste2.set(i, liste2.get(i + schritt)); liste2.set(i + schritt, (Oremix) tmp); @@ -110,14 +107,11 @@ public class CSVMaker implements Runnable { BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVnameSmall)); ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy(); strat.setType(Oremix.class); - String[] columns = - "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" - .split("\\,"); + String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" + .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder(one) - .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER) - .withMappingStrategy(strat) - .build(); + .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); List towrite = Combsort(OreVeins); one.write( "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E"); @@ -155,8 +149,13 @@ public class CSVMaker implements Runnable { oremix.setHeight(oreLayer.worldGenHeightRange); oremix.setDensity(oreLayer.density); oremix.setWeight(oreLayer.randomWeight); - oremix.setMix(Integer.toString(oreLayer.Meta[0]) + "|" + Integer.toString(oreLayer.Meta[1]) + "|" - + Integer.toString(oreLayer.Meta[2]) + "|" + Integer.toString(oreLayer.Meta[3])); + oremix.setMix( + Integer.toString(oreLayer.Meta[0]) + "|" + + Integer.toString(oreLayer.Meta[1]) + + "|" + + Integer.toString(oreLayer.Meta[2]) + + "|" + + Integer.toString(oreLayer.Meta[3])); oremix.as = Dims.contains("As"); oremix.bc = Dims.contains("BC"); oremix.be = Dims.contains("BE"); @@ -199,14 +198,11 @@ public class CSVMaker implements Runnable { BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVname)); ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy(); strat.setType(Oremix.class); - String[] columns = - "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" - .split("\\,"); + String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" + .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder(one) - .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER) - .withMappingStrategy(strat) - .build(); + .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); List towrite = Combsort(OreVeins); one.write( "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E"); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java index 1b361cb86e..704ccc49c2 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java @@ -6,116 +6,88 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; + import net.minecraft.client.resources.I18n; public class DimensionHelper { public static String[] DimName = { - // Non GC dimensions in progression order instead of alphabetical - "Overworld", - "Nether", - "Twilight", - "TheEnd", - "Vanilla_EndAsteroids", - "EndAsteroid", - // T1 - "GalacticraftCore_Moon", - // T2 - "GalaxySpace_Deimos", - "GalacticraftMars_Mars", - "GalaxySpace_Phobos", - // T3 - "GalacticraftMars_Asteroids", - "GalaxySpace_Callisto", - "GalaxySpace_Ceres", - "GalaxySpace_Europa", - "GalaxySpace_Ganymede", - "Ross128b", - // T4 - "GalaxySpace_Io", - "GalaxySpace_Mercury", - "GalaxySpace_Venus", - // T5 - "GalaxySpace_Enceladus", - "GalaxySpace_Miranda", - "GalaxySpace_Oberon", - "GalaxySpace_Titan", - "Ross128ba", - // T6 - "GalaxySpace_Proteus", - "GalaxySpace_Triton", - // T7 - "GalaxySpace_Haumea", - "GalaxySpace_Kuiperbelt", - "GalaxySpace_MakeMake", - "GalaxySpace_Pluto", - // T8 - "GalaxySpace_BarnardC", - "GalaxySpace_BarnardE", - "GalaxySpace_BarnardF", - "GalaxySpace_CentauriA", - "GalaxySpace_TcetiE", - "Underdark", - "GalaxySpace_VegaB", - }; + // Non GC dimensions in progression order instead of alphabetical + "Overworld", "Nether", "Twilight", "TheEnd", "Vanilla_EndAsteroids", "EndAsteroid", + // T1 + "GalacticraftCore_Moon", + // T2 + "GalaxySpace_Deimos", "GalacticraftMars_Mars", "GalaxySpace_Phobos", + // T3 + "GalacticraftMars_Asteroids", "GalaxySpace_Callisto", "GalaxySpace_Ceres", "GalaxySpace_Europa", + "GalaxySpace_Ganymede", "Ross128b", + // T4 + "GalaxySpace_Io", "GalaxySpace_Mercury", "GalaxySpace_Venus", + // T5 + "GalaxySpace_Enceladus", "GalaxySpace_Miranda", "GalaxySpace_Oberon", "GalaxySpace_Titan", "Ross128ba", + // T6 + "GalaxySpace_Proteus", "GalaxySpace_Triton", + // T7 + "GalaxySpace_Haumea", "GalaxySpace_Kuiperbelt", "GalaxySpace_MakeMake", "GalaxySpace_Pluto", + // T8 + "GalaxySpace_BarnardC", "GalaxySpace_BarnardE", "GalaxySpace_BarnardF", "GalaxySpace_CentauriA", + "GalaxySpace_TcetiE", "Underdark", "GalaxySpace_VegaB", }; public static String[] DimNameTrimmed = Arrays.stream(DimName) - .map(n -> n.replaceAll("GalacticraftCore_", "") - .replaceAll("GalacticraftMars_", "") - .replaceAll("GalaxySpace_", "") - .replaceAll("Vanilla_", "Vanilla ")) - .collect(Collectors.toList()) - .toArray(new String[0]); + .map( + n -> n.replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "") + .replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla ")) + .collect(Collectors.toList()).toArray(new String[0]); - public static String[] - DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except capital letter in - // name, then 1rst + capital Moon = Mo, BarnardC = BC, EndAsteroid = EA - // Non GC dimensions in progression order instead of alphabetical - "Ow", // Overworld - "Ne", // Nether - "TF", // Twilight - "ED", // TheEnd because En = Encalus - "VA", // Vanilla_EndAsteroids - "EA", // EndAsteroid - // T1 - "Mo", // GalacticraftCore_Moon - // T2 - "De", // GalaxySpace_Deimos - "Ma", // GalacticraftMars_Mars - "Ph", // GalaxySpace_Phobos - // T3 - "As", // GalacticraftMars_Asteroids - "Ca", // GalaxySpace_Callisto - "Ce", // GalaxySpace_Ceres - "Eu", // GalaxySpace_Europa - "Ga", // GalaxySpace_Ganymede - "Rb", // Ross128b - // T4 - "Io", // GalaxySpace_Io - "Me", // GalaxySpace_Mercury - "Ve", // GalaxySpace_Venus - // T5 - "En", // GalaxySpace_Enceladus - "Mi", // GalaxySpace_Miranda - "Ob", // GalaxySpace_Oberon - "Ti", // GalaxySpace_Titan - "Ra", // Ross128ba - // T6 - "Pr", // GalaxySpace_Proteus - "Tr", // GalaxySpace_Triton - // T7 - "Ha", // GalaxySpace_Haumea - "KB", // GalaxySpace_Kuiperbelt - "MM", // GalaxySpace_MakeMake - "Pl", // GalaxySpace_Pluto - // T8 - "BC", // GalaxySpace_BarnardC - "BE", // GalaxySpace_BarnardE - "BF", // GalaxySpace_BarnardF - "CB", // GalaxySpace_CentauriA is actually αCentauri Bb - "TE", // GalaxySpace_TcetiE - "DD", // Underdark - "VB", // GalaxySpace_VegaB + public static String[] DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except + // capital letter in + // name, then 1rst + capital Moon = Mo, BarnardC = BC, EndAsteroid = EA + // Non GC dimensions in progression order instead of alphabetical + "Ow", // Overworld + "Ne", // Nether + "TF", // Twilight + "ED", // TheEnd because En = Encalus + "VA", // Vanilla_EndAsteroids + "EA", // EndAsteroid + // T1 + "Mo", // GalacticraftCore_Moon + // T2 + "De", // GalaxySpace_Deimos + "Ma", // GalacticraftMars_Mars + "Ph", // GalaxySpace_Phobos + // T3 + "As", // GalacticraftMars_Asteroids + "Ca", // GalaxySpace_Callisto + "Ce", // GalaxySpace_Ceres + "Eu", // GalaxySpace_Europa + "Ga", // GalaxySpace_Ganymede + "Rb", // Ross128b + // T4 + "Io", // GalaxySpace_Io + "Me", // GalaxySpace_Mercury + "Ve", // GalaxySpace_Venus + // T5 + "En", // GalaxySpace_Enceladus + "Mi", // GalaxySpace_Miranda + "Ob", // GalaxySpace_Oberon + "Ti", // GalaxySpace_Titan + "Ra", // Ross128ba + // T6 + "Pr", // GalaxySpace_Proteus + "Tr", // GalaxySpace_Triton + // T7 + "Ha", // GalaxySpace_Haumea + "KB", // GalaxySpace_Kuiperbelt + "MM", // GalaxySpace_MakeMake + "Pl", // GalaxySpace_Pluto + // T8 + "BC", // GalaxySpace_BarnardC + "BE", // GalaxySpace_BarnardE + "BF", // GalaxySpace_BarnardF + "CB", // GalaxySpace_CentauriA is actually αCentauri Bb + "TE", // GalaxySpace_TcetiE + "DD", // Underdark + "VB", // GalaxySpace_VegaB }; private static final HashMap<String, List<String>> tooltipBuffer = new HashMap<>(); @@ -187,7 +159,9 @@ public class DimensionHelper { if (dims.length > maxTooltipLines) { dims = StringPaddingHack.stringsToSpacedColumns( - dims, dims.length / maxTooltipLines + (dims.length % maxTooltipLines == 0 ? 0 : 1), 2); + dims, + dims.length / maxTooltipLines + (dims.length % maxTooltipLines == 0 ? 0 : 1), + 2); } return Arrays.asList(dims); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java index 9b12e3d007..3660d9877e 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java @@ -1,7 +1,5 @@ package pers.gwyog.gtneioreplugin.util; -import cpw.mods.fml.common.FMLLog; -import gregtech.api.GregTech_API; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -9,10 +7,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; + import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import pers.gwyog.gtneioreplugin.GTNEIOrePlugin; +import cpw.mods.fml.common.FMLLog; +import gregtech.api.GregTech_API; public class GT5CFGHelper { @@ -32,11 +34,10 @@ public class GT5CFGHelper { raw.add(p.getName() + "=" + p.getBoolean()); } } - if (!raw.isEmpty()) - for (int i = 0; i < raw.size(); i++) { - for (int j = 0; j < DimensionHelper.DimName.length; j++) - if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i)); - } + if (!raw.isEmpty()) for (int i = 0; i < raw.size(); i++) { + for (int j = 0; j < DimensionHelper.DimName.length; j++) + if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i)); + } else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname); String ret = " "; @@ -44,11 +45,7 @@ public class GT5CFGHelper { HashSet<String> rawboolsset = new HashSet<String>(); if (!rawbools.isEmpty()) { for (int i = 0; i < rawbools.size(); i++) { - st = rawbools.get(i) - .replace("B:", "") - .replace("_true", "") - .replace("_false", "") - .replaceAll(" ", "") + st = rawbools.get(i).replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "") .replaceAll("\"", ""); rawboolsset.add(st); } @@ -71,116 +68,110 @@ public class GT5CFGHelper { if (F == null) { FMLLog.bigWarning("GT_CFG_NOT_found[0]"); return "Error while Loading CFG"; - } else - try { - int buffer = (int) (0.1 * Runtime.getRuntime().freeMemory()); - if (buffer > F.length()) buffer = (int) F.length(); - // allocate 10% of free memory for read-in-buffer, if there is less than filesize memory available - // FMLLog.info("GT_CFG_found[0]"); - FileReader in = new FileReader(F); - // FMLLog.info("FileReader created"); - BufferedReader reader = new BufferedReader(in, buffer); - // FMLLog.info("BufferedReader" +Integer.toString(buffer)+"created"); - String st = null; - List<String> raw = new ArrayList<String>(); - List<String> rawbools = new ArrayList<String>(); - Boolean[] found = new Boolean[2]; - found[0] = false; - found[1] = false; + } else try { + int buffer = (int) (0.1 * Runtime.getRuntime().freeMemory()); + if (buffer > F.length()) buffer = (int) F.length(); + // allocate 10% of free memory for read-in-buffer, if there is less than filesize memory available + // FMLLog.info("GT_CFG_found[0]"); + FileReader in = new FileReader(F); + // FMLLog.info("FileReader created"); + BufferedReader reader = new BufferedReader(in, buffer); + // FMLLog.info("BufferedReader" +Integer.toString(buffer)+"created"); + String st = null; + List<String> raw = new ArrayList<String>(); + List<String> rawbools = new ArrayList<String>(); + Boolean[] found = new Boolean[2]; + found[0] = false; + found[1] = false; - do { - // FMLLog.info("erste"); - // read until reached eof or mix { - st = reader.readLine(); - // FMLLog.info("st: "+st); - if (st != null && st.trim().equals("mix {")) { - while (!((st == null) || ((st != null) && found[0]))) { - // FMLLog.info("zweite"); - st = reader.readLine(); - // read until reached eof or Veinname { - // FMLLog.info("MIXst: "+st); - if (st != null && st.trim().equals(Veinname + " {")) { - // FMLLog.info("VEINNAMEst: "+st); - while (!((st == null) || ((st != null) && found[0]))) { - st = reader.readLine(); - if ((!(st == null)) && st.trim().equals("}")) found[0] = true; - // FMLLog.info("dritte"); - // add everything below Veinname { undtil } to raw - raw.add(st); - } + do { + // FMLLog.info("erste"); + // read until reached eof or mix { + st = reader.readLine(); + // FMLLog.info("st: "+st); + if (st != null && st.trim().equals("mix {")) { + while (!((st == null) || ((st != null) && found[0]))) { + // FMLLog.info("zweite"); + st = reader.readLine(); + // read until reached eof or Veinname { + // FMLLog.info("MIXst: "+st); + if (st != null && st.trim().equals(Veinname + " {")) { + // FMLLog.info("VEINNAMEst: "+st); + while (!((st == null) || ((st != null) && found[0]))) { + st = reader.readLine(); + if ((!(st == null)) && st.trim().equals("}")) found[0] = true; + // FMLLog.info("dritte"); + // add everything below Veinname { undtil } to raw + raw.add(st); } } } + } - if (st != null && st.trim().equals("dimensions {")) { - while (!((st == null) || ((st != null) && found[1]))) { - // FMLLog.info("zweite"); - st = reader.readLine(); - if (st != null && (st.trim().equals("mix {"))) { - while (!((st == null) || ((st != null) && found[1]))) { - // FMLLog.info("dritte"); - st = reader.readLine(); - // read until reached eof or Veinname { - // FMLLog.info("MIXst: "+st); - if (st != null && st.trim().equals(Veinname + " {")) { - // FMLLog.info("VEINNAMEst: "+st); - while (!((st == null) || ((st != null) && found[1]))) { - st = reader.readLine(); - if ((!(st == null)) && st.trim().equals("}")) found[1] = true; - // FMLLog.info("vierte"); - // add everything below Veinname { undtil } to raw - raw.add(st); - } + if (st != null && st.trim().equals("dimensions {")) { + while (!((st == null) || ((st != null) && found[1]))) { + // FMLLog.info("zweite"); + st = reader.readLine(); + if (st != null && (st.trim().equals("mix {"))) { + while (!((st == null) || ((st != null) && found[1]))) { + // FMLLog.info("dritte"); + st = reader.readLine(); + // read until reached eof or Veinname { + // FMLLog.info("MIXst: "+st); + if (st != null && st.trim().equals(Veinname + " {")) { + // FMLLog.info("VEINNAMEst: "+st); + while (!((st == null) || ((st != null) && found[1]))) { + st = reader.readLine(); + if ((!(st == null)) && st.trim().equals("}")) found[1] = true; + // FMLLog.info("vierte"); + // add everything below Veinname { undtil } to raw + raw.add(st); } } } } } - } while (st != null); - reader.close(); // not needed anymore + } + } while (st != null); + reader.close(); // not needed anymore - if (!raw.isEmpty()) - for (int i = 0; i < raw.size(); i++) { - // filter needed booleans from raw - /// FMLLog.info("raw contains"+raw.get(i)); - for (int j = 0; j < DimensionHelper.DimName.length; j++) - if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i)); - // FMLLog.info("rawbools: "+rawbools.get(i)); - } - else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname); + if (!raw.isEmpty()) for (int i = 0; i < raw.size(); i++) { + // filter needed booleans from raw + /// FMLLog.info("raw contains"+raw.get(i)); + for (int j = 0; j < DimensionHelper.DimName.length; j++) + if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i)); + // FMLLog.info("rawbools: "+rawbools.get(i)); + } + else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname); - String ret = " "; + String ret = " "; - HashSet<String> rawboolsset = new HashSet<String>(); - if (!rawbools.isEmpty()) { - // remove dublicates + HashSet<String> rawboolsset = new HashSet<String>(); + if (!rawbools.isEmpty()) { + // remove dublicates + for (int i = 0; i < rawbools.size(); i++) { + st = rawbools.get(i).replace("B:", "").replace("_true", "").replace("_false", "") + .replaceAll(" ", "").replaceAll("\"", ""); + rawboolsset.add(st); + } + rawbools = new ArrayList<String>(rawboolsset); + // filter for dims set to true + for (int j = 0; j < DimensionHelper.DimName.length; j++) { + // FMLLog.info("RawBools:"+st); for (int i = 0; i < rawbools.size(); i++) { - st = rawbools.get(i) - .replace("B:", "") - .replace("_true", "") - .replace("_false", "") - .replaceAll(" ", "") - .replaceAll("\"", ""); - rawboolsset.add(st); - } - rawbools = new ArrayList<String>(rawboolsset); - // filter for dims set to true - for (int j = 0; j < DimensionHelper.DimName.length; j++) { - // FMLLog.info("RawBools:"+st); - for (int i = 0; i < rawbools.size(); i++) { - st = rawbools.get(i); - if (st.contains(DimensionHelper.DimName[j])) - if (st.contains("=true")) ret = (ret + DimensionHelper.DimNameDisplayed[j] + ","); - } + st = rawbools.get(i); + if (st.contains(DimensionHelper.DimName[j])) + if (st.contains("=true")) ret = (ret + DimensionHelper.DimNameDisplayed[j] + ","); } } - ret = ret.trim(); - // FMLLog.info("ret:"+ret); - if (ret.equals("") || ret.equals(" ")) ret = oreVeinNotInAnyDim; - return ret; - } catch (IOException e) { - e.printStackTrace(); - return "Error while Loading CFG"; } + ret = ret.trim(); + // FMLLog.info("ret:"+ret); + if (ret.equals("") || ret.equals(" ")) ret = oreVeinNotInAnyDim; + return ret; + } catch (IOException e) { + e.printStackTrace(); + return "Error while Loading CFG"; + } } } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java index 3df3d98242..feed3d0794 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java @@ -3,19 +3,22 @@ package pers.gwyog.gtneioreplugin.util; import static pers.gwyog.gtneioreplugin.util.GT5CFGHelper.oreVeinNotInAnyDim; import static pers.gwyog.gtneioreplugin.util.OreVeinLayer.*; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.GT_Worldgen_GT_Ore_Layer; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; + import net.minecraft.item.ItemStack; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.common.GT_Worldgen_GT_Ore_Layer; + public class GT5OreLayerHelper { public static class NormalOreDimensionWrapper { + public final ArrayList<OreLayerWrapper> internalDimOreList = new ArrayList<>(); public final HashMap<OreLayerWrapper, Double> oreVeinToProbabilityInDimension = new HashMap<>(); @@ -57,8 +60,8 @@ public class GT5OreLayerHelper { for (String dim : dims.split(",")) { if (!dim.isEmpty()) { - NormalOreDimensionWrapper dimensionOres = - dimToOreWrapper.getOrDefault(dim, new NormalOreDimensionWrapper()); + NormalOreDimensionWrapper dimensionOres = dimToOreWrapper + .getOrDefault(dim, new NormalOreDimensionWrapper()); dimensionOres.internalDimOreList.add(veinInfo); dimToOreWrapper.put(dim, dimensionOres); } @@ -73,11 +76,11 @@ public class GT5OreLayerHelper { } public static String getDims(OreLayerWrapper oreLayer) { - return GT5CFGHelper.GT5CFG( - oreLayer.veinName.replace("ore.mix.custom" + ".", "").replace("ore.mix.", "")); + return GT5CFGHelper.GT5CFG(oreLayer.veinName.replace("ore.mix.custom" + ".", "").replace("ore.mix.", "")); } public static class OreLayerWrapper { + public String veinName, worldGenHeightRange; public short[] Meta = new short[4]; public short randomWeight, size, density; @@ -98,23 +101,14 @@ public class GT5OreLayerHelper { // Black magic, don't ask me how it works, I have no idea. try { this.mPrimaryVeinMaterial = GT_OreDictUnificator.getAssociation( - new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mPrimaryMeta)) - .mMaterial - .mMaterial; + new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mPrimaryMeta)).mMaterial.mMaterial; this.mSecondaryMaterial = GT_OreDictUnificator.getAssociation( - new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSecondaryMeta)) - .mMaterial - .mMaterial; + new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSecondaryMeta)).mMaterial.mMaterial; this.mBetweenMaterial = GT_OreDictUnificator.getAssociation( - new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mBetweenMeta)) - .mMaterial - .mMaterial; + new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mBetweenMeta)).mMaterial.mMaterial; this.mSporadicMaterial = GT_OreDictUnificator.getAssociation( - new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSporadicMeta)) - .mMaterial - .mMaterial; - } catch (Exception ignored) { - } + new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSporadicMeta)).mMaterial.mMaterial; + } catch (Exception ignored) {} this.size = worldGen.mSize; this.density = worldGen.mDensity; @@ -135,8 +129,7 @@ public class GT5OreLayerHelper { } public boolean containsOre(short materialIndex) { - return Meta[VEIN_PRIMARY] == materialIndex - || Meta[VEIN_SECONDARY] == materialIndex + return Meta[VEIN_PRIMARY] == materialIndex || Meta[VEIN_SECONDARY] == materialIndex || Meta[VEIN_BETWEEN] == materialIndex || Meta[VEIN_SPORADIC] == materialIndex; } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java index 9ea39398ea..56143c8068 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java @@ -2,19 +2,22 @@ package pers.gwyog.gtneioreplugin.util; import static pers.gwyog.gtneioreplugin.util.GT5CFGHelper.oreVeinNotInAnyDim; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.world.GT_Worldgen; import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import net.minecraft.item.ItemStack; public class GT5OreSmallHelper { + private static final int SMALL_ORE_BASE_META = 16000; public static boolean restrictBiomeSupport = false; public static boolean gcBasicSupport = false; @@ -26,6 +29,7 @@ public class GT5OreSmallHelper { public static HashMap<String, SmallOreDimensionWrapper> dimToSmallOreWrapper = new HashMap<>(); public static class SmallOreDimensionWrapper { + public final ArrayList<OreSmallWrapper> internalDimOreList = new ArrayList<>(); public final HashMap<OreSmallWrapper, Double> oreVeinToProbabilityInDimension = new HashMap<>(); @@ -36,8 +40,8 @@ public class GT5OreSmallHelper { totalWeight += oreVein.amountPerChunk; } for (OreSmallWrapper oreVein : internalDimOreList) { - oreVeinToProbabilityInDimension.put( - oreVein, ((double) oreVein.amountPerChunk) / ((double) totalWeight)); + oreVeinToProbabilityInDimension + .put(oreVein, ((double) oreVein.amountPerChunk) / ((double) totalWeight)); } } } @@ -125,8 +129,8 @@ public class GT5OreSmallHelper { for (String dim : dims.split(",")) { if (!dim.isEmpty()) { - SmallOreDimensionWrapper dimensionSmallOres = - dimToSmallOreWrapper.getOrDefault(dim, new SmallOreDimensionWrapper()); + SmallOreDimensionWrapper dimensionSmallOres = dimToSmallOreWrapper + .getOrDefault(dim, new SmallOreDimensionWrapper()); dimensionSmallOres.internalDimOreList.add(veinInfo); dimToSmallOreWrapper.put(dim, dimensionSmallOres); } @@ -144,37 +148,27 @@ public class GT5OreSmallHelper { Class<?> clazzGTOreSmall = null; try { clazzGTOreSmall = Class.forName("gregtech.common" + ".GT_Worldgen_GT_Ore_SmallPieces"); - } catch (ClassNotFoundException e) { - } + } catch (ClassNotFoundException e) {} if (clazzGTOreSmall != null) { try { Field fieldRestrictBiome = clazzGTOreSmall.getField("mRestrictBiome"); restrictBiomeSupport = true; - } catch (Exception e) { - } + } catch (Exception e) {} try { Field fieldGCMoon = clazzGTOreSmall.getField("mMoon"); Field fieldGCMars = clazzGTOreSmall.getField("mMars"); gcBasicSupport = true; - } catch (Exception e) { - } + } catch (Exception e) {} } } public static Materials[] getDroppedDusts() { - return new Materials[] { - Materials.Stone, - Materials.Netherrack, - Materials.Endstone, - Materials.GraniteBlack, - Materials.GraniteRed, - Materials.Marble, - Materials.Basalt, - Materials.Stone - }; + return new Materials[] { Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, + Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone }; } public static class OreSmallWrapper { + public String oreGenName; public short oreMeta; public String worldGenHeightRange; @@ -193,10 +187,8 @@ public class GT5OreSmallHelper { this.worldGenHeightRange = worldGen.mMinY + "-" + worldGen.mMaxY; this.amountPerChunk = worldGen.mAmount; try { - this.oreMaterial = GT_OreDictUnificator.getAssociation( - new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mMeta)) - .mMaterial - .mMaterial; + this.oreMaterial = GT_OreDictUnificator + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mMeta)).mMaterial.mMaterial; } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java index 731867953d..171ee195a2 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java @@ -2,11 +2,6 @@ package pers.gwyog.gtneioreplugin.util; import static pers.gwyog.gtneioreplugin.GTNEIOrePlugin.LOG; -import com.google.common.collect.BiMap; -import gregtech.GT_Mod; -import gregtech.api.objects.GT_UO_Dimension; -import gregtech.api.objects.GT_UO_DimensionList; -import gregtech.api.objects.GT_UO_Fluid; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -17,16 +12,23 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.stream.Collectors; + import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.google.common.collect.BiMap; + +import gregtech.GT_Mod; +import gregtech.api.objects.GT_UO_Dimension; +import gregtech.api.objects.GT_UO_DimensionList; +import gregtech.api.objects.GT_UO_Fluid; + public class GT5UndergroundFluidHelper { /** - * Need to store fluid name instead of fluid - * because fluid instance might be different between gas and liquid + * Need to store fluid name instead of fluid because fluid instance might be different between gas and liquid */ private static final Map<String, List<UndergroundFluidWrapper>> fluidMap = new HashMap<>(); @@ -35,8 +37,8 @@ public class GT5UndergroundFluidHelper { try { Field fieldDimensionList = GT_UO_DimensionList.class.getDeclaredField("fDimensionList"); fieldDimensionList.setAccessible(true); - BiMap<String, GT_UO_Dimension> dimensionList = - (BiMap<String, GT_UO_Dimension>) fieldDimensionList.get(GT_Mod.gregtechproxy.mUndergroundOil); + BiMap<String, GT_UO_Dimension> dimensionList = (BiMap<String, GT_UO_Dimension>) fieldDimensionList + .get(GT_Mod.gregtechproxy.mUndergroundOil); for (Map.Entry<String, GT_UO_Dimension> dimensionEntry : dimensionList.entrySet()) { String rawDimension = dimensionEntry.getKey(); String dimension = null; @@ -45,20 +47,18 @@ public class GT5UndergroundFluidHelper { } catch (NumberFormatException ignored) { Field fieldProviders = DimensionManager.class.getDeclaredField("providers"); fieldProviders.setAccessible(true); - Hashtable<Integer, Class<? extends WorldProvider>> providers = - (Hashtable<Integer, Class<? extends WorldProvider>>) fieldProviders.get(null); + Hashtable<Integer, Class<? extends WorldProvider>> providers = (Hashtable<Integer, Class<? extends WorldProvider>>) fieldProviders + .get(null); // some short dimension names like Io might be caught by multiple dimension classes, // so we'll check them all. - // List<WorldProvider> dimensionCandidates = providers.values() + // List<WorldProvider> dimensionCandidates = providers.values() List<Class<? extends WorldProvider>> dimensionCandidates = providers.values().stream() - .filter(p -> p.getName().contains(rawDimension)) - .collect(Collectors.toList()); - loop: - for (Class<? extends WorldProvider> candidate : dimensionCandidates) { + .filter(p -> p.getName().contains(rawDimension)).collect(Collectors.toList()); + loop: for (Class<? extends WorldProvider> candidate : dimensionCandidates) { for (int i = 0; i < DimensionHelper.DimNameTrimmed.length; i++) { - if (DimensionHelper.DimNameTrimmed[i].equalsIgnoreCase( - candidate.newInstance().getDimensionName())) { + if (DimensionHelper.DimNameTrimmed[i] + .equalsIgnoreCase(candidate.newInstance().getDimensionName())) { dimension = DimensionHelper.DimNameDisplayed[i]; break loop; } @@ -76,8 +76,8 @@ public class GT5UndergroundFluidHelper { Field fieldFluids = GT_UO_Dimension.class.getDeclaredField("fFluids"); fieldFluids.setAccessible(true); - BiMap<String, GT_UO_Fluid> fluids = - (BiMap<String, GT_UO_Fluid>) fieldFluids.get(dimensionEntry.getValue()); + BiMap<String, GT_UO_Fluid> fluids = (BiMap<String, GT_UO_Fluid>) fieldFluids + .get(dimensionEntry.getValue()); int maxChance = 0; for (Map.Entry<String, GT_UO_Fluid> fluidEntry : fluids.entrySet()) { @@ -105,8 +105,8 @@ public class GT5UndergroundFluidHelper { } for (List<UndergroundFluidWrapper> wrappers : fluidMap.values()) { - wrappers.sort(Comparator.comparingInt( - w -> Arrays.asList(DimensionHelper.DimNameDisplayed).indexOf(w.dimension))); + wrappers.sort( + Comparator.comparingInt(w -> Arrays.asList(DimensionHelper.DimNameDisplayed).indexOf(w.dimension))); } } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java index 8cf6a8faac..29eaf8c9f4 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java @@ -1,14 +1,17 @@ package pers.gwyog.gtneioreplugin.util; -import codechicken.nei.recipe.GuiRecipe; -import cpw.mods.fml.common.FMLLog; import java.lang.reflect.Field; + import net.minecraft.client.Minecraft; + import org.apache.logging.log4j.Level; +import codechicken.nei.recipe.GuiRecipe; +import cpw.mods.fml.common.FMLLog; + public class GuiRecipeHelper { - private static final String INIT_ERROR = - "pers.gwyog.gtneioreplugin.util.GuiRecipeHelper failed setting up reflection : "; + + private static final String INIT_ERROR = "pers.gwyog.gtneioreplugin.util.GuiRecipeHelper failed setting up reflection : "; private static final int DEFAULT_XSIZE = 176; public static Field xSizeField; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java b/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java index 3bd684987e..bc32f2ce46 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java @@ -1,17 +1,14 @@ package pers.gwyog.gtneioreplugin.util; public class OreVeinLayer { + public static final int VEIN_PRIMARY = 0; public static final int VEIN_SECONDARY = 1; public static final int VEIN_BETWEEN = 2; public static final int VEIN_SPORADIC = 3; - private static final String[] LAYER_NAMES = { - "gtnop.gui.nei.primaryOre", - "gtnop.gui.nei.secondaryOre", - "gtnop.gui.nei.betweenOre", - "gtnop.gui" + ".nei.sporadicOre" - }; + private static final String[] LAYER_NAMES = { "gtnop.gui.nei.primaryOre", "gtnop.gui.nei.secondaryOre", + "gtnop.gui.nei.betweenOre", "gtnop.gui" + ".nei.sporadicOre" }; public static String getOreVeinLayerName(int layerId) { return LAYER_NAMES[layerId]; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java b/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java index 20e524ec41..59a55a82fa 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java @@ -1,20 +1,23 @@ package pers.gwyog.gtneioreplugin.util; -import com.google.common.base.Strings; import java.util.Arrays; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import com.google.common.base.Strings; + public class StringPaddingHack { + private static final int SPACE_WIDTH = 4; private static final int BOLD_SPACE_WIDTH = 5; /** - * Given a list of strings, arrange them into the requested number of columns with the specified spacing. - * Up to 3 additional spaces might be added between columns because this function relies on quirky font behaviors. + * Given a list of strings, arrange them into the requested number of columns with the specified spacing. Up to 3 + * additional spaces might be added between columns because this function relies on quirky font behaviors. * - * @param strings List of strings to wrap into columns - * @param numColumns Number of columns, minimum of 1 + * @param strings List of strings to wrap into columns + * @param numColumns Number of columns, minimum of 1 * @param minColumnSpacing Minimum amount of extra spaces between columns. * @return strings wrapped into columns */ @@ -36,8 +39,8 @@ public class StringPaddingHack { remainder--; extra = 1; } - columns[i] = Arrays.copyOfRange( - strings, (sliceSize * i) + totalExtra, (sliceSize * (i + 1) + totalExtra + extra)); + columns[i] = Arrays + .copyOfRange(strings, (sliceSize * i) + totalExtra, (sliceSize * (i + 1) + totalExtra + extra)); totalExtra += extra; } @@ -60,14 +63,13 @@ public class StringPaddingHack { } /** - * Pads strings with spaces so that they are of equal length and adds to - * that the number of spaces specified and up to 3 if minExtraSpaces is - * below 3. Added spaces might be bold. + * Pads strings with spaces so that they are of equal length and adds to that the number of spaces specified and up + * to 3 if minExtraSpaces is below 3. Added spaces might be bold. * - * Relies on the quirk of bold space characters being 1 pixel wider than - * regular space characters in the default font renderer. + * Relies on the quirk of bold space characters being 1 pixel wider than regular space characters in the default + * font renderer. * - * @param strings List of strings + * @param strings List of strings * @param minExtraSpaces The minimum number of extra spaces to add * @return List of strings padded with spaces to an equal length */ diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java index 98be50d989..59dd82fa8e 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java @@ -1,13 +1,15 @@ package pers.gwyog.gtneioreplugin.util; -import com.opencsv.bean.AbstractBeanField; -import com.opencsv.exceptions.CsvConstraintViolationException; -import com.opencsv.exceptions.CsvDataTypeMismatchException; import java.util.ResourceBundle; + import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.BooleanConverter; +import com.opencsv.bean.AbstractBeanField; +import com.opencsv.exceptions.CsvConstraintViolationException; +import com.opencsv.exceptions.CsvDataTypeMismatchException; + public class XtoBool<T> extends AbstractBeanField<T> { @Override @@ -15,8 +17,8 @@ public class XtoBool<T> extends AbstractBeanField<T> { if (value.isEmpty()) { return null; } - String[] trueStrings = {"x", "X"}; - String[] falseStrings = {""}; + String[] trueStrings = { "x", "X" }; + String[] falseStrings = { "" }; Converter bc = new BooleanConverter(trueStrings, falseStrings); try { return bc.convert(Boolean.class, value.trim()); @@ -24,8 +26,7 @@ public class XtoBool<T> extends AbstractBeanField<T> { CsvDataTypeMismatchException csve = new CsvDataTypeMismatchException( value, field.getType(), - ResourceBundle.getBundle("convertGermanToBoolean", errorLocale) - .getString("input.not.boolean")); + ResourceBundle.getBundle("convertGermanToBoolean", errorLocale).getString("input.not.boolean")); csve.initCause(e); throw csve; } |