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/xmod/gregtech/api | |
| 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/xmod/gregtech/api')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 90 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java | 142 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPPUITextures.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java) | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java) | 6 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java) | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java) | 11 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java) | 24 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java) | 53 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java) | 118 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java) | 46 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java) | 76 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java) | 62 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java) | 37 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java) | 13 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java) | 19 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java) | 33 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java) | 25 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchInputBattery.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java) | 41 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java) | 75 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java) | 27 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchOutputBattery.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java) | 37 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchReservoir.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java) | 15 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Solidifier.java) | 21 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java) | 70 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java) | 14 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java) | 82 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java) | 37 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTETreeFarmerStructural.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java) | 15 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MteHatchSteamBusInput.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java) | 82 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMetaTileEntity.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java) | 10 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java) | 344 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTEHatchCustomFluidBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java) | 30 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java) | 122 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTETransformerHiAmp.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java) | 17 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java) | 71 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java) | 60 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTESolarGenerator.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java) | 14 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java) | 25 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPCopiedBlockTexture.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPRenderedTexture.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPPConfig.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java) | 38 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java | 4 |
51 files changed, 1045 insertions, 1123 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 708650dfe2..e51d60834f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -1,21 +1,21 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.enums.GTValues.W; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gtPlusPlus.xmod.gregtech.api.interfaces.IGregtechItemContainer; /** * Class containing all non-OreDict Items of GregTech. */ -public enum GregtechItemList implements GregtechItemContainer { +public enum GregtechItemList implements IGregtechItemContainer { /** * Items @@ -777,16 +777,16 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Dehydrator_ZPM, // Fluid Storage Tanks - GT_FluidTank_ULV, - GT_FluidTank_LV, - GT_FluidTank_MV, - GT_FluidTank_HV, - GT_FluidTank_EV, - GT_FluidTank_IV, - GT_FluidTank_LuV, - GT_FluidTank_ZPM, - GT_FluidTank_UV, - GT_FluidTank_MAX, + GTFluidTank_ULV, + GTFluidTank_LV, + GTFluidTank_MV, + GTFluidTank_HV, + GTFluidTank_EV, + GTFluidTank_IV, + GTFluidTank_LuV, + GTFluidTank_ZPM, + GTFluidTank_UV, + GTFluidTank_MAX, // GT RTG RTG, @@ -845,14 +845,14 @@ public enum GregtechItemList implements GregtechItemContainer { return this; } final ItemStack aStack = new ItemStack(aItem, 1, 0); - this.mStack = GT_Utility.copyAmount(1, aStack); + this.mStack = GTUtility.copyAmount(1, aStack); return this; } @Override public GregtechItemList set(final ItemStack aStack) { this.mHasNotBeenSet = false; - this.mStack = GT_Utility.copyAmount(1, aStack); + this.mStack = GTUtility.copyAmount(1, aStack); return this; } @@ -861,7 +861,7 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { + if (GTUtility.isStackInvalid(this.mStack)) { return null; } return this.mStack.getItem(); @@ -887,15 +887,15 @@ public enum GregtechItemList implements GregtechItemContainer { @Override public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) { - if (GT_Utility.isStackInvalid(aStack)) { + if (GTUtility.isStackInvalid(aStack)) { return false; } - return GT_Utility + return GTUtility .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); } public static Block getBlockFromStack(Object aStack) { - if (GT_Utility.isStackInvalid(aStack)) return Blocks.air; + if (GTUtility.isStackInvalid(aStack)) return Blocks.air; return Block.getBlockFromItem(((ItemStack) aStack).getItem()); } @@ -904,10 +904,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(this.mStack)); } @Override @@ -915,10 +915,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(this.mStack)); } @Override @@ -926,10 +926,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(this.mStack)); } @Override @@ -937,31 +937,31 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility - .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); + return GTUtility + .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GTOreDictUnificator.get(this.mStack)); } @Override public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) { final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } rStack.setStackDisplayName(aDisplayName); - return GT_Utility.copyAmount(aAmount, rStack); + return GTUtility.copyAmount(aAmount, rStack); } @Override public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) { final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); + GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); + return GTUtility.copyAmount(aAmount, rStack); } @Override @@ -969,10 +969,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(this.mStack)); } @Override @@ -981,7 +981,7 @@ public enum GregtechItemList implements GregtechItemContainer { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.get(1)); + GTOreDictUnificator.registerOre(tOreName, this.get(1)); } return this; } @@ -992,7 +992,7 @@ public enum GregtechItemList implements GregtechItemContainer { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1)); + GTOreDictUnificator.registerOre(tOreName, this.getWildcard(1)); } return this; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 655b242c04..fedd28f342 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -1,8 +1,8 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.B; -import static gregtech.api.enums.GT_Values.D2; -import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.GTValues.B; +import static gregtech.api.enums.GTValues.D2; +import static gregtech.api.enums.GTValues.M; import static gtPlusPlus.core.util.Utils.getTcAspectStack; import java.util.ArrayList; @@ -21,18 +21,18 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.ICondition; import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; +import gregtech.api.util.GTConfig; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; @@ -123,15 +123,15 @@ public enum GregtechOrePrefixes { public final List<TC_AspectStack> mAspects = new ArrayList<>(); public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<>(); /** - * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to + * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTechAPI.MATERIAL_UNIT to * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount */ public final long mMaterialAmount; private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); - private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>(); - private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); + private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<>(); + private final ArrayList<IOreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); public final ItemStack mContainerItem = null; public final ICondition<ISubTagContainer> mCondition = null; public byte mDefaultStackSize = 64; @@ -170,64 +170,64 @@ public enum GregtechOrePrefixes { // TODO - Utilise some form of way to check if it's gt 5.9 if so, use string switch. if (this.name() .startsWith("ore")) { - getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.TERRA.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("wire") || this.name() .startsWith("cable")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("dust")) { - getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("crushed")) { - getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("ingot") || this.name() .startsWith("nugget")) { - getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.METALLUM.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("armor")) { - getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); return; |
