diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/core/item | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
40 files changed, 783 insertions, 769 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 2253b024a7..cdb61a5e46 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import net.minecraft.item.EnumRarity; @@ -17,14 +17,14 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; -import gtPlusPlus.core.common.compat.COMPAT_Baubles; +import gtPlusPlus.core.common.compat.CompatBaubles; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; import gtPlusPlus.core.item.base.BaseItemDamageable; @@ -34,7 +34,7 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; import gtPlusPlus.core.item.base.ingots.BaseItemIngot; -import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; +import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; @@ -48,10 +48,10 @@ import gtPlusPlus.core.item.chemistry.RocketFuels; import gtPlusPlus.core.item.chemistry.StandardBaseParticles; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.item.general.BufferCore; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.item.general.ItemBlueprint; +import gtPlusPlus.core.item.general.ItemBufferCore; import gtPlusPlus.core.item.general.ItemEmpty; import gtPlusPlus.core.item.general.ItemGenericToken; import gtPlusPlus.core.item.general.ItemHalfCompleteCasings; @@ -64,17 +64,17 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.item.tool.misc.GregtechPump; +import gtPlusPlus.core.item.tool.misc.ItemGregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.NONMATERIAL; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -82,7 +82,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.everglades.GTplusplus_Everglades; +import gtPlusPlus.everglades.GTPPEverglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; @@ -181,7 +181,7 @@ public final class ModItems { public static Item dustRadium226; public static Item dustProtactinium233; - public static GregtechPump toolGregtechPump; + public static ItemGregtechPump toolGregtechPump; public static ItemGenericToken itemGenericToken; @@ -219,11 +219,7 @@ public final class ModItems { Logger.INFO("Items!"); // Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is // called upon. - AAA_Broken = new BaseItemIngot_OLD( - "AAA_Broken", - "Errors - Tell Alkalus", - Utils.rgbtoHexValue(128, 128, 128), - 0); + AAA_Broken = new BaseItemIngotOld("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0); ZZZ_Empty = new ItemEmpty(); } @@ -277,33 +273,33 @@ public final class ModItems { // Elements generate first so they can be used in compounds. // Missing Elements - MaterialGenerator.generate(ELEMENT.getInstance().SELENIUM); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().BROMINE); - MaterialGenerator.generate(ELEMENT.getInstance().KRYPTON); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().STRONTIUM); - MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM); - MaterialGenerator.generate(ELEMENT.getInstance().RUTHENIUM); - MaterialGenerator.generate(ELEMENT.getInstance().IODINE); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM); - MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM); - MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM); - MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM); - MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM); - MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM); - MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM); - MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE); + MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM); // RADIOACTIVE ELEMENTS - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false); // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false); // Nuclear Isotopes @@ -314,168 +310,168 @@ public final class ModItems { // neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural // lithium a // strong requirement for the possible use in lithium fluoride reactors. - MaterialGenerator.generate(ELEMENT.getInstance().LITHIUM7, false); + MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false); // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case. - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().THORIUM232); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232); // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U // as an impurity // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232: - MaterialGenerator.generate(ELEMENT.getInstance().URANIUM232); + MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM232); // Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel // cycle. - MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233); + MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM233); // Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage // in radioisotope thermoelectric generators (RTGs) // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PLUTONIUM238, false); // Custom Materials that will have standalone refinery processes - MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); - MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); - MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN); - MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + MaterialGenerator.generate(MaterialsElements.STANDALONE.ADVANCED_NITINOL, false); + MaterialGenerator.generate(MaterialsElements.STANDALONE.ASTRAL_TITANIUM); + MaterialGenerator.generate(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); + MaterialGenerator.generate(MaterialsElements.STANDALONE.HYPOGEN); + MaterialGenerator.generate(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Custom Materials that are from Runescape - MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); - MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL); - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE); - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE); - MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL); + MaterialGenerator.generate(MaterialsElements.STANDALONE.BLACK_METAL); + MaterialGenerator.generate(MaterialsElements.STANDALONE.WHITE_METAL); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.GRANITE); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.RUNITE); + MaterialGenerator.generate(MaterialsElements.STANDALONE.DRAGON_METAL); - MISC_MATERIALS.run(); + MaterialMisc.run(); - MaterialGenerator.generate(ALLOY.SILICON_CARBIDE); - MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); - MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); - MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE); - MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.SILICON_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.ZIRCONIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.TANTALUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.NIOBIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE); // LFTR Fuel components - MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component - MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.AMMONIUM_BIFLUORIDE); // LFTR fuel component + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_HYDROXIDE); // LFTR fuel component // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component // Generate Fluorides - MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_FLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.LITHIUM_FLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_TETRAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_TETRAFLUORIDE, false); - MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_HEXAFLUORIDE, false); - MaterialGenerator.generateNuclearDusts(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_FLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.LITHIUM_FLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_TETRAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_TETRAFLUORIDE, false); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_HEXAFLUORIDE, false); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE); // LFTR Fluoride outputs - MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.TECHNETIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.SELENIUM_HEXAFLUORIDE); // Generate Reactor Fuel Salts - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235); - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4); - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4U235); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4UF4); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ThF4UF4); // MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false); // Generate some Alloys // Misc Alloys - MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL); - MaterialGenerator.generate(ALLOY.BLOODSTEEL); + MaterialGenerator.generate(MaterialsAlloy.ENERGYCRYSTAL); + MaterialGenerator.generate(MaterialsAlloy.BLOODSTEEL); - MaterialGenerator.generate(ALLOY.ZERON_100); + MaterialGenerator.generate(MaterialsAlloy.ZERON_100); // Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper - MaterialGenerator.generate(ALLOY.TUMBAGA); + MaterialGenerator.generate(MaterialsAlloy.TUMBAGA); // Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible - MaterialGenerator.generate(ALLOY.POTIN); + MaterialGenerator.generate(MaterialsAlloy.POTIN); // Staballoy & Tantalloy - MaterialGenerator.generate(ALLOY.STABALLOY); - MaterialGenerator.generate(ALLOY.TANTALLOY_60); - MaterialGenerator.generate(ALLOY.TANTALLOY_61); + MaterialGenerator.generate(MaterialsAlloy.STABALLOY); + MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_60); + MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_61); // Inconel - MaterialGenerator.generate(ALLOY.INCONEL_625); - MaterialGenerator.generate(ALLOY.INCONEL_690); - MaterialGenerator.generate(ALLOY.INCONEL_792); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_625); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_690); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_792); // Steels - MaterialGenerator.generateDusts(ALLOY.EGLIN_STEEL_BASE); - MaterialGenerator.generate(ALLOY.EGLIN_STEEL); - MaterialGenerator.generate(ALLOY.MARAGING250); - MaterialGenerator.generate(ALLOY.MARAGING300); - MaterialGenerator.generate(ALLOY.MARAGING350); - MaterialGenerator.generate(ALLOY.AQUATIC_STEEL); + MaterialGenerator.generateDusts(MaterialsAlloy.EGLIN_STEEL_BASE); + MaterialGenerator.generate(MaterialsAlloy.EGLIN_STEEL); + MaterialGenerator.generate(MaterialsAlloy.MARAGING250); + MaterialGenerator.generate(MaterialsAlloy.MARAGING300); + MaterialGenerator.generate(MaterialsAlloy.MARAGING350); + MaterialGenerator.generate(MaterialsAlloy.AQUATIC_STEEL); - MaterialGenerator.generate(ALLOY.NITINOL_60, true); + MaterialGenerator.generate(MaterialsAlloy.NITINOL_60, true); // Composite Alloys - MaterialGenerator.generate(ALLOY.STELLITE); - MaterialGenerator.generate(ALLOY.TALONITE); + MaterialGenerator.generate(MaterialsAlloy.STELLITE); + MaterialGenerator.generate(MaterialsAlloy.TALONITE); // Hastelloy - MaterialGenerator.generate(ALLOY.HASTELLOY_W); - MaterialGenerator.generate(ALLOY.HASTELLOY_X); - MaterialGenerator.generate(ALLOY.HASTELLOY_C276); - MaterialGenerator.generate(ALLOY.HASTELLOY_N); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_W); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_X); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_C276); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_N); // Incoloy - MaterialGenerator.generate(ALLOY.INCOLOY_020); - MaterialGenerator.generate(ALLOY.INCOLOY_DS); - MaterialGenerator.generate(ALLOY.INCOLOY_MA956); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_020); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_DS); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_MA956); // Leagrisium - MaterialGenerator.generate(ALLOY.LEAGRISIUM); + MaterialGenerator.generate(MaterialsAlloy.LEAGRISIUM); // Super Conductor - MaterialGenerator.generate(ALLOY.HG1223, false, false); + MaterialGenerator.generate(MaterialsAlloy.HG1223, false, false); // Generate Fictional Materials - MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); - MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); - MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); - MaterialGenerator.generate(ALLOY.TRINIUM_REINFORCED_STEEL); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_TITANIUM); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH, false); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH_CARBON); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_REINFORCED_STEEL); // Top Tier Alloys - MaterialGenerator.generate(ALLOY.HELICOPTER); - MaterialGenerator.generate(ALLOY.LAFIUM); - MaterialGenerator.generate(ALLOY.CINOBITE); - MaterialGenerator.generate(ALLOY.PIKYONIUM); - MaterialGenerator.generate(ALLOY.ABYSSAL); - MaterialGenerator.generate(ALLOY.LAURENIUM); + MaterialGenerator.generate(MaterialsAlloy.HELICOPTER); + MaterialGenerator.generate(MaterialsAlloy.LAFIUM); + MaterialGenerator.generate(MaterialsAlloy.CINOBITE); + MaterialGenerator.generate(MaterialsAlloy.PIKYONIUM); + MaterialGenerator.generate(MaterialsAlloy.ABYSSAL); + MaterialGenerator.generate(MaterialsAlloy.LAURENIUM); // abs recipe in RECIPES_GREGTECH.java - MaterialGenerator.generate(ALLOY.BOTMIUM, true, false); + MaterialGenerator.generate(MaterialsAlloy.BOTMIUM, true, false); - MaterialGenerator.generate(ALLOY.HS188A); + MaterialGenerator.generate(MaterialsAlloy.HS188A); - MaterialGenerator.generate(ALLOY.TITANSTEEL); - MaterialGenerator.generate(ALLOY.ARCANITE); - MaterialGenerator.generate(ALLOY.OCTIRON); + MaterialGenerator.generate(MaterialsAlloy.TITANSTEEL); + MaterialGenerator.generate(MaterialsAlloy.ARCANITE); + MaterialGenerator.generate(MaterialsAlloy.OCTIRON); - MaterialGenerator.generate(ALLOY.BABBIT_ALLOY, false); - MaterialGenerator.generate(ALLOY.BLACK_TITANIUM, false); - MaterialGenerator.generate(ALLOY.INDALLOY_140, false, false); + MaterialGenerator.generate(MaterialsAlloy.BABBIT_ALLOY, false); + MaterialGenerator.generate(MaterialsAlloy.BLACK_TITANIUM, false); + MaterialGenerator.generate(MaterialsAlloy.INDALLOY_140, false, false); // High Level Bioplastic - MaterialGenerator.generate(ELEMENT.STANDALONE.RHUGNOR, false, false); + MaterialGenerator.generate(MaterialsElements.STANDALONE.RHUGNOR, false, false); // Must be the final Alloy to Generate - MaterialGenerator.generate(ALLOY.QUANTUM); + MaterialGenerator.generate(MaterialsAlloy.QUANTUM); // Ores - MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE); - MaterialGenerator.generateOreMaterial(ALLOY.KOBOLDITE); - GTplusplus_Everglades.GenerateOreMaterials(); + MaterialGenerator.generateOreMaterial(MaterialsFluorides.FLUORITE); + MaterialGenerator.generateOreMaterial(MaterialsAlloy.KOBOLDITE); + GTPPEverglades.GenerateOreMaterials(); // formula override - ALLOY.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3"); - ALLOY.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???"); + MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3"); + MaterialsAlloy.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???"); // Werkstoff bridge - ELEMENT.getInstance().ZIRCONIUM.setWerkstoffID((short) 3); - ELEMENT.getInstance().THORIUM232.setWerkstoffID((short) 30); - ELEMENT.getInstance().RUTHENIUM.setWerkstoffID((short) 64); - ELEMENT.getInstance().HAFNIUM.setWerkstoffID((short) 11000); - ELEMENT.getInstance().IODINE.setWerkstoffID((short) 11012); + MaterialsElements.getInstance().ZIRCONIUM.setWerkstoffID((short) 3); + MaterialsElements.getInstance().THORIUM232.setWerkstoffID((short) 30); + MaterialsElements.getInstance().RUTHENIUM.setWerkstoffID((short) 64); + MaterialsElements.getInstance().HAFNIUM.setWerkstoffID((short) 11000); + MaterialsElements.getInstance().IODINE.setWerkstoffID((short) 11012); } catch (final Throwable r) { Logger.INFO("Failed to Generated a Material. " + r.getMessage()); @@ -503,13 +499,13 @@ public final class ModItems { .getItem(); } // Generates a set of four special dusts to be used in my recipes. - dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0]; - dustIgnis = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().IGNIS, true)[0]; - dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0]; - dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0]; + dustAer = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AER, true)[0]; + dustIgnis = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().IGNIS, true)[0]; + dustTerra = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().TERRA, true)[0]; + dustAqua = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AQUA, true)[0]; - ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false); - cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1) + ItemUtils.generateSpecialUseDusts(MaterialMisc.WOODS_GLASS, false); + cellHydrogenChlorideMix = MaterialMisc.HYDROGEN_CHLORIDE_MIX.getCell(1) .getItem(); // Nuclear Fuel Dusts @@ -550,9 +546,9 @@ public final class ModItems { "Calcium Sulfate (Gypsum)", "CaSO4", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate - GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); + GTOreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); } else { - GT_OreDictUnificator + GTOreDictUnificator .registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); } dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts( @@ -560,14 +556,17 @@ public final class ModItems { "Li2CO3 + CaO2H2 Compound", "Li2CO3CaO2H2", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate - MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(MaterialsFluorides.SODIUM_FLUORIDE, false); // FLiBe Fuel Compounds dustLi2BeF4 = ItemUtils.generateSpecialUseDusts( "Li2BeF4", "Lithium Tetrafluoroberyllate Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe - Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4)); + Material.registerComponentForMaterial( + MaterialsNuclides.Li2BeF4, + OrePrefixes.dust, + ItemUtils.getSimpleStack(dustLi2BeF4)); // fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0); // fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255, // 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true); @@ -608,7 +607,7 @@ public final class ModItems { false, null); - if (CORE.ConfigSwitches.enableMachine_Pollution) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { itemBasicTurbine = new ItemBasicScrubberTurbine(); } @@ -618,7 +617,7 @@ public final class ModItems { "itemZirconiumPellet", "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); - GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); + GTOreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); // Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf dustCookedZrCl4 = ItemUtils @@ -626,9 +625,9 @@ public final class ModItems { // Zirconium Tetrafluoride /* - * GT_OreDictUnificator.registerOre("cellZrF4", + * GTOreDictUnificator.registerOre("cellZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); - * GT_OreDictUnificator.registerOre("dustZrF4", + * GTOreDictUnificator.registerOre("dustZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); */ fluidZrF4 = FluidUtils.generateFluidNoPrefix( @@ -636,7 +635,7 @@ public final class ModItems { "Zirconium Tetrafluoride", 500, new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); + MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); // Coolant Salt // NaBF4 - NaF - 621C @@ -644,7 +643,7 @@ public final class ModItems { // //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride // Load Tree Farmer - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN dustFertUN18 = ItemUtils .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; dustFertUN32 = ItemUtils @@ -665,7 +664,7 @@ public final class ModItems { temp1, null, true); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(temp2) .fluidOutputs(new FluidStack(fluidFertBasic, 36)) .duration(5 * TICKS) @@ -708,7 +707,7 @@ public final class ModItems { true); // Test items - toolGregtechPump = new GregtechPump(); + toolGregtechPump = new ItemGregtechPump(); toolGregtechPump.registerPumpType(0, "Simple Hand Pump", 0, 0); toolGregtechPump.registerPumpType(1, "Advanced Hand Pump", 32000, 1); toolGregtechPump.registerPumpType(2, "Super Hand Pump", 128000, 2); @@ -725,17 +724,17 @@ public final class ModItems { 50640, new String[] { StringUtils.superscript("238Np"), "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, - ELEMENT.getInstance().PLUTONIUM238.getDust(1) + MaterialsElements.getInstance().PLUTONIUM238.getDust(1) .getItem(), 5); dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts( "DecayedRadium226", "Decayed Radium-226", "Contains Radon (" + StringUtils.superscript("222Rn") + ")", - ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; + MaterialsElements.getInstance().RADIUM.getRgbAsHex())[0]; dustRadium226 = new DustDecayable( "dustRadium226", - ELEMENT.getInstance().RADIUM.getRgbAsHex(), + MaterialsElements.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] { StringUtils.superscript("226Ra"), "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, @@ -744,16 +743,16 @@ public final class ModItems { 5); dustProtactinium233 = new DustDecayable( "dustProtactinium233", - ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), + MaterialsElements.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, new String[] { StringUtils.superscript("233Pa"), "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, - ELEMENT.getInstance().URANIUM233.getDust(1) + MaterialsElements.getInstance().URANIUM233.getDust(1) .getItem(), 6); dustMolybdenum99 = new DustDecayable( "dustMolybdenum99", - ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), + MaterialsElements.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] { StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, @@ -799,7 +798,7 @@ public final class ModItems { try { final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); if (baublesTest != null) { - COMPAT_Baubles.run(); + CompatBaubles.run(); } else { Logger.INFO("Baubles Not Found - Skipping Resources."); } @@ -810,7 +809,7 @@ public final class ModItems { // Buffer Cores! Item itemBufferCore; for (int i = 1; i <= 10; i++) { - itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); + itemBufferCore = new ItemBufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()); } @@ -866,92 +865,106 @@ public final class ModItems { // Just an unusual plate needed for some black magic. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateClay", 1) == null) { - itemPlateClay = new BaseItemPlate(NONMATERIAL.CLAY); + itemPlateClay = new BaseItemPlate(MaterialsOther.CLAY); } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null) { - itemDoublePlateClay = new BaseItemPlateDouble(NONMATERIAL.CLAY); + itemDoublePlateClay = new BaseItemPlateDouble(MaterialsOther.CLAY); } // Need this for Mutagenic Frames if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null) { - itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235); + itemFoilUranium235 = new BaseItemFoil(MaterialsElements.getInstance().URANIUM235); } // A small gear needed for wizardry. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null) { - itemSmallWroughtIronGear = new BaseItemSmallGear(NONMATERIAL.WROUGHT_IRON); + itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialsOther.WROUGHT_IRON); } // Krypton Processing if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null) { itemHotTitaniumIngot = ItemUtils - .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); + .getSimpleStack(new BaseItemIngot(MaterialsElements.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); } else { itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1); } // Need this for Laurenium if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIndium", 1) == null) { - itemDustIndium = new BaseItemDust(ELEMENT.getInstance().INDIUM); + itemDustIndium = new BaseItemDust(MaterialsElements.getInstance().INDIUM); } // Springs + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.SPRING, + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.NITINOL_60); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.AQUATIC_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.EGLIN_STEEL); + .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.NITINOL_60); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.AQUATIC_STEEL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.EGLIN_STEEL); // Small Springs - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.MARAGING250); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.NICHROME); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STABALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STEEL_BLACK); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.BLACK_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.MARAGING250); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.NICHROME); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STABALLOY); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STEEL_BLACK); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.BLACK_TITANIUM); // Fine Wire - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().PALLADIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().ZIRCONIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.LEAGRISIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.BABBIT_ALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.KOBOLDITE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.HG1223); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.QUANTUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.HYPOGEN); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().PALLADIUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.KOBOLDITE); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.HG1223); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.QUANTUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.HYPOGEN); + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.FINEWIRE, + MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Foil - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BLACK_TITANIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BOTMIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TITANSTEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.NITINOL_60); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.QUANTUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAURENIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.HYPOGEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ASTRAL_TITANIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.RHUGNOR); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ADVANCED_NITINOL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.PIKYONIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.CINOBITE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAFIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TRINIUM_REINFORCED_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BLACK_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BOTMIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TITANSTEEL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.NITINOL_60); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.QUANTUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAURENIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.HYPOGEN); + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.FOIL, + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ASTRAL_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.RHUGNOR); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ADVANCED_NITINOL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.PIKYONIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.CINOBITE); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAFIUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TRINIUM_REINFORCED_STEEL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Gear - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, ELEMENT.STANDALONE.RHUGNOR); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, MaterialsElements.STANDALONE.RHUGNOR); // Special Sillyness if (true) { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) { - new BaseItemPlate(ELEMENT.getInstance().SODIUM); + new BaseItemPlate(MaterialsElements.getInstance().SODIUM); } - Material meatRaw = NONMATERIAL.MEAT; + Material meatRaw = MaterialsOther.MEAT; // A plate of Meat. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) { itemPlateRawMeat = new BaseItemPlate(meatRaw); @@ -966,22 +979,22 @@ public final class ModItems { // A plate of Vanadium. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null) { - itemPlateVanadium = new BaseItemPlate(ELEMENT.getInstance().VANADIUM); + itemPlateVanadium = new BaseItemPlate(MaterialsElements.getInstance().VANADIUM); } // A plate of Lithium. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null) { - itemPlateLithium = new BaseItemPlate(ELEMENT.getInstance().LITHIUM); + itemPlateLithium = new BaseItemPlate(MaterialsElements.getInstance().LITHIUM); } // A plate of Europium. if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { - itemPlateEuropium = new BaseItemPlate(ELEMENT.getInstance().EUROPIUM); + && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + itemPlateEuropium = new BaseItemPlate(MaterialsElements.getInstance().EUROPIUM); } if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { - itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM); + && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialsElements.getInstance().EUROPIUM); } // Tumbaga Mix (For Simple Crafting) diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index 8bbc5a3b08..3ce461ffab 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -4,7 +4,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemBurnable extends CoreItem { @@ -23,7 +23,7 @@ public class BaseItemBurnable extends CoreItem { } public void registerFuel(int burn) { - CORE.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); + GTPPCore.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); } public final void registerOrdictionary(String name) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index d391207a56..6a224ddc87 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -14,7 +14,7 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; public class BaseItemColourable extends Item { @@ -42,7 +42,7 @@ public class BaseItemColourable extends Item { this.setMaxDamage(maxDmg); this.setHasSubtypes(true); this.rarity = regRarity; - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); this.descColour = colour; this.hasEffect = Effect; this.componentColour = rgb; @@ -57,13 +57,13 @@ public class BaseItemColourable extends Item { final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); this.rarity = regRarity; - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); this.descColour = colour; this.hasEffect = Effect; this.componentColour = rgb; @@ -74,8 +74,7 @@ public class BaseItemColourable extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add( - this.descColour - + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); + this.descColour + GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); // super.addInformation(stack, aPlayer, list, bool); } @@ -93,8 +92,8 @@ public class BaseItemColourable extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { if (!("gtplusplus." + this.getUnlocalizedName() + ".name") - .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { - return GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"); + .equals(GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { + return GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"); } else return super.getItemStackDisplayName(tItem); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 6846f8febb..5a7bc4fa45 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -20,15 +20,15 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -71,15 +71,15 @@ public class BaseItemComponent extends Item { // if (componentType != ComponentTypes.DUST) - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( componentType.getOreDictName() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); if (componentType == ComponentTypes.GEAR) { - GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } registerComponent(); - GT_LanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName()); + GTLanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName()); } // For Cell Generation @@ -109,12 +109,12 @@ public class BaseItemComponent extends Item { this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this)); registerComponent(); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", getFormattedLangName()); } @@ -144,17 +144,17 @@ public class BaseItemComponent extends Item { + "]"); Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap); if (componentType == ComponentTypes.PLATE) { - GregTech_API.registerCover( + GregTechAPI.registerCover( componentMaterial.getPlate(1), - new GT_RenderedTexture( + new GTRenderedTexture( componentMaterial.getTextureSet().mTextures[71], componentMaterial.getRGBA(), false), null); } else if (componentType == ComponentTypes.PLATEDOUBLE) { - GregTech_API.registerCover( + GregTechAPI.registerCover( componentMaterial.getPlateDouble(1), - new GT_RenderedTexture( + new GTRenderedTexture( componentMaterial.getTextureSet().mTextures[72], componentMaterial.getRGBA(), false), @@ -169,7 +169,7 @@ public class BaseItemComponent extends Item { } public String getCorrectTextures() { - if (!CORE.ConfigSwitches.useGregtechTextures) { + if (!GTPPCore.ConfigSwitches.useGregtechTextures) { return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME; } String metType = "9j4852jyo3rjmh3owlhw9oe"; @@ -198,12 +198,12 @@ public class BaseItemComponent extends Item { public String getFluidName(String aKey) { String trans; - trans = GT_LanguageManager.getTranslation(aKey); + trans = GTLanguageManager.getTranslation(aKey); if (!trans.equals(aKey)) return trans; aKey = "fluid." + aKey; - trans = GT_LanguageManager.getTranslation(aKey); + trans = GTLanguageManager.getTranslation(aKey); if (!trans.equals(aKey)) return trans; - return GT_LanguageManager.addStringLocalization( + return GTLanguageManager.addStringLocalization( "gtplusplus.fluid." + this.materialName.toLowerCase() .replace(" ", ""), this.materialName); @@ -211,7 +211,7 @@ public class BaseItemComponent extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name") + return GTLanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name") .replace("%s", "%temp") .replace("%material", translatedMaterialName) .replace("%temp", "%s"); @@ -250,7 +250,7 @@ public class BaseItemComponent extends Item { } if (this.componentMaterial.isRadioactive) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) { @@ -324,7 +324,7 @@ public class BaseItemComponent extends Item { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - return (CORE.ConfigSwitches.useGregtechTextures ? true : false); + return (GTPPCore.ConfigSwitches.useGregtechTextures ? true : false); } @SuppressWarnings("unchecked") @@ -332,10 +332,10 @@ public class BaseItemComponent extends Item { public int getColorFromItemStack(final ItemStack stack, final int renderPass) { if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } } @@ -380,7 +380,7 @@ public class BaseItemComponent extends Item { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { if (pass == 0) { return this.base; } @@ -392,7 +392,7 @@ public class BaseItemComponent extends Item { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(getCorrectTextures()); this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 3ecb6960d6..a5792e236a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -35,22 +35,22 @@ public class BaseItemTCShard extends Item { this.setUnlocalizedName(this.unlocalName); if (Description != null) { for (int i = 0; i < Description.length; i++) { - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]); } } this.setMaxStackSize(64); this.setTextureName(GTPlusPlus.ID + ":" + "itemShard"); GameRegistry.registerItem(this, this.unlocalName); - GT_OreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); - GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 4745fda281..89e9c4b038 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -215,7 +215,7 @@ public class CoreItem extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); @@ -274,7 +274,7 @@ public class CoreItem extends Item { public void setItemDescription(String[] description) { for (int i = 0; i < description.length; i++) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i, description[i]); } diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 1140390375..228c1803eb 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -47,7 +47,7 @@ public class BaseItemCell extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); } else { @@ -62,10 +62,10 @@ public class BaseItemCell extends BaseItemComponent { @Override public int getColorFromItemStack(final ItemStack stack, final int renderPass) { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 2592fe3cf7..a451bfc77b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; @@ -61,7 +61,7 @@ public class BaseItemDustUnique extends Item { } else { type = "%material Dust"; } - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type); String temp = ""; Logger.WARNING("Unlocalized name for OreDict nameGen: " + this.getUnlocalizedName()); @@ -84,7 +84,7 @@ public class BaseItemDustUnique extends Item { Logger.WARNING("Generating OreDict Name: " + temp); } if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } registerComponent(); } @@ -115,12 +115,12 @@ public class BaseItemDustUnique extends Item { @Override public String getItemStackDisplayName(final ItemStack iStack) { - return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") - .replace("%material", GT_LanguageManager.getTranslation("gtplusplus.material." + materialName)); + return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") + .replace("%material", GTLanguageManager.getTranslation("gtplusplus.material." + materialName)); } private String getCorrectTexture(final String pileSize) { - if (!CORE.ConfigSwitches.useGregtechTextures) { + if (!GTPPCore.ConfigSwitches.useGregtechTextures) { if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) { this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { @@ -141,7 +141,7 @@ public class BaseItemDustUnique extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.sRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("") && !chemicalNotation.equals("NullFormula")) { diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 9d22c0faf8..82020229f0 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.ingots; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -14,10 +14,10 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseItemIngotHot extends BaseItemIngot { private void generateRecipe() { Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + "."); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(this)) .itemOutputs(this.outputIngot.copy()) .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) @@ -78,7 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { return true; } else { return false; @@ -88,7 +88,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); } else { @@ -100,9 +100,9 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (pass == 0 && CORE.ConfigSwitches.useGregtechTextures) { + if (pass == 0 && GTPPCore.ConfigSwitches.useGregtechTextures) { return this.base; - } else if (pass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + } else if (pass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return this.overlay; } else { return this.overlay; diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java index 6335820c9a..28407a4557 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.ingots; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -10,21 +10,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class BaseItemIngot_OLD extends Item { +public class BaseItemIngotOld extends Item { protected int colour; protected String materialName; protected String unlocalName; - public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour, + public BaseItemIngotOld(final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) { this.setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); @@ -42,7 +42,7 @@ public class BaseItemIngot_OLD extends Item { temp = this.unlocalName.replace("itemHotIngot", "ingotHot"); } if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } // this.generateCompressorRecipe(); } @@ -83,7 +83,7 @@ public class BaseItemIngot_OLD extends Item { if ((temp != null) && !temp.equals("")) { tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tempStack) .itemOutputs(tempOutput) .duration(15 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 98c652a1ba..92876663f0 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -149,7 +149,7 @@ public class ItemBlockGtBlock extends ItemBlock { if (this.mMaterial != null) { if (this.mMaterial.vRadiationLevel > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 0cee16b3f6..45d0e4f60e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -76,7 +76,7 @@ public class ItemBlockOre extends ItemBlock { // Radioactive? if (this.mThisRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.mThisMaterial != null) { diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 020becc687..6c8e0ce81a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -16,8 +16,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -48,12 +48,12 @@ public class BaseItemMisc extends Item { } if (description != null) { for (int i = 0; i < description.length; i++) { - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip." + i, description[i]); } } GameRegistry.registerItem(this, this.unlocalName); - GT_OreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this)); } private String getCorrectTextures() { @@ -95,7 +95,7 @@ public class BaseItemMisc extends Item { public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java index b7d07e5ef0..52cada6e01 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java @@ -1,15 +1,15 @@ package gtPlusPlus.core.item.base.ore; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.millingRecipes; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -30,26 +30,26 @@ public class BaseItemMilledOre extends BaseOreComponent { ItemStack millingBall_Alumina = GregtechItemList.Milling_Ball_Alumina.get(0); ItemStack millingBall_Soapstone = GregtechItemList.Milling_Ball_Soapstone.get(0); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10), oreStack, millingBall_Alumina) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10), oreStack, millingBall_Alumina) .itemOutputs(milledStackOres1) .duration(2 * MINUTES) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone) .itemOutputs(milledStackOres2) .duration(2 * MINUTES + 30 * SECONDS) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina) .itemOutputs(milledStackCrushed1) .duration(1 * MINUTES) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone) .itemOutputs(milledStackCrushed2) .duration(1 * MINUTES + 15 * SECONDS) .eut(materialEU) diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 2074bb2ede..dd4ad12df8 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -19,10 +19,10 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseOreComponent extends Item { this.componentColour = material.getRgbAsHex(); GameRegistry.registerItem(this, this.unlocalName); registerComponent(); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } @@ -127,7 +127,8 @@ public class BaseOreComponent extends Item { list.add(temp); } if (this.componentMaterial.isRadioactive) { - list.add(CORE.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel); + list.add( + GTPPCore.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel); } } else { String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); @@ -157,7 +158,7 @@ public class BaseOreComponent extends Item { /** * Rendering Related - * + * * @author Alkalus * */ @@ -179,7 +180,7 @@ public class BaseOreComponent extends Item { this.overlay = par1IconRegister .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY"); } - } else if (CORE.ConfigSwitches.useGregtechTextures) { + } else if (GTPPCore.ConfigSwitches.useGregtechTextures) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the // layer 0 texture path."); @@ -209,10 +210,10 @@ public class BaseOreComponent extends Item { } return this.componentColour; } else { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return this.componentColour; } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index 168d5236c6..0279a396de 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseItemPlate_OLD extends Item { .contains("itemplate")) { temp = this.unlocalName.replace("itemP", "p"); if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } } } @@ -81,7 +81,7 @@ public class BaseItemPlate_OLD extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.sRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (StringUtils.containsSuperOrSubScript(this.chemicalNotation)) { list.add(this.chemicalNotation); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 76121ef266..f1184fb5bb 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -17,7 +17,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -47,10 +47,10 @@ public class BaseBauble extends Item implements IBauble { @Override public String getItemStackDisplayName(final ItemStack tItem) { String key = "gtplusplus." + getUnlocalizedName() + ".name"; - if (key.equals(GT_LanguageManager.getTranslation(key))) { + if (key.equals(GTLanguageManager.getTranslation(key))) { return super.getItemStackDisplayName(tItem).replaceAll(".name", ""); } - return GT_LanguageManager.getTranslation(key); + return GTLanguageManager.getTranslation(key); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index 881146b15d..01cd0ec0c1 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java @@ -19,7 +19,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; @@ -29,7 +29,7 @@ import ic2.api.item.IElectricItem; public class BatteryPackBaseBauble extends ElectricBaseBauble { public BatteryPackBaseBauble(int tier) { - super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); + super(BaubleType.BELT, tier, GTValues.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); String aUnlocalName = "GTPP.BattPack.0" + tier + ".name"; this.setCreativeTab(AddToCreativeTab.tabMachines); if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index ab17e91232..5717a1e926 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -20,9 +20,9 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; @@ -112,7 +112,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric @Override public final double getTransferLimit(final ItemStack itemStack) { - return GT_Values.V[mTier]; + return GTValues.V[mTier]; } @Override @@ -141,13 +141,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTier(stack)) + + GTUtility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + + GTUtility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -155,12 +155,12 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getCharge(stack)) + + GTUtility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); super.addInformation(stack, aPlayer, list, bool); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index c3c371ae35..35adc35e96 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -18,7 +18,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class FireProtectionBauble extends BaseBauble { @@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble { static { isImmuneToFire = ReflectionUtils - .getField(Entity.class, !CORE_Preloader.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); + .getField(Entity.class, !PreloaderCore.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); } public static boolean fireImmune(Entity aEntity) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 2459e08bfc..4bbf29c88f 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -6,9 +6,9 @@ import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels; @@ -23,16 +23,16 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; -import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; +import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -152,7 +152,7 @@ public class AgriculturalChem extends ItemPackage { mAlgae = new ItemAlgaeBase(); mAgrichemItem1 = new ItemAgrichemBase(); - mBioCircuit = new GTPP_IntegratedCircuit_Item("BioRecipeSelector", "bioscience/BioCircuit"); + mBioCircuit = new GTPPIntegratedCircuitItem("BioRecipeSelector", "bioscience/BioCircuit"); GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit); mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1); @@ -422,8 +422,8 @@ public class AgriculturalChem extends ItemPackage { ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1); // Poop Juice to Basic Slurry - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10)) .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1) .outputChances(2000, 2000, 500, 500, 250, 250) .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) @@ -433,8 +433,8 @@ public class AgriculturalChem extends ItemPackage { .addTo(centrifugeRecipes); // More Efficient way to get byproducts, less Slurry - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20)) .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2) .outputChances(4000, 3000, 1250, 1250, 675, 675) .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) @@ -446,7 +446,7 @@ public class AgriculturalChem extends ItemPackage { private static void addAdvancedSlurryRecipes() { - ItemStack aCircuit = GT_Utility.getIntegratedCircuit(10); + ItemStack aCircuit = GTUtility.getIntegratedCircuit(10); ItemStack aBone; ItemStack aMeat; ItemStack aEmptyCells = Materials.Empty.getCells(2); @@ -459,7 +459,7 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); // Poop Juice to Fertile Slurry - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aCircuit, aBone, aMeat, aInputCells) .itemOutputs(aEmptyCells) .fluidInputs(aBloodStack) @@ -481,7 +481,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -492,7 +492,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 2); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 9); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -512,7 +512,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 5); for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 7); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -523,7 +523,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 12); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -558,9 +558,9 @@ public class AgriculturalChem extends ItemPackage { if (aItemInstance instanceof Item aForestryFert) { aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(11), + GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) .itemOutputs(ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod) .outputChances(100_00, 20_00, 20_00) @@ -578,8 +578,8 @@ public class AgriculturalChem extends ItemPackage { * IC2 Support */ aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) .itemOutputs(ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod) .outputChances(100_00, 20_00, 20_00) .eut(240) @@ -587,7 +587,7 @@ public class AgriculturalChem extends ItemPackage { .addTo(chemicalDehydratorRecipes); // Dirt Production - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(dustDirt, 9)) .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)) .duration(2 * SECONDS) @@ -597,13 +597,13 @@ public class AgriculturalChem extends ItemPackage { // Centrifuge Byproducts // Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GTUtility.getIntegratedCircuit(20)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), ItemUtils.getSimpleStack(dustDirt, 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1)) .outputChances(2500, 2500, 750, 1000, 5000, 250) @@ -614,21 +614,21 @@ public class AgriculturalChem extends ItemPackage { .addTo(centrifugeRecipes); // Add Fuel Usages - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) .duration(0) .eut(0) .metadata(FUEL_VALUE, 12) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(ManureSlurry, 1000)) .duration(0) .eut(0) .metadata(FUEL_VALUE, 24) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(FertileManureSlurry, 1000)) .duration(0) .eut(0) @@ -636,15 +636,15 @@ public class AgriculturalChem extends ItemPackage { .addTo(semiFluidFuels); // Red Slurry / Tailings Processing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(10)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)) .outputChances(3000, 3000, 2000, 2000, 1000, 1000) .fluidInputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 1000)) .fluidOutputs(Materials.Water.getFluid(500)) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index b9f5e58eef..87e5a7b22f 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -3,11 +3,11 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels; @@ -15,13 +15,13 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; @@ -48,7 +48,7 @@ public class CoalTar extends ItemPackage { // C2H6O = C2H4 + H2O if (bioEth1 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)) .fluidInputs(bioEth1) @@ -59,7 +59,7 @@ public class CoalTar extends ItemPackage { } if (bioEth2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)) .fluidInputs(bioEth2) @@ -72,7 +72,7 @@ public class CoalTar extends ItemPackage { public static void recipeCreateBenzene() { // C7H8 + 2H = CH4 + C6H6 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Toluene.getCells(1)) .itemOutputs(Materials.Benzene.getCells(1)) .fluidInputs(Materials.Hydrogen.getGas(2000)) @@ -85,10 +85,8 @@ public class CoalTar extends ItemPackage { public static void recipeCreateEthylbenzene() { // C2H4 + C6H6 = C8H10 - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), - GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2)) .fluidInputs(FluidUtils.getFluidStack("benzene", 2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000)) @@ -96,8 +94,8 @@ public class CoalTar extends ItemPackage { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2)) .fluidInputs(FluidUtils.getFluidStack("ethylene", 2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000)) @@ -108,10 +106,10 @@ public class CoalTar extends ItemPackage { public static void recipeCoalToCoalTar() { // Charcoal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800)) .duration(18 * SECONDS) @@ -119,10 +117,10 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Lignite - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800)) .duration(54 * SECONDS) @@ -130,10 +128,10 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Coal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 2200)) .duration(36 * SECONDS) @@ -141,8 +139,8 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Coke - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 3400)) .duration(18 * SECONDS) @@ -158,15 +156,15 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("liquid_naphtha", 150), FluidUtils.getFluidStack("fluid.ethylbenzene", 200), FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.kerosene", 600) }; for (int i = 0; i < distOutputs.length; i++) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)) .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000)) .fluidOutputs(distOutputs[i]) .duration(30 * SECONDS) .eut(64) .addTo(distilleryRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000)) .fluidOutputs(distOutputs) .duration(15 * SECONDS) @@ -176,7 +174,7 @@ public class CoalTar extends ItemPackage { private static void recipeCoalTarOilToSulfuricOilToNaphthalene() { // SulfuricCoalTarOil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 8), ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8)) @@ -185,8 +183,8 @@ public class CoalTar extends ItemPackage { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(6)) .fluidInputs(FluidUtils.getFluidStack("fluid.sulfuriccoaltaroil", 1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.naphthalene", 1000)) .eut(TierEU.RECIPE_LV) @@ -196,7 +194,7 @@ public class CoalTar extends ItemPackage { private static void recipeNaphthaleneToPhthalicAcid() { // SulfuricCoalTarOil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Lithium.getDust(5)) .fluidInputs(FluidUtils.getFluidStack(Naphthalene, 2000)) .fluidOutputs(Materials.PhthalicAcid.getFluid(2500)) @@ -207,7 +205,7 @@ public class CoalTar extends ItemPackage { } private static void recipePhthalicAcidToPhthalicAnhydride() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(15)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15)) .fluidInputs(Materials.PhthalicAcid.getFluid(1000)) @@ -234,15 +232,15 @@ public class CoalTar extends ItemPackage { recipePhthalicAcidToPhthalicAnhydride(); // Burn the coal gas! - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1)) .metadata(FUEL_VALUE, 96) - .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.GasTurbine.ordinal()) + .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.GasTurbine.ordinal()) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1))) @@ -251,7 +249,7 @@ public class CoalTar extends ItemPackage { .metadata(FUEL_VALUE, 64) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1))) @@ -260,7 +258,7 @@ public class CoalTar extends ItemPackage { .metadata(FUEL_VALUE, 32) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1))) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 65bc52739d..99885d77e8 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -2,12 +2,12 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; @@ -17,25 +17,25 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -63,10 +63,10 @@ public class GenericChem extends ItemPackage { false, null, 0, - new MaterialStack(NONMATERIAL.PTFE, 75), - new MaterialStack(NONMATERIAL.PLASTIC, 15), - new MaterialStack(ELEMENT.getInstance().CARBON, 5), - new MaterialStack(ELEMENT.getInstance().SODIUM, 5)); + new MaterialStack(MaterialsOther.PTFE, 75), + new MaterialStack(MaterialsOther.PLASTIC, 15), + new MaterialStack(MaterialsElements.getInstance().CARBON, 5), + new MaterialStack(MaterialsElements.getInstance().SODIUM, 5)); /** * Fluids @@ -146,7 +146,7 @@ public class GenericChem extends ItemPackage { MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); - mAdvancedCircuit = new GTPP_IntegratedCircuit_Item("T3RecipeSelector", "science/general/AdvancedCircuit"); + mAdvancedCircuit = new GTPPIntegratedCircuitItem("T3RecipeSelector", "science/general/AdvancedCircuit"); GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit); registerItemStacks(); @@ -382,11 +382,11 @@ public class GenericChem extends ItemPackage { private void recipeSodiumEthoxide() { // C2H5OH + Na → C2H5ONa + H - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16), MaterialsElements.getInstance().SODIUM.getDust(1)) .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) .fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(ELEMENT.getInstance().HYDROGEN.getFluidStack(1000)) + .fluidOutputs(MaterialsElements.getInstance().HYDROGEN.getFluidStack(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 2) @@ -395,9 +395,9 @@ public class GenericChem extends ItemPackage { private void recipePotassiumHydroxide() { // Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(18), + GTUtility.getIntegratedCircuit(18), Materials.Potash.getDust(3), ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)) .itemOutputs( @@ -414,8 +414,8 @@ public class GenericChem extends ItemPackage { private void recipeEthylXanthates() { // Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3)) .itemOutputs(ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12)) .fluidInputs(Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000)) .fluidOutputs(FluidUtils.getWater(1000)) @@ -425,8 +425,8 @@ public class GenericChem extends ItemPackage { .addTo(chemicalPlantRecipes); // Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12)) .fluidInputs(FluidUtils.getFluidStack(Carbon_Disulfide, 1000)) .duration(60 * SECONDS) @@ -437,20 +437,20 @@ public class GenericChem extends ItemPackage { private void recipeCarbonDisulfide() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000)) .duration(10 * MINUTES) .eut(TierEU.RECIPE_LV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(mBrownCatalyst, 0), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4)) .fluidInputs(FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000)) @@ -465,7 +465,7 @@ public class GenericChem extends ItemPackage { private void recipeMutatedLivingSolder() { // Endgame soldering alloy meant for the bioware circuit line and beyond. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 0), ItemList.Circuit_Chip_Biocell.get(64), @@ -475,7 +475,7 @@ public class GenericChem extends ItemPackage { FluidUtils.getFluidStack("plasma.tin", 18000), FluidUtils.getFluidStack("plasma.bismuth", 18000), FluidUtils.getFluidStack("cryotheum", 4000)) - .fluidOutputs(MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280)) + .fluidOutputs(MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280)) .duration(13 * MINUTES + 20 * SECONDS) .eut(3842160) .metadata(CHEMPLANT_CASING_TIER, 7) @@ -488,18 +488,18 @@ public class GenericChem extends ItemPackage { // Burnables // Gas Fuels - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1)) .metadata(FUEL_VALUE, 1600) .metadata(FUEL_TYPE, 1) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } private void recipeGrindingBallAlumina() { - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GTUtility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8)) .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)) .duration(3 * MINUTES) @@ -508,10 +508,10 @@ public class GenericChem extends ItemPackage { } private void recipeGrindingBallSoapstone() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), - GT_Utility.getIntegratedCircuit(10)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), + GTUtility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8)) .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)) .duration(2 * MINUTES) @@ -522,7 +522,7 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexane() { // C6H6 + 6H = C6H12 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(Benzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexane, 1000)) @@ -536,7 +536,7 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexanone() { // C6H12 + 2O(Air) = C6H10O + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("air", 4000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000)) @@ -544,7 +544,7 @@ public class GenericChem extends ItemPackage { .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 2) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip()) .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("oxygen", 2000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000)) @@ -557,12 +557,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystRed() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierOneChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -571,12 +571,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystYellow() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_EV) @@ -585,12 +585,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystBlue() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -599,12 +599,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystOrange() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -613,12 +613,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystPurple() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierFourChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), - ELEMENT.getInstance().RUTHENIUM.getDust(6)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), + MaterialsElements.getInstance().RUTHENIUM.getDust(6)) .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) @@ -627,12 +627,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystBrown() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierOneChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -641,12 +641,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystPink() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), - ELEMENT.getInstance().RHODIUM.getDust(4)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), + MaterialsElements.getInstance().RHODIUM.getDust(4)) .itemOutputs(ItemUtils.getSimpleStack(mPinkCatalyst, 10)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -655,7 +655,7 @@ public class GenericChem extends ItemPackage { private void recipeCatalystFormaldehyde() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(4), @@ -668,13 +668,13 @@ public class GenericChem extends ItemPackage { private void recipeCatalystSolidAcid() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5)) - .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)) + .fluidInputs(MaterialMisc.SOLID_ACID_MIXTURE.getFluidStack(1000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); @@ -682,12 +682,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystInfiniteMutation() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -697,7 +697,7 @@ public class GenericChem extends ItemPackage { private void recipeCadaverineAndPutrescine() { // Basic Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierOneChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 64)) .fluidInputs(FluidUtils.getHotWater(2000)) .fluidOutputs(FluidUtils.getFluidStack(Cadaverine, 250), FluidUtils.getFluidStack(Putrescine, 250)) @@ -706,7 +706,7 @@ public class GenericChem extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); // Advanced Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 128), @@ -723,7 +723,7 @@ public class GenericChem extends ItemPackage { private void recipeAniline() { // C6H5NO2 + 6H = C6H7N + 2H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Aniline, 1000)) @@ -737,7 +737,7 @@ public class GenericChem extends ItemPackage { private void recipeNitroBenzene() { // C6H6 + HNO3 =H2SO4= C6H5NO2 +H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierThreeChip()) .fluidInputs( FluidUtils.getFluidStack(Benzene, 5000), @@ -755,9 +755,9 @@ public class GenericChem extends ItemPackage { private void recipe2Ethylanthraquinone() { // C6H4(CO)2O + C6H5CH2CH3 = C6H4(CO)2C6H3CH2CH3 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(4), + GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15)) .fluidInputs(FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000)) .fluidOutputs(FluidUtils.getFluidStack(Ethylanthraquinone2, 1000)) @@ -771,8 +771,8 @@ public class GenericChem extends ItemPackage { private void recipe2Ethylanthrahydroquinone() { // C6H4(CO)2C6H3CH2CH3 + 2H = C6H4(COH)2C6H3CH2CH3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0)) .fluidInputs( FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), FluidUtils.getFluidStack("hydrogen", 2000)) @@ -786,7 +786,7 @@ public class GenericChem extends ItemPackage { private void recipeLithiumPeroxide() { // 2HLiO2 = Li2O2 + H2O2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8)) .fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4)) @@ -799,9 +799,9 @@ public class GenericChem extends ItemPackage { private void recipeLithiumHydroperoxide() { // LiOH + H2O2 = HLiO2 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(4), + GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4)) .fluidInputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000)) @@ -815,8 +815,8 @@ public class GenericChem extends ItemPackage { private void recipeHydrogenPeroxide() { // C6H4(COH)2C6H3CH2CH3 + 2O =(C6H4CH)2= H2O2 + C6H4(CO)2C6H3CH2CH3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), @@ -828,8 +828,8 @@ public class GenericChem extends ItemPackage { .eut(240) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( Materials.Oxygen.getGas(10000), FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), @@ -861,7 +861,7 @@ public class GenericChem extends ItemPackage { } private static void recipeAdvancedChip() { - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L), 0, new Object[] { OrePrefixes.circuit.get(Materials.HV) }); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index d4f5e832f6..c7738751c2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -15,7 +15,7 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.Materials; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.Utils; public class IonParticles extends BaseItemParticle { @@ -24,16 +24,16 @@ public class IonParticles extends BaseItemParticle { public static HashMap<Integer, String> MetaToNameMap = new HashMap<>(); public IonParticles() { - super("Ion", ELEMENT.NAMES.length, EnumRarity.rare); + super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare); } - public static IIcon[] overlays = new IIcon[ELEMENT.NAMES.length]; + public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length]; public static IIcon baseTexture; static { // Generate Ions int key = 0; - for (String s : ELEMENT.NAMES) { + for (String s : MaterialsElements.NAMES) { // Map names to Meta NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key); MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase())); @@ -60,7 +60,7 @@ public class IonParticles extends BaseItemParticle { @Override public String getUnlocalizedName(final ItemStack itemStack) { - return "item.particle.ion" + "." + ELEMENT.NAMES[itemStack.getItemDamage()]; + return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()]; } private static boolean createNBT(ItemStack rStack) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 5979fc76ef..078dcdee88 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -2,10 +2,10 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.*; import java.util.HashMap; @@ -14,27 +14,27 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.data.Quad; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.ore.BaseItemMilledOre; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.BiomesOPlentyHandler; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler; public class MilledOreProcessing extends ItemPackage { @@ -217,57 +217,57 @@ public class MilledOreProcessing extends ItemPackage { // milledSphalerite registerOreDataForMilledType( SphaleriteFlotationFroth, - ELEMENT.getInstance().ZINC, + MaterialsElements.getInstance().ZINC, 180, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 120, - ELEMENT.getInstance().INDIUM, + MaterialsElements.getInstance().INDIUM, 64, - ELEMENT.getInstance().GERMANIUM, + MaterialsElements.getInstance().GERMANIUM, 15); // milledChalcopyrite registerOreDataForMilledType( ChalcopyriteFlotationFroth, - ELEMENT.getInstance().COPPER, + MaterialsElements.getInstance().COPPER, 180, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 120, - ELEMENT.getInstance().CADMIUM, + MaterialsElements.getInstance().CADMIUM, 50, - ELEMENT.getInstance().INDIUM, + MaterialsElements.getInstance().INDIUM, 10); // milledNickel registerOreDataForMilledType( NickelFlotationFroth, - ELEMENT.getInstance().NICKEL, + MaterialsElements.getInstance().NICKEL, 150, - ELEMENT.getInstance().COBALT, + MaterialsElements.getInstance().COBALT, 120, - ELEMENT.getInstance().RHODIUM, + MaterialsElements.getInstance().RHODIUM, 32, - ELEMENT.getInstance().RUTHENIUM, + MaterialsElements.getInstance().RUTHENIUM, 16); // milledPlatinum registerOreDataForMilledType( PlatinumFlotationFroth, - ELEMENT.getInstance().PLATINUM, + MaterialsElements.getInstance().PLATINUM, 120, - ELEMENT.getInstance().RHODIUM, + MaterialsElements.getInstance().RHODIUM, 60, - ELEMENT.getInstance().SELENIUM, + MaterialsElements.getInstance().SELENIUM, 40, - ELEMENT.getInstance().TELLURIUM, + MaterialsElements.getInstance().TELLURIUM, 10); // milledPentlandite registerOreDataForMilledType( PentlanditeFlotationFroth, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 150, - ELEMENT.getInstance().NICKEL, + MaterialsElements.getInstance().NICKEL, 100, - ELEMENT.getInstance().PROMETHIUM, + MaterialsElements.getInstance().PROMETHIUM, 20, - ELEMENT.getInstance().HAFNIUM, + MaterialsElements.getInstance().HAFNIUM, 10); /* @@ -276,68 +276,68 @@ public class MilledOreProcessing extends ItemPackage { // milledRedstone registerOreDataForMilledType( RedstoneFlotationFroth, - NONMATERIAL.REDSTONE, + MaterialsOther.REDSTONE, 300, - ELEMENT.getInstance().CHROMIUM, + MaterialsElements.getInstance().CHROMIUM, 60, MaterialUtils.generateMaterialFromGtENUM(Materials.Firestone), 45, - ELEMENT.getInstance().DYSPROSIUM, + MaterialsElements.getInstance().DYSPROSIUM, 16); // milledSpessartine registerOreDataForMilledType( SpessartineFlotationFroth, - ELEMENT.getInstance().MANGANESE, + MaterialsElements.getInstance().MANGANESE, 150, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 90, - ELEMENT.getInstance().OSMIUM, + MaterialsElements.getInstance().OSMIUM, 30, - ELEMENT.getInstance().STRONTIUM, + MaterialsElements.getInstance().STRONTIUM, 20); // milledGrossular registerOreDataForMilledType( GrossularFlotationFroth, - ELEMENT.getInstance().CALCIUM, + MaterialsElements.getInstance().CALCIUM, 180, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 110, - ELEMENT.getInstance().TUNGSTEN, + MaterialsElements.getInstance().TUNGSTEN, 60, - ELEMENT.getInstance().THALLIUM, + MaterialsElements.getInstance().THALLIUM, 15); // milledAlmandine registerOreDataForMilledType( AlmandineFlotationFroth, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 150, - ELEMENT.getInstance().MAGNESIUM, + MaterialsElements.getInstance().MAGNESIUM, 75, - ELEMENT.getInstance().YTTRIUM, + MaterialsElements.getInstance().YTTRIUM, 25, - ELEMENT.getInstance().YTTERBIUM, + MaterialsElements.getInstance().YTTERBIUM, 15); // milledPyrope registerOreDataForMilledType( PyropeFlotationFroth, - ELEMENT.getInstance().MAGNESIUM, + MaterialsElements.getInstance().MAGNESIUM, 110, - ELEMENT.getInstance().MANGANESE, + MaterialsElements.getInstance().MANGANESE, 70, MaterialUtils.generateMaterialFromGtENUM(Materials.Borax), 60, - ELEMENT.getInstance().RHENIUM, + MaterialsElements.getInstance().RHENIUM, 20); // milledMonazite TODO registerOreDataForMilledType( MonaziteFlotationFroth, - ELEMENT.getInstance().ERBIUM, + MaterialsElements.getInstance().ERBIUM, 64, - ELEMENT.getInstance().LANTHANUM, + MaterialsElements.getInstance().LANTHANUM, 32, - ELEMENT.getInstance().LUTETIUM, + MaterialsElements.getInstance().LUTETIUM, 16, - ELEMENT.getInstance().EUROPIUM, + MaterialsElements.getInstance().EUROPIUM, 8); } @@ -358,8 +358,8 @@ public class MilledOreProcessing extends ItemPackage { private void addVacuumFurnaceRecipes() { int aCircuitID = 1; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(SphaleriteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -367,8 +367,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(ChalcopyriteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -376,8 +376,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(NickelFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(NickelFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -385,8 +385,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PlatinumFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PlatinumFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -394,8 +394,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PentlanditeFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PentlanditeFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -403,8 +403,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(RedstoneFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(RedstoneFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -412,8 +412,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(SpessartineFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(SpessartineFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -421,8 +421,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(GrossularFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(GrossularFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -430,8 +430,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(AlmandineFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(AlmandineFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -439,8 +439,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PyropeFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PyropeFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -448,8 +448,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 3500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(MonaziteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -466,7 +466,7 @@ public class MilledOreProcessing extends ItemPackage { // Sphalerite Material aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Sphalerite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -482,7 +482,7 @@ public class MilledOreProcessing extends ItemPackage { // Chalcopyrite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -498,7 +498,7 @@ public class MilledOreProcessing extends ItemPackage { // Nickel aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -514,7 +514,7 @@ public class MilledOreProcessing extends ItemPackage { // Platinum aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -530,7 +530,7 @@ public class MilledOreProcessing extends ItemPackage { // Pentlandite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pentlandite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -546,7 +546,7 @@ public class MilledOreProcessing extends ItemPackage { // Redstone aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Redstone); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -562,7 +562,7 @@ public class MilledOreProcessing extends ItemPackage { // Spessartine aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Spessartine); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -578,7 +578,7 @@ public class MilledOreProcessing extends ItemPackage { // Grossular aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Grossular); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -594,7 +594,7 @@ public class MilledOreProcessing extends ItemPackage { // Almandine aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Almandine); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -610,7 +610,7 @@ public class MilledOreProcessing extends ItemPackage { // Pyrope aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pyrope); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -626,7 +626,7 @@ public class MilledOreProcessing extends ItemPackage { // Monazite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Monazite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -648,16 +648,16 @@ public class MilledOreProcessing extends ItemPackage { ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1); - aLogs.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Pine)); - aLeaves.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.leaves_Pine)); - aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine)); + aLogs.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.log_Pine)); + aLeaves.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.leaves_Pine)); + aSaplings.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine)); aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1)); if (BiomesOPlenty.isModLoaded()) { - aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1)); - aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1)); - aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1)); - aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1)); + aLogs.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.logs4, 0, 1)); + aLeaves.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedLeaves2, 1, 1)); + aSaplings.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedSaplings, 5, 1)); + aPinecones.add(ItemUtils.simpleMetaStack(BiomesOPlentyHandler.mPineCone, 13, 1)); } if (Forestry.isModLoaded()) { ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1); @@ -690,7 +690,7 @@ public class MilledOreProcessing extends ItemPackage { addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] { 7500, 7500, 5000, 2500 }, 10, 60); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5), @@ -703,7 +703,7 @@ public class MilledOreProcessing extends ItemPackage { .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5), @@ -720,18 +720,18 @@ public class MilledOreProcessing extends ItemPackage { } public boolean addRecipe(ItemStack aInput, ItemStack aOutput1, int[] aChances, int aTime, int aEU) { - aOutput1 = GT_OreDictUnificator.get(true, aOutput1); + aOutput1 = GTOreDictUnificator.get(true, aOutput1); ItemStack aOutputs[] = new ItemStack[4]; for (int i = 0; i < aChances.length; i++) { aOutputs[i] = aOutput1; } aOutputs = cleanArray(aOutputs); - if ((GT_Utility.isStackInvalid(aInput)) - || (GT_Utility.isStackInvalid(aOutput1) || (GT_Utility.getContainerItem(aInput, false) != null))) { + if ((GTUtility.isStackInvalid(aInput)) + || (GTUtility.isStackInvalid(aOutput1) || (GTUtility.getContainerItem(aInput, false) != null))) { return false; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(14), aInput) .itemOutputs(aOutputs) .duration(aTime * 20) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index d83b5a7cea..db408721fc 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -1,17 +1,17 @@ package gtPlusPlus.core.item.chemistry; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -92,10 +92,10 @@ public class NuclearChem extends ItemPackage { } private static void chemReactor_CreateMutagen() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), - GT_Utility.getIntegratedCircuit(20)) + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), + GTUtility.getIntegratedCircuit(20)) .fluidInputs(FluidRegistry.getFluidStack("mobessence", 5000)) .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)) .duration(30 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 6cf0dcd09b..4a7291bb21 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -3,9 +3,9 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; @@ -19,13 +19,13 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.base.BaseItemComponent; @@ -74,8 +74,8 @@ public class RocketFuels extends ItemPackage { FluidStack fuelB = FluidUtils.getFluidStack("fuel", 3000); if (fuelA != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelA) .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)) .duration(10 * SECONDS) @@ -83,8 +83,8 @@ public class RocketFuels extends ItemPackage { .addTo(distilleryRecipes); } if (fuelA == null && fuelB != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelB) .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)) .duration(10 * SECONDS) @@ -96,8 +96,8 @@ public class RocketFuels extends ItemPackage { public static void createRP1() { FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000); if (fuelA != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelA) .fluidOutputs(FluidUtils.getFluidStack(RP1, 750)) .duration(40 * SECONDS) @@ -108,7 +108,7 @@ public class RocketFuels extends ItemPackage { public static void createNitrogenTetroxide() { // 2HNO3 + Cu = N2O4 + H2O + CuO - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0)) @@ -125,8 +125,8 @@ public class RocketFuels extends ItemPackage { public static void createHydrazine() { // H2O2 + 2NH3 = N2H4 + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21)) .fluidInputs( FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), FluidUtils.getFluidStack("ammonia", 2000)) @@ -141,8 +141,8 @@ public class RocketFuels extends ItemPackage { public static void createMonomethylhydrazine() { // C + 2H + N2H4 = CH6N2 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)) .fluidInputs(FluidUtils.getFluidStack("hydrogen", 2000), FluidUtils.getFluidStack(Hydrazine, 1000)) .fluidOutputs(FluidUtils.getFluidStack(Monomethylhydrazine, 1000)) .duration(48 * SECONDS) @@ -153,7 +153,7 @@ public class RocketFuels extends ItemPackage { } private static void createLOH() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)) .duration(16 * SECONDS) @@ -164,7 +164,7 @@ public class RocketFuels extends ItemPackage { private static void createHydratedAmmoniumNitrateSlurry() { // NH3 + HNO3 = NH4NO3 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(21)) .fluidInputs(FluidUtils.getFluidStack("ammonia", 4000), FluidUtils.getFluidStack("nitricacid", 4000)) .fluidOutputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184)) @@ -176,8 +176,8 @@ public class RocketFuels extends ItemPackage { } private static void createAmmoniumNitrateDust() { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(8)) .itemOutputs(ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)) .fluidInputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8 * 144)) .fluidOutputs(FluidUtils.getWater(2000)) @@ -189,7 +189,7 @@ public class RocketFuels extends ItemPackage { private static void createFormaldehyde() { // O + CH4O = CH2O + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0)) @@ -203,11 +203,11 @@ public class RocketFuels extends ItemPackage { } private static void createFormaldehydeCatalyst() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), - GT_Utility.getIntegratedCircuit(18)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GTUtility.getIntegratedCircuit(18)) .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -216,7 +216,7 @@ public class RocketFuels extends ItemPackage { private static void createUnsymmetricalDimethylhydrazine() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0)) @@ -233,10 +233,10 @@ public class RocketFuels extends ItemPackage { } private static void addRocketFuelsToMap() { - HashMap<Integer, GT_Recipe> mRocketFuels = new LinkedHashMap<>(); + HashMap<Integer, GTRecipe> mRocketFuels = new LinkedHashMap<>(); mRocketFuels.put( 0, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -250,7 +250,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 1, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -264,7 +264,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 2, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -278,7 +278,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 3, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -296,7 +296,7 @@ public class RocketFuels extends ItemPackage { mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel)); for (int mID : mRocketFuels.keySet()) { - GT_Recipe aFuelRecipe = mRocketFuels.get(mID); + GTRecipe aFuelRecipe = mRocketFuels.get(mID); if (aFuelRecipe != null) { mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid())); mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid()); @@ -308,8 +308,8 @@ public class RocketFuels extends ItemPackage { private static void createRocketFuels() { // RP1_Plus_Liquid_Oxygen - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(FluidUtils.getFluidStack(Liquid_Oxygen, 2000), FluidUtils.getFluidStack(RP1, 500)) .fluidOutputs(FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1500)) .duration(15 * SECONDS) @@ -317,8 +317,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); // Dense_Hydrazine_Mix - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(FluidUtils.getFluidStack(Hydrazine, 4000), FluidUtils.getFluidStack("methanol", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000)) .duration(30 * SECONDS) @@ -326,8 +326,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 4) .addTo(chemicalPlantRecipes); // Monomethylhydrazine_Plus_Nitric_Acid - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs( FluidUtils.getFluidStack(Monomethylhydrazine, 2000), FluidUtils.getFluidStack("nitricacid", 1000)) @@ -337,8 +337,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000), FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000)) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 8ef674ac19..038a1ea8ce 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -17,7 +17,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -270,10 +270,10 @@ public class ItemGenericChemBase extends Item { } public static int getMaxBallDurability(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { return 100; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { return 50; } return 0; diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java index 11bbac53a3..e616004ec1 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java @@ -29,25 +29,25 @@ import org.apache.commons.lang3.tuple.Pair; import com.gtnewhorizons.modularui.api.UIInfos; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.INetworkUpdatableItem; -import gregtech.api.net.GT_Packet_UpdateItem; +import gregtech.api.net.GTPacketUpdateItem; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem { +public class GTPPIntegratedCircuitItem extends Item implements INetworkUpdatableItem { private final List<ItemStack> ALL_VARIANTS = new ArrayList<>(); private final String iconLocation; protected final IIcon[] iconDamage = new IIcon[25]; - public GTPP_IntegratedCircuit_Item(String unlocalizedName, String iconLocation) { + public GTPPIntegratedCircuitItem(String unlocalizedName, String iconLocation) { this.setHasSubtypes(true); this.setNoRepair(); this.setMaxStackSize(64); @@ -72,13 +72,13 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab try { aList.add("Configuration == " + aStack.getItemDamage()); aList.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( new StringBuilder().append(getUnlocalizedName()) .append(".tooltip.0") .toString(), "Right click to reconfigure")); aList.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( new StringBuilder().append(getUnlocalizedName()) .append(".tooltip.1") .toString(), @@ -183,7 +183,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab buildContext -> new SelectItemUIFactory( StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"), configurator, - GTPP_IntegratedCircuit_Item::onConfigured, + GTPPIntegratedCircuitItem::onConfigured, ALL_VARIANTS, meta, true).createWindow(buildContext)); @@ -192,7 +192,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab private static void onConfigured(ItemStack stack) { NBTTagCompound tag = new NBTTagCompound(); tag.setByte("meta", (byte) stack.getItemDamage()); - GT_Values.NW.sendToServer(new GT_Packet_UpdateItem(tag)); + GTValues.NW.sendToServer(new GTPacketUpdateItem(tag)); } private static Pair<Integer, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> findConfiguratorInInv( @@ -201,9 +201,9 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab for (int j = 0, mainInventoryLength = mainInventory.length; j < mainInventoryLength; j++) { ItemStack toolStack = mainInventory[j]; - if (!GT_Utility.isStackValid(toolStack)) continue; + if (!GTUtility.isStackValid(toolStack)) continue; - for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList + for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTechAPI.sCircuitProgrammerList .entrySet()) if (p.getKey() .test(toolStack)) return Pair.of(j, p.getValue()); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 07bf082903..01f2b1b263 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -23,7 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; @@ -199,11 +199,11 @@ public class BaseItemMetaFood extends ItemFood { } mOreDictNames.put(aMetaID, aOreDictNames); if (aOreDictNames.contains("listAllmeatraw")) { - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(ModItems.itemMetaFood, 1, aMetaID), new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } else if (aOreDictNames.contains("listAllmeatcooked")) { - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(ModItems.itemMetaFood, 1, aMetaID), new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java index 69257afb0e..e99b4ca7a0 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java @@ -10,16 +10,16 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; -public class BufferCore extends BaseItemWithDamageValue { +public class ItemBufferCore extends BaseItemWithDamageValue { public int coreTier = 0; - public BufferCore(final String unlocalizedName, final int i) { + public ItemBufferCore(final String unlocalizedName, final int i) { super(unlocalizedName + i); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(32); @@ -42,7 +42,7 @@ public class BufferCore extends BaseItemWithDamageValue { public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add( EnumChatFormatting.GRAY + "A key crafting component for " - + GT_Values.VN[this.coreTier - 1] + + GTValues.VN[this.coreTier - 1] + " Applicances"); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index 9e5cf0a69d..f1f70b6cbd 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -19,7 +19,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -135,17 +135,17 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.3", - GT_Utility.formatNumbers(this.getTier(this.thisStack)), - GT_Utility.formatNumbers(this.getTransferLimit(this.thisStack)))); + GTUtility.formatNumbers(this.getTier(this.thisStack)), + GTUtility.formatNumbers(this.getTransferLimit(this.thisStack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.4", - GT_Utility.formatNumbers(this.getCharge(stack)), + GTUtility.formatNumbers(this.getCharge(stack)), MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.5", - GT_Utility.formatNumbers(this.secondsLeft(stack)))); + GTUtility.formatNumbers(this.secondsLeft(stack)))); super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index c1bea0b81d..7a0cbe3312 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -16,7 +16,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; @@ -74,12 +74,12 @@ public class ItemGenericToken extends CoreItem { sizes[0][4] = mCustomNameColours.size(); // sizes[0][5] = mIcons.size(); mLocalNames.put(id, aLocalName); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + "." + id + ".name", aLocalName); mMaxStackSizes.put(id, aMaxStack); mDescriptionArrays.put(id, aDescript); for (int i = 0; i < aDescript.length; i++) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName() + "." + id + ".tooltip." + i, aDescript[i]); } @@ -113,7 +113,7 @@ public class ItemGenericToken extends CoreItem { public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { super.addInformation(stack, aPlayer, list, bool); for (int i = 0;; i++) { - String tooltip = GT_LanguageManager.getTranslation( + String tooltip = GTLanguageManager.getTranslation( "gtplusplus." + this .getUnlocalizedNameInefficiently(stack) + "." + stack.getItemDamage() + ".tooltip." + i); if (!("gtplusplus." + this @@ -126,7 +126,7 @@ public class ItemGenericToken extends CoreItem { @Override public String getItemStackDisplayName(final ItemStack tItem) { - String ret = GT_LanguageManager.getTranslation( + String ret = GTLanguageManager.getTranslation( "gtplusplus." + this.getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name"); EnumChatFormatting format = mCustomNameColours.get(tItem.getItemDamage()); if (format != null) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index d80238b99a..ed9bddfd18 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -19,9 +19,9 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; @@ -89,7 +89,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI @Override public double getTransferLimit(final ItemStack itemStack) { - return GT_Values.V[7]; + return GTValues.V[7]; } @Override @@ -138,7 +138,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY); list.add( EnumChatFormatting.GREEN + aString2 - + GT_Utility.formatNumbers(EUPerOperation) + + GTUtility.formatNumbers(EUPerOperation) + aString3 + EnumChatFormatting.GRAY); list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY); @@ -151,13 +151,13 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTier(stack)) + + GTUtility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + + GTUtility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -165,12 +165,12 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getCharge(stack)) + + GTUtility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); list.add(EnumChatFormatting.GOLD + aString6 + EnumChatFormatting.GRAY); @@ -332,18 +332,18 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI .messagePlayer((EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger."); if (hp > 0) PlayerUtils - .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hp) + " hp."); + .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hp) + " hp."); if (hunger > 0) PlayerUtils - .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hunger) + " hunger."); + .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hunger) + " hunger."); if (saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, - "Satured Hunger by " + GT_Utility.formatNumbers(saturation) + "."); + "Satured Hunger by " + GTUtility.formatNumbers(saturation) + "."); if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, - "You check it's remaining uses, it has " + GT_Utility.formatNumbers(secondsLeft(baubleStack)) + "You check it's remaining uses, it has " + GTUtility.formatNumbers(secondsLeft(baubleStack)) + " seconds left."); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index 24759808ab..f23f4c8dce 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java @@ -12,7 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; public class ItemDehydratorCoil extends Item { @@ -56,7 +56,7 @@ public class ItemDehydratorCoil extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector - .translateToLocalFormatted("item.itemDehydratorCoil.name", GT_Values.VN[tItem.getItemDamage() + 4]); + .translateToLocalFormatted("item.itemDehydratorCoil.name", GTValues.VN[tItem.getItemDamage() + 4]); } /* diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index b050e4c65c..820486b742 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java @@ -12,7 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; public class ItemDehydratorCoilWire extends Item { @@ -56,7 +56,7 @@ public class ItemDehydratorCoilWire extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector - .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GT_Values.VN[tItem.getItemDamage() + 4]); + .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]); } /* diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index eaf8c2c9da..1524418038 100644 --- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -12,10 +12,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.handler.Recipes.DecayableRecipe; import gtPlusPlus.core.item.base.BaseItemTickable; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -28,7 +28,7 @@ public class DustDecayable extends BaseItemTickable { super(true, true, unlocal, colour, (maxTicks / 1), desc1); this.turnsIntoItem = turnsInto; this.radLevel = radLevel; - GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); new DecayableRecipe(maxTicks, getSimpleStack(this), getSimpleStack(turnsInto)); } @@ -45,7 +45,7 @@ public class DustDecayable extends BaseItemTickable { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { super.addInformation(stack, player, list, bool); if (this.radLevel > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java index 5ba3aa1531..082f74ad2b 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java @@ -1,8 +1,8 @@ package gtPlusPlus.core.item.tool.misc; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.util.GT_Utility.formatNumbers; +import static gregtech.api.util.GTUtility.formatNumbers; import java.util.ArrayList; import java.util.BitSet; @@ -35,21 +35,21 @@ import net.minecraftforge.fluids.IFluidTank; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -62,7 +62,7 @@ import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -public class GregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { +public class ItemGregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { /** * Right Click Functions @@ -91,7 +91,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri */ /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap<Short, ArrayList<IItemBehaviour<GregtechPump>>> mItemBehaviors = new HashMap<>(); + private final HashMap<Short, ArrayList<IItemBehaviour<ItemGregtechPump>>> mItemBehaviors = new HashMap<>(); public final short mOffset, mItemAmount; public final BitSet mEnabledItems; @@ -120,11 +120,11 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri ); } - public GregtechPump() { + public ItemGregtechPump() { this("MU-metatool.01", AddToCreativeTab.tabTools, (short) 1000, (short) 31766); } - public GregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, + public ItemGregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, final short aItemAmount) { this.mEnabledItems = new BitSet(aItemAmount); this.mVisibleItems = new BitSet(aItemAmount); @@ -157,7 +157,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri localizedName, EnumChatFormatting.GRAY + "Can be used to remove fluids from GT machine input & output slots"); if (euStorage > 0 && tier > 0) - this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); + this.setElectricStats(this.mOffset + id, euStorage, GTValues.V[tier], tier, -3L, true); this.rarity.put(id, regRarity); this.itemName.put(id, localizedName); this.hasEffect.put(id, Effect); @@ -188,7 +188,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri // aList.add("Meta: "+(aStack.getItemDamage()-mOffset)); int aOffsetMeta = getCorrectMetaForItemstack(aStack); aList.add( - GT_LanguageManager + GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + aOffsetMeta + ".tooltip")); if (aOffsetMeta <= 3) { @@ -234,9 +234,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } } - final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors + .get((short) this.getDamage(aStack)); if (tList != null) { - for (final IItemBehaviour<GregtechPump> tBehavior : tList) { + for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) { aList = tBehavior.getAdditionalToolTips(this, aList, aStack); } } @@ -366,7 +367,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } for (int i = 1; i < 5; i++) { final ItemStack tArmor = aPlayer.getEquipmentInSlot(i); - if (GT_ModHandler.isElectricItem(tArmor)) { + if (GTModHandler.isElectricItem(tArmor)) { final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) { final double tCharge = ElectricItem.manager.discharge( @@ -437,9 +438,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } public boolean isItemStackUsable(final ItemStack aStack) { - final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors + .get((short) this.getDamage(aStack)); if (tList != null) { - for (final IItemBehaviour<GregtechPump> tBehavior : tList) { + for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) { if (!tBehavior.isItemStackUsable(this, aStack)) { return false; } @@ -466,7 +468,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU) * @return the Item itself for convenience in constructing. */ - public final GregtechPump setBurnValue(final int aMetaValue, final int aValue) { + public final ItemGregtechPump setBurnValue(final int aMetaValue, final int aValue) { if ((aMetaValue < 0) || (aValue < 0)) { return this; } @@ -489,8 +491,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final GregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit, - final long aTier, final long aSpecialData, final boolean aUseAnimations) { + public final ItemGregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, + final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) { if (aMetaValue < 0) { return this; } @@ -509,7 +511,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri @SideOnly(Side.CLIENT) public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) { for (int i = 0, j = this.mEnabledItems.length(); i < j; i++) { - if (this.mVisibleItems.get(i) || (GT_Values.D1 && this.mEnabledItems.get(i))) { + if (this.mVisibleItems.get(i) || (GTValues.D1 && this.mEnabledItems.get(i))) { final Long[] tStats = this.mElectricStats.get((short) (this.mOffset + i)); if ((tStats != null) && (tStats[3] < 0)) { final ItemStack tStack = new ItemStack(this, 1, this.mOffset + i); @@ -598,11 +600,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * @param aBehavior the Click Behavior you want to add. * @return the Item itself for convenience in constructing. */ - public final GregtechPump addItemBehavior(final int aMetaValue, final IItemBehaviour<GregtechPump> aBehavior) { + public final ItemGregtechPump addItemBehavior(final int aMetaValue, + final IItemBehaviour<ItemGregtechPump> aBehavior) { if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue); + ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue); if (tList == null) { tList = new ArrayList<>(1); this.mItemBehaviors.put((short) aMetaValue, tList); @@ -628,12 +631,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } if ((aID >= 0) && (aID < this.mItemAmount)) { final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID); - GT_ModHandler.registerBoxableItemToToolBox(rStack); + GTModHandler.registerBoxableItemToToolBox(rStack); this.mEnabledItems.set(aID); this.mVisibleItems.set(aID); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".name", aEnglish); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".tooltip", aToolTip); final List<TC_AspectStack> tAspects = new ArrayList<>(); @@ -645,7 +648,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri continue; } if (tRandomData == SubTag.NO_UNIFICATION) { - GT_OreDictUnificator.addToBlacklist(rStack); + GTOreDictUnificator.addToBlacklist(rStack); continue; } } @@ -655,7 +658,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (tRandomData != null) { boolean tUseOreDict = true; if (tRandomData instanceof IItemBehaviour) { - this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GregtechPump>) tRandomData); + this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<ItemGregtechPump>) tRandomData); tUseOreDict = false; } if (tRandomData instanceof IItemContainer) { @@ -670,21 +673,21 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri continue; } if (tRandomData instanceof ItemData) { - if (GT_Utility.isStringValid(tRandomData)) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + if (GTUtility.isStringValid(tRandomData)) { + GTOreDictUnificator.registerOre(tRandomData, rStack); } else { - GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); + GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData); } continue; } if (tUseOreDict) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + GTOreDictUnificator.registerOre(tRandomData, rStack); continue; } } } - if (GregTech_API.sThaumcraftCompat != null) { - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); + if (GregTechAPI.sThaumcraftCompat != null) { + GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); } return rStack; } @@ -697,7 +700,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (keyValue < 0 || keyValue > 3) { keyValue = 0; } - return GT_LanguageManager + return GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".name"); } @@ -1236,19 +1239,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return null; } final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();; - if (aMetaTileEntity == null || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MultiInput) { + if (aMetaTileEntity == null || aMetaTileEntity instanceof MTEHatchMultiInput) { // blacklist multiinput hatch as it's too complex return null; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { + if (aMetaTileEntity instanceof MTEBasicTank) { Logger.INFO("Tile Was Instanceof BasicTank."); - return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity); + return getStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity); } else { return null; } } - public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) { + public FluidStack getStoredFluidOfGTMachine(MTEBasicTank aTileEntity) { FluidStack f = aTileEntity.mFluid; // Let's see if this machine has output fluid too @@ -1278,15 +1281,15 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { + if (aMetaTileEntity instanceof MTEBasicTank) { Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]"); - return setStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity, aSetFluid); + return setStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity, aSetFluid); } else { return false; } } - public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity, FluidStack aSetFluid) { + public boolean setStoredFluidOfGTMachine(MTEBasicTank aTileEntity, FluidStack aSetFluid) { try { // Try Handle Outputs First diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index e929d6cb7f..4c4330af75 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat; +import gtPlusPlus.core.item.wearable.armour.tinfoil.ItemArmourTinFoilHat; public class ArmourLoader { @@ -32,7 +32,7 @@ public class ArmourLoader { private static void glassArmour() {} private static void tinfoilArmour() { - TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); + TinFoilHat = new ItemArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", GTPlusPlus.ID); } } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java index 0703ac3b93..7df52a176a 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java @@ -28,15 +28,15 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -public class ArmourTinFoilHat extends BaseArmourHelm { +public class ItemArmourTinFoilHat extends BaseArmourHelm { public IIcon iconHelm; - public ArmourTinFoilHat() { + public ItemArmourTinFoilHat() { super(ArmourLoader.TinFoilArmour, 0); } @@ -122,7 +122,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { if (player instanceof EntityPlayer) { // Apply Slow - if (!GT_Utility.getPotion(player, Potion.moveSlowdown.id)) { + if (!GTUtility.getPotion(player, Potion.moveSlowdown.id)) { player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1, true)); } |