diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/core/lib | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/core/lib')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/lib/CORE.java | 102 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 7 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/lib/VanillaColours.java | 4 |
3 files changed, 61 insertions, 52 deletions
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index ce3ca22a37..82ecda5f53 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -1,6 +1,19 @@ package gtPlusPlus.core.lib; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.util.FakePlayerFactory; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.common.FMLCommonHandler; import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.Logger; @@ -13,16 +26,6 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.util.FakePlayerFactory; public class CORE { @@ -42,8 +45,7 @@ public class CORE { public static boolean DEVENV = false; // Only can be set in Dev, no config or setting elsewhere. - public static final boolean LOAD_ALL_CONTENT = false; - ; + public static final boolean LOAD_ALL_CONTENT = false;; // Mod Variables @@ -62,16 +64,28 @@ public class CORE { public static int turbineCutoffBase = 75000; // GT++ Fake Player Profile - public static final GameProfile gameProfile = - new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]"); + public static final GameProfile gameProfile = new GameProfile( + UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), + "[GT++]"); public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>(); // Tooltips; - public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN + "Alkalus " - + EnumChatFormatting.GRAY + "- " + EnumChatFormatting.RED + "[GT++]"; - public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN + "Alkalus " - + EnumChatFormatting.GRAY + "- " + EnumChatFormatting.RED + "[GT++]"; - public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY + "Warning: " + EnumChatFormatting.GREEN - + "Radioactive! " + EnumChatFormatting.GOLD + " Avoid direct handling without hazmat protection."; + public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN + + "Alkalus " + + EnumChatFormatting.GRAY + + "- " + + EnumChatFormatting.RED + + "[GT++]"; + public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN + + "Alkalus " + + EnumChatFormatting.GRAY + + "- " + + EnumChatFormatting.RED + + "[GT++]"; + public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY + "Warning: " + + EnumChatFormatting.GREEN + + "Radioactive! " + + EnumChatFormatting.GOLD + + " Avoid direct handling without hazmat protection."; public static final String noItem = ""; // Because I want to be lazy Gregtech New Horizons Var. @@ -89,10 +103,8 @@ public class CORE { public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>(); // TesseractMaps - public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = - new HashMap<>(); - public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = - new HashMap<>(); + public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>(); + public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>(); // BookMap public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>(); @@ -110,28 +122,21 @@ public class CORE { /** * File Paths and Resource Paths */ - public static final String TEX_DIR = "textures/", - TEX_DIR_GUI = TEX_DIR + "gui/", - TEX_DIR_ITEM = TEX_DIR + "items/", - TEX_DIR_BLOCK = TEX_DIR + "blocks/", - TEX_DIR_ENTITY = TEX_DIR + "entity/", - TEX_DIR_ASPECTS = TEX_DIR + "aspects/", - TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/", - RES_PATH = MODID + ":" + TEX_DIR, - RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI, - RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, - RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK, - RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY, - RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS, + public static final String TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", + TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", + TEX_DIR_ASPECTS = TEX_DIR + "aspects/", TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/", + RES_PATH = MODID + ":" + TEX_DIR, RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI, + RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK, + RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS, RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS; - /** Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}. - * If this instance already exists in the cache, we will return that instead. - * These instances are held via weak reference, if the world object is unloaded, they too will be removed. - * This is the suggested way to handle them, as suggested by Forge. + /** + * Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}. If this instance already exists in + * the cache, we will return that instead. These instances are held via weak reference, if the world object is + * unloaded, they too will be removed. This is the suggested way to handle them, as suggested by Forge. * - * @param world - The {@link World} object for which you want to check for in the cache. - * This object is used as a weak reference in a {@link WeakHashMap}. + * @param world - The {@link World} object for which you want to check for in the cache. This object is used as a + * weak reference in a {@link WeakHashMap}. * @return - An {@link EntityPlayerMP} instance, returned either from cache or created and cached prior to return. */ public static EntityPlayerMP getFakePlayer(World world) { @@ -146,6 +151,7 @@ public class CORE { */ public static class ConfigSwitches { + // Debug public static boolean disableEnderIOIntegration = false; public static boolean disableEnderIOIngotTooltips = false; @@ -278,17 +284,19 @@ public class CORE { public static int pollutionPerSecondMultiIndustrialChisel = 50; // pollution single blocks public static int basePollutionPerSecondSemiFluidGenerator = 40; - public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] {0, 2.0, 4.0, 8.0, 12.0, 16, 0}; + public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] { 0, 2.0, 4.0, 8.0, 12.0, 16, + 0 }; public static int basePollutionPerSecondBoiler = 35; - public static double[] pollutionReleasedByTierBoiler = new double[] {0, 1.0, 1.43, 1.86}; + public static double[] pollutionReleasedByTierBoiler = new double[] { 0, 1.0, 1.43, 1.86 }; public static int baseMinPollutionPerSecondRocketFuelGenerator = 250; public static int baseMaxPollutionPerSecondRocketFuelGenerator = 2000; - public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[] {0, 0, 0, 0, 1, 2, 3}; + public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[] { 0, 0, 0, 0, 1, 2, 3 }; public static int basePollutionPerSecondGeothermalGenerator = 100; - public static double[] pollutionReleasedByTierGeothermalGenerator = new double[] {0, 0, 0, 0, 1, 1, 1}; + public static double[] pollutionReleasedByTierGeothermalGenerator = new double[] { 0, 0, 0, 0, 1, 1, 1 }; } public static class Everglades { + public static final String MODID = "ToxicEverglades"; public static final String NAME = "GT++ Toxic Everglades"; public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java index 43822f868e..da24c8bbc1 100644 --- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java @@ -2,13 +2,14 @@ package gtPlusPlus.core.lib; import static gtPlusPlus.core.lib.CORE.*; +import java.util.HashMap; + import cpw.mods.fml.common.Loader; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures; import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder; -import java.util.HashMap; public class LoadedMods { @@ -363,9 +364,7 @@ public class LoadedMods { } public static String getModVersion(final String modName) { - final String ver = cpw.mods.fml.common.FMLCommonHandler.instance() - .findContainerFor(modName) - .getVersion(); + final String ver = cpw.mods.fml.common.FMLCommonHandler.instance().findContainerFor(modName).getVersion(); return ver; } diff --git a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java index 19e9d1c735..70e7902fbf 100644 --- a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java +++ b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.lib; import gtPlusPlus.core.util.Utils; public enum VanillaColours { + BONE_MEAL(249, 255, 254), INK_BLACK(29, 29, 33), COCOA_BEANS(131, 84, 50), @@ -23,6 +24,7 @@ public enum VanillaColours { DYE_DARK_BLUE(60, 68, 170), DYE_DARK_PURPLE(137, 50, 184), DYE_DARK_GRAY(71, 79, 82); + private final int r, g, b; private VanillaColours(int aR, int aG, int aB) { @@ -32,7 +34,7 @@ public enum VanillaColours { } public short[] getAsShort() { - return new short[] {(short) r, (short) g, (short) b}; + return new short[] { (short) r, (short) g, (short) b }; } public int getAsInt() { |
