diff options
Diffstat (limited to 'src/main/java/gregtech/api/enums')
8 files changed, 39 insertions, 21 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index a769a94a4e..a0f8e6c0b1 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -277,7 +277,6 @@ public enum Element { $Nq(-130, -200, 0, -1, null, "Anti-Naquadah", false), $Nt(0, -10000, 0, -1, null, "Anti-Neutronium", false); - public static volatile int VERSION = 509; public final long mProtons, mNeutrons, mAdditionalMass, mHalfLifeSeconds; public final String mName, mDecayTo; public final boolean mIsIsotope; diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index d494c5b64c..1dcbc419f2 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -4,7 +4,11 @@ import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -94,8 +98,6 @@ public class GT_Values { .divide(BigInteger.valueOf(32)) .longValueExact()) .toArray(); - // Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive - // testing. // TODO:Adding that in coremod!!! // TODO:tier 14,15 wires and transformers only (not even cables !!!) // TODO:tier 12,13 the above + batteries, battery buffers, (maybe cables,12 also works for machines) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 63be0ddb24..fc13aff66b 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -5,7 +5,15 @@ import static gregtech.api.enums.GT_Values.M; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Thaumcraft; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -25,7 +33,11 @@ import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import gregtech.common.render.items.*; +import gregtech.common.render.items.CosmicNeutroniumRenderer; +import gregtech.common.render.items.GT_GeneratedMaterial_Renderer; +import gregtech.common.render.items.GaiaSpiritRenderer; +import gregtech.common.render.items.InfinityRenderer; +import gregtech.common.render.items.TranscendentMetalRenderer; import gregtech.common.render.items.UniversiumRenderer; import gregtech.loaders.materialprocessing.ProcessingConfig; import gregtech.loaders.materialprocessing.ProcessingModSupport; @@ -38,7 +50,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static final Map<Fluid, Materials> FLUID_MAP = new LinkedHashMap<>(); - public static volatile int VERSION = 509; /** * This is for keeping compatibility with addons mods (Such as TinkersGregworks etc.) that looped over the old * materials enum diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java index b82d810a19..7728351bbc 100644 --- a/src/main/java/gregtech/api/enums/MaterialsBotania.java +++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java @@ -1,6 +1,11 @@ package gregtech.api.enums; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.nugget; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.rod; +import static gregtech.api.enums.OrePrefixes.rotor; import java.util.Arrays; diff --git a/src/main/java/gregtech/api/enums/MaterialsKevlar.java b/src/main/java/gregtech/api/enums/MaterialsKevlar.java index 647fe08ef4..b199acc59c 100644 --- a/src/main/java/gregtech/api/enums/MaterialsKevlar.java +++ b/src/main/java/gregtech/api/enums/MaterialsKevlar.java @@ -595,8 +595,8 @@ public class MaterialsKevlar { // H3RhCl6 /** - * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is - * initialized + * This method is called by Materials. It can be safely called multiple times. + * It exists to allow Materials ensure this class is initialized. */ public static void init() { // no-op. all work is done by <clinit> diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index c029083a50..cfe30d97dd 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -1,8 +1,15 @@ package gregtech.api.enums; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.B; +import static gregtech.api.enums.GT_Values.D2; +import static gregtech.api.enums.GT_Values.M; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; import net.minecraft.item.ItemStack; @@ -667,8 +674,6 @@ public enum OrePrefixes { cellSteamCracked2, cellSteamCracked3); - public static volatile int VERSION = 509; - static { pulp.mPrefixInto = dust; oreGem.mPrefixInto = ore; @@ -731,9 +736,6 @@ public enum OrePrefixes { dust.mNotGeneratedItems.add(Materials.Gunpowder); dust.mNotGeneratedItems.add(Materials.Sugar); dust.mNotGeneratedItems.add(Materials.Blaze); - // dust.mNotGeneratedItems.add(Materials.Ichorium); - // dustSmall.mNotGeneratedItems.add(Materials.Ichorium); - // dustTiny.mNotGeneratedItems.add(Materials.Ichorium); stick.mNotGeneratedItems.add(Materials.Wood); stick.mNotGeneratedItems.add(Materials.Bone); stick.mNotGeneratedItems.add(Materials.Blaze); @@ -860,7 +862,6 @@ public enum OrePrefixes { crateGtIngot.mGeneratedItems.addAll(ingot.mGeneratedItems); crateGtGem.mGeneratedItems.addAll(gem.mGeneratedItems); crateGtPlate.mGeneratedItems.addAll(plate.mGeneratedItems); - itemCasing.mGeneratedItems.addAll(itemCasing.mGeneratedItems); // ----- toolHeadFile.mCondition = new ICondition.And<>( diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 3fb15656e5..9bf690d423 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -97,7 +97,7 @@ public class TextureSet { /** * Construct a TextureSet that will delegate some of its textures to the origin TextureSet. - * + * <p> * This assumes you want to construct a custom texture set. */ private TextureSet(String aSetName, TextureSet origin, boolean overrideBlock, boolean overrideItem) { diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index a38a10ccce..80d7d1c8f0 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1677,7 +1677,7 @@ public class Textures { setCasingTextureForId(ERROR_TEXTURE_INDEX, ERROR_RENDERING[0]); } - protected IIcon mIcon; + IIcon mIcon; BlockIcons() { GregTech_API.sGTBlockIconload.add(this); @@ -1822,7 +1822,7 @@ public class Textures { public static final ITexture[] ERROR_RENDERING = { TextureFactory.of(RENDERING_ERROR) }; - protected IIcon mIcon, mOverlay; + IIcon mIcon, mOverlay; ItemIcons() { GregTech_API.sGTItemIconload.add(this); |