diff options
Diffstat (limited to 'src/main')
29 files changed, 345 insertions, 284 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java b/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java index a114cead69..bdc57f1e59 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java +++ b/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java @@ -49,7 +49,7 @@ public class ShieldedAccGlass extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java index 1a00d16d85..b881f47cfa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java @@ -108,7 +108,7 @@ public class BW_Blocks extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java index 0d1d9fd20b..e7abd0e6ce 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java @@ -37,7 +37,7 @@ public class BW_TileEntityContainer_MachineBlock extends BW_TileEntityContainer @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java index 67c77f5ac4..0ac925926c 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java @@ -93,7 +93,7 @@ public class GodforgeGlassBlock extends BlockBase { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMeta)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java index 790b4f390b..6c22595b53 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java @@ -97,7 +97,7 @@ public final class QuantumGlassBlock extends BlockBase { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMeta)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java index ef61327dd7..ff38365d79 100644 --- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java +++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java @@ -50,7 +50,7 @@ public abstract class BaseGTUpdateableBlock extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java index 9e01d783d2..c10b0f7184 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java @@ -97,7 +97,7 @@ public class Casing extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index 6c13a9c680..dcd2bdd801 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -114,7 +114,7 @@ public class TEBlock extends BlockContainer { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } aWorld.removeTileEntity(aX, aY, aZ); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 59144666df..cfa51f8e99 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -100,7 +100,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java b/src/main/java/gregtech/common/blocks/GT_Block_Laser.java index 7ec03ce781..038b114284 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Laser.java @@ -41,7 +41,7 @@ public class GT_Block_Laser extends Block implements ITileEntityProvider { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index a87f6c92b3..79d9e2c458 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java @@ -106,7 +106,7 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock, final int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java index f16fa148e0..e277ba915c 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java @@ -13,6 +13,7 @@ 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 gregtech.GT_Version; import pers.gwyog.gtneioreplugin.plugin.IMCForNEI; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; import pers.gwyog.gtneioreplugin.util.CSVMaker; @@ -21,15 +22,15 @@ import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper; @Mod( - modid = GTNEIOrePlugin.MODID, - name = GTNEIOrePlugin.NAME, - version = GTNEIOrePlugin.VERSION, - dependencies = "required-after:gregtech;required-after:NotEnoughItems") + modid = GTNEIOrePlugin.MODID, + name = GTNEIOrePlugin.NAME, + version = GTNEIOrePlugin.VERSION, + dependencies = "required-after:gregtech;required-after:NotEnoughItems") public class GTNEIOrePlugin { public static final String MODID = "gtneioreplugin"; public static final String NAME = "GT NEI Ore Plugin GT:NH Mod"; - public static final String VERSION = Tags.VERSION; + public static final String VERSION = GT_Version.VERSION; public static final Logger LOG = LogManager.getLogger(NAME); public static boolean csv = false; public static String CSVname; @@ -39,7 +40,8 @@ public class GTNEIOrePlugin { @Override public Item getTabIconItem() { - return GameRegistry.makeItemStack("gregtech:gt.blockores", 386, 1, null).getItem(); + return GameRegistry.makeItemStack("gregtech:gt.blockores", 386, 1, null) + .getItem(); } }; @@ -50,27 +52,27 @@ public class GTNEIOrePlugin { public void preinit(FMLPreInitializationEvent event) { Config c = new Config(event, MODID + ".cfg"); csv = c.tConfig.getBoolean( - "print csv", - "ALL", - false, - "print csv, you need apache commons collections to be injected in the minecraft jar."); + "print csv", + "ALL", + false, + "print csv, you need apache commons collections to be injected in the minecraft jar."); CSVname = c.tConfig.getString( - "CSV_name", - "ALL", - event.getModConfigurationDirectory() + "/GTNH-Oresheet.csv", - "rename the oresheet here, it will appear in /config"); + "CSV_name", + "ALL", + event.getModConfigurationDirectory() + "/GTNH-Oresheet.csv", + "rename the oresheet here, it will appear in /config"); CSVnameSmall = c.tConfig.getString( - "CSV_name_for_Small_Ore_Sheet", - "ALL", - event.getModConfigurationDirectory() + "/GTNH-Small-Ores-Sheet.csv", - "rename the oresheet here, it will appear in /config"); + "CSV_name_for_Small_Ore_Sheet", + "ALL", + event.getModConfigurationDirectory() + "/GTNH-Small-Ores-Sheet.csv", + "rename the oresheet here, it will appear in /config"); maxTooltipLines = c.tConfig.getInt( - "MaxToolTipLines", - "ALL", - 11, - 1, - Integer.MAX_VALUE, - "Maximum number of lines the dimension names tooltip can have before it wraps around."); + "MaxToolTipLines", + "ALL", + 11, + 1, + Integer.MAX_VALUE, + "Maximum number of lines the dimension names tooltip can have before it wraps around."); c.save(); } 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(); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java index 1a56044219..1a99b469af 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java @@ -34,8 +34,14 @@ public class CSVMaker implements Runnable { step = (int) (step / 1.3); } for (int i = 0; i < list2.size() - step; i++) { - if (list2.get(i).getOreName().substring(0, 3) - .compareTo((list2.get(i + step).getOreName().substring(0, 3))) > 0) { + if (list2.get(i) + .getOreName() + .substring(0, 3) + .compareTo( + (list2.get(i + step) + .getOreName() + .substring(0, 3))) + > 0) { Oremix tmp = list2.get(i); list2.set(i, list2.get(i + step)); list2.set(i + step, tmp); @@ -53,7 +59,8 @@ public class CSVMaker implements Runnable { public void runSmallOres() { try { Iterator<Map.Entry<String, GT5OreSmallHelper.OreSmallWrapper>> it = GT5OreSmallHelper.mapOreSmallWrapper - .entrySet().iterator(); + .entrySet() + .iterator(); List<Oremix> OreVeins = new ArrayList<>(); while (it.hasNext()) { Oremix oremix = new Oremix(); @@ -113,13 +120,15 @@ public class CSVMaker implements Runnable { ColumnPositionMappingStrategy<Oremix> 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,an,ho,np,mh,mb,se" - .split("\\,"); + .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one) - .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); + .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER) + .withMappingStrategy(strat) + .build(); List<Oremix> 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,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); + "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,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); one.newLine(); beanToCsv.write(towrite); one.flush(); @@ -138,7 +147,7 @@ public class CSVMaker implements Runnable { public void runVeins() { try { Iterator<Map.Entry<String, OreLayerWrapper>> it = GT5OreLayerHelper.mapOreLayerWrapper.entrySet() - .iterator(); + .iterator(); List<Oremix> OreVeins = new ArrayList<>(); while (it.hasNext()) { Oremix oremix = new Oremix(); @@ -156,12 +165,12 @@ public class CSVMaker implements Runnable { 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])); + Integer.toString(oreLayer.Meta[0]) + "|" + + Integer.toString(oreLayer.Meta[1]) + + "|" + + Integer.toString(oreLayer.Meta[2]) + + "|" + + Integer.toString(oreLayer.Meta[3])); oremix.an = Dims.contains("An"); oremix.as = Dims.contains("As"); oremix.bc = Dims.contains("BC"); @@ -211,13 +220,15 @@ public class CSVMaker implements Runnable { ColumnPositionMappingStrategy<Oremix> 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,an,ho,np,mh,mb,se" - .split("\\,"); + .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one) - .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); + .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER) + .withMappingStrategy(strat) + .build(); List<Oremix> 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,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); + "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,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); one.newLine(); beanToCsv.write(towrite); one.flush(); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java index b82cb63f58..e416713208 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java @@ -11,96 +11,98 @@ import net.minecraft.util.StatCollector; public class DimensionHelper { public static final 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", "GalaxySpace_VegaB", - // T9 - "GalacticraftAmunRa_Anubis", "GalacticraftAmunRa_Horus", "GalacticraftAmunRa_Maahes", - "GalacticraftAmunRa_MehenBelt", "GalacticraftAmunRa_Neper", "GalacticraftAmunRa_Seth", - // T10 - "Underdark", }; + // 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", "GalaxySpace_VegaB", + // T9 + "GalacticraftAmunRa_Anubis", "GalacticraftAmunRa_Horus", "GalacticraftAmunRa_Maahes", + "GalacticraftAmunRa_MehenBelt", "GalacticraftAmunRa_Neper", "GalacticraftAmunRa_Seth", + // T10 + "Underdark", }; public static final String[] DimNameTrimmed = Arrays.stream(DimName) - .map( - n -> n.replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "") - .replaceAll("GalaxySpace_", "").replaceAll("GalacticraftAmunRa_", "") - .replaceAll("Vanilla_", "Vanilla ")) - .toArray(String[]::new); + .map( + n -> n.replaceAll("GalacticraftCore_", "") + .replaceAll("GalacticraftMars_", "") + .replaceAll("GalaxySpace_", "") + .replaceAll("GalacticraftAmunRa_", "") + .replaceAll("Vanilla_", "Vanilla ")) + .toArray(String[]::new); public static final 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 - "VB", // GalaxySpace_VegaB - // T9 - "An", // GalacticraftAmunRa_Anubis - "Ho", // GalacticraftAmunRa_Horus - "Mh", // GalacticraftAmunRa_Maahes - "MB", // GalacticraftAmunRa_MehenBelt - "Np", // GalacticraftAmunRa_Neper - "Se", // GalacticraftAmunRa_Seth - // T10 - "DD", // Underdark + // 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 + "VB", // GalaxySpace_VegaB + // T9 + "An", // GalacticraftAmunRa_Anubis + "Ho", // GalacticraftAmunRa_Horus + "Mh", // GalacticraftAmunRa_Maahes + "MB", // GalacticraftAmunRa_MehenBelt + "Np", // GalacticraftAmunRa_Neper + "Se", // GalacticraftAmunRa_Seth + // T10 + "DD", // Underdark }; private static final HashMap<String, List<String>> tooltipBuffer = new HashMap<>(); @@ -134,9 +136,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 ebc9956af1..7394edea58 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java @@ -49,8 +49,11 @@ public class GT5CFGHelper { HashSet<String> rawboolsset = new HashSet<>(); if (!rawbools.isEmpty()) { for (String rawbool : rawbools) { - st = rawbool.replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "") - .replaceAll("\"", ""); + st = rawbool.replace("B:", "") + .replace("_true", "") + .replace("_false", "") + .replaceAll(" ", "") + .replaceAll("\"", ""); rawboolsset.add(st); } rawbools = new ArrayList<>(rawboolsset); @@ -58,13 +61,19 @@ public class GT5CFGHelper { for (String rawbool : rawbools) { st = rawbool; if (st.contains(DimensionHelper.DimName[j]) && st.contains("=true")) { - ret.append(DimensionHelper.DimNameDisplayed[j]).append(","); + ret.append(DimensionHelper.DimNameDisplayed[j]) + .append(","); } } } } - ret = new StringBuilder(ret.toString().trim()); - if (ret.toString().equals("") || ret.toString().equals(" ")) { + ret = new StringBuilder( + ret.toString() + .trim()); + if (ret.toString() + .equals("") + || ret.toString() + .equals(" ")) { ret = new StringBuilder(oreVeinNotInAnyDim); } return ret.toString(); @@ -76,7 +85,8 @@ public class GT5CFGHelper { FMLLog.bigWarning("GT_CFG_NOT_found[0]"); return "Error while Loading CFG"; } else try { - int buffer = (int) (0.1 * Runtime.getRuntime().freeMemory()); + int buffer = (int) (0.1 * Runtime.getRuntime() + .freeMemory()); if (buffer > F.length()) { buffer = (int) F.length(); } @@ -98,17 +108,20 @@ public class GT5CFGHelper { // read until reached eof or mix { st = reader.readLine(); // FMLLog.info("st: "+st); - if (st != null && st.trim().equals("mix {")) { + if (st != null && st.trim() + .equals("mix {")) { while (!(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 + " {")) { + if (st != null && st.trim() + .equals(Veinname + " {")) { // FMLLog.info("VEINNAMEst: "+st); while (!(st == null || found[0])) { st = reader.readLine(); - if ((!(st == null)) && st.trim().equals("}")) { + if ((!(st == null)) && st.trim() + .equals("}")) { found[0] = true; } // FMLLog.info("dritte"); @@ -119,21 +132,25 @@ public class GT5CFGHelper { } } - if (st != null && st.trim().equals("dimensions {")) { + if (st != null && st.trim() + .equals("dimensions {")) { while (!(st == null || found[1])) { // FMLLog.info("zweite"); st = reader.readLine(); - if (st != null && (st.trim().equals("mix {"))) { + if (st != null && (st.trim() + .equals("mix {"))) { while (!(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 + " {")) { + if (st != null && st.trim() + .equals(Veinname + " {")) { // FMLLog.info("VEINNAMEst: "+st); while (!(st == null || found[1])) { st = reader.readLine(); - if ((!(st == null)) && st.trim().equals("}")) { + if ((!(st == null)) && st.trim() + .equals("}")) { found[1] = true; } // FMLLog.info("vierte"); @@ -169,8 +186,11 @@ public class GT5CFGHelper { if (!rawbools.isEmpty()) { // remove dublicates for (String rawbool : rawbools) { - st = rawbool.replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "") - .replaceAll("\"", ""); + st = rawbool.replace("B:", "") + .replace("_true", "") + .replace("_false", "") + .replaceAll(" ", "") + .replaceAll("\"", ""); rawboolsset.add(st); } rawbools = new ArrayList<>(rawboolsset); @@ -180,14 +200,20 @@ public class GT5CFGHelper { for (String rawbool : rawbools) { st = rawbool; if (st.contains(DimensionHelper.DimName[j]) && st.contains("=true")) { - ret.append(DimensionHelper.DimNameDisplayed[j]).append(","); + ret.append(DimensionHelper.DimNameDisplayed[j]) + .append(","); } } } } - ret = new StringBuilder(ret.toString().trim()); + ret = new StringBuilder( + ret.toString() + .trim()); // FMLLog.info("ret:"+ret); - if (ret.toString().equals("") || ret.toString().equals(" ")) { + if (ret.toString() + .equals("") + || ret.toString() + .equals(" ")) { ret = new StringBuilder(oreVeinNotInAnyDim); } return ret.toString(); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java index c2c4fa9800..ccb8c88e75 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java @@ -62,7 +62,7 @@ public class GT5OreLayerHelper { for (String dim : dims.split(",")) { if (!dim.isEmpty()) { NormalOreDimensionWrapper dimensionOres = dimToOreWrapper - .getOrDefault(dim, new NormalOreDimensionWrapper()); + .getOrDefault(dim, new NormalOreDimensionWrapper()); dimensionOres.internalDimOreList.add(veinInfo); dimToOreWrapper.put(dim, dimensionOres); } @@ -70,14 +70,17 @@ public class GT5OreLayerHelper { // Calculate probabilities for each dim. for (String dim : dimToOreWrapper.keySet()) { - dimToOreWrapper.get(dim).calculateWeights(); + dimToOreWrapper.get(dim) + .calculateWeights(); } }); // --- End of handling for dimToOreWrapper --- } 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 { @@ -100,16 +103,16 @@ public class GT5OreLayerHelper { // Black magic, don't ask me how it works, I have no idea. ItemData primaryVeinData = GT_OreDictUnificator - .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mPrimaryMeta)); + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mPrimaryMeta)); this.mPrimaryVeinMaterial = primaryVeinData != null ? primaryVeinData.mMaterial.mMaterial : null; ItemData secondaryVeinData = GT_OreDictUnificator - .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSecondaryMeta)); + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSecondaryMeta)); this.mSecondaryMaterial = secondaryVeinData != null ? secondaryVeinData.mMaterial.mMaterial : null; ItemData betweenVeinData = GT_OreDictUnificator - .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mBetweenMeta)); + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mBetweenMeta)); this.mBetweenMaterial = betweenVeinData != null ? betweenVeinData.mMaterial.mMaterial : null; ItemData sporadicVeinData = GT_OreDictUnificator - .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSporadicMeta)); + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mSporadicMeta)); this.mSporadicMaterial = sporadicVeinData != null ? sporadicVeinData.mMaterial.mMaterial : null; this.size = worldGen.mSize; @@ -132,8 +135,8 @@ public class GT5OreLayerHelper { public boolean containsOre(short materialIndex) { return Meta[VEIN_PRIMARY] == materialIndex || Meta[VEIN_SECONDARY] == materialIndex - || Meta[VEIN_BETWEEN] == materialIndex - || Meta[VEIN_SPORADIC] == 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 8a150967a0..725b0c2819 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java @@ -40,7 +40,7 @@ public class GT5OreSmallHelper { } for (OreSmallWrapper oreVein : internalDimOreList) { oreVeinToProbabilityInDimension - .put(oreVein, ((double) oreVein.amountPerChunk) / ((double) totalWeight)); + .put(oreVein, ((double) oreVein.amountPerChunk) / ((double) totalWeight)); } } } @@ -60,19 +60,19 @@ public class GT5OreSmallHelper { if (!mapOreMetaToOreDrops.containsKey(meta)) { List<ItemStack> stackList = new ArrayList<>(); stack = GT_OreDictUnificator.get( - OrePrefixes.gemExquisite, - material, - GT_OreDictUnificator.get(OrePrefixes.gem, material, 1L), - 1L); + OrePrefixes.gemExquisite, + material, + GT_OreDictUnificator.get(OrePrefixes.gem, material, 1L), + 1L); if (stack != null && !mapOreDropUnlocalizedNameToOreMeta.containsKey(stack.getUnlocalizedName())) { mapOreDropUnlocalizedNameToOreMeta.put(stack.getUnlocalizedName(), meta); stackList.add(stack); } stack = GT_OreDictUnificator.get( - OrePrefixes.gemFlawless, - material, - GT_OreDictUnificator.get(OrePrefixes.gem, material, 1L), - 1L); + OrePrefixes.gemFlawless, + material, + GT_OreDictUnificator.get(OrePrefixes.gem, material, 1L), + 1L); if (stack != null && !mapOreDropUnlocalizedNameToOreMeta.containsKey(stack.getUnlocalizedName())) { mapOreDropUnlocalizedNameToOreMeta.put(stack.getUnlocalizedName(), meta); stackList.add(stack); @@ -83,10 +83,10 @@ public class GT5OreSmallHelper { stackList.add(stack); } stack = GT_OreDictUnificator.get( - OrePrefixes.gemFlawed, - material, - GT_OreDictUnificator.get(OrePrefixes.crushed, material, 1L), - 1L); + OrePrefixes.gemFlawed, + material, + GT_OreDictUnificator.get(OrePrefixes.crushed, material, 1L), + 1L); if (stack != null && !mapOreDropUnlocalizedNameToOreMeta.containsKey(stack.getUnlocalizedName())) { mapOreDropUnlocalizedNameToOreMeta.put(stack.getUnlocalizedName(), meta); stackList.add(stack); @@ -97,10 +97,10 @@ public class GT5OreSmallHelper { stackList.add(stack); } stack = GT_OreDictUnificator.get( - OrePrefixes.gemChipped, - material, - GT_OreDictUnificator.get(OrePrefixes.dustImpure, material, 1L), - 1L); + OrePrefixes.gemChipped, + material, + GT_OreDictUnificator.get(OrePrefixes.dustImpure, material, 1L), + 1L); if (stack != null && !mapOreDropUnlocalizedNameToOreMeta.containsKey(stack.getUnlocalizedName())) { mapOreDropUnlocalizedNameToOreMeta.put(stack.getUnlocalizedName(), meta); stackList.add(stack); @@ -129,7 +129,7 @@ public class GT5OreSmallHelper { for (String dim : dims.split(",")) { if (!dim.isEmpty()) { SmallOreDimensionWrapper dimensionSmallOres = dimToSmallOreWrapper - .getOrDefault(dim, new SmallOreDimensionWrapper()); + .getOrDefault(dim, new SmallOreDimensionWrapper()); dimensionSmallOres.internalDimOreList.add(veinInfo); dimToSmallOreWrapper.put(dim, dimensionSmallOres); } @@ -137,7 +137,8 @@ public class GT5OreSmallHelper { // Calculate probabilities for each dim. for (String dim : dimToSmallOreWrapper.keySet()) { - dimToSmallOreWrapper.get(dim).calculateWeights(); + dimToSmallOreWrapper.get(dim) + .calculateWeights(); } }); // --- End of handling for dimToOreWrapper --- @@ -158,7 +159,7 @@ public class GT5OreSmallHelper { public static Materials[] getDroppedDusts() { return new Materials[] { Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, - Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone }; + Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone }; } public static class OreSmallWrapper { @@ -181,7 +182,7 @@ public class GT5OreSmallHelper { this.worldGenHeightRange = worldGen.mMinY + "-" + worldGen.mMaxY; this.amountPerChunk = worldGen.mAmount; ItemData oreData = GT_OreDictUnificator - .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mMeta)); + .getAssociation(new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.mMeta)); this.oreMaterial = oreData != null ? oreData.mMaterial.mMaterial : null; } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java index 85c4ee3004..d08709d775 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java @@ -34,7 +34,7 @@ public class GT5UndergroundFluidHelper { 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); + .get(GT_Mod.gregtechproxy.mUndergroundOil); for (Map.Entry<String, GT_UO_Dimension> dimensionEntry : dimensionList.entrySet()) { String rawDimension = dimensionEntry.getKey(); String dimension; @@ -59,7 +59,7 @@ 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()); + .get(dimensionEntry.getValue()); int maxChance = 0; for (Map.Entry<String, GT_UO_Fluid> fluidEntry : fluids.entrySet()) { @@ -70,12 +70,13 @@ public class GT5UndergroundFluidHelper { Fluid fluid = FluidRegistry.getFluid(fluidEntry.getKey()); if (fluid != null) { UndergroundFluidWrapper wrapper = new UndergroundFluidWrapper( - dimension, - fluidEntry.getValue().Chance * 10000 / maxChance, - fluidEntry.getValue().MaxAmount, - fluidEntry.getValue().MinAmount); + dimension, + fluidEntry.getValue().Chance * 10000 / maxChance, + fluidEntry.getValue().MaxAmount, + fluidEntry.getValue().MinAmount); if (fluidMap.containsKey(fluid.getName())) { - fluidMap.get(fluid.getName()).add(wrapper); + fluidMap.get(fluid.getName()) + .add(wrapper); } else { fluidMap.put(fluid.getName(), new ArrayList<>(Collections.singletonList(wrapper))); } @@ -88,7 +89,9 @@ public class GT5UndergroundFluidHelper { for (List<UndergroundFluidWrapper> wrappers : fluidMap.values()) { wrappers.sort( - Comparator.comparingInt(w -> Arrays.asList(DimensionHelper.DimNameDisplayed).indexOf(w.dimension))); + Comparator.comparingInt( + w -> Arrays.asList(DimensionHelper.DimNameDisplayed) + .indexOf(w.dimension))); } } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java b/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java index bc32f2ce46..3aaba2d1e4 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/OreVeinLayer.java @@ -8,7 +8,7 @@ public class OreVeinLayer { 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" }; + "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 0b1d391a08..3f6d3fa387 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java @@ -24,7 +24,7 @@ public class StringPaddingHack { public static String[] stringsToSpacedColumns(String[] strings, int numColumns, int minColumnSpacing) { if (numColumns < 1) { throw new IllegalArgumentException( - String.format("Argument numColumns must be 1 or higher, got value %d", numColumns)); + String.format("Argument numColumns must be 1 or higher, got value %d", numColumns)); } if (numColumns > 1) { int sliceSize = strings.length / numColumns; @@ -40,7 +40,7 @@ public class StringPaddingHack { extra = 1; } columns[i] = Arrays - .copyOfRange(strings, (sliceSize * i) + totalExtra, (sliceSize * (i + 1) + totalExtra + extra)); + .copyOfRange(strings, (sliceSize * i) + totalExtra, (sliceSize * (i + 1) + totalExtra + extra)); totalExtra += extra; } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java index f3426d53dd..4c15cdecb6 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java @@ -23,9 +23,10 @@ public class XtoBool<T> extends AbstractBeanField<T> { return bc.convert(Boolean.class, value.trim()); } catch (ConversionException e) { CsvDataTypeMismatchException csve = new CsvDataTypeMismatchException( - value, - field.getType(), - ResourceBundle.getBundle("convertGermanToBoolean", errorLocale).getString("input.not.boolean")); + value, + field.getType(), + ResourceBundle.getBundle("convertGermanToBoolean", errorLocale) + .getString("input.not.boolean")); csve.initCause(e); throw csve; } |